diff --git a/CHANGELOG.md b/CHANGELOG.md
index d357d3a67d1ca..4661c4875737d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,415 @@
+2.3.3
+=============
+* GitHub issues:
+    * [#533](https://github.com/magento/magento2/issues/533) -- By default Allow all access in .htaccess (fixed in [magento/graphql-ce#578](https://github.com/magento/graphql-ce/pull/578))
+    * [#601](https://github.com/magento/magento2/issues/601) -- Admin tabs js error. (fixed in [magento/graphql-ce#632](https://github.com/magento/graphql-ce/pull/632))
+    * [#631](https://github.com/magento/magento2/issues/631) -- Image Management / Editing (fixed in [magento/graphql-ce#634](https://github.com/magento/graphql-ce/pull/634))
+    * [#20124](https://github.com/magento/magento2/issues/20124) -- Sort By label is hidden by Shop By Menu on listing page in iphone5 device (fixed in [magento/magento2#20135](https://github.com/magento/magento2/pull/20135))
+    * [#21978](https://github.com/magento/magento2/issues/21978) -- Adding product image: File doesn't exist (fixed in [magento/magento2#22020](https://github.com/magento/magento2/pull/22020))
+    * [#22045](https://github.com/magento/magento2/issues/22045) -- Instant Purchase on product page not working properly. (fixed in [magento/magento2#22260](https://github.com/magento/magento2/pull/22260))
+    * [#22134](https://github.com/magento/magento2/issues/22134) -- Paypal buttons disable issue - Magento 2.3.1 (fixed in [magento/magento2#22260](https://github.com/magento/magento2/pull/22260))
+    * [#22249](https://github.com/magento/magento2/issues/22249) -- Configurable Product Gallery Images Out of Order when More than 10 images (fixed in [magento/magento2#22287](https://github.com/magento/magento2/pull/22287))
+    * [#22527](https://github.com/magento/magento2/issues/22527) -- Wishlist and compare icon align issue in product listing page (fixed in [magento/magento2#22532](https://github.com/magento/magento2/pull/22532))
+    * [#628](https://github.com/magento/magento2/issues/628) -- Feature Request: Parent entities links in child entities grid. (fixed in [magento/graphql-ce#636](https://github.com/magento/graphql-ce/pull/636))
+    * [#640](https://github.com/magento/magento2/issues/640) -- [Insight] Files should not be executable (fixed in [magento/graphql-ce#648](https://github.com/magento/graphql-ce/pull/648))
+    * [#603](https://github.com/magento/magento2/issues/603) -- 'Continue' button is disabled even though "I've read OSL licence" is checked (fixed in [magento/graphql-ce#653](https://github.com/magento/graphql-ce/pull/653))
+    * [#22406](https://github.com/magento/magento2/issues/22406) -- Store view specific labels cut in left navigation menu (fixed in [magento/magento2#22423](https://github.com/magento/magento2/pull/22423))
+    * [#19515](https://github.com/magento/magento2/issues/19515) -- Create new order from backend saves the credit card when it is told not to (fixed in [magento/magento2#19767](https://github.com/magento/magento2/pull/19767))
+    * [#21473](https://github.com/magento/magento2/issues/21473) -- Form element validation is not triggered when validation rules change (fixed in [magento/magento2#21992](https://github.com/magento/magento2/pull/21992))
+    * [#22641](https://github.com/magento/magento2/issues/22641) -- Typo Issue and Missing header title at Customer Sales order grid  (fixed in [magento/magento2#22643](https://github.com/magento/magento2/pull/22643))
+    * [#22647](https://github.com/magento/magento2/issues/22647) -- In customer account create page word not readable, should use '-' after break to new line In mobile view (fixed in [magento/magento2#22656](https://github.com/magento/magento2/pull/22656))
+    * [#22395](https://github.com/magento/magento2/issues/22395) -- config:set -le and -lc short form options don't work (fixed in [magento/magento2#22720](https://github.com/magento/magento2/pull/22720))
+    * [#198](https://github.com/magento/magento2/issues/198) -- Better Search Please!! NOW (fixed in [magento/graphql-ce#371](https://github.com/magento/graphql-ce/pull/371))
+    * [#436](https://github.com/magento/magento2/issues/436) -- [Feature request]custom option attach an image (fixed in [magento/graphql-ce#445](https://github.com/magento/graphql-ce/pull/445))
+    * [#309](https://github.com/magento/magento2/issues/309) -- Terrible UI in Backend (fixed in [magento/graphql-ce#504](https://github.com/magento/graphql-ce/pull/504))
+    * [#535](https://github.com/magento/magento2/issues/535) -- A few bugs (fixed in [magento/graphql-ce#650](https://github.com/magento/graphql-ce/pull/650))
+    * [#658](https://github.com/magento/magento2/issues/658) -- Inline translate malfunctioning (fixed in [magento/graphql-ce#665](https://github.com/magento/graphql-ce/pull/665) and [magento/graphql-ce#744](https://github.com/magento/graphql-ce/pull/744))
+    * [#657](https://github.com/magento/magento2/issues/657) -- Feature Request: Grid paging options at the top and the bottom of the grid. (fixed in [magento/graphql-ce#666](https://github.com/magento/graphql-ce/pull/666))
+    * [#12612](https://github.com/magento/magento2/issues/12612) -- Array to String conversion error on checkout page when changin country - how to debug (fixed in [magento/magento2#22558](https://github.com/magento/magento2/pull/22558))
+    * [#22556](https://github.com/magento/magento2/issues/22556) -- VatValidator::validate returns error if region in quoteAddress is not set (fixed in [magento/magento2#22558](https://github.com/magento/magento2/pull/22558))
+    * [#20843](https://github.com/magento/magento2/issues/20843) -- Uncaught TypeError: panel.addClass is not a function when Swatches are disabled (fixed in [magento/magento2#22560](https://github.com/magento/magento2/pull/22560))
+    * [#22636](https://github.com/magento/magento2/issues/22636) -- arrow toggle not changing only showing to down It should be toggle as every where is working  (fixed in [magento/magento2#22644](https://github.com/magento/magento2/pull/22644))
+    * [#22640](https://github.com/magento/magento2/issues/22640) -- Add tax rule form checkbox design is not as per the magento admin panel checkbox design, It is showing default design  (fixed in [magento/magento2#22655](https://github.com/magento/magento2/pull/22655))
+    * [#20906](https://github.com/magento/magento2/issues/20906) -- Magento backend catalog "Cost" without currency symbol (fixed in [magento/magento2#22739](https://github.com/magento/magento2/pull/22739))
+    * [#22771](https://github.com/magento/magento2/issues/22771) -- Magento 2.3.0 can't change text area field height admin form using Ui component (fixed in [magento/magento2#22779](https://github.com/magento/magento2/pull/22779))
+    * [#22788](https://github.com/magento/magento2/issues/22788) -- New Shipment emails do not generate (fixed in [magento/magento2#22791](https://github.com/magento/magento2/pull/22791))
+    * [#18651](https://github.com/magento/magento2/issues/18651) -- Tierprice can't save float percentage value (fixed in [magento/magento2#19584](https://github.com/magento/magento2/pull/19584))
+    * [#21672](https://github.com/magento/magento2/issues/21672) -- Database Media Storage - Design Config fails to save transactional email logo correctly (fixed in [magento/magento2#21675](https://github.com/magento/magento2/pull/21675) and [magento/magento2#21674](https://github.com/magento/magento2/pull/21674))
+    * [#22028](https://github.com/magento/magento2/issues/22028) -- Unable to update products via csv file, when products ids from file are from wide id range (fixed in [magento/magento2#22575](https://github.com/magento/magento2/pull/22575))
+    * [#21558](https://github.com/magento/magento2/issues/21558) -- Navigation issue of review from product listing when click on review count (fixed in [magento/magento2#22794](https://github.com/magento/magento2/pull/22794))
+    * [#22127](https://github.com/magento/magento2/issues/22127) -- Magento 2.3.0: getSize call on configurable collection leads to exception, if no product filters are applied (fixed in [magento/magento2#22186](https://github.com/magento/magento2/pull/22186))
+    * [#22639](https://github.com/magento/magento2/issues/22639) -- Without select attribute click on add attribute it display all selected when add attribute again. (fixed in [magento/magento2#22724](https://github.com/magento/magento2/pull/22724))
+    * [#22676](https://github.com/magento/magento2/issues/22676) -- Compare Products counter, and My Wish List counter vertical not aligned (fixed in [magento/magento2#22742](https://github.com/magento/magento2/pull/22742))
+    * [#6659](https://github.com/magento/magento2/issues/6659) -- Disabled payment methods show in Customer Dashboard (fixed in [magento/magento2#22850](https://github.com/magento/magento2/pull/22850))
+    * [#4628](https://github.com/magento/magento2/issues/4628) -- .lib-font-face mixin - Fixed font formats (fixed in [magento/magento2#22854](https://github.com/magento/magento2/pull/22854))
+    * [#3795](https://github.com/magento/magento2/issues/3795) -- Validation messages missing from datepicker form elements (fixed in [magento/magento2#21397](https://github.com/magento/magento2/pull/21397))
+    * [#22786](https://github.com/magento/magento2/issues/22786) -- The validation for UPS configurations triggers even if UPS is disabled for checkout (fixed in [magento/magento2#22787](https://github.com/magento/magento2/pull/22787))
+    * [#22822](https://github.com/magento/magento2/issues/22822) -- [Shipping] The contact us link isn't showing on order tracking page (fixed in [magento/magento2#22823](https://github.com/magento/magento2/pull/22823))
+    * [#21852](https://github.com/magento/magento2/issues/21852) -- Random Error while waiting for package deployed (fixed in [magento/magento2#22607](https://github.com/magento/magento2/pull/22607))
+    * [#22563](https://github.com/magento/magento2/issues/22563) -- Parallelised execution of static content deploy is broken on 2.3-develop (fixed in [magento/magento2#22607](https://github.com/magento/magento2/pull/22607))
+    * [#22736](https://github.com/magento/magento2/issues/22736) -- Cursor position not in right side of search keyword in search box when click on search again (Mobile issue) (fixed in [magento/magento2#22795](https://github.com/magento/magento2/pull/22795))
+    * [#22875](https://github.com/magento/magento2/issues/22875) -- Billing Agreements page title need to be improved (fixed in [magento/magento2#22876](https://github.com/magento/magento2/pull/22876))
+    * [#21214](https://github.com/magento/magento2/issues/21214) -- Luma theme Apply Discount Code section design improvement (fixed in [magento/magento2#21215](https://github.com/magento/magento2/pull/21215))
+    * [#22143](https://github.com/magento/magento2/issues/22143) -- Varnish health check failing due to presence of id_prefix in env.php (fixed in [magento/magento2#22307](https://github.com/magento/magento2/pull/22307))
+    * [#22317](https://github.com/magento/magento2/issues/22317) -- CodeSniffer should not mark correctly aligned DocBlock elements as code style violation. (fixed in [magento/magento2#22444](https://github.com/magento/magento2/pull/22444))
+    * [#22396](https://github.com/magento/magento2/issues/22396) -- config:set fails with JSON values (fixed in [magento/magento2#22513](https://github.com/magento/magento2/pull/22513))
+    * [#22506](https://github.com/magento/magento2/issues/22506) -- Search suggestion panel overlapping on advance reporting button (fixed in [magento/magento2#22520](https://github.com/magento/magento2/pull/22520))
+    * [#22869](https://github.com/magento/magento2/issues/22869) -- REST: Updating a customer without store_id sets the store_id to default  (fixed in [magento/magento2#22893](https://github.com/magento/magento2/pull/22893))
+    * [#22924](https://github.com/magento/magento2/issues/22924) -- Store view label not in the middle of panel (fixed in [magento/magento2#22926](https://github.com/magento/magento2/pull/22926))
+    * [#20186](https://github.com/magento/magento2/issues/20186) -- phpcs error on rule classes -  must be of the type integer (fixed in [magento/magento2#22947](https://github.com/magento/magento2/pull/22947))
+    * [#574](https://github.com/magento/magento2/issues/574) -- Maximum function nesting level of '100' reached (fixed in [magento/graphql-ce#694](https://github.com/magento/graphql-ce/pull/694))
+    * [#686](https://github.com/magento/magento2/issues/686) -- Product save validation errors in the admin don't hide the overlay (fixed in [magento/graphql-ce#695](https://github.com/magento/graphql-ce/pull/695))
+    * [#22380](https://github.com/magento/magento2/issues/22380) -- Checkout totals order in specific store (fixed in [magento/magento2#22387](https://github.com/magento/magento2/pull/22387))
+    * [#18183](https://github.com/magento/magento2/issues/18183) -- Magento 2.2.6 coupon codes don't work anymore (fixed in [magento/magento2#22718](https://github.com/magento/magento2/pull/22718))
+    * [#22899](https://github.com/magento/magento2/issues/22899) -- Incorrect return type at getListByCustomerId in PaymentTokenManagementInterface (fixed in [magento/magento2#22914](https://github.com/magento/magento2/pull/22914))
+    * [#22686](https://github.com/magento/magento2/issues/22686) -- Shipment Create via API salesShipmentRepositoryV1 throw Fatal error in Admin Order -> Shipment -> View (fixed in [magento/magento2#22687](https://github.com/magento/magento2/pull/22687))
+    * [#22767](https://github.com/magento/magento2/issues/22767) -- Not clear logic for loading CMS Pages with setStoreId function  (fixed in [magento/magento2#22772](https://github.com/magento/magento2/pull/22772))
+    * [#20788](https://github.com/magento/magento2/issues/20788) -- Listing page no equal spacing in product in list view (fixed in [magento/magento2#22931](https://github.com/magento/magento2/pull/22931))
+    * [#23030](https://github.com/magento/magento2/issues/23030) -- Magento2 Swatch change Image does not slide to first Image (fixed in [magento/magento2#23033](https://github.com/magento/magento2/pull/23033))
+    * [#23034](https://github.com/magento/magento2/issues/23034) -- Wrong behaviour of validation scroll (fixed in [magento/magento2#23035](https://github.com/magento/magento2/pull/23035))
+    * [#12696](https://github.com/magento/magento2/issues/12696) -- Integration tests create stub modules in app/code (fixed in [magento/magento2#18459](https://github.com/magento/magento2/pull/18459))
+    * [#13266](https://github.com/magento/magento2/issues/13266) -- Topmenu 'last' class not being set if the a parent is inactive (fixed in [magento/magento2#22071](https://github.com/magento/magento2/pull/22071))
+    * [#22882](https://github.com/magento/magento2/issues/22882) -- Static content deploy - Don't shows error message, just stack trace (fixed in [magento/magento2#22884](https://github.com/magento/magento2/pull/22884))
+    * [#23045](https://github.com/magento/magento2/issues/23045) -- Exceptions from data patches do not show root cause (fixed in [magento/magento2#23046](https://github.com/magento/magento2/pull/23046))
+    * [#16446](https://github.com/magento/magento2/issues/16446) -- magento 2.2.2 text swatch switches product image even if attribute feature is disabled (fixed in [magento/magento2#19184](https://github.com/magento/magento2/pull/19184))
+    * [#14492](https://github.com/magento/magento2/issues/14492) -- Creating Customer without password is directly confirmed (fixed in [magento/magento2#21394](https://github.com/magento/magento2/pull/21394))
+    * [#21671](https://github.com/magento/magento2/issues/21671) -- Database Media Storage - Transaction emails logo not used when pub/media cleared (fixed in [magento/magento2#21674](https://github.com/magento/magento2/pull/21674))
+    * [#22425](https://github.com/magento/magento2/issues/22425) -- wrong url redirect when edit product review from Customer view page (fixed in [magento/magento2#22426](https://github.com/magento/magento2/pull/22426))
+    * [#22511](https://github.com/magento/magento2/issues/22511) -- Special From Date set to today's date when Use Default Date checked in Store scope (fixed in [magento/magento2#22521](https://github.com/magento/magento2/pull/22521))
+    * [#23080](https://github.com/magento/magento2/issues/23080) -- Missing whitespace in mobile navigation for non-English websites (fixed in [magento/magento2#23081](https://github.com/magento/magento2/pull/23081))
+    * [#19872](https://github.com/magento/magento2/issues/19872) -- Magento 2.3 category edit page "Select from gallery" button not working. (fixed in [magento/magento2#21131](https://github.com/magento/magento2/pull/21131))
+    * [#22092](https://github.com/magento/magento2/issues/22092) -- Assigning Catalog Image from Gallery, then Saving Twice, Clears Image (fixed in [magento/magento2#21131](https://github.com/magento/magento2/pull/21131))
+    * [#22087](https://github.com/magento/magento2/issues/22087) -- Products Ordered Report - Not grouped by product (fixed in [magento/magento2#22646](https://github.com/magento/magento2/pull/22646))
+    * [#21546](https://github.com/magento/magento2/issues/21546) -- [2.3] Database Media Storage - New Product Images fail to be processed correctly (fixed in [magento/magento2#21605](https://github.com/magento/magento2/pull/21605))
+    * [#21604](https://github.com/magento/magento2/issues/21604) -- Database Media Storage - Admin Product Edit page does not handle product images correctly in database storage mode (fixed in [magento/magento2#21605](https://github.com/magento/magento2/pull/21605))
+    * [#4247](https://github.com/magento/magento2/issues/4247) -- getProductUrl does not allow to override the scope in backend context (fixed in [magento/magento2#21876](https://github.com/magento/magento2/pull/21876))
+    * [#22940](https://github.com/magento/magento2/issues/22940) -- Reset feature does not clear the date (fixed in [magento/magento2#23007](https://github.com/magento/magento2/pull/23007))
+    * [#23053](https://github.com/magento/magento2/issues/23053) -- Sendfriend works for products with visibility not visible individually (fixed in [magento/magento2#23118](https://github.com/magento/magento2/pull/23118))
+    * [#675](https://github.com/magento/magento2/issues/675) -- Textarea element cols and rows (fixed in [magento/graphql-ce#677](https://github.com/magento/graphql-ce/pull/677))
+    * [#682](https://github.com/magento/magento2/issues/682) -- \Magento\Framework\Pricing\PriceCurrencyInterface depends on Magento application code (fixed in [magento/graphql-ce#700](https://github.com/magento/graphql-ce/pull/700))
+    * [#681](https://github.com/magento/magento2/issues/681) -- Magento\Framework\Xml\Parser class issues (fixed in [magento/graphql-ce#711](https://github.com/magento/graphql-ce/pull/711))
+    * [#22484](https://github.com/magento/magento2/issues/22484) -- Customer address States are duplicated in backend (fixed in [magento/magento2#22637](https://github.com/magento/magento2/pull/22637))
+    * [#23138](https://github.com/magento/magento2/issues/23138) -- Magento_Theme. Incorrect configuration file location  (fixed in [magento/magento2#23140](https://github.com/magento/magento2/pull/23140))
+    * [#22004](https://github.com/magento/magento2/issues/22004) -- ce231 - can't update attribute for all product (fixed in [magento/magento2#22704](https://github.com/magento/magento2/pull/22704))
+    * [#22870](https://github.com/magento/magento2/issues/22870) -- ProductRepository fails to update an existing product with a changed SKU (fixed in [magento/magento2#22933](https://github.com/magento/magento2/pull/22933))
+    * [#22808](https://github.com/magento/magento2/issues/22808) -- php bin/magento catalog:image:resize error if image is missing (fixed in [magento/magento2#23005](https://github.com/magento/magento2/pull/23005))
+    * [#674](https://github.com/magento/magento2/issues/674) -- Widgets in content pages. (fixed in [magento/graphql-ce#709](https://github.com/magento/graphql-ce/pull/709))
+    * [#683](https://github.com/magento/magento2/issues/683) -- CMS Router not routing correctly (fixed in [magento/graphql-ce#717](https://github.com/magento/graphql-ce/pull/717))
+    * [#9113](https://github.com/magento/magento2/issues/9113) -- [Bug or Feature?] url_path attribute value is not populated for any product (fixed in [magento/graphql-ce#721](https://github.com/magento/graphql-ce/pull/721))
+    * [#18337](https://github.com/magento/magento2/issues/18337) -- #search input is missing required attribute aria-expanded. (fixed in [magento/magento2#22942](https://github.com/magento/magento2/pull/22942))
+    * [#23213](https://github.com/magento/magento2/issues/23213) -- Static content deploy showing percentage(%) two times in progress bar (fixed in [magento/magento2#23216](https://github.com/magento/magento2/pull/23216))
+    * [#23238](https://github.com/magento/magento2/issues/23238) -- Apply coupon button act like remove coupon while create new order from admin (fixed in [magento/magento2#23250](https://github.com/magento/magento2/pull/23250))
+    * [#4788](https://github.com/magento/magento2/issues/4788) -- Wrong sitemap product url (fixed in [magento/magento2#23129](https://github.com/magento/magento2/pull/23129))
+    * [#22934](https://github.com/magento/magento2/issues/22934) -- Incorrect work of "Use Categories Path for Product URLs" in sitemap generation. (fixed in [magento/magento2#23129](https://github.com/magento/magento2/pull/23129))
+    * [#23266](https://github.com/magento/magento2/issues/23266) -- Cannot filter admin user by ID (fixed in [magento/magento2#23267](https://github.com/magento/magento2/pull/23267))
+    * [#23285](https://github.com/magento/magento2/issues/23285) -- Credit memo submit button(refund) stays disable after validation fails & unable to enable button (fixed in [magento/magento2#23286](https://github.com/magento/magento2/pull/23286))
+    * [#486](https://github.com/magento/magento2/issues/486) -- Take inspiration from other frameworks (fixed in [magento/graphql-ce#714](https://github.com/magento/graphql-ce/pull/714))
+    * [#716](https://github.com/magento/magento2/issues/716) -- Wrong mimetype returned by getMimeType from Magento library (fixed in [magento/graphql-ce#723](https://github.com/magento/graphql-ce/pull/723))
+    * [#687](https://github.com/magento/magento2/issues/687) -- Improvement Idea: /var/cache/mage--X (fixed in [magento/graphql-ce#749](https://github.com/magento/graphql-ce/pull/749))
+    * [#20038](https://github.com/magento/magento2/issues/20038) -- loading icon disappearing before background process completes for braintree payment (Admin order) (fixed in [magento/magento2#22675](https://github.com/magento/magento2/pull/22675))
+    * [#23074](https://github.com/magento/magento2/issues/23074) -- Magento 2.3.1 - URL rewrite rules are not creating for product after update url key (fixed in [magento/magento2#23309](https://github.com/magento/magento2/pull/23309))
+    * [#622](https://github.com/magento/magento2/issues/622) -- FIX Magento Search Please! (fixed in [magento/graphql-ce#626](https://github.com/magento/graphql-ce/pull/626))
+    * [#732](https://github.com/magento/magento2/issues/732) -- Inconsistency between Select and Multiselect form elements.  (fixed in [magento/graphql-ce#734](https://github.com/magento/graphql-ce/pull/734))
+    * [#13227](https://github.com/magento/magento2/issues/13227) -- Knockout Recently Viewed contains wrong product url (with category path), also not correct url <meta property="og:url"> on product view page (fixed in [magento/magento2#22650](https://github.com/magento/magento2/pull/22650))
+    * [#22638](https://github.com/magento/magento2/issues/22638) -- Asterisk(*) sign position does not consistent in admin (fixed in [magento/magento2#22800](https://github.com/magento/magento2/pull/22800))
+    * [#22266](https://github.com/magento/magento2/issues/22266) -- Product Alert after login shows 404 page (fixed in [magento/magento2#23218](https://github.com/magento/magento2/pull/23218))
+    * [#23230](https://github.com/magento/magento2/issues/23230) -- Sticky header floating under top when there is no buttons in the toolbar (fixed in [magento/magento2#23247](https://github.com/magento/magento2/pull/23247))
+    * [#23333](https://github.com/magento/magento2/issues/23333) -- Incorrect payment method translation in order emails (fixed in [magento/magento2#23338](https://github.com/magento/magento2/pull/23338))
+    * [#23346](https://github.com/magento/magento2/issues/23346) -- 'Test Connection' button is over-spanned (fixed in [magento/magento2#23367](https://github.com/magento/magento2/pull/23367))
+    * [#21380](https://github.com/magento/magento2/issues/21380) -- Cron schedule is being duplicated (fixed in [magento/magento2#23312](https://github.com/magento/magento2/pull/23312))
+    * [#21136](https://github.com/magento/magento2/issues/21136) -- Magento installation via metapackage: checkExtensions fails (fixed in [magento/magento2#22116](https://github.com/magento/magento2/pull/22116))
+    * [#23233](https://github.com/magento/magento2/issues/23233) -- Alert widget doesn't trigger always method on showing the message (fixed in [magento/magento2#23234](https://github.com/magento/magento2/pull/23234))
+    * [#21974](https://github.com/magento/magento2/issues/21974) -- Changes for PayPal affect core config fields with tooltip  (fixed in [magento/magento2#23393](https://github.com/magento/magento2/pull/23393))
+    * [#23377](https://github.com/magento/magento2/issues/23377) -- Mini cart loader not working first time magento2 (fixed in [magento/magento2#23394](https://github.com/magento/magento2/pull/23394))
+    * [#22998](https://github.com/magento/magento2/issues/22998) -- POST on /orders fails when properties in the body are out of sequence (fixed in [magento/magento2#23048](https://github.com/magento/magento2/pull/23048))
+    * [#23522](https://github.com/magento/magento2/issues/23522) -- UPS shipping booking and label generation gives error when shipper's street given more than 35 chars (fixed in [magento/magento2#23523](https://github.com/magento/magento2/pull/23523))
+    * [#8298](https://github.com/magento/magento2/issues/8298) -- Mobile Menu Behavior at Incorrect Breakpoint (fixed in [magento/magento2#23528](https://github.com/magento/magento2/pull/23528))
+    * [#22103](https://github.com/magento/magento2/issues/22103) -- Character Encoding in Plain Text Emails Fails since 2.2.8/2.3.0 due to emails no longer being sent as MIME (fixed in [magento/magento2#23535](https://github.com/magento/magento2/pull/23535))
+    * [#23199](https://github.com/magento/magento2/issues/23199) -- NO sender in email header for magento 2 sales order and password change emails to customer (fixed in [magento/magento2#23535](https://github.com/magento/magento2/pull/23535))
+    * [#23538](https://github.com/magento/magento2/issues/23538) -- wrong validation happen for max-words validation class  (fixed in [magento/magento2#23541](https://github.com/magento/magento2/pull/23541))
+    * [#21126](https://github.com/magento/magento2/issues/21126) -- Backend Import behavior  design break (fixed in [magento/magento2#21128](https://github.com/magento/magento2/pull/21128))
+    * [#23471](https://github.com/magento/magento2/issues/23471) -- Tooltip missing at store view lable in Cms page and Cms block (fixed in [magento/magento2#23474](https://github.com/magento/magento2/pull/23474))
+    * [#23466](https://github.com/magento/magento2/issues/23466) -- Cart empty after update qty with -1 and change address. (fixed in [magento/magento2#23477](https://github.com/magento/magento2/pull/23477))
+    * [#23467](https://github.com/magento/magento2/issues/23467) -- Phone and Zip not update if customer have no saved address (fixed in [magento/magento2#23494](https://github.com/magento/magento2/pull/23494))
+    * [#23222](https://github.com/magento/magento2/issues/23222) -- setup:upgrade should return failure when app:config:import failed (fixed in [magento/magento2#23310](https://github.com/magento/magento2/pull/23310))
+    * [#23354](https://github.com/magento/magento2/issues/23354) -- Data saving problem error showing when leave blank qty and update it (fixed in [magento/magento2#23360](https://github.com/magento/magento2/pull/23360))
+    * [#23424](https://github.com/magento/magento2/issues/23424) -- Search by keyword didn't work properly with "0" value (fixed in [magento/magento2#23427](https://github.com/magento/magento2/pull/23427))
+    * [#16234](https://github.com/magento/magento2/issues/16234) -- Unable to enter `+` character in widget content (fixed in [magento/magento2#23496](https://github.com/magento/magento2/pull/23496))
+    * [#9798](https://github.com/magento/magento2/issues/9798) -- Problem adding attribute options to configurable product via REST Api (fixed in [magento/magento2#23529](https://github.com/magento/magento2/pull/23529))
+    * [#6287](https://github.com/magento/magento2/issues/6287) -- Customer Admin Shopping Cart View Missing (fixed in [magento/magento2#20918](https://github.com/magento/magento2/pull/20918))
+    * [#22545](https://github.com/magento/magento2/issues/22545) -- Status downloadable product stays pending after succesfull payment (fixed in [magento/magento2#22658](https://github.com/magento/magento2/pull/22658))
+    * [#23383](https://github.com/magento/magento2/issues/23383) -- Products which are not assigned to any store are automatically being force-assigned a store ID after being saved (fixed in [magento/magento2#23500](https://github.com/magento/magento2/pull/23500))
+    * [#22950](https://github.com/magento/magento2/issues/22950) -- Spacing issue for Gift message section in my account (fixed in [magento/magento2#23226](https://github.com/magento/magento2/pull/23226))
+    * [#23606](https://github.com/magento/magento2/issues/23606) -- Default value for report filters might result in errors (fixed in [magento/magento2#23607](https://github.com/magento/magento2/pull/23607))
+    * [#736](https://github.com/magento/magento2/issues/736) -- Access to Zend Framework classes (fixed in [magento/graphql-ce#747](https://github.com/magento/graphql-ce/pull/747))
+    * [#739](https://github.com/magento/magento2/issues/739) -- Command line install script no longer exists. (fixed in [magento/graphql-ce#753](https://github.com/magento/graphql-ce/pull/753))
+    * [#23435](https://github.com/magento/magento2/issues/23435) -- Catalog Products Filter in 2.3.2  (fixed in [magento/magento2#23444](https://github.com/magento/magento2/pull/23444))
+    * [#12817](https://github.com/magento/magento2/issues/12817) -- Coupon code with canceled order (fixed in [magento/magento2#20579](https://github.com/magento/magento2/pull/20579))
+    * [#23386](https://github.com/magento/magento2/issues/23386) -- Copy Service does not works properly for Entities which extends Data Object and implements ExtensibleDataInterface (fixed in [magento/magento2#23387](https://github.com/magento/magento2/pull/23387))
+    * [#23345](https://github.com/magento/magento2/issues/23345) -- Creditmemo getOrder() method loads order incorrectly (fixed in [magento/magento2#23358](https://github.com/magento/magento2/pull/23358))
+    * [#22814](https://github.com/magento/magento2/issues/22814) -- Product stock alert - unsubscribe not working (fixed in [magento/magento2#23459](https://github.com/magento/magento2/pull/23459))
+    * [#23594](https://github.com/magento/magento2/issues/23594) -- Database Media Storage : php bin/magento catalog:images:resize fails when image does not exist locally (fixed in [magento/magento2#23598](https://github.com/magento/magento2/pull/23598))
+    * [#23595](https://github.com/magento/magento2/issues/23595) -- Database Media Storage : php bin/magento catalog:images:resize fails to generate cached images in database (fixed in [magento/magento2#23598](https://github.com/magento/magento2/pull/23598))
+    * [#23596](https://github.com/magento/magento2/issues/23596) -- Database Media Storage : Add new product image, cached images not generated (fixed in [magento/magento2#23598](https://github.com/magento/magento2/pull/23598))
+    * [#23643](https://github.com/magento/magento2/issues/23643) -- Mime parts of email are no more encoded with quoted printable (fixed in [magento/magento2#23649](https://github.com/magento/magento2/pull/23649))
+    * [#23597](https://github.com/magento/magento2/issues/23597) -- Database Media Storage : Difficulty changing mode to database media storage due to poor "Use Default Value" checkbox behaviour (fixed in [magento/magento2#23710](https://github.com/magento/magento2/pull/23710))
+    * [#23510](https://github.com/magento/magento2/issues/23510) -- Product customizable options of Area type render issue in Dashboard (fixed in [magento/magento2#23524](https://github.com/magento/magento2/pull/23524))
+    * [#22890](https://github.com/magento/magento2/issues/22890) -- Disabled config can be overwritten via admin (fixed in [magento/magento2#22891](https://github.com/magento/magento2/pull/22891))
+    * [#23054](https://github.com/magento/magento2/issues/23054) -- Cron job not running after crashed once (fixed in [magento/magento2#23125](https://github.com/magento/magento2/pull/23125))
+    * [#23135](https://github.com/magento/magento2/issues/23135) -- Insert Variable popup missing template variables for new templates (fixed in [magento/magento2#23173](https://github.com/magento/magento2/pull/23173))
+    * [#23211](https://github.com/magento/magento2/issues/23211) -- Zero Subtotal Checkout erroneously says the default value for "Automatically Invoice All Items" is "Yes" (fixed in [magento/magento2#23688](https://github.com/magento/magento2/pull/23688))
+    * [#23624](https://github.com/magento/magento2/issues/23624) -- [Authorize.net accept.js] "Place Order" button not being disabled (fixed in [magento/magento2#23718](https://github.com/magento/magento2/pull/23718))
+    * [#23717](https://github.com/magento/magento2/issues/23717) -- dependency injection fails for \Magento\ConfigurableProduct\Pricing\Price\PriceResolverInterface (fixed in [magento/magento2#23753](https://github.com/magento/magento2/pull/23753))
+    * [#758](https://github.com/magento/magento2/issues/758) -- Coding standards: arrays (fixed in [magento/graphql-ce#759](https://github.com/magento/graphql-ce/pull/759))
+    * [#14071](https://github.com/magento/magento2/issues/14071) -- Not able to change a position of last two related products in case of I've 20+ related products. (fixed in [magento/magento2#22984](https://github.com/magento/magento2/pull/22984))
+    * [#22112](https://github.com/magento/magento2/issues/22112) -- Shipping address information is lost in billing step (fixed in [magento/magento2#23656](https://github.com/magento/magento2/pull/23656))
+    * [#23654](https://github.com/magento/magento2/issues/23654) -- Frontend Label For Custom Order Status not Editable in Magento Admin in Single Store Mode (fixed in [magento/magento2#23681](https://github.com/magento/magento2/pull/23681))
+    * [#23751](https://github.com/magento/magento2/issues/23751) -- Database Media Storage : PDF Logo file not database aware (fixed in [magento/magento2#23752](https://github.com/magento/magento2/pull/23752))
+    * [#23678](https://github.com/magento/magento2/issues/23678) -- Can't see "Zero Subtotal Checkout" payment method settings if "Offline Payments" module is disabled (fixed in [magento/magento2#23679](https://github.com/magento/magento2/pull/23679))
+    * [#23777](https://github.com/magento/magento2/issues/23777) -- "Discount Amount" field is validated after the page load without any action from user in Create New Catalog Rule form (fixed in [magento/magento2#23779](https://github.com/magento/magento2/pull/23779))
+    * [#23789](https://github.com/magento/magento2/issues/23789) -- CommentLevelsSniff works incorrect with @magento_import statement. (fixed in [magento/magento2#23790](https://github.com/magento/magento2/pull/23790))
+    * [#22702](https://github.com/magento/magento2/issues/22702) -- Toggle icon not working in create configuration Product creation Page (fixed in [magento/magento2#23803](https://github.com/magento/magento2/pull/23803))
+    * [#167](https://github.com/magento/magento2/issues/167) -- Fatal error: Class 'Mage' not found (fixed in [magento/graphql-ce#351](https://github.com/magento/graphql-ce/pull/351))
+    * [#438](https://github.com/magento/magento2/issues/438) -- [Feature request] Price slider (fixed in [magento/graphql-ce#699](https://github.com/magento/graphql-ce/pull/699))
+    * [#702](https://github.com/magento/magento2/issues/702) -- Base table or view not found (fixed in [magento/graphql-ce#779](https://github.com/magento/graphql-ce/pull/779))
+    * [#738](https://github.com/magento/magento2/issues/738) -- pub/setup missing in 0.1.0-alpha103 (fixed in [magento/graphql-ce#789](https://github.com/magento/graphql-ce/pull/789))
+    * [#23405](https://github.com/magento/magento2/issues/23405) -- 2.3.2 installed and bin/magento setup:upgrade not working (fixed in [magento/magento2#23866](https://github.com/magento/magento2/pull/23866))
+    * [#23900](https://github.com/magento/magento2/issues/23900) -- Report->Product->Downloads has wrong ACL (fixed in [magento/magento2#23901](https://github.com/magento/magento2/pull/23901))
+    * [#23904](https://github.com/magento/magento2/issues/23904) -- No auto-focus after validation at "Create Configurations" button => User can not see the error message (fixed in [magento/magento2#23905](https://github.com/magento/magento2/pull/23905))
+    * [#23916](https://github.com/magento/magento2/issues/23916) -- Missing Validation at some Payment Method Settings (fixed in [magento/magento2#23917](https://github.com/magento/magento2/pull/23917))
+    * [#23932](https://github.com/magento/magento2/issues/23932) -- Decimal quantity is not displayed for wishlist items. (fixed in [magento/magento2#23933](https://github.com/magento/magento2/pull/23933))
+* GitHub pull requests:
+    * [magento/magento2#20135](https://github.com/magento/magento2/pull/20135) -- issue fixed #20124 Sort By label is hidden by Shop By Menu on listing (by @cedarvinda)
+    * [magento/magento2#22020](https://github.com/magento/magento2/pull/22020) -- Non existing file, when adding image to gallery with move option. Fix for #21978 (by @dudzio12)
+    * [magento/magento2#22260](https://github.com/magento/magento2/pull/22260) -- Disabling "Display on Product Details Page" the button is shown anyway. (by @Nazar65)
+    * [magento/magento2#22287](https://github.com/magento/magento2/pull/22287) -- #222249 configurable product images wrong sorting fix (by @Wirson)
+    * [magento/magento2#22526](https://github.com/magento/magento2/pull/22526) -- code cleanup (http to https) (by @ravi-chandra3197)
+    * [magento/magento2#22532](https://github.com/magento/magento2/pull/22532) -- fixed issue 22527 wishlist and compare icon alignment (by @sanjaychouhan-webkul)
+    * [magento/magento2#22423](https://github.com/magento/magento2/pull/22423) -- Store view specific labels cut in left navigation menu #22406 (by @sudhanshu-bajaj)
+    * [magento/magento2#22561](https://github.com/magento/magento2/pull/22561) -- [Catalog|Eav] Revert change of PR magento/magento2#13302 not included into revert commit (by @Den4ik)
+    * [magento/magento2#22569](https://github.com/magento/magento2/pull/22569) -- 2.3 develop pr1 (by @abhinay111222)
+    * [magento/magento2#22594](https://github.com/magento/magento2/pull/22594) -- Fixed typo issue (by @AfreenScarlet)
+    * [magento/magento2#22599](https://github.com/magento/magento2/pull/22599) -- Correct spelling (by @ravi-chandra3197)
+    * [magento/magento2#22621](https://github.com/magento/magento2/pull/22621) -- Resolved Typo (by @UdgamN)
+    * [magento/magento2#19767](https://github.com/magento/magento2/pull/19767) -- Prevent display of token when save for later is not selected (by @pmclain)
+    * [magento/magento2#21744](https://github.com/magento/magento2/pull/21744) -- Custom option type select - Allow modify list of single selection option types (by @ihor-sviziev)
+    * [magento/magento2#21992](https://github.com/magento/magento2/pull/21992) -- #21473: Form element validation is not triggered when validation rules... (by @kisroman)
+    * [magento/magento2#22493](https://github.com/magento/magento2/pull/22493) -- Update credit-card-number-validator.js (by @justin-at-bounteous)
+    * [magento/magento2#22643](https://github.com/magento/magento2/pull/22643) -- Fixed typo issue and added missing header in customer sales order grid (by @vishal-7037)
+    * [magento/magento2#22656](https://github.com/magento/magento2/pull/22656) -- issues #22647 fixed, In customer account create page word not readable, should use '-' after break to new line In mobile view  (by @cedarvinda)
+    * [magento/magento2#22720](https://github.com/magento/magento2/pull/22720) -- Fixed:#22395 (by @satyaprakashpatel)
+    * [magento/magento2#22558](https://github.com/magento/magento2/pull/22558) -- Additional condition in getRegion() method (by @Leone)
+    * [magento/magento2#22560](https://github.com/magento/magento2/pull/22560) -- Fix undefined methods 'addClass' and `removeClass` on a PrototypeJS Element (by @markvds)
+    * [magento/magento2#22606](https://github.com/magento/magento2/pull/22606) -- Fix Exception While Creating an Order in the Admin (by @justin-at-bounteous)
+    * [magento/magento2#22628](https://github.com/magento/magento2/pull/22628) -- Add a missting colon in the pdf page. (by @Hailong)
+    * [magento/magento2#22644](https://github.com/magento/magento2/pull/22644) -- Issue fixed #22636 arrow toggle not changing only showing to down It should be toggle as every where is working  (by @cedarvinda)
+    * [magento/magento2#22664](https://github.com/magento/magento2/pull/22664) -- Fixed Typo Error (by @LuciferStrome)
+    * [magento/magento2#22729](https://github.com/magento/magento2/pull/22729) -- Fixed Typo Issue (by @jitendra-cedcoss)
+    * [magento/magento2#22734](https://github.com/magento/magento2/pull/22734) -- Ignores allure-results in git. (by @hostep)
+    * [magento/magento2#22758](https://github.com/magento/magento2/pull/22758) -- Correct spelling (by @ravi-chandra3197)
+    * [magento/magento2#22798](https://github.com/magento/magento2/pull/22798) -- Disable Travis builds - 2.3-develop (by @okorshenko)
+    * [magento/magento2#22126](https://github.com/magento/magento2/pull/22126) -- Remove unnecessary form on order success page (by @danielgoodwin97)
+    * [magento/magento2#22655](https://github.com/magento/magento2/pull/22655) -- Fixed Issue #22640 (by @Surabhi-Cedcoss)
+    * [magento/magento2#22657](https://github.com/magento/magento2/pull/22657) -- 404 not found form validation url when updating quantity in cart page (by @gulshanchitransh)
+    * [magento/magento2#22739](https://github.com/magento/magento2/pull/22739) -- Revert "Magento backend catalog cost without currency symbol" as Cost... (by @orlangur)
+    * [magento/magento2#22779](https://github.com/magento/magento2/pull/22779) -- #22771 Remove hardcoded height for admin textarea (by @serhiyzhovnir)
+    * [magento/magento2#22791](https://github.com/magento/magento2/pull/22791) -- Fixed issue #22788 (by @gauravagarwal1001)
+    * [magento/magento2#19584](https://github.com/magento/magento2/pull/19584) -- Tierprice can t save float percentage value 18651 (by @novikor)
+    * [magento/magento2#21675](https://github.com/magento/magento2/pull/21675) -- [2.3] Database Media Storage - Design Config Save functions to be Database Media Storage aware (by @gwharton)
+    * [magento/magento2#21917](https://github.com/magento/magento2/pull/21917) -- Prevent duplicate variation error during import of configurable products with numerical SKUs (by @alexander-aleman)
+    * [magento/magento2#22463](https://github.com/magento/magento2/pull/22463) -- Set timezone on DateTime object not in constructor (by @NathMorgan)
+    * [magento/magento2#22575](https://github.com/magento/magento2/pull/22575) -- Fix for update products via csv file (fix for 22028) (by @mtwegrzycki)
+    * [magento/magento2#22794](https://github.com/magento/magento2/pull/22794) -- fixed issue #21558 - Navigation issue of review from product listing (by @sanjaychouhan-webkul)
+    * [magento/magento2#22844](https://github.com/magento/magento2/pull/22844) -- Allow to specify a field to be checked in the response (by @diazwatson)
+    * [magento/magento2#22186](https://github.com/magento/magento2/pull/22186) -- 22127: check that products is set (by @davidverholen)
+    * [magento/magento2#22418](https://github.com/magento/magento2/pull/22418) -- Patch the prototype pollution vulnerability in jQuery < 3.4.0 (CVE-2019-11358) (by @DanielRuf)
+    * [magento/magento2#22724](https://github.com/magento/magento2/pull/22724) -- Fixed issue #22639: Without select attribute click on add attribute it display all selected when add attribute again. (by @maheshWebkul721)
+    * [magento/magento2#22742](https://github.com/magento/magento2/pull/22742) -- issue #22676 fixed - Compare Products counter, and My Wish List count... (by @sanjaychouhan-webkul)
+    * [magento/magento2#22850](https://github.com/magento/magento2/pull/22850) -- only show customer account sections if payment method is active (by @torhoehn)
+    * [magento/magento2#22854](https://github.com/magento/magento2/pull/22854) -- fix #4628 font-face mixin add fromat option (by @Karlasa)
+    * [magento/magento2#22868](https://github.com/magento/magento2/pull/22868) -- fix date calculation for report's years interval (by @polkan-msk)
+    * [magento/magento2#21397](https://github.com/magento/magento2/pull/21397) -- Fixed Validation messages missing from datepicker form elements (by @ravi-chandra3197)
+    * [magento/magento2#22694](https://github.com/magento/magento2/pull/22694) -- Fixed Issue #20234 (by @surbhi-ranosys)
+    * [magento/magento2#22787](https://github.com/magento/magento2/pull/22787) -- #22786 Add dependency for UPS required fields to avoid validation for these fields if UPS Shipping is not active (by @serhiyzhovnir)
+    * [magento/magento2#22823](https://github.com/magento/magento2/pull/22823) -- [Shipping] Adjusting the Contact Us Xpath (by @eduard13)
+    * [magento/magento2#22830](https://github.com/magento/magento2/pull/22830) -- Removing "if" block and making code more legible (by @matheusgontijo)
+    * [magento/magento2#22839](https://github.com/magento/magento2/pull/22839) -- FIX: Add missing Stories and Severity to Test cases (by @lbajsarowicz)
+    * [magento/magento2#22858](https://github.com/magento/magento2/pull/22858) -- Grammatical mistake in the comments (by @sudhanshu-bajaj)
+    * [magento/magento2#22889](https://github.com/magento/magento2/pull/22889) -- Replace hardcoded CarierCode from createShippingMethod() (by @wigman)
+    * [magento/magento2#22922](https://github.com/magento/magento2/pull/22922) -- [BUGFIX] Set correct cron instance for catalog_product_frontend_actio... (by @lewisvoncken)
+    * [magento/magento2#22607](https://github.com/magento/magento2/pull/22607) -- Implement Better Error Handling and Fix Waits on Null PIDs in Parallel SCD Execution (by @davidalger)
+    * [magento/magento2#22795](https://github.com/magento/magento2/pull/22795) -- fixed issue #22736 - Cursor position not in right side of search keyword in mobile (by @sanjaychouhan-webkul)
+    * [magento/magento2#22876](https://github.com/magento/magento2/pull/22876) -- Fixed issue #22875 Billing Agreements page title need to be improved (by @amitvishvakarma)
+    * [magento/magento2#21215](https://github.com/magento/magento2/pull/21215) -- fixed-Discount-Code-improvement-21214 (by @abrarpathan19)
+    * [magento/magento2#22307](https://github.com/magento/magento2/pull/22307) -- Varnish health check failing due to presence of id_prefix in env.php (by @Nazar65)
+    * [magento/magento2#22444](https://github.com/magento/magento2/pull/22444) -- magento/magento2#22317: PR#22321 fix. (by @p-bystritsky)
+    * [magento/magento2#22513](https://github.com/magento/magento2/pull/22513) -- Fixed #22396 config:set fails with JSON values (by @shikhamis11)
+    * [magento/magento2#22520](https://github.com/magento/magento2/pull/22520) -- Fixed #22506: Search suggestion panel overlapping on advance reporting button  (by @webkul-ajaysaini)
+    * [magento/magento2#22760](https://github.com/magento/magento2/pull/22760) -- [Forwardport] Magento Catalog - fix custom option type text price conversion for mu... (by @ihor-sviziev)
+    * [magento/magento2#22893](https://github.com/magento/magento2/pull/22893) -- #22869 - defaulting customer storeId fix (by @Wirson)
+    * [magento/magento2#22926](https://github.com/magento/magento2/pull/22926) -- Store view label not in the middle of panel  (by @speedy008)
+    * [magento/magento2#22947](https://github.com/magento/magento2/pull/22947) -- phpcs error on rule classes - must be of the type integer (by @Nazar65)
+    * [magento/magento2#22951](https://github.com/magento/magento2/pull/22951) -- Update the contributing.md to match the new beginners guide (by @dmanners)
+    * [magento/magento2#22387](https://github.com/magento/magento2/pull/22387) -- Checkout totals order in specific store (by @krnshah)
+    * [magento/magento2#22718](https://github.com/magento/magento2/pull/22718) -- Resolved issue coupon codes don't work anymore #18183 (by @this-adarsh)
+    * [magento/magento2#22914](https://github.com/magento/magento2/pull/22914) -- #22899 Fix the issue with Incorrect return type at getListByCustomerId in PaymentTokenManagementInterface (by @serhiyzhovnir)
+    * [magento/magento2#22687](https://github.com/magento/magento2/pull/22687) -- #22686 Shipment view fixed for Fatal error. (by @milindsingh)
+    * [magento/magento2#22772](https://github.com/magento/magento2/pull/22772) -- Fixed issue #22767: Not clear logic for loading CMS Pages with setStoreId function (by @maheshWebkul721)
+    * [magento/magento2#22931](https://github.com/magento/magento2/pull/22931) -- [Fixed-20788: Listing page no equal spacing in product in list view] (by @hitesh-wagento)
+    * [magento/magento2#22965](https://github.com/magento/magento2/pull/22965) -- Simplify if else catalog search full text data provider (by @sankalpshekhar)
+    * [magento/magento2#23011](https://github.com/magento/magento2/pull/23011) -- Fix typehint (by @amenk)
+    * [magento/magento2#22920](https://github.com/magento/magento2/pull/22920) -- Mview Indexers getList should return integer values of id's and not strings (by @mhodge13)
+    * [magento/magento2#23020](https://github.com/magento/magento2/pull/23020) -- Remove direct use of object manager (by @AnshuMishra17)
+    * [magento/magento2#23033](https://github.com/magento/magento2/pull/23033) -- Issue fix #23030: Swatch change Image does not slide to first Image (by @milindsingh)
+    * [magento/magento2#23035](https://github.com/magento/magento2/pull/23035) -- [Validator] Fix wrong behaviour of validation scroll (by @Den4ik)
+    * [magento/magento2#18459](https://github.com/magento/magento2/pull/18459) -- 12696 Delete all test modules after integration tests (by @avstudnitz)
+    * [magento/magento2#19897](https://github.com/magento/magento2/pull/19897) -- Re-enable PriceBox block caching (by @brucemead)
+    * [magento/magento2#21200](https://github.com/magento/magento2/pull/21200) -- [FEATURE] Don't load product collection in review observer (by @Den4ik)
+    * [magento/magento2#22071](https://github.com/magento/magento2/pull/22071) -- Make sure 'last' class is set on top menu (by @arnoudhgz)
+    * [magento/magento2#22821](https://github.com/magento/magento2/pull/22821) -- Customer Account Forgot Password page title fix (by @textarea)
+    * [magento/magento2#22884](https://github.com/magento/magento2/pull/22884) --  Show exception message during SCD failure (by @ihor-sviziev)
+    * [magento/magento2#22989](https://github.com/magento/magento2/pull/22989) -- Properly transliterate German Umlauts (by @amenk)
+    * [magento/magento2#23036](https://github.com/magento/magento2/pull/23036) -- [Framework] Reassign fields variable after converting to array (by @Den4ik)
+    * [magento/magento2#23040](https://github.com/magento/magento2/pull/23040) -- Don't create a new account-nav block - use existing instead. (by @vovayatsyuk)
+    * [magento/magento2#23046](https://github.com/magento/magento2/pull/23046) -- Add more descriptive exception when data patch fails to apply. (by @ashsmith)
+    * [magento/magento2#23067](https://github.com/magento/magento2/pull/23067) -- Create Security.md file to show on GitHub Security/Policy page (by @piotrekkaminski)
+    * [magento/magento2#14384](https://github.com/magento/magento2/pull/14384) -- Don't throw shipping method exception when creating quote with only virtual products in API (by @Maikel-Koek)
+    * [magento/magento2#19184](https://github.com/magento/magento2/pull/19184) -- Fixed magento text swatch switches product image even if attribute feature is disabled #16446 (by @ravi-chandra3197)
+    * [magento/magento2#21394](https://github.com/magento/magento2/pull/21394) -- [2.3]creating customer without password is directly confirmed 14492 (by @novikor)
+    * [magento/magento2#21674](https://github.com/magento/magento2/pull/21674) -- [2.3] Database Media Storage - Transactional Emails will now extract image from database in Database Media Storage mode (by @gwharton)
+    * [magento/magento2#22336](https://github.com/magento/magento2/pull/22336) -- fix clean_cache plugin flush mode (by @thomas-kl1)
+    * [magento/magento2#22426](https://github.com/magento/magento2/pull/22426) -- Fixed wrong url redirect when edit product review from Customer view page (by @ravi-chandra3197)
+    * [magento/magento2#22521](https://github.com/magento/magento2/pull/22521) -- Fixed 22511 (by @maheshWebkul721)
+    * [magento/magento2#22626](https://github.com/magento/magento2/pull/22626) -- resolved typo error (by @nehaguptacedcoss)
+    * [magento/magento2#22834](https://github.com/magento/magento2/pull/22834) -- #16445 - getRegionHtmlSelect does not have configuration - resolved (by @nikunjskd20)
+    * [magento/magento2#22937](https://github.com/magento/magento2/pull/22937) -- Mark Elasticsearch 6 support for synonyms (by @aapokiiso)
+    * [magento/magento2#23081](https://github.com/magento/magento2/pull/23081) -- Fix missing whitespace in mobile navigation for non-English websites (by @alexeya-ven)
+    * [magento/magento2#21131](https://github.com/magento/magento2/pull/21131) -- Fix Issue #19872 - checking if image is in media directory (by @Bartlomiejsz)
+    * [magento/magento2#22341](https://github.com/magento/magento2/pull/22341) -- Apply coupoun and scroll top to check. applied successfully or not (by @krnshah)
+    * [magento/magento2#22646](https://github.com/magento/magento2/pull/22646) -- Fixed Issue #22087 (by @Surabhi-Cedcoss)
+    * [magento/magento2#23025](https://github.com/magento/magento2/pull/23025) -- Re-enable XML as request and response types within the SwaggerUI (by @sweikenb)
+    * [magento/magento2#20848](https://github.com/magento/magento2/pull/20848) -- Partial docs fixes in Newsletter module (by @SikailoISM)
+    * [magento/magento2#21605](https://github.com/magento/magento2/pull/21605) -- [2.3] Database Media Storage - Admin Product Edit Page handles recreates images correctly when pub/media/catalog is cleared. (by @gwharton)
+    * [magento/magento2#21876](https://github.com/magento/magento2/pull/21876) -- $product->getUrlInStore() does not allow to override the scope in backend context (by @Nazar65)
+    * [magento/magento2#23007](https://github.com/magento/magento2/pull/23007) -- [Fixed] Reset feature does not clear the date (by @niravkrish)
+    * [magento/magento2#23118](https://github.com/magento/magento2/pull/23118) -- #23053 : sendfriend verifies product visibility instead of status (by @Wirson)
+    * [magento/magento2#22637](https://github.com/magento/magento2/pull/22637) -- Fixed #22484 Customer address States are duplicated in backend (by @shikhamis11)
+    * [magento/magento2#23140](https://github.com/magento/magento2/pull/23140) -- magento/magento2#23138: Magento_Theme. Incorrect configuration file location  (by @atwixfirster)
+    * [magento/magento2#23179](https://github.com/magento/magento2/pull/23179) -- Fix for translation function (by @kkdg)
+    * [magento/magento2#22704](https://github.com/magento/magento2/pull/22704) -- Fixed #22004 can't update attribute for all product (by @shikhamis11)
+    * [magento/magento2#22933](https://github.com/magento/magento2/pull/22933) -- magento/magento2#22870: ProductRepository fails to update an existing product with a changed SKU. (by @p-bystritsky)
+    * [magento/magento2#23005](https://github.com/magento/magento2/pull/23005) -- Improve command catalog:images:resize (by @tdgroot)
+    * [magento/magento2#22942](https://github.com/magento/magento2/pull/22942) -- Fixed issue #18337 (by @geet07)
+    * [magento/magento2#23216](https://github.com/magento/magento2/pull/23216) -- Fixed #23213 Static content deploy showing percentage symbol two times in progress bar (by @amitvishvakarma)
+    * [magento/magento2#23244](https://github.com/magento/magento2/pull/23244) -- Update CONTRIBUTING.md (by @diazwatson)
+    * [magento/magento2#23248](https://github.com/magento/magento2/pull/23248) -- fix tooltip toggle selector typo (by @Karlasa)
+    * [magento/magento2#23250](https://github.com/magento/magento2/pull/23250) -- Fixed #23238 Apply button act like remove button while create new order from admin (by @gauravagarwal1001)
+    * [magento/magento2#22211](https://github.com/magento/magento2/pull/22211) -- Show converted value for validateForRefund error message (by @kassner)
+    * [magento/magento2#23129](https://github.com/magento/magento2/pull/23129) -- #22934 Improved sitemap product generation logic (by @sergiy-v)
+    * [magento/magento2#23201](https://github.com/magento/magento2/pull/23201) -- MFTF: Use AdminLoginActionGroup for AdminLoginTest - easiest use of ActionGroup (by @lbajsarowicz)
+    * [magento/magento2#23100](https://github.com/magento/magento2/pull/23100) -- Resolve issue with improper EAV attribute join statement (by @udovicic)
+    * [magento/magento2#23267](https://github.com/magento/magento2/pull/23267) -- Add filter index for ID column in adminhtml user grid (by @JeroenVanLeusden)
+    * [magento/magento2#23286](https://github.com/magento/magento2/pull/23286) -- Fixed Credit memo submit button(refund) stays disable after validation fails & unable to enable button issue. (by @nishantjariwala)
+    * [magento/magento2#23292](https://github.com/magento/magento2/pull/23292) -- revert Properly transliterate German Umlauts (by @Nazar65)
+    * [magento/magento2#23307](https://github.com/magento/magento2/pull/23307) -- [Ui] Allow to define listing configuration via ui component xml (by @Den4ik)
+    * [magento/magento2#23335](https://github.com/magento/magento2/pull/23335) -- Correct spelling (by @ravi-chandra3197)
+    * [magento/magento2#22675](https://github.com/magento/magento2/pull/22675) -- Fixed #20038 loading icon disappearing before background process completes for Braintree payment in Admin (by @kunal-rtpl)
+    * [magento/magento2#23174](https://github.com/magento/magento2/pull/23174) -- Move Quote related Plugins to correct module (by @sankalpshekhar)
+    * [magento/magento2#23309](https://github.com/magento/magento2/pull/23309) -- magento/magento2#23074: update correct product URL rewrites after changing category url key (by @sta1r)
+    * [magento/magento2#23347](https://github.com/magento/magento2/pull/23347) -- Fixes incorrect file reference in a comment in a .htaccess file. (by @hostep)
+    * [magento/magento2#22650](https://github.com/magento/magento2/pull/22650) -- Fixes issue #13227  (by @atishgoswami)
+    * [magento/magento2#22800](https://github.com/magento/magento2/pull/22800) -- fixed issue #22638 - Asterisk(*) sign position does not consistent in admin (by @sanjaychouhan-webkul)
+    * [magento/magento2#22910](https://github.com/magento/magento2/pull/22910) -- Do an empty check instead of isset check on image removed (by @arnoudhgz)
+    * [magento/magento2#23218](https://github.com/magento/magento2/pull/23218) -- Fixed #22266: 404 message for product alerts when not logged in (by @ArjenMiedema)
+    * [magento/magento2#23247](https://github.com/magento/magento2/pull/23247) -- Fixed 23230 : Sticky header floating under top when there is no buttons in the toolbar (by @konarshankar07)
+    * [magento/magento2#23338](https://github.com/magento/magento2/pull/23338) -- Fix issue with incorrect payment translation in sales emails (by @alexeya-ven)
+    * [magento/magento2#23366](https://github.com/magento/magento2/pull/23366) -- Correct spelling (by @ravi-chandra3197)
+    * [magento/magento2#23367](https://github.com/magento/magento2/pull/23367) -- #23346: 'Test Connection' button is over-spanned (by @konarshankar07)
+    * [magento/magento2#22671](https://github.com/magento/magento2/pull/22671) -- Change exportButton option cvs (by @ajeetsinghcedcoss)
+    * [magento/magento2#23240](https://github.com/magento/magento2/pull/23240) -- Refactor: Improve mview code readability (by @lbajsarowicz)
+    * [magento/magento2#23280](https://github.com/magento/magento2/pull/23280) -- Ensure page is loaded after order click actions (by @fooman)
+    * [magento/magento2#23306](https://github.com/magento/magento2/pull/23306) -- FS/23038 Decimal qty with Increment is with specific values are not adding in cart (by @sertlab)
+    * [magento/magento2#23312](https://github.com/magento/magento2/pull/23312) -- Added function to check against running/pending/successful cron tasks (by @chickenland)
+    * [magento/magento2#22116](https://github.com/magento/magento2/pull/22116) -- Fix magento root package identification for metapackage installation (by @oleksii-lisovyi)
+    * [magento/magento2#23234](https://github.com/magento/magento2/pull/23234) -- [Ui] Calling the always action on opening and closing the modal. (by @eduard13)
+    * [magento/magento2#23353](https://github.com/magento/magento2/pull/23353) -- Get review entity id by code instead hard-coded. (by @DaniloEmpire)
+    * [magento/magento2#23393](https://github.com/magento/magento2/pull/23393) -- Fixed issue #21974 (by @geet07)
+    * [magento/magento2#23394](https://github.com/magento/magento2/pull/23394) -- Fixed issue #23377 (by @geet07)
+    * [magento/magento2#23403](https://github.com/magento/magento2/pull/23403) -- Remove rogue closing tag from store-switcher template (by @sta1r)
+    * [magento/magento2#22987](https://github.com/magento/magento2/pull/22987) -- Fixed apply discount coupons for bundle product (by @NikolasSumrak)
+    * [magento/magento2#23048](https://github.com/magento/magento2/pull/23048) -- #22998 : failing order creation with api when no address email is provided (by @Wirson)
+    * [magento/magento2#23390](https://github.com/magento/magento2/pull/23390) -- Changed logic so that _scrollToTopIfVisible is called only if element is in viewport. Previously it was called only when the element was outside it. (by @oskarolaussen)
+    * [magento/magento2#23425](https://github.com/magento/magento2/pull/23425) -- The best practices for SEO meta sequence. (by @vaseemishak)
+    * [magento/magento2#23523](https://github.com/magento/magento2/pull/23523) -- Issue #23522 UPS shipping booking and label generation gives error when shipper's street given more than 35 chars (by @ankurvr)
+    * [magento/magento2#23528](https://github.com/magento/magento2/pull/23528) -- move breakpoint by -1px to make nav work correctly at viewport 768 (by @bobemoe)
+    * [magento/magento2#23532](https://github.com/magento/magento2/pull/23532) -- Correct array type hints in Visibility model (by @pmclain)
+    * [magento/magento2#23535](https://github.com/magento/magento2/pull/23535) -- [2.3] Plain Text Emails are now sent with correct MIME Encoding (by @gwharton)
+    * [magento/magento2#23541](https://github.com/magento/magento2/pull/23541) -- fix validation class for max-words (by @sunilit42)
+    * [magento/magento2#21128](https://github.com/magento/magento2/pull/21128) -- Fix issue 21126 : Import design break issue resolved (by @speedy008)
+    * [magento/magento2#22213](https://github.com/magento/magento2/pull/22213) -- Date column ui component locale date format (by @Karlasa)
+    * [magento/magento2#23457](https://github.com/magento/magento2/pull/23457) -- Update CartTotalRepository.php (by @UlyanaKiklevich)
+    * [magento/magento2#23474](https://github.com/magento/magento2/pull/23474) -- Fixed tooltip missing at store view lable in Cms page and Cms block (by @dipeshrangani)
+    * [magento/magento2#23477](https://github.com/magento/magento2/pull/23477) -- Added quantity validation on Shipping Multiple Address Page (by @nirmalraval18)
+    * [magento/magento2#23494](https://github.com/magento/magento2/pull/23494) -- Removed editor from phone and zipcode (by @kazim-krish)
+    * [magento/magento2#23310](https://github.com/magento/magento2/pull/23310) -- magento/magento-2#23222: setup:upgrade should return failure when app... (by @ProcessEight)
+    * [magento/magento2#23360](https://github.com/magento/magento2/pull/23360) -- #23354 : Data saving problem error showing when leave blank qty and update it (by @konarshankar07)
+    * [magento/magento2#23427](https://github.com/magento/magento2/pull/23427) -- 23424: fixed search with 0 (by @jeysmook)
+    * [magento/magento2#23496](https://github.com/magento/magento2/pull/23496) -- Resolved + character issue in custom widget (by @sarfarazbheda)
+    * [magento/magento2#23529](https://github.com/magento/magento2/pull/23529) -- Feature/9798 updating configurable product options based on produc id and sku (by @lpouwelse)
+    * [magento/magento2#20918](https://github.com/magento/magento2/pull/20918) -- Enabled 'Shopping Cart' tab for customer edit interface in admin (by @rav-redchamps)
+    * [magento/magento2#22624](https://github.com/magento/magento2/pull/22624) -- Resolve Typo (by @prashantsharmacedcoss)
+    * [magento/magento2#22658](https://github.com/magento/magento2/pull/22658) -- Fixed #22545 Status downloadable product stays pending after succesfu... (by @shikhamis11)
+    * [magento/magento2#23500](https://github.com/magento/magento2/pull/23500) -- Fixed issue #23383 (by @manishgoswamij)
+    * [magento/magento2#23226](https://github.com/magento/magento2/pull/23226) -- Spacing issue for Gift message section in my account (by @amjadm61)
+    * [magento/magento2#23272](https://github.com/magento/magento2/pull/23272) -- hide or show the select for regions instead of enabling/disabling in customer registration (by @UB3RL33T)
+    * [magento/magento2#23593](https://github.com/magento/magento2/pull/23593) -- A small fix to improve format customer acl xml. (by @mrkhoa99)
+    * [magento/magento2#23607](https://github.com/magento/magento2/pull/23607) -- Default filter for reports set to past month (by @rogyar)
+    * [magento/magento2#22138](https://github.com/magento/magento2/pull/22138) -- BeanShells are changed to correct using of variables (by @AnnaShepa)
+    * [magento/magento2#22733](https://github.com/magento/magento2/pull/22733) -- Adds module:config:status command which checks if the module config i... (by @hostep)
+    * [magento/magento2#23351](https://github.com/magento/magento2/pull/23351) -- Fix some framework coding issues (by @fooman)
+    * [magento/magento2#23444](https://github.com/magento/magento2/pull/23444) -- Fix missing attribute_id condition from filter (by @mattijv)
+    * [magento/magento2#20579](https://github.com/magento/magento2/pull/20579) -- magento/magento2#12817: [Forwardport] Coupon code with canceled order. (by @p-bystritsky)
+    * [magento/magento2#23387](https://github.com/magento/magento2/pull/23387) -- magento/magento2#23386: Copy Service does not work properly for Entities which extends Data Object and implements ExtensibleDataInterface. (by @swnsma)
+    * [magento/magento2#23358](https://github.com/magento/magento2/pull/23358) -- magento/magento2#23345: Creditmemo getOrder() method loads order incorrectly. (by @p-bystritsky)
+    * [magento/magento2#23459](https://github.com/magento/magento2/pull/23459) -- magento/magento2#22814: Product stock alert - unsubscribe not working (by @yuriichayka)
+    * [magento/magento2#23598](https://github.com/magento/magento2/pull/23598) -- [2.3] magento catalog:images:resize now Database Media Storage mode aware (by @gwharton)
+    * [magento/magento2#23291](https://github.com/magento/magento2/pull/23291) -- Optimized dev:urn-catalog:generate for PHPStorm (by @JeroenBoersma)
+    * [magento/magento2#23592](https://github.com/magento/magento2/pull/23592) -- [Unit] Fix broken unit tests (by @Den4ik)
+    * [magento/magento2#23649](https://github.com/magento/magento2/pull/23649) -- [2.3] Transfer Encoding of emails changed to QUOTED-PRINTABLE (by @gwharton)
+    * [magento/magento2#23652](https://github.com/magento/magento2/pull/23652) -- Add missing getClass() to image.phtml so it is more like image_with_borders.phtml (by @woutersamaey)
+    * [magento/magento2#23710](https://github.com/magento/magento2/pull/23710) -- [2.3] Improve Database Media Storage Configuration settings usability (by @gwharton)
+    * [magento/magento2#23735](https://github.com/magento/magento2/pull/23735) -- Fixed typo in deploy module README.md (by @arnolds)
+    * [magento/magento2#22717](https://github.com/magento/magento2/pull/22717) -- Getting 404 url while updating quantity on multiple address cart page (by @vikalps4)
+    * [magento/magento2#23166](https://github.com/magento/magento2/pull/23166) -- Fix 22085 (by @geet07)
+    * [magento/magento2#23524](https://github.com/magento/magento2/pull/23524) -- remove html tag  from option html from order page (by @sunilit42)
+    * [magento/magento2#22891](https://github.com/magento/magento2/pull/22891) -- Check if setting is disabled on default scope (by @kassner)
+    * [magento/magento2#23099](https://github.com/magento/magento2/pull/23099) -- fix customer data race condition when bundling is enabled (by @davidverholen)
+    * [magento/magento2#23125](https://github.com/magento/magento2/pull/23125) -- Catch throwables in mview updating (by @QuentinFarizonAfrimarket)
+    * [magento/magento2#23173](https://github.com/magento/magento2/pull/23173) -- Fixed issue #23135: Insert Variable popup missing template variables for new templates (by @maheshWebkul721)
+    * [magento/magento2#23688](https://github.com/magento/magento2/pull/23688) -- Resolve "Automatically Invoice All Items" is "Yes" but no invoice is created (Zero Subtotal Checkout) (by @edenduong)
+    * [magento/magento2#23718](https://github.com/magento/magento2/pull/23718) -- Resolve [Authorize.net accept.js] "Place Order" button not being disabled when editing billing address (by @edenduong)
+    * [magento/magento2#23753](https://github.com/magento/magento2/pull/23753) -- Add Magento\ConfigurableProduct\Pricing\Price\PriceResolverInterface to di.xml in issue23717 (by @edenduong)
+    * [magento/magento2#22984](https://github.com/magento/magento2/pull/22984) -- magento/magento2#14071: Not able to change a position of last two rel... (by @m-a-x-i-m)
+    * [magento/magento2#23656](https://github.com/magento/magento2/pull/23656) -- Fixes issue 22112 (https://github.com/magento/magento2/issues/22112) ... (by @rsimmons07)
+    * [magento/magento2#23666](https://github.com/magento/magento2/pull/23666) -- magento/magento2#: Fix storeId param type in the EmailNotification::newAccount, EmailNotificationInterface::newAccount methods (by @atwixfirster)
+    * [magento/magento2#23681](https://github.com/magento/magento2/pull/23681) -- Resolve Frontend Label For Custom Order Status not Editable in Magento Admin in Single Store Mode (by @edenduong)
+    * [magento/magento2#23752](https://github.com/magento/magento2/pull/23752) -- [2.3] Database Media Storage : PDF Logo file now database aware (by @gwharton)
+    * [magento/magento2#23679](https://github.com/magento/magento2/pull/23679) -- Moved Zero Subtotal Checkout Payment Settings (by @textarea)
+    * [magento/magento2#23779](https://github.com/magento/magento2/pull/23779) -- Resolve "Discount Amount" field is validated after the page load without any action from user in Create New Catalog Rule form issue23777 (by @edenduong)
+    * [magento/magento2#23787](https://github.com/magento/magento2/pull/23787) -- Fix for PHP_CodeSniffer error after app:config:dump (by @dng-dev)
+    * [magento/magento2#23790](https://github.com/magento/magento2/pull/23790) -- magento/magento2#23789: CommentLevelsSniff works incorrect with @magento_import statement. (by @p-bystritsky)
+    * [magento/magento2#23794](https://github.com/magento/magento2/pull/23794) -- Remove duplicate declaration (by @gfernandes410)
+    * [magento/magento2#23803](https://github.com/magento/magento2/pull/23803) -- Resolve Toggle icon not working in create configuration Product creation Page issue 22702 (by @edenduong)
+    * [magento/magento2#23782](https://github.com/magento/magento2/pull/23782) -- Cleaning some code gaps (by @Stepa4man)
+    * [magento/magento2#23840](https://github.com/magento/magento2/pull/23840) -- Fix regular expression comment on function isNameValid() in ImageContentValidator.php (by @nimbus2300)
+    * [magento/magento2#23845](https://github.com/magento/magento2/pull/23845) -- Add custom added url key to decoded directive string in WYSIWYG editor (by @JeroenVanLeusden)
+    * [magento/magento2#23866](https://github.com/magento/magento2/pull/23866) -- additional check for correct version of sodium (by @matei)
+    * [magento/magento2#23901](https://github.com/magento/magento2/pull/23901) -- Resolve Report->Product->Downloads has wrong ACL issue 23900 (by @edenduong)
+    * [magento/magento2#23905](https://github.com/magento/magento2/pull/23905) -- Resolve No auto-focus after validation at "Create Configurations" button => User can not see the error message issue23904 (by @edenduong)
+    * [magento/magento2#23917](https://github.com/magento/magento2/pull/23917) -- Resolve Missing Validation at some Payment Method Settings issue 23916 (by @edenduong)
+    * [magento/magento2#23919](https://github.com/magento/magento2/pull/23919) -- class ApplyAttributesUpdate  should use \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE instead of fixing "bundle" (by @edenduong)
+    * [magento/magento2#23933](https://github.com/magento/magento2/pull/23933) -- Fix display of decimal quantities for wishlist items (by @mfickers)
+
 2.3.2
 =============
 * GitHub issues:
diff --git a/README.md b/README.md
index 91d0d902cb614..91f2ed19fb453 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 [![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.svg)](https://crowdin.com/project/magento-2)
-<h2>Welcome</h2>
+
+## Welcome
 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
@@ -30,7 +31,7 @@ To suggest documentation improvements, click [here][4].
 [4]: https://devdocs.magento.com
 
 <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.
+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 to these Community Maintainers for their valuable contributions.
 
 <a href="https://magento.com/magento-contributors#maintainers">
     <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>
@@ -64,7 +65,7 @@ Please see LICENSE_EE.txt for the full text of the MEE License or visit https://
 
 ## 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 a request at [engcom@adobe.com](mailto:engcom@adobe.com) or [self signup](https://tinyurl.com/engcom-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 a request at [engcom@adobe.com](mailto:engcom@adobe.com) or [self signup](https://opensource.magento.com/slack).
 
 
 We have channels for each project. These channels are recommended for new members:
diff --git a/app/code/Magento/AdminAnalytics/Controller/Adminhtml/Config/DisableAdminUsage.php b/app/code/Magento/AdminAnalytics/Controller/Adminhtml/Config/DisableAdminUsage.php
new file mode 100644
index 0000000000000..34a9ef4f75b98
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Controller/Adminhtml/Config/DisableAdminUsage.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AdminAnalytics\Controller\Adminhtml\Config;
+
+use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\AdminAnalytics\Model\ResourceModel\Viewer\Logger as NotificationLogger;
+use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Config\Model\Config\Factory;
+
+/**
+ * Controller to record Admin analytics usage log
+ */
+class DisableAdminUsage extends Action implements HttpPostActionInterface
+{
+    /**
+     * @var Factory
+     */
+    private $configFactory;
+
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
+    /**
+     * @var NotificationLogger
+     */
+    private $notificationLogger;
+
+    /**
+     * DisableAdminUsage constructor.
+     *
+     * @param Action\Context $context
+     * @param ProductMetadataInterface $productMetadata
+     * @param NotificationLogger $notificationLogger
+     * @param Factory $configFactory
+     */
+    public function __construct(
+        Action\Context $context,
+        ProductMetadataInterface $productMetadata,
+        NotificationLogger $notificationLogger,
+        Factory $configFactory
+    ) {
+        parent::__construct($context);
+        $this->configFactory = $configFactory;
+        $this->productMetadata = $productMetadata;
+        $this->notificationLogger = $notificationLogger;
+    }
+
+    /**
+     * Change the value of config/admin/usage/enabled
+     */
+    private function disableAdminUsage()
+    {
+        $configModel = $this->configFactory->create();
+        $configModel->setDataByPath('admin/usage/enabled', 0);
+        $configModel->save();
+    }
+
+    /**
+     * Log information about the last admin usage selection
+     *
+     * @return ResultInterface
+     */
+    private function markUserNotified(): ResultInterface
+    {
+        $responseContent = [
+            'success' => $this->notificationLogger->log(
+                $this->productMetadata->getVersion()
+            ),
+            'error_message' => ''
+        ];
+
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        return $resultJson->setData($responseContent);
+    }
+
+    /**
+     * Log information about the last shown advertisement
+     *
+     * @return ResultInterface
+     */
+    public function execute()
+    {
+        $this->disableAdminUsage();
+        $this->markUserNotified();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed(static::ADMIN_RESOURCE);
+    }
+}
diff --git a/app/code/Magento/AdminAnalytics/Controller/Adminhtml/Config/EnableAdminUsage.php b/app/code/Magento/AdminAnalytics/Controller/Adminhtml/Config/EnableAdminUsage.php
new file mode 100644
index 0000000000000..f70dd57aa59d6
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Controller/Adminhtml/Config/EnableAdminUsage.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AdminAnalytics\Controller\Adminhtml\Config;
+
+use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\AdminAnalytics\Model\ResourceModel\Viewer\Logger as NotificationLogger;
+use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Config\Model\Config\Factory;
+
+/**
+ * Controller to record that the current admin user has responded to Admin Analytics notice
+ */
+class EnableAdminUsage extends Action implements HttpPostActionInterface
+{
+    /**
+     * @var Factory
+     */
+    private $configFactory;
+
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
+    /**
+     * @var NotificationLogger
+     */
+    private $notificationLogger;
+
+    /**
+     * @param Action\Context $context
+     * @param ProductMetadataInterface $productMetadata
+     * @param NotificationLogger $notificationLogger
+     * @param Factory $configFactory
+     */
+    public function __construct(
+        Action\Context $context,
+        ProductMetadataInterface $productMetadata,
+        NotificationLogger $notificationLogger,
+        Factory $configFactory
+    ) {
+        parent::__construct($context);
+        $this->configFactory = $configFactory;
+        $this->productMetadata = $productMetadata;
+        $this->notificationLogger = $notificationLogger;
+    }
+
+    /**
+     * Change the value of config/admin/usage/enabled
+     */
+    private function enableAdminUsage()
+    {
+        $configModel = $this->configFactory->create();
+        $configModel->setDataByPath('admin/usage/enabled', 1);
+        $configModel->save();
+    }
+
+    /**
+     * Log information about the last user response
+     *
+     * @return ResultInterface
+     */
+    private function markUserNotified(): ResultInterface
+    {
+        $responseContent = [
+            'success' => $this->notificationLogger->log(
+                $this->productMetadata->getVersion()
+            ),
+            'error_message' => ''
+        ];
+
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        return $resultJson->setData($responseContent);
+    }
+
+    /**
+     * Log information about the last shown advertisement
+     *
+     * @return \Magento\Framework\Controller\ResultInterface
+     */
+    public function execute()
+    {
+        $this->enableAdminUsage();
+        $this->markUserNotified();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed(static::ADMIN_RESOURCE);
+    }
+}
diff --git a/app/code/Magento/AdminAnalytics/Model/Condition/CanViewNotification.php b/app/code/Magento/AdminAnalytics/Model/Condition/CanViewNotification.php
new file mode 100644
index 0000000000000..222261d4abfb5
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Model/Condition/CanViewNotification.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AdminAnalytics\Model\Condition;
+
+use Magento\AdminAnalytics\Model\ResourceModel\Viewer\Logger;
+use Magento\Framework\View\Layout\Condition\VisibilityConditionInterface;
+use Magento\Framework\App\CacheInterface;
+
+/**
+ * Dynamic validator for UI admin analytics notification, control UI component visibility.
+ */
+class CanViewNotification implements VisibilityConditionInterface
+{
+    /**
+     * Unique condition name.
+     *
+     * @var string
+     */
+    private static $conditionName = 'can_view_admin_usage_notification';
+
+    /**
+     * Prefix for cache
+     *
+     * @var string
+     */
+    private static $cachePrefix = 'admin-usage-notification-popup';
+
+    /**
+     * @var Logger
+     */
+    private $viewerLogger;
+
+    /**
+     * @var CacheInterface
+     */
+    private $cacheStorage;
+
+    /**
+     * @param Logger $viewerLogger
+     * @param CacheInterface $cacheStorage
+     */
+    public function __construct(
+        Logger $viewerLogger,
+        CacheInterface $cacheStorage
+    ) {
+        $this->viewerLogger = $viewerLogger;
+        $this->cacheStorage = $cacheStorage;
+    }
+
+    /**
+     * Validate if notification popup can be shown and set the notification flag
+     *
+     * @param array $arguments Attributes from element node.
+     * @inheritdoc
+     */
+    public function isVisible(array $arguments): bool
+    {
+        $cacheKey = self::$cachePrefix;
+        $value = $this->cacheStorage->load($cacheKey);
+        if ($value !== 'log-exists') {
+            $logExists = $this->viewerLogger->checkLogExists();
+            if ($logExists) {
+                $this->cacheStorage->save('log-exists', $cacheKey);
+            }
+            return !$logExists;
+        }
+        return false;
+    }
+
+    /**
+     * Get condition name
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return self::$conditionName;
+    }
+}
diff --git a/app/code/Magento/AdminAnalytics/Model/ResourceModel/Viewer/Logger.php b/app/code/Magento/AdminAnalytics/Model/ResourceModel/Viewer/Logger.php
new file mode 100644
index 0000000000000..c66f31e3d3bcb
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Model/ResourceModel/Viewer/Logger.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AdminAnalytics\Model\ResourceModel\Viewer;
+
+use Magento\AdminAnalytics\Model\Viewer\Log;
+use Magento\AdminAnalytics\Model\Viewer\LogFactory;
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Admin Analytics log data logger.
+ *
+ * Saves and retrieves release notification viewer log data.
+ */
+class Logger
+{
+    /**
+     * Admin Analytics usage version log table name
+     */
+    const LOG_TABLE_NAME = 'admin_analytics_usage_version_log';
+
+    /**
+     * @var Resource
+     */
+    private $resource;
+
+    /**
+     * @var LogFactory
+     */
+    private $logFactory;
+
+    /**
+     * @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 string $lastViewVersion
+     * @return bool
+     */
+    public function log(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),
+            [
+                'last_viewed_in_version' => $lastViewVersion,
+            ],
+            [
+                'last_viewed_in_version',
+            ]
+        );
+        return true;
+    }
+
+    /**
+     * Get log by the last view version.
+     *
+     * @return Log
+     */
+    public function get(): Log
+    {
+        return $this->logFactory->create(['data' => $this->loadLatestLogData()]);
+    }
+
+    /**
+     * Checks is log already exists.
+     *
+     * @return boolean
+     */
+    public function checkLogExists(): bool
+    {
+        $data = $this->logFactory->create(['data' => $this->loadLatestLogData()]);
+        $lastViewedVersion = $data->getLastViewVersion();
+        return isset($lastViewedVersion);
+    }
+
+    /**
+     * Load release notification viewer log data by last view version
+     *
+     * @return array
+     */
+    private function loadLatestLogData(): array
+    {
+        $connection = $this->resource->getConnection();
+        $select = $connection->select()
+            ->from(['log_table' => $this->resource->getTableName(self::LOG_TABLE_NAME)])
+            ->order('log_table.id desc')
+            ->limit(['count' => 1]);
+
+        $data = $connection->fetchRow($select);
+        if (!$data) {
+            $data = [];
+        }
+        return $data;
+    }
+}
diff --git a/app/code/Magento/AdminAnalytics/Model/Viewer/Log.php b/app/code/Magento/AdminAnalytics/Model/Viewer/Log.php
new file mode 100644
index 0000000000000..0c3b6b81ec811
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Model/Viewer/Log.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AdminAnalytics\Model\Viewer;
+
+use Magento\Framework\DataObject;
+
+/**
+ * Admin Analytics log resource
+ */
+class Log extends DataObject
+{
+    /**
+     * Get log id
+     *
+     * @return int
+     */
+    public function getId() : ?int
+    {
+        return $this->getData('id');
+    }
+
+    /**
+     * Get last viewed product version
+     *
+     * @return string
+     */
+    public function getLastViewVersion() : ?string
+    {
+        return $this->getData('last_viewed_in_version');
+    }
+}
diff --git a/app/code/Magento/AdminAnalytics/README.md b/app/code/Magento/AdminAnalytics/README.md
new file mode 100644
index 0000000000000..e905344031ad3
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/README.md
@@ -0,0 +1 @@
+The Magento\AdminAnalytics module gathers information about the features Magento administrators use. This information will be used to help improve the user experience on the Magento Admin.
\ No newline at end of file
diff --git a/app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/CloseAllDialogBoxesActionGroup.xml b/app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/CloseAllDialogBoxesActionGroup.xml
new file mode 100644
index 0000000000000..4fd7fd17c57ee
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/CloseAllDialogBoxesActionGroup.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="CloseAllDialogBoxes">
+        <conditionalClick selector="{{AdminUsageNotificationSection.releaseNotificationCloseButton1}}" dependentSelector="{{AdminUsageNotificationSection.releaseNotificationCloseButton1}}" visible="true" stepKey="clickCloseButtonIfVisible1"/>
+        <conditionalClick selector="{{AdminUsageNotificationSection.releaseNotificationCloseButton2}}" dependentSelector="{{AdminUsageNotificationSection.releaseNotificationCloseButton2}}" visible="true" stepKey="clickCloseButtonIfVisible2"/>
+        <conditionalClick selector="{{AdminUsageNotificationSection.releaseNotificationCloseButton3}}" dependentSelector="{{AdminUsageNotificationSection.releaseNotificationCloseButton3}}" visible="true" stepKey="clickCloseButtonIfVisible3"/>
+        <conditionalClick selector="{{AdminUsageNotificationSection.releaseNotificationCloseButton4}}" dependentSelector="{{AdminUsageNotificationSection.releaseNotificationCloseButton4}}" visible="true" stepKey="clickCloseButtonIfVisible4"/>
+        <conditionalClick selector="{{AdminUsageNotificationSection.releaseNotificationCloseButton5}}" dependentSelector="{{AdminUsageNotificationSection.releaseNotificationCloseButton5}}" visible="true" stepKey="clickCloseButtonIfVisible5"/>
+        <conditionalClick selector="{{AdminUsageNotificationSection.releaseNotificationCloseButton6}}" dependentSelector="{{AdminUsageNotificationSection.releaseNotificationCloseButton6}}" visible="true" stepKey="clickCloseButtonIfVisible6"/>
+        <conditionalClick selector="{{AdminUsageNotificationSection.adminUsageAllowButton}}" dependentSelector="{{AdminUsageNotificationSection.adminUsageAllowButton}}" visible="true" stepKey="clickAllowButtonIfVisible"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/LoginAdminWithCredentialsActionGroup.xml b/app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/LoginAdminWithCredentialsActionGroup.xml
new file mode 100644
index 0000000000000..d9f5e5dbcb106
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/LoginAdminWithCredentialsActionGroup.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="LoginAdminWithCredentialsActionGroup">
+        <conditionalClick selector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" dependentSelector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" visible="true" stepKey="clickDontAllowButtonIfVisible" before="closeAdminNotification"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml b/app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.xml
new file mode 100644
index 0000000000000..5cf7be8a6fe11
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/LoginAsAdminActionGroup.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="LoginAsAdmin">
+        <conditionalClick selector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" dependentSelector="{{AdminUsageNotificationSection.adminUsageDontAllowButton}}" visible="true" stepKey="clickDontAllowButtonIfVisible" before="closeAdminNotification"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/SelectAdminUsageSettingActionGroup.xml b/app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/SelectAdminUsageSettingActionGroup.xml
new file mode 100644
index 0000000000000..3b302fe5be18b
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Test/Mftf/ActionGroup/SelectAdminUsageSettingActionGroup.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="SelectAdminUsageSetting">
+        <arguments>
+            <argument name="adminUsageValue" type="string" defaultValue="0"/>
+        </arguments>
+        <conditionalClick selector="{{AdminUsageConfigSection.adminUsageHeader}}" dependentSelector="{{AdminUsageConfigSection.adminUsageOptions}}" visible="false" stepKey="clickOnAdminUsageHeader"/>
+        <selectOption selector="{{AdminUsageConfigSection.adminUsageOptions}}" userInput="{{adminUsageValue}}" stepKey="selectOption"/>
+        <click selector="{{AdminNewStoreGroupActionsSection.saveButton}}" stepKey="clickSaveButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/AdminAnalytics/Test/Mftf/Section/AdminHeaderSection.xml b/app/code/Magento/AdminAnalytics/Test/Mftf/Section/AdminHeaderSection.xml
new file mode 100644
index 0000000000000..cc9f495a60026
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Test/Mftf/Section/AdminHeaderSection.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="AdminHeaderSection">
+        <element name="adminTrackingScript" type="text" selector="script[src*='//assets.adobedtm.com/launch']"/>
+        <element name="adminTrackingMetaData" type="text" selector="//*script[contains('adminAnalyticsMetadata')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleStagingSection.xml b/app/code/Magento/AdminAnalytics/Test/Mftf/Section/AdminUsageConfigSection.xml
similarity index 60%
rename from app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleStagingSection.xml
rename to app/code/Magento/AdminAnalytics/Test/Mftf/Section/AdminUsageConfigSection.xml
index bab9842caaa42..634ebf855d940 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleStagingSection.xml
+++ b/app/code/Magento/AdminAnalytics/Test/Mftf/Section/AdminUsageConfigSection.xml
@@ -8,7 +8,8 @@
 
 <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 name="AdminUsageConfigSection">
+        <element name="adminUsageHeader" type="text" selector="#admin_usage-head"/>
+        <element name="adminUsageOptions" type="select" selector="#admin_usage_enabled"/>
     </section>
 </sections>
diff --git a/app/code/Magento/AdminAnalytics/Test/Mftf/Section/AdminUsageNotificationSection.xml b/app/code/Magento/AdminAnalytics/Test/Mftf/Section/AdminUsageNotificationSection.xml
new file mode 100644
index 0000000000000..8bd6263d35e38
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Test/Mftf/Section/AdminUsageNotificationSection.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="AdminUsageNotificationSection">
+        <element name="adminUsageDialogBox" type="text" selector="//*[@class='modal-inner-wrap'][last()]"/>
+        <element name="adminUsageDontAllowButton" type="text" selector=".modal-popup .action-secondary"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/AdminAnalytics/Test/Mftf/Test/TrackingScriptTest.xml b/app/code/Magento/AdminAnalytics/Test/Mftf/Test/TrackingScriptTest.xml
new file mode 100644
index 0000000000000..58bcacc190cff
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Test/Mftf/Test/TrackingScriptTest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="TrackingScriptTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Checks to see if the tracking script is in the dom of admin and if setting is turned to no it checks if the tracking script in the dom was removed"/>
+            <title value="Checks to see if the tracking script is in the dom of admin and if setting is turned to no it checks if the tracking script in the dom was removed"/>
+            <description value="Checks to see if the tracking script is in the dom of admin and if setting is turned to no it checks if the tracking script in the dom was removed"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-18192"/>
+            <group value="backend"/>
+            <group value="login"/>
+        </annotations>
+
+        <!-- Logging in Magento admin -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php b/app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php
new file mode 100644
index 0000000000000..7819f2f017a01
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdminAnalytics\Test\Unit\Condition;
+
+use Magento\AdminAnalytics\Model\Condition\CanViewNotification;
+use Magento\AdminAnalytics\Model\ResourceModel\Viewer\Logger;
+use Magento\AdminAnalytics\Model\Viewer\Log;
+use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\App\CacheInterface;
+
+/**
+ * Class CanViewNotificationTest
+ */
+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  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->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,
+                'productMetadata' => $this->productMetadataMock,
+                'cacheStorage' => $this->cacheStorageMock,
+            ]
+        );
+    }
+
+    /**
+     * @param $expected
+     * @param $cacheResponse
+     * @param $logExists
+     * @dataProvider isVisibleProvider
+     */
+    public function testIsVisibleLoadDataFromLog($expected, $cacheResponse, $logExists)
+    {
+        $this->cacheStorageMock->expects($this->once())
+            ->method('load')
+            ->with('admin-usage-notification-popup')
+            ->willReturn($cacheResponse);
+        $this->viewerLoggerMock
+            ->method('checkLogExists')
+            ->willReturn($logExists);
+        $this->cacheStorageMock
+            ->method('save')
+            ->with('log-exists', 'admin-usage-notification-popup');
+        $this->assertEquals($expected, $this->canViewNotification->isVisible([]));
+    }
+
+    /**
+     * @return array
+     */
+    public function isVisibleProvider()
+    {
+        return [
+            [true, false, false],
+            [false, 'log-exists', true],
+            [false, false, true],
+        ];
+    }
+}
diff --git a/app/code/Magento/AdminAnalytics/Ui/DataProvider/AdminUsageNotificationDataProvider.php b/app/code/Magento/AdminAnalytics/Ui/DataProvider/AdminUsageNotificationDataProvider.php
new file mode 100644
index 0000000000000..961a5663730a2
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Ui/DataProvider/AdminUsageNotificationDataProvider.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\AdminAnalytics\Ui\DataProvider;
+
+use Magento\Ui\DataProvider\AbstractDataProvider;
+use Magento\Framework\Api\Filter;
+
+/**
+ * Data Provider for the Admin usage UI component.
+ */
+class AdminUsageNotificationDataProvider extends AbstractDataProvider
+{
+    /**
+     * @inheritdoc
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function addFilter(Filter $filter)
+    {
+        return null;
+    }
+}
diff --git a/app/code/Magento/AdminAnalytics/ViewModel/Metadata.php b/app/code/Magento/AdminAnalytics/ViewModel/Metadata.php
new file mode 100644
index 0000000000000..9b1accbe0c823
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/ViewModel/Metadata.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdminAnalytics\ViewModel;
+
+use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Backend\Model\Auth\Session;
+use Magento\Framework\App\State;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * Gets user version and mode
+ */
+class Metadata implements ArgumentInterface
+{
+    /**
+     * @var State
+     */
+    private $appState;
+
+    /**
+     * @var Session
+     */
+    private $authSession;
+
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
+    /**
+     * @param ProductMetadataInterface $productMetadata
+     * @param Session $authSession
+     * @param State $appState
+     */
+    public function __construct(
+        ProductMetadataInterface $productMetadata,
+        Session $authSession,
+        State $appState
+    ) {
+        $this->productMetadata = $productMetadata;
+        $this->authSession = $authSession;
+        $this->appState = $appState;
+    }
+
+    /**
+     * Get product version
+     *
+     * @return string
+     */
+    public function getMagentoVersion() :string
+    {
+        return $this->productMetadata->getVersion();
+    }
+
+    /**
+     * Get current user id (hash generated from email)
+     *
+     * @return string
+     */
+    public function getCurrentUser() :string
+    {
+        return hash('sha512', 'ADMIN_USER' . $this->authSession->getUser()->getEmail());
+    }
+    /**
+     * Get Magento mode that the user is using
+     *
+     * @return string
+     */
+    public function getMode() :string
+    {
+        return $this->appState->getMode();
+    }
+}
diff --git a/app/code/Magento/AdminAnalytics/ViewModel/Notification.php b/app/code/Magento/AdminAnalytics/ViewModel/Notification.php
new file mode 100644
index 0000000000000..030e027b83fce
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/ViewModel/Notification.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AdminAnalytics\ViewModel;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\AdminAnalytics\Model\Condition\CanViewNotification as AdminAnalyticsNotification;
+use Magento\ReleaseNotification\Model\Condition\CanViewNotification as ReleaseNotification;
+
+/**
+ * Control display of admin analytics and release notification modals
+ */
+class Notification implements ArgumentInterface
+{
+    /**
+     * @var AdminAnalyticsNotification
+     */
+    private $canViewNotificationAnalytics;
+
+    /**
+     * @var ReleaseNotification
+     */
+    private $canViewNotificationRelease;
+
+    /**
+     * @param AdminAnalyticsNotification $canViewNotificationAnalytics
+     * @param ReleaseNotification $canViewNotificationRelease
+     */
+    public function __construct(
+        AdminAnalyticsNotification $canViewNotificationAnalytics,
+        ReleaseNotification $canViewNotificationRelease
+    ) {
+        $this->canViewNotificationAnalytics = $canViewNotificationAnalytics;
+        $this->canViewNotificationRelease = $canViewNotificationRelease;
+    }
+
+    /**
+     * Determine if the analytics popup is visible
+     *
+     * @return bool
+     */
+    public function isAnalyticsVisible(): bool
+    {
+        return $this->canViewNotificationAnalytics->isVisible([]);
+    }
+
+    /**
+     * Determine if the release popup is visible
+     *
+     * @return bool
+     */
+    public function isReleaseVisible(): bool
+    {
+        return $this->canViewNotificationRelease->isVisible([]);
+    }
+}
diff --git a/app/code/Magento/AdminAnalytics/composer.json b/app/code/Magento/AdminAnalytics/composer.json
new file mode 100644
index 0000000000000..0b977a23ad3ca
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/composer.json
@@ -0,0 +1,29 @@
+{
+    "name": "magento/module-admin-analytics",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-config": "*",
+        "magento/module-ui": "*",
+        "magento/module-release-notification": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+          "files": [
+              "registration.php"
+          ],
+          "psr-4": {
+              "Magento\\AdminAnalytics\\": ""
+          }
+    }
+}
+
diff --git a/app/code/Magento/AdminAnalytics/etc/adminhtml/routes.xml b/app/code/Magento/AdminAnalytics/etc/adminhtml/routes.xml
new file mode 100644
index 0000000000000..5b5f2b52210b0
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/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="adminAnalytics" frontName="adminAnalytics">
+            <module name="Magento_AdminAnalytics" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/AdminAnalytics/etc/adminhtml/system.xml b/app/code/Magento/AdminAnalytics/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..d6867e74c4760
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/etc/adminhtml/system.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_Config:etc/system_file.xsd">
+    <system>
+        <section id="admin">
+            <group id="usage" translate="label" type="text" sortOrder="2000" showInDefault="1" showInWebsite="0" showInStore="0">
+                <label>Admin Usage</label>
+                <field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enable Admin Usage Tracking</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>Allow Magento to track admin usage in order to improve the quality and user experience.</comment>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/AdminAnalytics/etc/config.xml b/app/code/Magento/AdminAnalytics/etc/config.xml
new file mode 100644
index 0000000000000..ba683f13c11e3
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/etc/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>
+        <admin>
+            <usage>
+                <enabled>
+                    1
+                </enabled>
+            </usage>
+        </admin>
+    </default>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/AdminAnalytics/etc/db_schema.xml b/app/code/Magento/AdminAnalytics/etc/db_schema.xml
new file mode 100644
index 0000000000000..ef1a657dc8243
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/etc/db_schema.xml
@@ -0,0 +1,23 @@
+<?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_analytics_usage_version_log" resource="default" engine="innodb"
+           comment="Admin Notification Viewer Log Table">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
+                comment="Log ID"/>
+        <column xsi:type="varchar" name="last_viewed_in_version" nullable="false" length="50"
+                comment="Viewer last viewed on product version"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <constraint xsi:type="unique" referenceId="ADMIN_ANALYTICS_USAGE_VERSION_LOG_LAST_VIEWED_IN_VERSION">
+            <column name="last_viewed_in_version"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/AdminAnalytics/etc/db_schema_whitelist.json b/app/code/Magento/AdminAnalytics/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..626e3ec14bc90
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/etc/db_schema_whitelist.json
@@ -0,0 +1,12 @@
+{
+    "admin_analytics_usage_version_log": {
+        "column": {
+            "id": true,
+            "last_viewed_in_version": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "ADMIN_ANALYTICS_USAGE_VERSION_LOG_LAST_VIEWED_IN_VERSION": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/AdminAnalytics/etc/module.xml b/app/code/Magento/AdminAnalytics/etc/module.xml
new file mode 100644
index 0000000000000..f0990b114e25f
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/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_AdminAnalytics"/>
+</config>
diff --git a/app/code/Magento/AdminAnalytics/registration.php b/app/code/Magento/AdminAnalytics/registration.php
new file mode 100644
index 0000000000000..65c9955d396a8
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/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_AdminAnalytics', __DIR__);
diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/layout/adminhtml_dashboard_index.xml b/app/code/Magento/AdminAnalytics/view/adminhtml/layout/adminhtml_dashboard_index.xml
new file mode 100644
index 0000000000000..3069db1ecc2bb
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/layout/adminhtml_dashboard_index.xml
@@ -0,0 +1,22 @@
+<?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="admin_usage_notification">
+                <visibilityCondition name="can_view_admin_usage_notification" className="Magento\AdminAnalytics\Model\Condition\CanViewNotification"/>
+            </uiComponent>
+            <block name="tracking_notification" as="tracking_notification" template="Magento_AdminAnalytics::notification.phtml">
+                <arguments>
+                    <argument name="notification" xsi:type="object">Magento\AdminAnalytics\ViewModel\Notification</argument>
+                </arguments>
+            </block>
+        </referenceContainer>
+    </body>
+</page>
\ No newline at end of file
diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/layout/default.xml b/app/code/Magento/AdminAnalytics/view/adminhtml/layout/default.xml
new file mode 100644
index 0000000000000..7e379a17c78d7
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/layout/default.xml
@@ -0,0 +1,21 @@
+<?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="header">
+            <block name="tracking" as="tracking" template="Magento_AdminAnalytics::tracking.phtml" ifconfig="admin/usage/enabled">
+                <arguments>
+                    <argument name="tracking_url" xsi:type="string">//assets.adobedtm.com/launch-EN30eb7ffa064444f1b8b0368ef38fd3a9.min.js</argument>
+                    <argument name="metadata" xsi:type="object">Magento\AdminAnalytics\ViewModel\Metadata</argument>
+                </arguments>
+            </block>
+        </referenceContainer>
+    </body>
+</page>
+
+
diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/requirejs-config.js b/app/code/Magento/AdminAnalytics/view/adminhtml/requirejs-config.js
new file mode 100644
index 0000000000000..1361210929789
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/requirejs-config.js
@@ -0,0 +1,14 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    config: {
+        mixins: {
+            'Magento_ReleaseNotification/js/modal/component': {
+                'Magento_AdminAnalytics/js/release-notification/modal/component-mixin': true
+            }
+        }
+    }
+};
diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml
new file mode 100644
index 0000000000000..4b1f971670184
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml
@@ -0,0 +1,16 @@
+
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+
+<script>
+    define('analyticsPopupConfig', function () {
+        return {
+            analyticsVisible: <?= $block->getNotification()->isAnalyticsVisible() ? 1 : 0; ?>,
+            releaseVisible: <?= $block->getNotification()->isReleaseVisible() ? 1 : 0; ?>,
+        }
+    });
+</script>
diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
new file mode 100644
index 0000000000000..0ea5c753c9337
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+
+<script src="<?= $block->escapeUrl($block->getTrackingUrl()) ?>" async></script>
+<script>
+    var adminAnalyticsMetadata = {
+        "version": "<?= $block->escapeJs($block->getMetadata()->getMagentoVersion()) ?>",
+        "user": "<?= $block->escapeJs($block->getMetadata()->getCurrentUser()) ?>",
+        "mode": "<?= $block->escapeJs($block->getMetadata()->getMode()) ?>"
+    };
+</script>
diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/ui_component/admin_usage_notification.xml b/app/code/Magento/AdminAnalytics/view/adminhtml/ui_component/admin_usage_notification.xml
new file mode 100644
index 0000000000000..fcd1c4ebbbcdf
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/ui_component/admin_usage_notification.xml
@@ -0,0 +1,95 @@
+<?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">admin_usage_notification.admin_usage_notification_data_source</item>
+        </item>
+        <item name="label" xsi:type="string" translate="true">Admin Usage Notification</item>
+        <item name="template" xsi:type="string">templates/form/collapsible</item>
+    </argument>
+    <settings>
+        <namespace>admin_usage_notification</namespace>
+        <dataScope>data</dataScope>
+        <deps>
+            <dep>admin_usage_notification.admin_usage_notification_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="admin_usage_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="enableLogAction" xsi:type="url" path="adminAnalytics/config/enableAdminUsage"/>
+                        <item name="disableLogAction" xsi:type="url" path="adminAnalytics/config/disableAdminUsage"/>
+
+                    </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\AdminAnalytics\Ui\DataProvider\AdminUsageNotificationDataProvider" name="admin_usage_notification_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>entity_id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <modal name="notification_modal_1" component="Magento_AdminAnalytics/js/modal/component">
+        <settings>
+            <state>true</state>
+            <options>
+                <option name="modalClass" xsi:type="string">admin-usage-notification</option>
+                <option name="title" xsi:type="string" translate="true">Allow admin usage data collection</option>
+                <option name="autoOpen" xsi:type="boolean">true</option>
+                <option name="type" xsi:type="string">popup</option>
+                <option name="clickableOverlay" xsi:type="boolean">false</option>
+                <option name="responsive" xsi:type="boolean">true</option>
+                <option name="innerScroll" xsi:type="boolean">false</option>
+                <option name="buttons" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="text" xsi:type="string" translate="true">Don't Allow</item>
+                        <item name="class" xsi:type="string">action-secondary</item>
+                        <item name="actions" xsi:type="array">
+                            <item name="0" xsi:type="string">disableAdminUsage</item>
+                        </item>
+                    </item>
+                    <item name="1" xsi:type="array">
+                        <item name="text" xsi:type="string" translate="true">Allow</item>
+                        <item name="class" xsi:type="string">action-primary</item>
+                        <item name="actions" xsi:type="array">
+                            <item name="0" xsi:type="string">enableAdminUsage</item>
+                        </item>
+                    </item>
+                </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>Help us improve Magento Admin by allowing us to collect usage data.</p>
+                        <p>All usage data that we collect for this purpose cannot be used to individually identify you and is used only to improve the Magento Admin and related products and services.</p>
+                        <p>You can learn more and opt out at any time by following the instructions in <a href="https://docs.magento.com/m2/ce/user_guide/stores/admin.html" target="_blank" tabindex="0">merchant documentation</a>.</p>
+]]></item>
+                    </item>
+                </argument>
+            </container>
+        </fieldset>
+    </modal>
+</form>
diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/web/js/modal/component.js b/app/code/Magento/AdminAnalytics/view/adminhtml/web/js/modal/component.js
new file mode 100644
index 0000000000000..fac71870603c3
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/web/js/modal/component.js
@@ -0,0 +1,187 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'underscore',
+    'jquery',
+    'Magento_Ui/js/modal/modal-component',
+    'uiRegistry',
+    'analyticsPopupConfig'
+],
+    function (_, $, Modal, registry, analyticsPopupConfig) {
+        'use strict';
+
+        return Modal.extend(
+            {
+                defaults: {
+                    imports: {
+                        enableLogAction: '${ $.provider }:data.enableLogAction',
+                        disableLogAction: '${ $.provider }:data.disableLogAction'
+                    },
+                    options: {},
+                    notificationWindow: null
+                },
+
+                /**
+                 * Initializes modal on opened function
+                 */
+                initModal: function () {
+                    this.options.opened = this.onOpened.bind(this);
+                    this._super();
+                },
+
+                /**
+                 * Configure ESC and TAB so user can't leave modal
+                 * without selecting an option
+                 *
+                 * @returns {Object} Chainable.
+                 */
+                initModalEvents: function () {
+                    this._super();
+                    //Don't allow ESC key to close modal
+                    this.options.keyEventHandlers.escapeKey = this.handleEscKey.bind(this);
+                    //Restrict tab action to the modal
+                    this.options.keyEventHandlers.tabKey = this.handleTabKey.bind(this);
+
+                    return this;
+                },
+
+                /**
+                 * Once the modal is opened it hides the X
+                 */
+                onOpened: function () {
+                    $('.modal-header button.action-close').attr('disabled', true).hide();
+
+                    this.focusableElements = $(this.rootSelector).find('a[href], button:enabled');
+                    this.firstFocusableElement = this.focusableElements[0];
+                    this.lastFocusableElement = this.focusableElements[this.focusableElements.length - 1];
+                    this.firstFocusableElement.focus();
+                },
+
+                /**
+                 * Changes admin usage setting to yes
+                 */
+                enableAdminUsage: function () {
+                    var data = {
+                        'form_key': window.FORM_KEY
+                    };
+
+                    $.ajax(
+                        {
+                            type: 'POST',
+                            url: this.enableLogAction,
+                            data: data,
+                            showLoader: true
+                        }
+                    ).done(
+                        function (xhr) {
+                            if (xhr.error) {
+                                self.onError(xhr);
+                            }
+                        }
+                    ).fail(this.onError);
+                    this.openReleasePopup();
+                    this.closeModal();
+                },
+
+                /**
+                 * Changes admin usage setting to no
+                 */
+                disableAdminUsage: function () {
+                    var data = {
+                        'form_key': window.FORM_KEY
+                    };
+
+                    $.ajax(
+                        {
+                            type: 'POST',
+                            url: this.disableLogAction,
+                            data: data,
+                            showLoader: true
+                        }
+                    ).done(
+                        function (xhr) {
+                            if (xhr.error) {
+                                self.onError(xhr);
+                            }
+                        }
+                    ).fail(this.onError);
+                    this.openReleasePopup();
+                    this.closeModal();
+                },
+
+                /**
+                 * Allows admin usage popup to be shown first and then new release notification
+                 */
+                openReleasePopup: function () {
+                    var notificationModalSelector = 'release_notification.release_notification.notification_modal_1';
+
+                    if (analyticsPopupConfig.releaseVisible) {
+                        registry.get(notificationModalSelector).initializeContentAfterAnalytics();
+                    }
+                },
+
+                /**
+                 * Handle Tab and Shift+Tab key event
+                 *
+                 * Keep the tab actions restricted to the popup modal
+                 * so the user must select an option to dismiss the modal
+                 */
+                handleTabKey: function (event) {
+                    var modal = this,
+                        KEY_TAB = 9;
+
+                    /**
+                     * Handle Shift+Tab to tab backwards
+                     */
+                    function handleBackwardTab() {
+                        if (document.activeElement === modal.firstFocusableElement ||
+                            document.activeElement === $(modal.rootSelector)[0]
+                        ) {
+                            event.preventDefault();
+                            modal.lastFocusableElement.focus();
+                        }
+                    }
+
+                    /**
+                     * Handle Tab forward
+                     */
+                    function handleForwardTab() {
+                        if (document.activeElement === modal.lastFocusableElement) {
+                            event.preventDefault();
+                            modal.firstFocusableElement.focus();
+                        }
+                    }
+
+                    switch (event.keyCode) {
+                        case KEY_TAB:
+                            if (modal.focusableElements.length === 1) {
+                                event.preventDefault();
+                                break;
+                            }
+
+                            if (event.shiftKey) {
+                                handleBackwardTab();
+                                break;
+                            }
+                            handleForwardTab();
+                            break;
+                        default:
+                            break;
+                    }
+                },
+
+                /**
+                 * Handle Esc key
+                 *
+                 * Esc key should not close modal
+                 */
+                handleEscKey: function (event) {
+                    event.preventDefault();
+                }
+            }
+        );
+    }
+);
diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/web/js/release-notification/modal/component-mixin.js b/app/code/Magento/AdminAnalytics/view/adminhtml/web/js/release-notification/modal/component-mixin.js
new file mode 100644
index 0000000000000..ffecd031cbb43
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/web/js/release-notification/modal/component-mixin.js
@@ -0,0 +1,39 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define(['jquery', 'analyticsPopupConfig'], function ($, analyticsPopupConfig) {
+    'use strict';
+
+    var deferred = $.Deferred(),
+
+        mixin = {
+        /**
+         * Initializes content only if its visible
+         */
+        initializeContent: function () {
+            var initializeContent = this._super.bind(this);
+
+            if (!analyticsPopupConfig.analyticsVisible) {
+                initializeContent();
+            } else {
+                deferred.then(function () {
+                    initializeContent();
+                });
+            }
+        },
+
+        /**
+         * Initializes release notification content after admin analytics
+         */
+        initializeContentAfterAnalytics: function () {
+            deferred.resolve();
+        }
+    };
+
+    return function (target) {
+        return target.extend(mixin);
+    };
+});
+
diff --git a/app/code/Magento/AdminNotification/Test/Mftf/ActionGroup/AdminSystemMessagesActionGroup.xml b/app/code/Magento/AdminNotification/Test/Mftf/ActionGroup/AdminSystemMessagesActionGroup.xml
new file mode 100644
index 0000000000000..a498c95c65a30
--- /dev/null
+++ b/app/code/Magento/AdminNotification/Test/Mftf/ActionGroup/AdminSystemMessagesActionGroup.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="AdminSystemMessagesWarningActionGroup">
+        <annotations>
+            <description>Check warning system message exists.</description>
+        </annotations>
+        <arguments>
+            <argument name="message" type="string"/>
+        </arguments>
+
+        <waitForElementVisible selector="{{AdminSystemMessagesSection.systemMessagesDropdown}}" stepKey="waitMessagesDropdownAppears"/>
+        <conditionalClick selector="{{AdminSystemMessagesSection.systemMessagesDropdown}}" dependentSelector="{{AdminSystemMessagesSection.messagesBlock}}" visible="false" stepKey="openMessagesBlockIfCollapsed"/>
+        <see userInput="{{message}}" selector="{{AdminSystemMessagesSection.warning}}" stepKey="seeWarningMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/AdminNotification/Test/Mftf/Section/AdminSystemMessagesSection.xml b/app/code/Magento/AdminNotification/Test/Mftf/Section/AdminSystemMessagesSection.xml
index 8a73968edb9a6..e3b2ea7e24c83 100644
--- a/app/code/Magento/AdminNotification/Test/Mftf/Section/AdminSystemMessagesSection.xml
+++ b/app/code/Magento/AdminNotification/Test/Mftf/Section/AdminSystemMessagesSection.xml
@@ -11,5 +11,9 @@
     <section name="AdminSystemMessagesSection">
         <element name="systemMessagesDropdown" type="button" selector="#system_messages .message-system-action-dropdown"/>
         <element name="actionMessageLog" type="button" selector="//*[contains(@class, 'message-system-summary')]/a[contains(text(), '{{textMessage}}')]" parameterized="true"/>
+        <element name="messagesBlock" type="block" selector="#system_messages div.message-system-collapsible"/>
+        <element name="success" type="text" selector="#system_messages div.message-success"/>
+        <element name="warning" type="text" selector="#system_messages div.message-warning"/>
+        <element name="notice" type="text" selector="#system_messages div.message-notice"/>
     </section>
 </sections>
diff --git a/app/code/Magento/AdvancedSearch/Test/Unit/Model/Recommendations/DataProviderTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Model/Recommendations/DataProviderTest.php
new file mode 100644
index 0000000000000..c62c906914fd7
--- /dev/null
+++ b/app/code/Magento/AdvancedSearch/Test/Unit/Model/Recommendations/DataProviderTest.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AdvancedSearch\Test\Unit\Model\Recommendations;
+
+use Magento\AdvancedSearch\Model\Recommendations\DataProvider;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Catalog\Model\Layer\Resolver;
+use Magento\AdvancedSearch\Model\ResourceModel\Recommendations;
+use Magento\AdvancedSearch\Model\ResourceModel\RecommendationsFactory;
+use Magento\Search\Model\QueryResult;
+use Magento\Search\Model\QueryResultFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\Catalog\Model\Layer as SearchLayer;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Search\Model\QueryInterface;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
+ * Class \Magento\AdvancedSearch\Test\Unit\Model\Recommendations\DataProviderTest
+ */
+class DataProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DataProvider;
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ScopeConfigInterface
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Resolver
+     */
+    private $layerResolverMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|SearchLayer
+     */
+    private $searchLayerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|RecommendationsFactory
+     */
+    private $recommendationsFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Recommendations
+     */
+    private $recommendationsMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Resolver
+     */
+    private $queryResultFactory;
+
+    /**
+     * Set up test environment.
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->layerResolverMock = $this->getMockBuilder(Resolver::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['get'])
+            ->getMock();
+
+        $this->searchLayerMock = $this->createMock(SearchLayer::class);
+
+        $this->layerResolverMock->expects($this->any())
+            ->method('get')
+            ->will($this->returnValue($this->searchLayerMock));
+
+        $this->recommendationsFactoryMock = $this->getMockBuilder(RecommendationsFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->recommendationsMock = $this->createMock(Recommendations::class);
+
+        $this->queryResultFactory = $this->getMockBuilder(QueryResultFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            DataProvider::class,
+            [
+                'scopeConfig' => $this->scopeConfigMock,
+                'layerResolver' => $this->layerResolverMock,
+                'recommendationsFactory' => $this->recommendationsFactoryMock,
+                'queryResultFactory' => $this->queryResultFactory
+            ]
+        );
+    }
+
+    /**
+     * Test testGetItems() when Search Recommendations disabled.
+     *
+     * @return void
+     */
+    public function testGetItemsWhenDisabledSearchRecommendations()
+    {
+        $isEnabledSearchRecommendations = false;
+
+        /** @var $queryInterfaceMock QueryInterface */
+        $queryInterfaceMock = $this->createMock(QueryInterface::class);
+
+        $this->scopeConfigMock->expects($this->any())
+            ->method('isSetFlag')
+            ->with('catalog/search/search_recommendations_enabled', ScopeInterface::SCOPE_STORE)
+            ->willReturn($isEnabledSearchRecommendations);
+
+        $result = $this->model->getItems($queryInterfaceMock);
+        $this->assertEquals([], $result);
+    }
+
+    /**
+     * Test testGetItems() when Search Recommendations enabled.
+     *
+     * @return void
+     */
+    public function testGetItemsWhenEnabledSearchRecommendations()
+    {
+        $storeId = 1;
+        $searchRecommendationsCountConfig = 2;
+        $isEnabledSearchRecommendations = true;
+        $queryText = 'test';
+
+        /** @var $queryInterfaceMock QueryInterface */
+        $queryInterfaceMock = $this->createMock(QueryInterface::class);
+        $queryInterfaceMock->expects($this->any())->method('getQueryText')->willReturn($queryText);
+
+        $this->scopeConfigMock->expects($this->any())
+            ->method('isSetFlag')
+            ->with('catalog/search/search_recommendations_enabled', ScopeInterface::SCOPE_STORE)
+            ->willReturn($isEnabledSearchRecommendations);
+
+        $this->scopeConfigMock->expects($this->any())
+            ->method('getValue')
+            ->with('catalog/search/search_recommendations_count', ScopeInterface::SCOPE_STORE)
+            ->willReturn($searchRecommendationsCountConfig);
+
+        $productCollectionMock = $this->createMock(ProductCollection::class);
+        $productCollectionMock->expects($this->any())->method('getStoreId')->willReturn($storeId);
+
+        $this->searchLayerMock->expects($this->any())->method('getProductCollection')
+            ->willReturn($productCollectionMock);
+
+        $this->recommendationsFactoryMock->expects($this->any())->method('create')
+            ->willReturn($this->recommendationsMock);
+
+        $this->recommendationsMock->expects($this->any())->method('getRecommendationsByQuery')
+            ->with($queryText, ['store_id' => $storeId], $searchRecommendationsCountConfig)
+            ->willReturn(
+                [
+                    [
+                        'query_text' => 'a',
+                        'num_results' => 3
+                    ],
+                    [
+                        'query_text' => 'b',
+                        'num_results' => 2
+                    ]
+                ]
+            );
+        $queryResultMock = $this->createMock(QueryResult::class);
+        $this->queryResultFactory->expects($this->any())->method('create')->willReturn($queryResultMock);
+
+        $result = $this->model->getItems($queryInterfaceMock);
+        $this->assertEquals(2, count($result));
+    }
+}
diff --git a/app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml b/app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml
index 63c78e07c7bfc..905dd3e7d1819 100644
--- a/app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml
+++ b/app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml
@@ -60,7 +60,7 @@
                             <field id="search_suggestion_enabled">1</field>
                         </depends>
                     </field>
-                    <field id="search_suggestion_count_results_enabled" translate="label" type="select" sortOrder="92" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="search_suggestion_count_results_enabled" translate="label comment" type="select" sortOrder="92" 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>
diff --git a/app/code/Magento/Analytics/Model/ExportDataHandler.php b/app/code/Magento/Analytics/Model/ExportDataHandler.php
index 72a8e4ea00347..4dbc316d0901a 100644
--- a/app/code/Magento/Analytics/Model/ExportDataHandler.php
+++ b/app/code/Magento/Analytics/Model/ExportDataHandler.php
@@ -89,7 +89,7 @@ public function __construct(
     public function prepareExportData()
     {
         try {
-            $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+            $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
 
             $this->prepareDirectory($tmpDirectory, $this->getTmpFilesDirRelativePath());
             $this->reportWriter->write($tmpDirectory, $this->getTmpFilesDirRelativePath());
diff --git a/app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php b/app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php
index 4d62344197405..fecbf2033c1ba 100644
--- a/app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php
+++ b/app/code/Magento/Analytics/Model/ReportXml/ModuleIterator.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Analytics\Model\ReportXml;
 
-use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
+use Magento\Framework\Module\Manager as ModuleManager;
 
 /**
  * Iterator for ReportXml modules
diff --git a/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml b/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
index 099cc71321b84..3b198644fcc9b 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Data/UserRoleData.xml
@@ -9,6 +9,7 @@
 <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="all">0</data>
         <data key="rolename" unique="suffix">noreport</data>
         <data key="current_password">123123q</data>
         <array key="resource">
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php
index 493fe71c9fbfc..cf00556cfe590 100644
--- a/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php
@@ -13,7 +13,7 @@
 use Magento\Framework\Archive;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
-use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DirectoryList;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class ExportDataHandlerTest extends \PHPUnit\Framework\TestCase
@@ -137,7 +137,7 @@ public function testPrepareExportData($isArchiveSourceDirectory)
         $this->filesystemMock
             ->expects($this->once())
             ->method('getDirectoryWrite')
-            ->with(DirectoryList::VAR_DIR)
+            ->with(DirectoryList::SYS_TMP)
             ->willReturn($this->directoryMock);
         $this->directoryMock
             ->expects($this->exactly(4))
@@ -238,7 +238,7 @@ public function testPrepareExportDataWithLocalizedException()
         $this->filesystemMock
             ->expects($this->once())
             ->method('getDirectoryWrite')
-            ->with(DirectoryList::VAR_DIR)
+            ->with(DirectoryList::SYS_TMP)
             ->willReturn($this->directoryMock);
         $this->reportWriterMock
             ->expects($this->once())
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php
index b08d41ac829b7..5288bcd306af9 100644
--- a/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Model/ReportXml/ModuleIteratorTest.php
@@ -7,7 +7,7 @@
 namespace Magento\Analytics\Test\Unit\Model\ReportXml;
 
 use Magento\Analytics\Model\ReportXml\ModuleIterator;
-use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
+use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
diff --git a/app/code/Magento/Analytics/etc/adminhtml/system.xml b/app/code/Magento/Analytics/etc/adminhtml/system.xml
index c7da840b7e665..2a04128099345 100644
--- a/app/code/Magento/Analytics/etc/adminhtml/system.xml
+++ b/app/code/Magento/Analytics/etc/adminhtml/system.xml
@@ -15,7 +15,7 @@
                 <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">
+                "Go to Advanced Reporting" link. </br> For more information, see our <a target="_blank" 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>
@@ -29,7 +29,7 @@
                     <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">
+                <field id="vertical" translate="hint 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>
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkStatus.php b/app/code/Magento/AsynchronousOperations/Model/BulkStatus.php
index c37ae0d23dd25..6290ac00ce87f 100644
--- a/app/code/Magento/AsynchronousOperations/Model/BulkStatus.php
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkStatus.php
@@ -87,22 +87,6 @@ public function getFailedOperationsByBulkId($bulkUuid, $failureType = null)
      */
     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)
diff --git a/app/code/Magento/AsynchronousOperations/Model/Operation.php b/app/code/Magento/AsynchronousOperations/Model/Operation.php
index dbe6ecc1b6b1f..00f33d10a1e1b 100644
--- a/app/code/Magento/AsynchronousOperations/Model/Operation.php
+++ b/app/code/Magento/AsynchronousOperations/Model/Operation.php
@@ -6,13 +6,33 @@
 namespace Magento\AsynchronousOperations\Model;
 
 use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\AsynchronousOperations\Model\OperationStatusValidator;
 use Magento\Framework\DataObject;
 
 /**
- * Class Operation
+ * Class Operation encapsulates methods for Operation Model Object
  */
 class Operation extends DataObject implements OperationInterface
 {
+    /**
+     * @var OperationStatusValidator
+     */
+    private $operationStatusValidator;
+
+    /**
+     * Operation constructor.
+     *
+     * @param OperationStatusValidator $operationStatusValidator
+     * @param array $data
+     */
+    public function __construct(
+        OperationStatusValidator $operationStatusValidator,
+        array $data = []
+    ) {
+        $this->operationStatusValidator = $operationStatusValidator;
+        parent::__construct($data);
+    }
+
     /**
      * @inheritDoc
      */
@@ -106,6 +126,7 @@ public function getStatus()
      */
     public function setStatus($status)
     {
+        $this->operationStatusValidator->validate($status);
         return $this->setData(self::STATUS, $status);
     }
 
diff --git a/app/code/Magento/AsynchronousOperations/Model/OperationStatusPool.php b/app/code/Magento/AsynchronousOperations/Model/OperationStatusPool.php
new file mode 100644
index 0000000000000..890eb8c1c8c75
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/OperationStatusPool.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model;
+
+/**
+ * Class OperationStatusPool
+ *
+ * Pool of statuses that require validate
+ */
+class OperationStatusPool
+{
+    /**
+     * @var array
+     */
+    private $statuses;
+
+    /**
+     * @param array $statuses
+     */
+    public function __construct(array $statuses = [])
+    {
+        $this->statuses = $statuses;
+    }
+
+    /**
+     * Retrieve statuses that require validate
+     *
+     * @return array
+     */
+    public function getStatuses()
+    {
+        return $this->statuses;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/OperationStatusValidator.php b/app/code/Magento/AsynchronousOperations/Model/OperationStatusValidator.php
new file mode 100644
index 0000000000000..f2ae135e4303c
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/OperationStatusValidator.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Model\OperationStatusPool;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Doctrine\Instantiator\Exception\InvalidArgumentException;
+
+/**
+ * Class OperationStatusValidator to validate operation status
+ */
+class OperationStatusValidator
+{
+    /**
+     * @var OperationStatusPool
+     */
+    private $operationStatusPool;
+
+    /**
+     * OperationStatusValidator constructor.
+     *
+     * @param OperationStatusPool $operationStatusPool
+     */
+    public function __construct(OperationStatusPool $operationStatusPool)
+    {
+        $this->operationStatusPool = $operationStatusPool;
+    }
+
+    /**
+     * Validate method
+     *
+     * @param int $status
+     * @throws \InvalidArgumentException
+     * @return void
+     */
+    public function validate($status)
+    {
+        $statuses = $this->operationStatusPool->getStatuses();
+
+        if (!in_array($status, $statuses)) {
+            throw new \InvalidArgumentException('Invalid Operation Status.');
+        }
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationStatusValidatorTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationStatusValidatorTest.php
new file mode 100644
index 0000000000000..b93d9701a7a69
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationStatusValidatorTest.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Test\Unit\Model;
+
+use Magento\AsynchronousOperations\Model\OperationStatusValidator;
+use Magento\AsynchronousOperations\Model\Operation;
+use Magento\AsynchronousOperations\Model\OperationStatusPool;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class OperationStatusValidatorTest implements logic for testing Operation::setStatus() method
+ */
+class OperationStatusValidatorTest extends TestCase
+{
+    /**
+     * @var OperationStatusPool
+     */
+    private $operationStatusPool;
+
+    /**
+     * @var OperationStatusValidator
+     */
+    private $operationStatusValidator;
+
+    /**
+     * @var Operation
+     */
+    private $operation;
+
+    protected function setUp()
+    {
+        $this->operationStatusPool = $this->getMockBuilder(OperationStatusPool::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new ObjectManager($this);
+
+        $this->operationStatusValidator = $objectManager->getObject(
+            OperationStatusValidator::class,
+            [
+                'operationStatusPool' => $this->operationStatusPool
+            ]
+        );
+
+        $this->operation = $objectManager->getObject(
+            Operation::class,
+            [
+                'operationStatusValidator' => $this->operationStatusValidator
+            ]
+        );
+    }
+
+    /**
+     * @param string $status
+     * @param array $statusPool
+     * @param string $expectedResult
+     * @dataProvider dataProviderForTestSetStatus
+     */
+    public function testSetStatus(
+        string $status,
+        array $statusPool,
+        string $expectedResult
+    ) {
+        $this->operationStatusPool
+            ->expects($this->any())
+            ->method('getStatuses')
+            ->willReturn($statusPool);
+
+        try {
+            $this->operation->setStatus($status);
+            $this->assertEquals($expectedResult, $this->operation->getStatus());
+        } catch (\Exception $exception) {
+            $this->assertEquals($expectedResult, $exception->getMessage());
+        }
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function dataProviderForTestSetStatus()
+    {
+        return [
+            [
+                'status' => 0,
+                'statusPool' => [
+                    'complete' => 1,
+                    'retriablyFailed' => 2,
+                    'notRetriablyFailed' => 3,
+                    'open' => 4,
+                    'rejected' => 5
+                ],
+                'expectedResult' => 'Invalid Operation Status.'
+            ],
+            [
+                'status' => 1,
+                'statusPool' => [
+                    'complete' => 1,
+                    'retriablyFailed' => 2,
+                    'notRetriablyFailed' => 3,
+                    'open' => 4,
+                    'rejected' => 5
+                ],
+                'expectedResult' => 1
+            ],
+            [
+                'status' => 2,
+                'statusPool' => [
+                    'complete' => 1,
+                    'retriablyFailed' => 2,
+                    'notRetriablyFailed' => 3,
+                    'open' => 4,
+                    'rejected' => 5
+                ],
+                'expectedResult' => 2
+            ],
+            [
+                'status' => 3,
+                'statusPool' => [
+                    'complete' => 1,
+                    'retriablyFailed' => 2,
+                    'notRetriablyFailed' => 3,
+                    'open' => 4,
+                    'rejected' => 5
+                ],
+                'expectedResult' => 3
+            ],
+            [
+                'status' => 4,
+                'statusPool' => [
+                    'complete' => 1,
+                    'retriablyFailed' => 2,
+                    'notRetriablyFailed' => 3,
+                    'open' => 4,
+                    'rejected' => 5
+                ],
+                'expectedResult' => 4
+            ],
+            [
+                'status' => 5,
+                'statusPool' => [
+                    'complete' => 1,
+                    'retriablyFailed' => 2,
+                    'notRetriablyFailed' => 3,
+                    'open' => 4,
+                    'rejected' => 5
+                ],
+                'expectedResult' => 5
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/etc/di.xml b/app/code/Magento/AsynchronousOperations/etc/di.xml
index 94a4c56c19cea..171a01cedf289 100644
--- a/app/code/Magento/AsynchronousOperations/etc/di.xml
+++ b/app/code/Magento/AsynchronousOperations/etc/di.xml
@@ -80,6 +80,17 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\AsynchronousOperations\Model\OperationStatusPool">
+        <arguments>
+            <argument name="statuses" xsi:type="array">
+                <item name="complete" xsi:type="string">1</item>
+                <item name="retriablyFailed" xsi:type="string">2</item>
+                <item name="notRetriablyFailed" xsi:type="string">3</item>
+                <item name="open" xsi:type="string">4</item>
+                <item name="rejected" xsi:type="string">5</item>
+            </argument>
+        </arguments>
+    </type>
     <virtualType
             name="Magento\AsynchronousOperations\Ui\Component\DataProvider"
             type="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider"/>
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
index 512b08d6a8de2..87dc0525eb1c0 100644
--- a/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_listing.xml
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/ui_component/bulk_listing.xml
@@ -92,7 +92,7 @@
         <actionsColumn name="actions" class="\Magento\AsynchronousOperations\Ui\Component\Listing\Column\Actions">
             <settings>
                 <indexField>id</indexField>
-                <label>Action</label>
+                <label translate="true">Action</label>
             </settings>
         </actionsColumn>
     </columns>
diff --git a/app/code/Magento/Authorization/Model/Role.php b/app/code/Magento/Authorization/Model/Role.php
index 042e95806ae18..fc32fbcaa2e98 100644
--- a/app/code/Magento/Authorization/Model/Role.php
+++ b/app/code/Magento/Authorization/Model/Role.php
@@ -52,9 +52,6 @@ public function __construct( //phpcs:ignore Generic.CodeAnalysis.UselessOverridi
 
     /**
      * @inheritDoc
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -64,9 +61,6 @@ public function __sleep()
 
     /**
      * @inheritDoc
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/app/code/Magento/Authorizenet/Test/Mftf/Test/StorefrontVerifySecureURLRedirectAuthorizenetTest.xml b/app/code/Magento/Authorizenet/Test/Mftf/Test/StorefrontVerifySecureURLRedirectAuthorizenetTest.xml
deleted file mode 100644
index 5db903f0ed54a..0000000000000
--- a/app/code/Magento/Authorizenet/Test/Mftf/Test/StorefrontVerifySecureURLRedirectAuthorizenetTest.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifySecureURLRedirectAuthorizenet">
-        <annotations>
-            <features value="Authorizenet"/>
-            <stories value="Storefront Secure URLs"/>
-            <title value="Verify Secure URLs For Storefront Authorizenet Pages"/>
-            <description value="Verify that the Secure URL configuration applies to the Authorizenet pages on the Storefront"/>
-            <severity value="MAJOR"/>
-            <testCaseId value="MC-15610"/>
-            <group value="authorizenet"/>
-            <group value="configuration"/>
-            <group value="secure_storefront_url"/>
-        </annotations>
-        <before>
-            <createData entity="Simple_US_Customer" stepKey="customer"/>
-            <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefront">
-                <argument name="Customer" value="$$customer$$"/>
-            </actionGroup>
-            <executeJS function="return window.location.host" stepKey="hostname"/>
-            <magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
-            <magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-        </before>
-        <after>
-            <magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-        </after>
-        <executeJS function="return window.location.host" stepKey="hostname"/>
-        <amOnUrl url="http://{$hostname}/authorizenet" stepKey="goToUnsecureAuthorizenetURL"/>
-        <seeCurrentUrlEquals url="https://{$hostname}/authorizenet" stepKey="seeSecureAuthorizenetURL"/>
-    </test>
-</tests>
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php
index 95c67f67852da..a1547a0563461 100644
--- a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php
+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php
@@ -3,8 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Authorizenet\Test\Unit\Model;
 
+use Magento\Authorizenet\Helper\Backend\Data;
+use Magento\Authorizenet\Helper\Data as HelperData;
+use Magento\Authorizenet\Model\Directpost\Response;
+use Magento\Authorizenet\Model\Directpost\Response\Factory as ResponseFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\HTTP\ZendClientFactory;
+use Magento\Payment\Model\InfoInterface;
+use Magento\Payment\Model\Method\ConfigInterface;
 use Magento\Sales\Api\PaymentFailuresInterface;
 use Magento\Framework\Simplexml\Element;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
@@ -13,118 +24,118 @@
 use Magento\Authorizenet\Model\Request;
 use Magento\Authorizenet\Model\Directpost\Request\Factory;
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Sales\Model\Order\Payment\Transaction;
 use Magento\Sales\Model\Order\Payment\Transaction\Repository as TransactionRepository;
+use PHPUnit\Framework\MockObject_MockBuilder;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject;
+use ReflectionClass;
 
 /**
  * Class DirectpostTest
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class DirectpostTest extends \PHPUnit\Framework\TestCase
+class DirectpostTest extends TestCase
 {
     const TOTAL_AMOUNT = 100.02;
     const INVOICE_NUM = '00000001';
     const TRANSACTION_ID = '41a23x34fd124';
 
     /**
-     * @var \Magento\Authorizenet\Model\Directpost
+     * @var Directpost
      */
     protected $directpost;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeConfigInterface|PHPUnit_Framework_MockObject_MockObject
      */
     protected $scopeConfigMock;
 
     /**
-     * @var \Magento\Payment\Model\InfoInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var InfoInterface|PHPUnit_Framework_MockObject_MockObject
      */
     protected $paymentMock;
 
     /**
-     * @var \Magento\Authorizenet\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var HelperData|PHPUnit_Framework_MockObject_MockObject
      */
     protected $dataHelperMock;
 
     /**
-     * @var \Magento\Authorizenet\Model\Directpost\Response\Factory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResponseFactory|PHPUnit_Framework_MockObject_MockObject
      */
     protected $responseFactoryMock;
 
     /**
-     * @var TransactionRepository|\PHPUnit_Framework_MockObject_MockObject
+     * @var TransactionRepository|PHPUnit_Framework_MockObject_MockObject
      */
     protected $transactionRepositoryMock;
 
     /**
-     * @var \Magento\Authorizenet\Model\Directpost\Response|\PHPUnit_Framework_MockObject_MockObject
+     * @var Response|PHPUnit_Framework_MockObject_MockObject
      */
     protected $responseMock;
 
     /**
-     * @var TransactionService|\PHPUnit_Framework_MockObject_MockObject
+     * @var TransactionService|PHPUnit_Framework_MockObject_MockObject
      */
     protected $transactionServiceMock;
 
     /**
-     * @var \Magento\Framework\HTTP\ZendClient|\PHPUnit_Framework_MockObject_MockObject
+     * @var ZendClient|PHPUnit_Framework_MockObject_MockObject
      */
     protected $httpClientMock;
 
     /**
-     * @var \Magento\Authorizenet\Model\Directpost\Request\Factory|\PHPUnit_Framework_MockObject_MockObject
+     * @var Factory|PHPUnit_Framework_MockObject_MockObject
      */
     protected $requestFactory;
 
     /**
-     * @var PaymentFailuresInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var PaymentFailuresInterface|PHPUnit_Framework_MockObject_MockObject
      */
     private $paymentFailures;
 
+    /**
+     * @var ZendClientFactory|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $httpClientFactoryMock;
+
     /**
      * @inheritdoc
      */
     protected function setUp()
     {
-        $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
-            ->getMock();
-        $this->paymentMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Payment::class)
-            ->disableOriginalConstructor()
-            ->setMethods([
-                'getOrder', 'getId', 'setAdditionalInformation', 'getAdditionalInformation',
-                'setIsTransactionDenied', 'setIsTransactionClosed', 'decrypt', 'getCcLast4',
-                'getParentTransactionId', 'getPoNumber'
-            ])
-            ->getMock();
-        $this->dataHelperMock = $this->getMockBuilder(\Magento\Authorizenet\Helper\Data::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
+        $this->initPaymentMock();
         $this->initResponseFactoryMock();
+        $this->initHttpClientMock();
 
-        $this->transactionRepositoryMock = $this->getMockBuilder(
-            \Magento\Sales\Model\Order\Payment\Transaction\Repository::class
-        )
+        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)->getMock();
+        $this->dataHelperMock = $this->getMockBuilder(HelperData::class)->disableOriginalConstructor()->getMock();
+        $this->transactionRepositoryMock = $this->getMockBuilder(TransactionRepository::class)
             ->disableOriginalConstructor()
             ->setMethods(['getByTransactionId'])
             ->getMock();
-
-        $this->transactionServiceMock = $this->getMockBuilder(\Magento\Authorizenet\Model\TransactionService::class)
+        $this->transactionServiceMock = $this->getMockBuilder(TransactionService::class)
             ->disableOriginalConstructor()
             ->setMethods(['getTransactionDetails'])
             ->getMock();
-
-        $this->paymentFailures = $this->getMockBuilder(
-            PaymentFailuresInterface::class
-        )
+        $this->paymentFailures = $this->getMockBuilder(PaymentFailuresInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-
-        $this->requestFactory = $this->getRequestFactoryMock();
-        $httpClientFactoryMock = $this->getHttpClientFactoryMock();
+        $this->requestFactory = $this->getMockBuilder(Factory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->httpClientFactoryMock = $this->getMockBuilder(ZendClientFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
 
         $helper = new ObjectManagerHelper($this);
         $this->directpost = $helper->getObject(
-            \Magento\Authorizenet\Model\Directpost::class,
+            Directpost::class,
             [
                 'scopeConfig' => $this->scopeConfigMock,
                 'dataHelper' => $this->dataHelperMock,
@@ -132,18 +143,97 @@ protected function setUp()
                 'responseFactory' => $this->responseFactoryMock,
                 'transactionRepository' => $this->transactionRepositoryMock,
                 'transactionService' => $this->transactionServiceMock,
-                'httpClientFactory' => $httpClientFactoryMock,
+                'httpClientFactory' => $this->httpClientFactoryMock,
                 'paymentFailures' => $this->paymentFailures,
             ]
         );
     }
 
+    /**
+     * Create mock for response factory
+     *
+     * @return void
+     */
+    private function initResponseFactoryMock()
+    {
+        $this->responseFactoryMock = $this->getMockBuilder(ResponseFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->responseMock = $this->getMockBuilder(Response::class)
+            ->setMethods(
+                [
+                    'isValidHash',
+                    'getXTransId',
+                    'getXResponseCode',
+                    'getXResponseReasonCode',
+                    'getXResponseReasonText',
+                    'getXAmount',
+                    'setXResponseCode',
+                    'setXResponseReasonCode',
+                    'setXAvsCode',
+                    'setXResponseReasonText',
+                    'setXTransId',
+                    'setXInvoiceNum',
+                    'setXAmount',
+                    'setXMethod',
+                    'setXType',
+                    'setData',
+                    'getData',
+                    'setXAccountNumber',
+                    '__wakeup'
+                ]
+            )
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->responseFactoryMock->expects($this->any())->method('create')->willReturn($this->responseMock);
+    }
+
+    /**
+     * Create mock for payment
+     *
+     * @return void
+     */
+    private function initPaymentMock()
+    {
+        $this->paymentMock = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'getOrder',
+                    'setAmount',
+                    'setAnetTransType',
+                    'setXTransId',
+                    'getId',
+                    'setAdditionalInformation',
+                    'getAdditionalInformation',
+                    'setIsTransactionDenied',
+                    'setIsTransactionClosed',
+                    'decrypt',
+                    'getCcLast4',
+                    'getParentTransactionId',
+                    'getPoNumber'
+                ]
+            )
+            ->getMock();
+    }
+
+    /**
+     * Create a mock for http client
+     *
+     * @return void
+     */
+    private function initHttpClientMock()
+    {
+        $this->httpClientMock = $this->getMockBuilder(ZendClient::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['request', 'getBody', '__wakeup'])
+            ->getMock();
+    }
+
     public function testGetConfigInterface()
     {
-        $this->assertInstanceOf(
-            \Magento\Payment\Model\Method\ConfigInterface::class,
-            $this->directpost->getConfigInterface()
-        );
+        $this->assertInstanceOf(ConfigInterface::class, $this->directpost->getConfigInterface());
     }
 
     public function testGetConfigValue()
@@ -162,7 +252,7 @@ public function testSetDataHelper()
         $storeId = 'store-id';
         $expectedResult = 'relay-url';
 
-        $helperDataMock = $this->getMockBuilder(\Magento\Authorizenet\Helper\Backend\Data::class)
+        $helperDataMock = $this->getMockBuilder(Data::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -179,7 +269,7 @@ public function testAuthorize()
     {
         $paymentAction = 'some_action';
 
-        $this->scopeConfigMock->expects($this->any())
+        $this->scopeConfigMock->expects($this->once())
             ->method('getValue')
             ->with('payment/authorizenet_directpost/payment_action', 'store', null)
             ->willReturn($paymentAction);
@@ -190,11 +280,143 @@ public function testAuthorize()
         $this->directpost->authorize($this->paymentMock, 10);
     }
 
+    /**
+     * @dataProvider dataProviderCaptureWithInvalidAmount
+     * @expectedExceptionMessage Invalid amount for capture.
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     *
+     * @param int $invalidAmount
+     */
+    public function testCaptureWithInvalidAmount($invalidAmount)
+    {
+        $this->directpost->capture($this->paymentMock, $invalidAmount);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderCaptureWithInvalidAmount()
+    {
+        return [
+            [0],
+            [0.000],
+            [-1.000],
+            [-1],
+            [null],
+        ];
+    }
+
+    /**
+     * Test capture has parent transaction id.
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testCaptureHasParentTransactionId()
+    {
+        $amount = 10;
+
+        $this->paymentMock->expects($this->once())->method('setAmount')->with($amount);
+        $this->paymentMock->expects($this->exactly(2))->method('getParentTransactionId')->willReturn(1);
+        $this->paymentMock->expects($this->once())->method('setAnetTransType')->willReturn('PRIOR_AUTH_CAPTURE');
+
+        $this->paymentMock->expects($this->once())->method('getId')->willReturn(1);
+        $orderMock = $this->getOrderMock();
+        $orderMock->expects($this->once())->method('getId')->willReturn(1);
+        $this->paymentMock->expects($this->once())->method('getOrder')->willReturn($orderMock);
+
+        $transactionMock = $this->getMockBuilder(Transaction::class)->disableOriginalConstructor()->getMock();
+        $this->transactionRepositoryMock->expects($this->once())
+            ->method('getByTransactionId')
+            ->with(1, 1, 1)
+            ->willReturn($transactionMock);
+
+        $this->paymentMock->expects($this->once())->method('setXTransId');
+        $this->responseMock->expects($this->once())->method('getData')->willReturn([1]);
+
+        $this->directpost->capture($this->paymentMock, 10);
+    }
+
+    /**
+     * @@expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testCaptureWithoutParentTransactionId()
+    {
+        $amount = 10;
+
+        $this->paymentMock->expects($this->once())->method('setAmount')->with($amount);
+        $this->paymentMock->expects($this->once())->method('getParentTransactionId')->willReturn(null);
+        $this->responseMock->expects($this->once())->method('getData')->willReturn([1]);
+
+        $this->directpost->capture($this->paymentMock, 10);
+    }
+
+    public function testCaptureWithoutParentTransactionIdWithoutData()
+    {
+        $amount = 10;
+
+        $this->paymentMock->expects($this->once())->method('setAmount')->with($amount);
+        $this->paymentMock->expects($this->exactly(2))->method('getParentTransactionId')->willReturn(null);
+        $this->responseMock->expects($this->once())->method('getData')->willReturn([]);
+
+        $this->paymentMock->expects($this->once())
+            ->method('setIsTransactionClosed')
+            ->with(0)
+            ->willReturnSelf();
+
+        $this->httpClientFactoryMock->expects($this->once())->method('create')->willReturn($this->httpClientMock);
+        $this->httpClientMock->expects($this->once())->method('request')->willReturnSelf();
+
+        $this->buildRequestTest();
+        $this->postRequestTest();
+
+        $this->directpost->capture($this->paymentMock, 10);
+    }
+
+    private function buildRequestTest()
+    {
+        $orderMock = $this->getOrderMock();
+        $orderMock->expects($this->once())->method('getStoreId')->willReturn(1);
+        $orderMock->expects($this->exactly(2))->method('getIncrementId')->willReturn(self::INVOICE_NUM);
+        $this->paymentMock->expects($this->once())->method('getOrder')->willReturn($orderMock);
+
+        $this->addRequestMockToRequestFactoryMock();
+    }
+
+    private function postRequestTest()
+    {
+        $this->httpClientFactoryMock->expects($this->once())->method('create')->willReturn($this->httpClientMock);
+        $this->httpClientMock->expects($this->once())->method('request')->willReturnSelf();
+        $this->responseMock->expects($this->once())->method('setXResponseCode')->willReturnSelf();
+        $this->responseMock->expects($this->once())->method('setXResponseReasonCode')->willReturnSelf();
+        $this->responseMock->expects($this->once())->method('setXResponseReasonText')->willReturnSelf();
+        $this->responseMock->expects($this->once())->method('setXAvsCode')->willReturnSelf();
+        $this->responseMock->expects($this->once())->method('setXTransId')->willReturnSelf();
+        $this->responseMock->expects($this->once())->method('setXInvoiceNum')->willReturnSelf();
+        $this->responseMock->expects($this->once())->method('setXAmount')->willReturnSelf();
+        $this->responseMock->expects($this->once())->method('setXMethod')->willReturnSelf();
+        $this->responseMock->expects($this->once())->method('setXType')->willReturnSelf();
+        $this->responseMock->expects($this->once())->method('setData')->willReturnSelf();
+
+        $response = $this->getRefundResponseBody(
+            Directpost::RESPONSE_CODE_APPROVED,
+            Directpost::RESPONSE_REASON_CODE_APPROVED,
+            'Successful'
+        );
+        $this->httpClientMock->expects($this->once())->method('getBody')->willReturn($response);
+        $this->responseMock->expects($this->once())
+            ->method('getXResponseCode')
+            ->willReturn(Directpost::RESPONSE_CODE_APPROVED);
+        $this->responseMock->expects($this->once())
+            ->method('getXResponseReasonCode')
+            ->willReturn(Directpost::RESPONSE_REASON_CODE_APPROVED);
+        $this->dataHelperMock->expects($this->never())->method('wrapGatewayError');
+    }
+
     public function testGetCgiUrl()
     {
         $url = 'cgi/url';
 
-        $this->scopeConfigMock->expects($this->any())
+        $this->scopeConfigMock->expects($this->once())
             ->method('getValue')
             ->with('payment/authorizenet_directpost/cgi_url', 'store', null)
             ->willReturn($url);
@@ -204,7 +426,7 @@ public function testGetCgiUrl()
 
     public function testGetCgiUrlWithEmptyConfigValue()
     {
-        $this->scopeConfigMock->expects($this->any())
+        $this->scopeConfigMock->expects($this->once())
             ->method('getValue')
             ->with('payment/authorizenet_directpost/cgi_url', 'store', null)
             ->willReturn(null);
@@ -218,7 +440,7 @@ public function testGetRelayUrl()
         $url = 'relay/url';
         $this->directpost->setData('store', $storeId);
 
-        $this->dataHelperMock->expects($this->any())
+        $this->dataHelperMock->expects($this->exactly(2))
             ->method('getRelayUrl')
             ->with($storeId)
             ->willReturn($url);
@@ -268,7 +490,7 @@ public function testValidateResponseFailure()
      */
     protected function prepareTestValidateResponse($transMd5, $login, $isValidHash)
     {
-        $this->scopeConfigMock->expects($this->any())
+        $this->scopeConfigMock->expects($this->exactly(2))
             ->method('getValue')
             ->willReturnMap(
                 [
@@ -276,7 +498,7 @@ protected function prepareTestValidateResponse($transMd5, $login, $isValidHash)
                     ['payment/authorizenet_directpost/login', 'store', null, $login]
                 ]
             );
-        $this->responseMock->expects($this->any())
+        $this->responseMock->expects($this->exactly(1))
             ->method('isValidHash')
             ->with($transMd5, $login)
             ->willReturn($isValidHash);
@@ -328,6 +550,20 @@ public function checkResponseCodeSuccessDataProvider()
         ];
     }
 
+    /**
+     * Checks response failures behaviour.
+     *
+     * @return void
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testCheckResponseCodeFailureDefault()
+    {
+        $responseCode = 999999;
+        $this->responseMock->expects($this->once())->method('getXResponseCode')->willReturn($responseCode);
+
+        $this->directpost->checkResponseCode();
+    }
+
     /**
      * Checks response failures behaviour.
      *
@@ -338,34 +574,24 @@ public function checkResponseCodeSuccessDataProvider()
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @dataProvider checkResponseCodeFailureDataProvider
      */
-    public function testCheckResponseCodeFailure(int $responseCode, int $failuresHandlerCalls): void
+    public function testCheckResponseCodeFailureDeclinedOrError(int $responseCode, int $failuresHandlerCalls): void
     {
         $reasonText = 'reason text';
 
         $this->responseMock->expects($this->once())
             ->method('getXResponseCode')
             ->willReturn($responseCode);
-        $this->responseMock->expects($this->any())
-            ->method('getXResponseReasonText')
-            ->willReturn($reasonText);
-        $this->dataHelperMock->expects($this->any())
+        $this->responseMock->expects($this->once())->method('getXResponseReasonText')->willReturn($reasonText);
+        $this->dataHelperMock->expects($this->once())
             ->method('wrapGatewayError')
             ->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);
+        $this->paymentFailures->expects($this->exactly($failuresHandlerCalls))->method('handle')->with(1);
+        $orderMock = $this->getOrderMock($failuresHandlerCalls);
 
-        $reflection = new \ReflectionClass($this->directpost);
+        $orderMock->expects($this->exactly($failuresHandlerCalls))->method('getQuoteId')->willReturn(1);
+        $reflection = new ReflectionClass($this->directpost);
         $order = $reflection->getProperty('order');
         $order->setAccessible(true);
         $order->setValue($this->directpost, $orderMock);
@@ -381,7 +607,6 @@ public function checkResponseCodeFailureDataProvider(): array
         return [
             ['responseCode' => Directpost::RESPONSE_CODE_DECLINED, 1],
             ['responseCode' => Directpost::RESPONSE_CODE_ERROR, 1],
-            ['responseCode' => 999999, 0],
         ];
     }
 
@@ -417,7 +642,7 @@ public function testCanCapture($isGatewayActionsLocked, $canCapture)
     {
         $this->directpost->setData('info_instance', $this->paymentMock);
 
-        $this->paymentMock->expects($this->any())
+        $this->paymentMock->expects($this->once())
             ->method('getAdditionalInformation')
             ->with(Directpost::GATEWAY_ACTIONS_LOCKED_STATE_KEY)
             ->willReturn($isGatewayActionsLocked);
@@ -452,30 +677,16 @@ public function testFetchVoidedTransactionInfo($transactionId, $resultStatus, $r
         $paymentId = 36;
         $orderId = 36;
 
-        $this->paymentMock->expects(static::once())
-            ->method('getId')
-            ->willReturn($paymentId);
-
-        $orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getId', '__wakeup'])
-            ->getMock();
-        $orderMock->expects(static::once())
-            ->method('getId')
-            ->willReturn($orderId);
+        $this->paymentMock->expects($this->once())->method('getId')->willReturn($paymentId);
 
-        $this->paymentMock->expects(static::once())
-            ->method('getOrder')
-            ->willReturn($orderMock);
-
-        $transactionMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Payment\Transaction::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->transactionRepositoryMock->expects(static::once())
+        $orderMock = $this->getOrderMock();
+        $orderMock->expects($this->once())->method('getId')->willReturn($orderId);
+        $this->paymentMock->expects($this->once())->method('getOrder')->willReturn($orderMock);
+        $transactionMock = $this->getMockBuilder(Transaction::class)->disableOriginalConstructor()->getMock();
+        $this->transactionRepositoryMock->expects($this->once())
             ->method('getByTransactionId')
             ->with($transactionId, $paymentId, $orderId)
             ->willReturn($transactionMock);
-
         $document = $this->getTransactionXmlDocument(
             $transactionId,
             TransactionService::PAYMENT_UPDATE_STATUS_CODE_SUCCESS,
@@ -483,20 +694,15 @@ public function testFetchVoidedTransactionInfo($transactionId, $resultStatus, $r
             $responseStatus,
             $responseCode
         );
-        $this->transactionServiceMock->expects(static::once())
+        $this->transactionServiceMock->expects($this->once())
             ->method('getTransactionDetails')
             ->with($this->directpost, $transactionId)
             ->willReturn($document);
 
         // transaction should be closed
-        $this->paymentMock->expects(static::once())
-            ->method('setIsTransactionDenied')
-            ->with(true);
-        $this->paymentMock->expects(static::once())
-            ->method('setIsTransactionClosed')
-            ->with(true);
-        $transactionMock->expects(static::once())
-            ->method('close');
+        $this->paymentMock->expects($this->once())->method('setIsTransactionDenied')->with(true);
+        $this->paymentMock->expects($this->once())->method('setIsTransactionClosed')->with(true);
+        $transactionMock->expects($this->once())->method('close');
 
         $this->directpost->fetchTransactionInfo($this->paymentMock, $transactionId);
     }
@@ -509,60 +715,41 @@ public function testSuccessRefund()
     {
         $card = 1111;
 
-        $this->paymentMock->expects(static::exactly(2))
-            ->method('getCcLast4')
-            ->willReturn($card);
-        $this->paymentMock->expects(static::once())
-            ->method('decrypt')
-            ->willReturn($card);
-        $this->paymentMock->expects(static::exactly(3))
+        $this->paymentMock->expects($this->exactly(1))->method('getCcLast4')->willReturn($card);
+        $this->paymentMock->expects($this->once())->method('decrypt')->willReturn($card);
+        $this->paymentMock->expects($this->exactly(3))
             ->method('getParentTransactionId')
             ->willReturn(self::TRANSACTION_ID . '-capture');
-        $this->paymentMock->expects(static::once())
-            ->method('getPoNumber')
-            ->willReturn(self::INVOICE_NUM);
-        $this->paymentMock->expects(static::once())
+        $this->paymentMock->expects($this->once())->method('getPoNumber')->willReturn(self::INVOICE_NUM);
+        $this->paymentMock->expects($this->once())
             ->method('setIsTransactionClosed')
             ->with(true)
             ->willReturnSelf();
 
+        $this->addRequestMockToRequestFactoryMock();
+
         $orderMock = $this->getOrderMock();
 
-        $this->paymentMock->expects(static::exactly(2))
-            ->method('getOrder')
-            ->willReturn($orderMock);
+        $orderMock->expects($this->once())->method('getId')->willReturn(1);
+        $orderMock->expects($this->exactly(2))->method('getIncrementId')->willReturn(self::INVOICE_NUM);
+        $orderMock->expects($this->once())->method('getStoreId')->willReturn(1);
+
+        $this->paymentMock->expects($this->exactly(2))->method('getOrder')->willReturn($orderMock);
 
-        $transactionMock = $this->getMockBuilder(Order\Payment\Transaction::class)
+        $transactionMock = $this->getMockBuilder(Transaction::class)
             ->disableOriginalConstructor()
             ->setMethods(['getAdditionalInformation'])
             ->getMock();
-        $transactionMock->expects(static::once())
+        $transactionMock->expects($this->once())
             ->method('getAdditionalInformation')
             ->with(Directpost::REAL_TRANSACTION_ID_KEY)
             ->willReturn(self::TRANSACTION_ID);
 
-        $this->transactionRepositoryMock->expects(static::once())
+        $this->transactionRepositoryMock->expects($this->once())
             ->method('getByTransactionId')
             ->willReturn($transactionMock);
 
-        $response = $this->getRefundResponseBody(
-            Directpost::RESPONSE_CODE_APPROVED,
-            Directpost::RESPONSE_REASON_CODE_APPROVED,
-            'Successful'
-        );
-        $this->httpClientMock->expects(static::once())
-            ->method('getBody')
-            ->willReturn($response);
-
-        $this->responseMock->expects(static::once())
-            ->method('getXResponseCode')
-            ->willReturn(Directpost::RESPONSE_CODE_APPROVED);
-        $this->responseMock->expects(static::once())
-            ->method('getXResponseReasonCode')
-            ->willReturn(Directpost::RESPONSE_REASON_CODE_APPROVED);
-
-        $this->dataHelperMock->expects(static::never())
-            ->method('wrapGatewayError');
+        $this->postRequestTest();
 
         $this->directpost->refund($this->paymentMock, self::TOTAL_AMOUNT);
     }
@@ -583,65 +770,6 @@ public function dataProviderTransaction()
         ];
     }
 
-    /**
-     * Create mock for response factory
-     * @return void
-     */
-    private function initResponseFactoryMock()
-    {
-        $this->responseFactoryMock = $this->getMockBuilder(
-            \Magento\Authorizenet\Model\Directpost\Response\Factory::class
-        )->disableOriginalConstructor()->getMock();
-        $this->responseMock = $this->getMockBuilder(\Magento\Authorizenet\Model\Directpost\Response::class)
-            ->setMethods(
-                [
-                    'isValidHash',
-                    'getXTransId', 'getXResponseCode', 'getXResponseReasonCode', 'getXResponseReasonText', 'getXAmount',
-                    'setXResponseCode', 'setXResponseReasonCode', 'setXAvsCode', 'setXResponseReasonText',
-                    'setXTransId', 'setXInvoiceNum', 'setXAmount', 'setXMethod', 'setXType', 'setData',
-                    'setXAccountNumber',
-                    '__wakeup'
-                ]
-            )
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->responseMock->expects(static::any())
-            ->method('setXResponseCode')
-            ->willReturnSelf();
-        $this->responseMock->expects(static::any())
-            ->method('setXResponseReasonCode')
-            ->willReturnSelf();
-        $this->responseMock->expects(static::any())
-            ->method('setXResponseReasonText')
-            ->willReturnSelf();
-        $this->responseMock->expects(static::any())
-            ->method('setXAvsCode')
-            ->willReturnSelf();
-        $this->responseMock->expects(static::any())
-            ->method('setXTransId')
-            ->willReturnSelf();
-        $this->responseMock->expects(static::any())
-            ->method('setXInvoiceNum')
-            ->willReturnSelf();
-        $this->responseMock->expects(static::any())
-            ->method('setXAmount')
-            ->willReturnSelf();
-        $this->responseMock->expects(static::any())
-            ->method('setXMethod')
-            ->willReturnSelf();
-        $this->responseMock->expects(static::any())
-            ->method('setXType')
-            ->willReturnSelf();
-        $this->responseMock->expects(static::any())
-            ->method('setData')
-            ->willReturnSelf();
-
-        $this->responseFactoryMock->expects($this->any())
-            ->method('create')
-            ->willReturn($this->responseMock);
-    }
-
     /**
      * Get transaction data
      * @param $transactionId
@@ -694,80 +822,40 @@ private function getTransactionXmlDocument(
 
     /**
      * Get mock for authorize.net request factory
-     * @return \PHPUnit\Framework\MockObject_MockBuilder
      */
-    private function getRequestFactoryMock()
+    private function addRequestMockToRequestFactoryMock()
     {
-        $requestFactory = $this->getMockBuilder(Factory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
         $request = $this->getMockBuilder(Request::class)
             ->disableOriginalConstructor()
             ->setMethods(['__wakeup'])
             ->getMock();
-        $requestFactory->expects(static::any())
+        $this->requestFactory->expects($this->once())
             ->method('create')
             ->willReturn($request);
-        return $requestFactory;
     }
 
     /**
      * Get mock for order
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return PHPUnit_Framework_MockObject_MockObject
      */
     private function getOrderMock()
     {
-        $orderMock = $this->getMockBuilder(Order::class)
-            ->disableOriginalConstructor()
-            ->setMethods([
-                'getId', 'getIncrementId', 'getStoreId', 'getBillingAddress', 'getShippingAddress',
-                'getBaseCurrencyCode', 'getBaseTaxAmount', '__wakeup'
-            ])
-            ->getMock();
-
-        $orderMock->expects(static::once())
-            ->method('getId')
-            ->willReturn(1);
-
-        $orderMock->expects(static::exactly(2))
-            ->method('getIncrementId')
-            ->willReturn(self::INVOICE_NUM);
-
-        $orderMock->expects(static::once())
-            ->method('getStoreId')
-            ->willReturn(1);
-
-        $orderMock->expects(static::once())
-            ->method('getBaseCurrencyCode')
-            ->willReturn('USD');
-        return $orderMock;
-    }
-
-    /**
-     * Create and return mock for http client factory
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    private function getHttpClientFactoryMock()
-    {
-        $this->httpClientMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClient::class)
+        return $this->getMockBuilder(Order::class)
             ->disableOriginalConstructor()
-            ->setMethods(['request', 'getBody', '__wakeup'])
-            ->getMock();
-
-        $this->httpClientMock->expects(static::any())
-            ->method('request')
-            ->willReturnSelf();
-
-        $httpClientFactoryMock = $this->getMockBuilder(\Magento\Framework\HTTP\ZendClientFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->setMethods(
+                [
+                    'getId',
+                    'getQuoteId',
+                    'getIncrementId',
+                    'getStoreId',
+                    'getBillingAddress',
+                    'getShippingAddress',
+                    'getBaseCurrencyCode',
+                    'getBaseTaxAmount',
+                    '__wakeup'
+                ]
+            )
             ->getMock();
-
-        $httpClientFactoryMock->expects(static::any())
-            ->method('create')
-            ->willReturn($this->httpClientMock);
-        return $httpClientFactoryMock;
     }
 
     /**
@@ -788,7 +876,9 @@ private function getRefundResponseBody($code, $reasonCode, $reasonText)
         $result[9] = self::TOTAL_AMOUNT; // XAmount
         $result[10] = Directpost::REQUEST_METHOD_CC; // XMethod
         $result[11] = Directpost::REQUEST_TYPE_CREDIT; // XType
+        // @codingStandardsIgnoreStart
         $result[37] = md5(self::TRANSACTION_ID); // x_MD5_Hash
+        // @codingStandardsIgnoreEnd
         $result[50] = '48329483921'; // setXAccountNumber
         return implode(Directpost::RESPONSE_DELIM_CHAR, $result);
     }
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js b/app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js
index e43341ca2b337..eb162034bc04d 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js
+++ b/app/code/Magento/Authorizenet/view/adminhtml/web/js/direct-post.js
@@ -3,18 +3,11 @@
  * See COPYING.txt for license details.
  */
 
-(function (factory) {
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'mage/backend/validation',
-            'prototype'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function (jQuery) {
-
+define([
+    'jquery',
+    'mage/backend/validation',
+    'prototype'
+], function (jQuery) {
     window.directPost = Class.create();
     directPost.prototype = {
         initialize: function (methodCode, iframeId, controller, orderSaveUrl, cgiUrl, nativeAction) {
@@ -349,4 +342,4 @@
             }
         }
     };
-}));
+});
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Block/Form.php b/app/code/Magento/AuthorizenetAcceptjs/Block/Form.php
index 9f10b2df40e9f..f669ead967c59 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Block/Form.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Block/Form.php
@@ -18,6 +18,8 @@
  * Block for representing the payment form
  *
  * @api
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Form extends Cc
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Block/Info.php b/app/code/Magento/AuthorizenetAcceptjs/Block/Info.php
index ea476eaa55716..1876685998643 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Block/Info.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Block/Info.php
@@ -15,6 +15,8 @@
  * Translates the labels for the info block
  *
  * @api
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Info extends ConfigurableInfo
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Block/Payment.php b/app/code/Magento/AuthorizenetAcceptjs/Block/Payment.php
index 059bba0c805e8..b1c79e9e51426 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Block/Payment.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Block/Payment.php
@@ -18,6 +18,8 @@
  * Represents the payment block for the admin checkout form
  *
  * @api
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Payment extends Template
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptPaymentStrategyCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptPaymentStrategyCommand.php
index a72435644d23c..d59edde212760 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptPaymentStrategyCommand.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/AcceptPaymentStrategyCommand.php
@@ -14,6 +14,9 @@
 
 /**
  * Chooses the best method of accepting the payment based on the status of the transaction
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AcceptPaymentStrategyCommand implements CommandInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/CaptureStrategyCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/CaptureStrategyCommand.php
index a4d895d4daae0..4318441014ad7 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/CaptureStrategyCommand.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/CaptureStrategyCommand.php
@@ -20,6 +20,9 @@
 
 /**
  * Chooses the best method of capture based on the context of the payment
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CaptureStrategyCommand implements CommandInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommand.php
index bb9e7c26a45b1..d0c1ceac81378 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommand.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/FetchTransactionInfoCommand.php
@@ -17,6 +17,9 @@
 
 /**
  * Syncs the transaction status with authorize.net
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class FetchTransactionInfoCommand implements CommandInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/GatewayQueryCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/GatewayQueryCommand.php
index f8975ef38eed1..7185639936fa4 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/GatewayQueryCommand.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/GatewayQueryCommand.php
@@ -20,6 +20,9 @@
 
 /**
  * Makes a request to the gateway and returns results
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class GatewayQueryCommand implements CommandInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundTransactionStrategyCommand.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundTransactionStrategyCommand.php
index 3cdfcf23ba607..de3ded6515ae0 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundTransactionStrategyCommand.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Command/RefundTransactionStrategyCommand.php
@@ -14,6 +14,9 @@
 
 /**
  * Chooses the best method of returning the payment based on the status of the transaction
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RefundTransactionStrategyCommand implements CommandInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Config.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Config.php
index 2a28945d98359..f41eb1660da55 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Config.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Config.php
@@ -13,6 +13,9 @@
 
 /**
  * Houses configuration for this gateway
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Config extends \Magento\Payment\Gateway\Config\Config
 {
@@ -33,19 +36,6 @@ class Config extends \Magento\Payment\Gateway\Config\Config
     private const SOLUTION_ID_SANDBOX = 'AAA102993';
     private const SOLUTION_ID_PRODUCTION = 'AAA175350';
 
-    /**
-     * @param ScopeConfigInterface $scopeConfig
-     * @param null|string $methodCode
-     * @param string $pathPattern
-     */
-    public function __construct(
-        ScopeConfigInterface $scopeConfig,
-        $methodCode = null,
-        $pathPattern = self::DEFAULT_PATH_PATTERN
-    ) {
-        parent::__construct($scopeConfig, $methodCode, $pathPattern);
-    }
-
     /**
      * Gets the login id
      *
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Client.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Client.php
index 1b2efbb85721a..ebd4240108a09 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Client.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Client.php
@@ -21,6 +21,9 @@
 
 /**
  * A client that can communicate with the Authorize.net API
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Client implements ClientInterface
 {
@@ -109,10 +112,12 @@ public function placeRequest(TransferInterface $transferObject)
             try {
                 $data = $this->json->unserialize($responseBody);
             } catch (InvalidArgumentException $e) {
+                // phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw new \Exception('Invalid JSON was returned by the gateway');
             }
 
             return $data;
+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (\Exception $e) {
             $this->logger->critical($e);
 
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/Filter/RemoveFieldsFilter.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/Filter/RemoveFieldsFilter.php
index a23397c09189a..cce878cfbbb16 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/Filter/RemoveFieldsFilter.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/Filter/RemoveFieldsFilter.php
@@ -12,6 +12,9 @@
 
 /**
  * Removes a set of fields from the payload
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RemoveFieldsFilter implements FilterInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/FilterInterface.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/FilterInterface.php
index 35e563eacb0cd..dade4bd4ee1f3 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/FilterInterface.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/Payload/FilterInterface.php
@@ -10,6 +10,9 @@
 
 /**
  * Describes a filter for filtering content after all the builders have finished
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 interface FilterInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/TransferFactory.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/TransferFactory.php
index a4cdeba77492c..238b65fb8af37 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/TransferFactory.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Http/TransferFactory.php
@@ -14,6 +14,9 @@
 
 /**
  * Can create a transfer object
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class TransferFactory implements TransferFactoryInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AcceptFdsDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AcceptFdsDataBuilder.php
index 6883d63397be0..4a673112e6a5f 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AcceptFdsDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AcceptFdsDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the meta transaction information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AcceptFdsDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AddressDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AddressDataBuilder.php
index e9c42e864440c..07a4921b7d60b 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AddressDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AddressDataBuilder.php
@@ -13,6 +13,9 @@
 
 /**
  * Adds the basic payment information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AddressDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AmountDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AmountDataBuilder.php
index 601c329fe4f76..07fae5e536a28 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AmountDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AmountDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the amount of the transaction to the Request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AmountDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthenticationDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthenticationDataBuilder.php
index 2387ab0ab89f3..dec6626dc7524 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthenticationDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthenticationDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the stored credentials to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AuthenticationDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthorizeDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthorizeDataBuilder.php
index 226175f74d55a..c440da3ca9f4f 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthorizeDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/AuthorizeDataBuilder.php
@@ -15,6 +15,9 @@
 
 /**
  * Adds the meta transaction information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AuthorizeDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CaptureDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CaptureDataBuilder.php
index 0b17d10fb0d68..1e2a8617907a0 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CaptureDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CaptureDataBuilder.php
@@ -15,6 +15,9 @@
 
 /**
  * Adds the meta transaction information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CaptureDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomSettingsBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomSettingsBuilder.php
index e5b4472c098c8..31246497fca92 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomSettingsBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomSettingsBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the custom settings to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CustomSettingsBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomerDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomerDataBuilder.php
index 7cd0426e93dd7..cfdaa31552960 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomerDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/CustomerDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the basic payment information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CustomerDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/OrderDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/OrderDataBuilder.php
index b0e33c9ca9615..bf0a15f552e6c 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/OrderDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/OrderDataBuilder.php
@@ -13,6 +13,9 @@
 
 /**
  * Adds the basic payment information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class OrderDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PassthroughDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PassthroughDataBuilder.php
index 0301d08ad42c5..6e6ef04972c78 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PassthroughDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PassthroughDataBuilder.php
@@ -13,6 +13,9 @@
 
 /**
  * Adds data to the request that can be used in the response
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class PassthroughDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PaymentDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PaymentDataBuilder.php
index 1ad73f6236616..99955e9724577 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PaymentDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PaymentDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the basic payment information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class PaymentDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PoDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PoDataBuilder.php
index ad8f8c2b05d91..9b56e0852af01 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PoDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/PoDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the basic payment information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class PoDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundPaymentDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundPaymentDataBuilder.php
index 96f3e67720fea..ac5bcb08cb04a 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundPaymentDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundPaymentDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the basic refund information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RefundPaymentDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundReferenceTransactionDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundReferenceTransactionDataBuilder.php
index b8cb5f858d05d..65842354b7e2a 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundReferenceTransactionDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundReferenceTransactionDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the reference transaction to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RefundReferenceTransactionDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundTransactionTypeDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundTransactionTypeDataBuilder.php
index 752be05f6b576..0f74299ebf5bd 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundTransactionTypeDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RefundTransactionTypeDataBuilder.php
@@ -12,6 +12,9 @@
 
 /**
  * Adds the meta transaction information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RefundTransactionTypeDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RequestTypeBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RequestTypeBuilder.php
index 16c3f9556de27..d20add70846b8 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RequestTypeBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/RequestTypeBuilder.php
@@ -12,6 +12,9 @@
 
 /**
  * Adds the type of the request to the build subject
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class RequestTypeBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SaleDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SaleDataBuilder.php
index 6ec27b105615b..4402fb5af8c82 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SaleDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SaleDataBuilder.php
@@ -15,6 +15,9 @@
 
 /**
  * Adds the meta transaction information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class SaleDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/ShippingDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/ShippingDataBuilder.php
index 390714579f0b3..ea2cb89971fb5 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/ShippingDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/ShippingDataBuilder.php
@@ -15,6 +15,9 @@
 
 /**
  * Adds the shipping information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class ShippingDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SolutionDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SolutionDataBuilder.php
index 0c89a0116defe..8734c0ab454ce 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SolutionDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/SolutionDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the appropriate solution ID to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class SolutionDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StoreConfigBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StoreConfigBuilder.php
index f44b1e5de9a28..396ad143466cd 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StoreConfigBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StoreConfigBuilder.php
@@ -12,6 +12,9 @@
 
 /**
  * This builder is used for correct store resolving and used only to retrieve correct store ID.
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class StoreConfigBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StubDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StubDataBuilder.php
index 794c120f94451..a2766d97d9299 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StubDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/StubDataBuilder.php
@@ -15,6 +15,9 @@
  *
  * Since the order of params is matters for Authorize.net request,
  * this builder is used to reserve a place in builders sequence.
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class StubDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/TransactionDetailsDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/TransactionDetailsDataBuilder.php
index e3a17e9636846..9365347df7a60 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/TransactionDetailsDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/TransactionDetailsDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the reference transaction to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class TransactionDetailsDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/VoidDataBuilder.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/VoidDataBuilder.php
index ef0cb96774e62..c830f1f23d17c 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/VoidDataBuilder.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Request/VoidDataBuilder.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the meta transaction information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class VoidDataBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseParentTransactionHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseParentTransactionHandler.php
index 30b1ce88b083a..60c5bb21c0865 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseParentTransactionHandler.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseParentTransactionHandler.php
@@ -14,6 +14,9 @@
 
 /**
  * Processes payment information from a void transaction response
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CloseParentTransactionHandler implements HandlerInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/ClosePartialTransactionHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/ClosePartialTransactionHandler.php
index fd8af3d28c4d4..5279df56b5e28 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/ClosePartialTransactionHandler.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/ClosePartialTransactionHandler.php
@@ -11,6 +11,9 @@
 
 /**
  * Determines that parent transaction should be close for partial refund operation.
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class ClosePartialTransactionHandler extends CloseTransactionHandler
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandler.php
index fa9bf55462111..2cccf255ab8e9 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandler.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/CloseTransactionHandler.php
@@ -14,6 +14,9 @@
 
 /**
  * Processes payment information from a void transaction response
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CloseTransactionHandler implements HandlerInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentResponseHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentResponseHandler.php
index 16e8fbabb214a..e0b192205012f 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentResponseHandler.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentResponseHandler.php
@@ -14,6 +14,9 @@
 
 /**
  * Processes payment information from a response
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class PaymentResponseHandler implements HandlerInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentReviewStatusHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentReviewStatusHandler.php
index 9f7c62873669f..41c2ddd2b3271 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentReviewStatusHandler.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/PaymentReviewStatusHandler.php
@@ -14,6 +14,9 @@
 
 /**
  * Processes payment information from a void transaction response
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class PaymentReviewStatusHandler implements HandlerInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionDetailsResponseHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionDetailsResponseHandler.php
index 0dab641452136..81bb9c92b15ed 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionDetailsResponseHandler.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionDetailsResponseHandler.php
@@ -16,6 +16,9 @@
 
 /**
  * Adds the details to the transaction that should show when the transaction is viewed in the admin
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class TransactionDetailsResponseHandler implements HandlerInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionIdHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionIdHandler.php
index bf5257f95dad6..f3a9a0a1c4466 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionIdHandler.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/TransactionIdHandler.php
@@ -14,6 +14,9 @@
 
 /**
  * Processes transaction id for the payment
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class TransactionIdHandler implements HandlerInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/VoidResponseHandler.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/VoidResponseHandler.php
index 06b16b37278ba..7bcb8c6c8dba1 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/VoidResponseHandler.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Response/VoidResponseHandler.php
@@ -14,6 +14,9 @@
 
 /**
  * Processes payment information from a void transaction response
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class VoidResponseHandler implements HandlerInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/SubjectReader.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/SubjectReader.php
index 855d48e27968e..b5f1cef94ea46 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/SubjectReader.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/SubjectReader.php
@@ -13,6 +13,9 @@
 
 /**
  * Helper for extracting information from the payment data structure
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class SubjectReader
 {
@@ -42,6 +45,7 @@ public function readStoreId(array $subject): ?int
                 $storeId = (int)$this->readPayment($subject)
                     ->getOrder()
                     ->getStoreId();
+                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
             } catch (\InvalidArgumentException $e) {
                 // No store id is current set
             }
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/GeneralResponseValidator.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/GeneralResponseValidator.php
index 7ad4647b421a1..47065ed96c240 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/GeneralResponseValidator.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/GeneralResponseValidator.php
@@ -15,6 +15,9 @@
 
 /**
  * Validates that the request was successful
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class GeneralResponseValidator extends AbstractValidator
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionHashValidator.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionHashValidator.php
index 0d1c2ad033d87..c11e22110d952 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionHashValidator.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionHashValidator.php
@@ -17,6 +17,9 @@
 
 /**
  * Validates the transaction hash
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class TransactionHashValidator extends AbstractValidator
 {
@@ -171,6 +174,7 @@ private function generateMd5Hash(
         $amount,
         $transactionId
     ) {
+        // phpcs:disable Magento2.Security.InsecureFunction
         return strtoupper(md5($merchantMd5 . $merchantApiLogin . $transactionId . $amount));
     }
 
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionResponseValidator.php b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionResponseValidator.php
index 326f4fb29ac84..8238aa37dcc0a 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionResponseValidator.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Gateway/Validator/TransactionResponseValidator.php
@@ -15,6 +15,9 @@
 
 /**
  * Validates the status of an attempted transaction
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class TransactionResponseValidator extends AbstractValidator
 {
@@ -85,9 +88,7 @@ private function isResponseCodeAnError(array $transactionResponse): bool
             ?? $transactionResponse['errors'][0]['errorCode']
             ?? null;
 
-        return !in_array($transactionResponse['responseCode'], [
-                self::RESPONSE_CODE_APPROVED, self::RESPONSE_CODE_HELD
-            ])
+        return !in_array($transactionResponse['responseCode'], [self::RESPONSE_CODE_APPROVED, self::RESPONSE_CODE_HELD])
             || $code
             && !in_array(
                 $code,
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Cctype.php b/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Cctype.php
index 046907ebb88cc..cdd1745a6bc1e 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Cctype.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Cctype.php
@@ -12,6 +12,9 @@
 
 /**
  * Authorize.net Payment CC Types Source Model
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Cctype extends PaymentCctype
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Environment.php b/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Environment.php
index f2eca8e143916..6f8e4394a589f 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Environment.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/Environment.php
@@ -10,6 +10,9 @@
 
 /**
  * Authorize.net Environment Dropdown source
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Environment implements \Magento\Framework\Data\OptionSourceInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/PaymentAction.php b/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/PaymentAction.php
index 907a1b2a51b85..953841604bfee 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/PaymentAction.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Model/Adminhtml/Source/PaymentAction.php
@@ -10,6 +10,9 @@
 
 /**
  * Authorize.net Payment Action Dropdown source
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class PaymentAction implements \Magento\Framework\Data\OptionSourceInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Model/PassthroughDataObject.php b/app/code/Magento/AuthorizenetAcceptjs/Model/PassthroughDataObject.php
index b49ef7e622506..145d8c000e8f7 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Model/PassthroughDataObject.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Model/PassthroughDataObject.php
@@ -12,6 +12,9 @@
 
 /**
  * Contains all the accumulated data from the request builders that should be passed through to the handlers
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class PassthroughDataObject extends DataObject
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Model/Ui/ConfigProvider.php b/app/code/Magento/AuthorizenetAcceptjs/Model/Ui/ConfigProvider.php
index b24c101a3f792..108f18f393641 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Model/Ui/ConfigProvider.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Model/Ui/ConfigProvider.php
@@ -14,6 +14,9 @@
 
 /**
  * Retrieves config needed for checkout
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class ConfigProvider implements ConfigProviderInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Observer/DataAssignObserver.php b/app/code/Magento/AuthorizenetAcceptjs/Observer/DataAssignObserver.php
index c7490ad0c80c3..0f989bb032175 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Observer/DataAssignObserver.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Observer/DataAssignObserver.php
@@ -14,6 +14,9 @@
 
 /**
  * Adds the payment info to the payment object
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class DataAssignObserver extends AbstractDataAssignObserver
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Setup/Patch/Data/CopyCurrentConfig.php b/app/code/Magento/AuthorizenetAcceptjs/Setup/Patch/Data/CopyCurrentConfig.php
index 0675bd94b6200..aa699569c61f6 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Setup/Patch/Data/CopyCurrentConfig.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Setup/Patch/Data/CopyCurrentConfig.php
@@ -18,6 +18,9 @@
 
 /**
  * Copies the Authorize.net DirectPost configuration values to the new Accept.js module.
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CopyCurrentConfig implements DataPatchInterface
 {
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ConfigureAuthorizenetAcceptjsActionGroup.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ConfigureAuthorizenetAcceptjsActionGroup.xml
deleted file mode 100644
index 924f2b720dd2f..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ConfigureAuthorizenetAcceptjsActionGroup.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.
-  */
--->
-
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="ConfigureAuthorizenetAcceptjs" extends="EnableAuthorizenetAcceptjs">
-        <annotations>
-            <description>Sets up the Authorize.net Accept JS configuration setting with a specified Payment action.</description>
-        </annotations>
-        <arguments>
-            <argument name="paymentAction" type="string"/>
-        </arguments>
-        <!-- Fill Auth.net fields and save -->
-        <waitForElementVisible selector="{{AuthorizenetAcceptjsConfigurationSection.paymentActionCheckbox}}" stepKey="waitForFormVisible"/>
-        <conditionalClick selector="{{AuthorizenetAcceptjsConfigurationSection.paymentActionCheckbox}}" stepKey="uncheckPaymentActionDefault" dependentSelector="{{AuthorizenetAcceptjsConfigurationSection.paymentActionSelectDisabled}}" visible="true"/>
-        <selectOption selector="{{AuthorizenetAcceptjsConfigurationSection.paymentActionSelect}}" stepKey="selectPaymentAction" userInput="{{paymentAction}}"/>
-        <scrollTo selector="{{AuthorizenetAcceptjsConfigurationSection.apiLoginIdField}}" stepKey="scrollToApiLoginId"/>
-        <fillField selector="{{AuthorizenetAcceptjsConfigurationSection.apiLoginIdField}}" userInput="{{_CREDS.authorizenet_acceptjs_api_login_id}}" stepKey="fillApiLoginId"/>
-        <fillField selector="{{AuthorizenetAcceptjsConfigurationSection.transactionKeyField}}" userInput="{{_CREDS.authorizenet_acceptjs_transaction_key}}" stepKey="fillTransactionKey"/>
-        <fillField selector="{{AuthorizenetAcceptjsConfigurationSection.publicClientKeyField}}" userInput="{{_CREDS.authorizenet_acceptjs_public_client_key}}" stepKey="fillPublicClientKey"/>
-        <fillField selector="{{AuthorizenetAcceptjsConfigurationSection.signatureKeyField}}" userInput="{{_CREDS.authorizenet_acceptjs_signature_key}}" stepKey="fillSignatureKey"/>
-    </actionGroup>
-
-    <actionGroup name="DisableAuthorizenetAcceptjs">
-        <annotations>
-            <description>Disables the Authorize.net Accept JS configuration setting via the CLI.</description>
-        </annotations>
-
-        <magentoCLI stepKey="disableAuthorizenetAcceptjs" command="config:set payment/authorizenet_acceptjs/active 0"/>
-    </actionGroup>
-    
-    <actionGroup name="EnableAuthorizenetAcceptjs">
-        <scrollTo selector="{{AuthorizenetAcceptjsConfigurationSection.openSectionToggle}}" stepKey="scrollToAuthorizeNetConfigSection"/>
-        <conditionalClick selector="{{AuthorizenetAcceptjsConfigurationSection.openSectionToggle}}" dependentSelector="{{AuthorizenetAcceptjsConfigurationSection.enabledDefaultSelect}}" visible="false" stepKey="openConfigSection"/>
-        <waitForElementVisible selector="{{AuthorizenetAcceptjsConfigurationSection.enabledDefaultSelect}}" stepKey="waitForEnableFieldVisible"/>
-        <uncheckOption selector="{{AuthorizenetAcceptjsConfigurationSection.enabledDefaultCheckbox}}" stepKey="uncheckCheckbox"/>
-        <selectOption selector="{{AuthorizenetAcceptjsConfigurationSection.enabledDefaultSelect}}" userInput="Yes" stepKey="enablePayment"/>
-    </actionGroup>
-    
-    <actionGroup name="AssertAuthorizenetAcceptjsRequiredFieldsValidationIsPresentOnSave">
-        <scrollToTopOfPage stepKey="scrollToTop"/>
-        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
-        <scrollTo selector="{{AuthorizenetAcceptjsConfigurationSection.apiLoginIdField}}" stepKey="scrollToApiLoginIdField"/>
-        <see selector="{{AuthorizenetAcceptjsConfigurationSection.apiLoginIdField}} + {{AdminConfigSection.fieldError}}" userInput="This is a required field." stepKey="seeApiLoginIdRequiredMessage"/>
-        <scrollTo selector="{{AuthorizenetAcceptjsConfigurationSection.publicClientKeyField}}" stepKey="scrollToPublicClientKeyField"/>
-        <see selector="{{AuthorizenetAcceptjsConfigurationSection.publicClientKeyField}} + {{AdminConfigSection.fieldError}}" userInput="This is a required field." stepKey="seePublicClientKeyRequiredErrorMessage"/>
-        <scrollTo selector="{{AuthorizenetAcceptjsConfigurationSection.transactionKeyField}}" stepKey="scrollTransactionKeyField"/>
-        <see selector="{{AuthorizenetAcceptjsConfigurationSection.transactionKeyField}} + {{AdminConfigSection.fieldError}}" userInput="This is a required field." stepKey="seeTransactionKeyRequiredErrorMessage"/>
-        <scrollTo selector="{{AuthorizenetAcceptjsConfigurationSection.signatureKeyField}}" stepKey="scrollToSignatureKeyField"/>
-        <see selector="{{AuthorizenetAcceptjsConfigurationSection.signatureKeyField}} + {{AdminConfigSection.fieldError}}" userInput="This is a required field." stepKey="seeSignatureKeyRequiredErrorMessage"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/FillPaymentInformationActionGroup.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/FillPaymentInformationActionGroup.xml
deleted file mode 100644
index 96c0b122e36d9..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/FillPaymentInformationActionGroup.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.
-  */
--->
-
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="FillPaymentInformation">
-        <annotations>
-            <description>Fill Payment Method with Authorize.net</description>
-        </annotations>
-
-        <click stepKey="clickOnAuthorizenetToggle" selector="{{AuthorizenetCheckoutSection.selectAuthorizenet}}"/>
-        <waitForPageLoad stepKey="waitForCardDataSection"/>
-        <fillField stepKey="fillCardNumber" selector="{{AuthorizenetCheckoutSection.cardInput}}" userInput="{{PaymentAndShippingInfo.cardNumber}}"/>
-        <selectOption stepKey="fillExpMonth" selector="{{AuthorizenetCheckoutSection.expMonth}}" userInput="{{PaymentAndShippingInfo.month}}"/>
-        <selectOption stepKey="fillExpYear" selector="{{AuthorizenetCheckoutSection.expYear}}" userInput="20{{PaymentAndShippingInfo.year}}"/>
-        <fillField stepKey="fillCvv" selector="{{AuthorizenetCheckoutSection.cvv}}" userInput="123"/>
-        <click stepKey="checkoutButton" selector="{{AuthorizenetCheckoutSection.checkoutButton}}"/>
-        <waitForPageLoad stepKey="waitForCheckout"/>
-    </actionGroup>
-
-    <!-- Guest checkout Authorize.net fill billing address -->
-    <actionGroup name="GuestCheckoutAuthorizenetFillBillingAddress">
-        <annotations>
-            <description>Fill Billing Address as Guest with Authorize.net</description>
-        </annotations>
-        <arguments>
-            <argument name="customer"/>
-            <argument name="customerAddress"/>
-        </arguments>
-
-        <fillField selector="{{GuestAuthorizenetCheckoutSection.firstName}}" userInput="{{customer.firstName}}" stepKey="fillFirstName"/>
-        <fillField selector="{{GuestAuthorizenetCheckoutSection.lastName}}" userInput="{{customer.lastName}}" stepKey="fillLastName"/>
-        <fillField selector="{{GuestAuthorizenetCheckoutSection.street}}" userInput="{{customerAddress.street[0]}}" stepKey="fillStreet"/>
-        <fillField selector="{{GuestAuthorizenetCheckoutSection.city}}" userInput="{{customerAddress.city}}" stepKey="fillCity"/>
-        <selectOption selector="{{GuestAuthorizenetCheckoutSection.state}}" userInput="{{customerAddress.state}}" stepKey="selectState"/>
-        <fillField selector="{{GuestAuthorizenetCheckoutSection.postcode}}" userInput="{{customerAddress.postcode}}" stepKey="fillPostCode"/>
-        <fillField selector="{{GuestAuthorizenetCheckoutSection.telephone}}" userInput="{{customerAddress.telephone}}" stepKey="fillTelephone"/>
-        <click selector="{{GuestAuthorizenetCheckoutSection.update}}" stepKey="updateAddress"/>
-        <waitForPageLoad stepKey="waitForUpdate"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ViewAndValidateOrderActionGroup.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ViewAndValidateOrderActionGroup.xml
deleted file mode 100644
index ecbed57ff15b0..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ViewAndValidateOrderActionGroup.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="ViewAndValidateOrderActionGroup">
-        <annotations>
-            <description>Validate the Order is Correct. Then Submit the Invoice.</description>
-        </annotations>
-        <arguments>
-            <argument name="amount" type="string"/>
-            <argument name="status" type="string"/>
-            <argument name="captureStatus" type="string"/>
-            <argument name="closedStatus" type="string"/>
-        </arguments>
-
-        <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
-        <click selector="{{AdminMenuSection.sales}}" stepKey="clickSales"/>
-        <waitForPageLoad stepKey="waitForSalesSubsection"/>
-        <click selector="{{AdminMenuSection.orders}}" stepKey="clickOrders"/>
-        <waitForPageLoad stepKey="waitForOrdersGrid" time="30"/>
-        <click selector="{{OrdersGridSection.viewMostRecentOrder}}" stepKey="viewOrder"/>
-        <waitForPageLoad stepKey="waitForViewOrder"/>
-        <click selector="{{ViewOrderSection.openInvoiceForm}}" stepKey="openInvoiceForm"/>
-        <selectOption selector="{{ViewOrderSection.selectCaptureType}}" stepKey="selectCaptureType" userInput="Capture Online"/>
-        <click selector="{{ViewOrderSection.submitInvoice}}" stepKey="submitInvoice"/>
-        <waitForPageLoad stepKey="waitForInvoiceLoad"/>
-        <click selector="{{ViewOrderSection.commentsHistory}}" stepKey="viewCommentsHistory"/>
-        <waitForPageLoad stepKey="waitForHistoryLoad"/>
-        <see userInput="{{amount}}" selector="{{ViewOrderSection.capturedAmountText}}" stepKey="validateCapturedAmount"/>
-        <see userInput="{{status}}" selector="{{ViewOrderSection.orderStatus}}" stepKey="validateOrderStatus"/>
-        <click selector="{{ViewOrderSection.invoices}}" stepKey="openInvoices"/>
-        <waitForPageLoad stepKey="waitForInvoices"/>
-        <seeElement selector="{{ViewOrderSection.firstInvoice}}" stepKey="seeFirstInvoice"/>
-        <click selector="{{ViewOrderSection.transactions}}" stepKey="openTransactions"/>
-        <waitForPageLoad stepKey="waitForTransactions"/>
-        <see userInput="{{captureStatus}}" selector="{{ViewOrderSection.confirmCapture}}" stepKey="seeCapture"/>
-        <!-- Enable below line after fix of MC-
-        <see userInput="{{closedStatus}}" selector="{{ViewOrderSection.confirmClosed}}" stepKey="seeClosed"/>
-        -->
-    </actionGroup>
-
-    <actionGroup name="ViewAndValidateOrderActionGroupNoSubmit">
-        <annotations>
-            <description>Validate the Order is Correct. Do Not Submit the Invoice.</description>
-        </annotations>
-        <arguments>
-            <argument name="amount" type="string"/>
-            <argument name="status" type="string"/>
-            <argument name="captureStatus" type="string"/>
-            <argument name="closedStatus" type="string"/>
-        </arguments>
-
-        <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
-        <click selector="{{AdminMenuSection.sales}}" stepKey="clickSales"/>
-        <waitForPageLoad stepKey="waitForSalesSubsection"/>
-        <click selector="{{AdminMenuSection.orders}}" stepKey="clickOrders"/>
-        <waitForPageLoad stepKey="waitForOrdersGrid" time="30"/>
-        <click selector="{{OrdersGridSection.viewMostRecentOrder}}" stepKey="viewOrder"/>
-        <waitForPageLoad stepKey="waitForViewOrder"/>
-        <click selector="{{ViewOrderSection.commentsHistory}}" stepKey="viewCommentsHistory"/>
-        <waitForPageLoad stepKey="waitForHistoryLoad"/>
-        <see userInput="{{amount}}" selector="{{ViewOrderSection.capturedAmountTextUnsubmitted}}" stepKey="validateCapturedAmount"/>
-        <see userInput="{{status}}" selector="{{ViewOrderSection.orderStatus}}" stepKey="validateOrderStatus"/>
-        <click selector="{{ViewOrderSection.invoices}}" stepKey="openInvoices"/>
-        <waitForPageLoad stepKey="waitForInvoices"/>
-        <seeElement selector="{{ViewOrderSection.firstInvoice}}" stepKey="seeFirstInvoice"/>
-        <click selector="{{ViewOrderSection.transactions}}" stepKey="openTransactions"/>
-        <waitForPageLoad stepKey="waitForTransactions"/>
-        <see userInput="{{captureStatus}}" selector="{{ViewOrderSection.confirmCapture}}" stepKey="seeCapture"/>
-        <!-- Enable below line after fix of MC-
-        <see userInput="{{closedStatus}}" selector="{{ViewOrderSection.confirmClosed}}" stepKey="seeClosed"/>
-        -->
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Data/AuthorizenetAcceptjsOrderValidationData.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Data/AuthorizenetAcceptjsOrderValidationData.xml
deleted file mode 100644
index 59d4be98d450c..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Data/AuthorizenetAcceptjsOrderValidationData.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.
-  */
--->
-
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="AuthorizenetAcceptjsOrderValidationData" type="AuthorizenetAcceptjsCredentials">
-        <data key="virtualProductOrderAmount">$24.68</data>
-        <data key="twoSimpleProductsOrderAmount">$128.00</data>
-        <data key="processingStatusProcessing">Processing</data>
-        <data key="captureStatusCapture">Capture</data>
-        <data key="closedStatusNo">No</data>
-    </entity>
-</entities>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AdminMenuSection.xml
deleted file mode 100644
index defb91339ea8f..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AdminMenuSection.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="AdminMenuSection">
-        <element name="dashboard" type="button" selector="#menu-magento-backend-dashboard"/>
-        <element name="sales" type="button" selector="#menu-magento-sales-sales"/>
-        <element name="orders" type="button" selector="//*[@id='menu-magento-sales-sales']//span[text()='Orders']"/>
-        <element name="catalog" type="button" selector="#menu-magento-catalog-catalog"/>
-        <element name="customers" type="button" selector="#menu-magento-customer-customer"/>
-        <element name="marketing" type="button" selector="#menu-magento-backend-marketing"/>
-        <element name="content" type="button" selector="#menu-magento-backend-content"/>
-        <element name="reports" type="button" selector="#menu-magento-reports-report"/>
-        <element name="stores" type="button" selector="#menu-magento-backend-stores"/>
-        <element name="system" type="button" selector="#menu-magento-backend-system"/>
-        <element name="findPartners" type="button" selector="#menu-magento-marketplace-partners"/>
-        <element name="currencySetup" type="button" selector="//a[contains(@class, 'item-nav')]//span[text()='Currency Setup']"/>
-    </section>
-</sections>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AuthorizenetAcceptjsConfigurationSection.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AuthorizenetAcceptjsConfigurationSection.xml
deleted file mode 100644
index 31be865ea2678..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AuthorizenetAcceptjsConfigurationSection.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.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="AuthorizenetAcceptjsConfigurationSection">
-        <element name="openSectionToggle" type="button" selector="#payment_us_authorizenet_acceptjs-head"/>
-        <element name="alreadyOpenSectionToggle" type="button" selector="#payment_us_authorizenet_acceptjs-head.open"/>
-        <element name="apiLoginIdField" type="input" selector="#payment_us_authorizenet_acceptjs_required_login"/>
-        <element name="transactionKeyField" type="input" selector="#payment_us_authorizenet_acceptjs_required_trans_key"/>
-        <element name="publicClientKeyField" type="input" selector="#payment_us_authorizenet_acceptjs_required_public_client_key"/>
-        <element name="signatureKeyField" type="input" selector="#payment_us_authorizenet_acceptjs_required_trans_signature_key"/>
-        <element name="enabledDefaultCheckbox" type="input" selector="#payment_us_authorizenet_acceptjs_active_inherit"/>
-        <element name="enabledDefaultSelect" type="select" selector="#payment_us_authorizenet_acceptjs_active"/>
-        <element name="paymentActionCheckbox" type="input" selector="#payment_us_authorizenet_acceptjs_required_payment_action_inherit"/>
-        <element name="paymentActionSelect" type="select" selector="#payment_us_authorizenet_acceptjs_required_payment_action"/>
-        <element name="paymentActionSelectDisabled" type="select" selector="#payment_us_authorizenet_acceptjs_required_payment_action[disabled='disabled']"/>
-    </section>
-</sections>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AuthorizenetCheckoutSection.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AuthorizenetCheckoutSection.xml
deleted file mode 100644
index 5d97842de374c..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/AuthorizenetCheckoutSection.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.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="AuthorizenetCheckoutSection">
-        <element name="selectAuthorizenet" type="button" selector="#authorizenet_acceptjs"/>
-        <element name="cardInput" type="input" selector="#authorizenet_acceptjs_cc_number"/>
-        <element name="expMonth" type="select" selector="#authorizenet_acceptjs_expiration"/>
-        <element name="expYear" type="select" selector="#authorizenet_acceptjs_expiration_yr"/>
-        <element name="cvv" type="input" selector="#authorizenet_acceptjs_cc_cid"/>
-        <element name="checkoutButton" type="button" selector="._active button.action.checkout"/>
-    </section>
-</sections>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/GuestAuthorizenetCheckoutSection.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/GuestAuthorizenetCheckoutSection.xml
deleted file mode 100644
index b5f2ecf641162..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/GuestAuthorizenetCheckoutSection.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.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="GuestAuthorizenetCheckoutSection">
-        <element name="firstName" type="input" selector="div[name='billingAddressauthorizenet_acceptjs.firstname'] input"/>
-        <element name="lastName" type="input" selector="div[name='billingAddressauthorizenet_acceptjs.lastname'] input"/>
-        <element name="street" type="input" selector="div[name='billingAddressauthorizenet_acceptjs.street.0'] input"/>
-        <element name="city" type="input" selector="div[name='billingAddressauthorizenet_acceptjs.city'] input"/>
-        <element name="state" type="select" selector="div[name='billingAddressauthorizenet_acceptjs.region_id'] select"/>
-        <element name="postcode" type="input" selector="div[name='billingAddressauthorizenet_acceptjs.postcode'] input"/>
-        <element name="country" type="select" selector="div[name='billingAddressauthorizenet_acceptjs.country_id'] select"/>
-        <element name="telephone" type="input" selector="div[name='billingAddressauthorizenet_acceptjs.telephone'] input"/>
-        <element name="update" type="button" selector=".payment-method._active button.action-update" />
-    </section>
-</sections>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/ViewOrderSection.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/ViewOrderSection.xml
deleted file mode 100644
index 608067d7d31a1..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/ViewOrderSection.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="ViewOrderSection">
-        <element name="openInvoiceForm" type="button" selector="#order_invoice"/>
-        <element name="selectCaptureType" type="select" selector="select[name='invoice[capture_case]']"/>
-        <element name="submitInvoice" type="button" selector="button.submit-button"/>
-        <element name="commentsHistory" type="button" selector="#sales_order_view_tabs_order_history"/>
-        <element name="capturedAmountText" type="text" selector="//div[@class='comments-block-item'][2]/div[@class='comments-block-item-comment']"/>
-        <element name="capturedAmountTextUnsubmitted" type="text" selector="//div[@class='comments-block-item'][1]/div[@class='comments-block-item-comment']"/>
-        <element name="orderStatus" type="text" selector=".note-list-item .note-list-status"/>
-        <element name="invoices" type="button" selector="#sales_order_view_tabs_order_invoices"/>
-        <element name="firstInvoice" type="text" selector=".data-grid tbody tr"/>
-        <element name="transactions" type="button" selector="#sales_order_view_tabs_order_transactions"/>
-        <element name="confirmCapture" type="text" selector="//table[@id='order_transactions_table']/tbody/tr/td[6]"/>
-        <element name="confirmClosed" type="text" selector="//table[@id='order_transactions_table']/tbody/tr/td[7]"/>
-    </section>
-</sections>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/ConfigureAuthorizenetAcceptjsWithoutRequiredOptionsTest.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/ConfigureAuthorizenetAcceptjsWithoutRequiredOptionsTest.xml
deleted file mode 100644
index cbb702c26f17d..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/ConfigureAuthorizenetAcceptjsWithoutRequiredOptionsTest.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.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="ConfigureAuthorizenetAcceptjsWithoutRequiredOptionsTest">
-        <annotations>
-            <stories value="Authorize.net Accept.js"/>
-            <title value="Unable to configure Authorize.net Accept.js without required options"/>
-            <description value="Unable to configure Authorize.net Accept.js without required options"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-17805"/>
-            <useCaseId value="MC-17753"/>
-            <group value="AuthorizenetAcceptjs"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-        </before>
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
-        <actionGroup ref="EnableAuthorizenetAcceptjs" stepKey="enableAuthorizenetAcceptjs"/>
-        <actionGroup ref="AssertAuthorizenetAcceptjsRequiredFieldsValidationIsPresentOnSave" stepKey="assertErrorMessages"/>
-    </test>
-</tests>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/FullCaptureAuthorizenetAcceptjsTest.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/FullCaptureAuthorizenetAcceptjsTest.xml
deleted file mode 100644
index 7f25482d627e1..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/FullCaptureAuthorizenetAcceptjsTest.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.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="FullCaptureAuthorizenetAcceptjsTest">
-        <annotations>
-            <stories value="Authorize.net Accept.js"/>
-            <title value="Full Capture using Authorize.net Accept.js"/>
-            <description value="Capture an order placed using Authorize.net Accept.js"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-12255"/>
-            <skip>
-                <issueId value="DEVOPS-4604"/>
-            </skip>
-            <group value="AuthorizenetAcceptjs"/>
-            <group value="ThirdPartyPayments"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-
-            <createData stepKey="createCustomer" entity="Simple_US_Customer"/>
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="_defaultProduct" stepKey="createProduct">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
-
-            <!--Configure Auth.net-->
-            <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
-            <actionGroup ref="ConfigureAuthorizenetAcceptjs" stepKey="configureAuthorizenetAcceptjs">
-                <argument name="paymentAction" value="Authorize Only"/>
-            </actionGroup>
-            <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig"/>
-
-        </before>
-        <after>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-            <actionGroup ref="DisableAuthorizenetAcceptjs" stepKey="DisableAuthorizenetAcceptjs"/>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-
-        <!--Storefront Login-->
-        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginStorefront">
-            <argument name="Customer" value="$$createCustomer$$"/>
-        </actionGroup>
-
-        <!--Add product to cart-->
-        <amOnPage url="$$createProduct.name$$.html" stepKey="goToProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPage"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-        <waitForPageLoad stepKey="waitForCartToFill"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-
-        <!--Checkout steps-->
-        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="GoToCheckoutFromMinicartActionGroup"/>
-        <waitForPageLoad stepKey="waitForCheckoutLoad"/>
-        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShipping"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="submitShippingSelection"/>
-        <waitForPageLoad stepKey="waitForShippingToFinish"/>
-        <actionGroup ref="FillPaymentInformation" stepKey="fillPaymentInfo"/>
-
-        <!--View and validate order-->
-        <actionGroup ref="ViewAndValidateOrderActionGroup" stepKey="viewAndValidateOrder">
-            <argument name="amount" value="{{AuthorizenetAcceptjsOrderValidationData.twoSimpleProductsOrderAmount}}"/>
-            <argument name="status" value="{{AuthorizenetAcceptjsOrderValidationData.processingStatusProcessing}}"/>
-            <argument name="captureStatus" value="{{AuthorizenetAcceptjsOrderValidationData.captureStatusCapture}}"/>
-            <argument name="closedStatus" value="{{AuthorizenetAcceptjsOrderValidationData.closedStatusNo}}"/>
-        </actionGroup>
-    </test>
-</tests>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/GuestCheckoutVirtualProductAuthorizenetAcceptjsTest.xml b/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/GuestCheckoutVirtualProductAuthorizenetAcceptjsTest.xml
deleted file mode 100644
index 919c32d8f70d6..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Test/GuestCheckoutVirtualProductAuthorizenetAcceptjsTest.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.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="GuestCheckoutVirtualProductAuthorizenetAcceptjsTest">
-        <annotations>
-            <stories value="Authorize.net Accept.js"/>
-            <title value="Guest Checkout of Virtual Product using Authorize.net Accept.js"/>
-            <description value="Checkout a virtual product with a guest using Authorize.net Accept.js"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-12712"/>
-            <skip>
-                <issueId value="DEVOPS-4604"/>
-            </skip>
-            <group value="AuthorizenetAcceptjs"/>
-            <group value="ThirdPartyPayments"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-
-            <!-- Create virtual product -->
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-            <waitForPageLoad stepKey="waitForProductIndexPage"/>
-            <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
-                <argument name="product" value="defaultVirtualProduct"/>
-            </actionGroup>
-            <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillProductForm">
-                <argument name="product" value="defaultVirtualProduct"/>
-            </actionGroup>
-            <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
-
-            <!--Configure Auth.net-->
-            <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
-            <actionGroup ref="ConfigureAuthorizenetAcceptjs" stepKey="configureAuthorizenetAcceptjs">
-                <argument name="paymentAction" value="Authorize and Capture"/>
-            </actionGroup>
-            <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig"/>
-
-        </before>
-        <after>
-            <actionGroup ref="DisableAuthorizenetAcceptjs" stepKey="DisableAuthorizenetAcceptjs"/>
-            <!-- Delete virtual product -->
-            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
-                <argument name="product" value="defaultVirtualProduct"/>
-            </actionGroup>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-
-        <!--Add product to cart twice-->
-        <amOnPage url="{{defaultVirtualProduct.sku}}.html" stepKey="goToProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPage"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-        <waitForPageLoad stepKey="waitForCartToFill"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCartAgain"/>
-        <waitForPageLoad stepKey="waitForCartToFillAgain"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage2"/>
-
-        <!--Checkout steps-->
-        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="GoToCheckoutFromMinicartActionGroup"/>
-        <waitForPageLoad stepKey="waitForCheckoutLoad"/>
-
-        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="enterEmail"/>
-        <click stepKey="clickOnAuthorizenetToggle" selector="{{AuthorizenetCheckoutSection.selectAuthorizenet}}"/>
-        <waitForPageLoad stepKey="waitForBillingInfoLoad"/>
-        <actionGroup ref="GuestCheckoutAuthorizenetFillBillingAddress" stepKey="fillAddressForm">
-            <argument name="customer" value="Simple_US_Customer"/>
-            <argument name="customerAddress" value="CustomerAddressSimple"/>
-        </actionGroup>
-        <actionGroup ref="FillPaymentInformation" stepKey="fillPaymentInfo"/>
-
-        <!--View and validate order-->
-        <actionGroup ref="ViewAndValidateOrderActionGroupNoSubmit" stepKey="viewAndValidateOrder">
-            <argument name="amount" value="{{AuthorizenetAcceptjsOrderValidationData.virtualProductOrderAmount}}"/>
-            <argument name="status" value="{{AuthorizenetAcceptjsOrderValidationData.processingStatusProcessing}}"/>
-            <argument name="captureStatus" value="{{AuthorizenetAcceptjsOrderValidationData.captureStatusCapture}}"/>
-            <argument name="closedStatus" value="{{AuthorizenetAcceptjsOrderValidationData.closedStatusNo}}"/>
-        </actionGroup>
-    </test>
-</tests>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/ConfigTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/ConfigTest.php
index da2b953d843b1..646ad4f195b9d 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/ConfigTest.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/ConfigTest.php
@@ -81,6 +81,9 @@ public function testGetSolutionIdSandbox($environment, $expectedSolution)
         $this->assertEquals($expectedSolution, $this->model->getSolutionId(123));
     }
 
+    /**
+     * @return array
+     */
     public function configMapProvider()
     {
         return [
@@ -97,6 +100,10 @@ public function configMapProvider()
             ['getTransactionInfoSyncKeys', 'transactionSyncKeys', 'a,b,c', ['a', 'b', 'c']],
         ];
     }
+
+    /**
+     * @return array
+     */
     public function environmentUrlProvider()
     {
         return [
@@ -105,6 +112,9 @@ public function environmentUrlProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function environmentSolutionProvider()
     {
         return [
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AddressDataBuilderTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AddressDataBuilderTest.php
index 6ddb30a64af96..84c2f19040e16 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AddressDataBuilderTest.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AddressDataBuilderTest.php
@@ -108,6 +108,10 @@ public function testBuildWithBothAddresses()
         $this->assertEquals('abc', $result['transactionRequest']['customerIP']);
     }
 
+    /**
+     * @param $responseData
+     * @param $addressPrefix
+     */
     private function validateAddressData($responseData, $addressPrefix)
     {
         foreach ($this->mockAddressData as $fieldValue => $field) {
@@ -115,6 +119,11 @@ private function validateAddressData($responseData, $addressPrefix)
         }
     }
 
+    /**
+     * @param $prefix
+     *
+     * @return \PHPUnit\Framework\MockObject\MockObject
+     */
     private function createAddressMock($prefix)
     {
         $addressAdapterMock = $this->createMock(AddressAdapterInterface::class);
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentReviewStatusHandlerTest.php b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentReviewStatusHandlerTest.php
index a52a1b317fbb7..197dc209ece66 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentReviewStatusHandlerTest.php
+++ b/app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentReviewStatusHandlerTest.php
@@ -112,6 +112,9 @@ public function testDoesNothingWhenPending(string $status)
         $this->handler->handle($subject, $response);
     }
 
+    /**
+     * @return array
+     */
     public function pendingTransactionStatusesProvider()
     {
         return [
@@ -120,6 +123,9 @@ public function pendingTransactionStatusesProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function declinedTransactionStatusesProvider()
     {
         return [
diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/adminhtml/system.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/adminhtml/system.xml
index 8623919cf5d6b..7cd00959d9772 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/etc/adminhtml/system.xml
+++ b/app/code/Magento/AuthorizenetAcceptjs/etc/adminhtml/system.xml
@@ -9,7 +9,7 @@
     <system>
         <section id="payment">
             <group id="authorizenet_acceptjs" translate="label" type="text" sortOrder="34" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Authorize.Net</label>
+                <label>Authorize.Net (Deprecated)</label>
                 <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/i18n/en_US.csv b/app/code/Magento/AuthorizenetAcceptjs/i18n/en_US.csv
index 3c5b677c88cc8..a8b5dbd2df525 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/i18n/en_US.csv
+++ b/app/code/Magento/AuthorizenetAcceptjs/i18n/en_US.csv
@@ -1,11 +1,11 @@
-Authorize.net,Authorize.net
+"Authorize.Net (Deprecated)","Authorize.Net (Deprecated)"
 "Gateway URL","Gateway URL"
 "Invalid payload type.","Invalid payload type."
 "Something went wrong in the payment gateway.","Something went wrong in the payment gateway."
 "Merchant MD5 (deprecated","Merchant MD5 (deprecated"
 "Signature Key","Signature Key"
 "Basic Authorize.Net Settings","Basic Authorize.Net Settings"
-"Advanced Authorie.Net Settings","Advanced Authorie.Net Settings"
+"Advanced Authorize.Net Settings","Advanced Authorize.Net Settings"
 "Public Client Key","Public Client Key"
 "Environment","Environment"
 "Production","Production"
diff --git a/app/code/Magento/AuthorizenetCardinal/Gateway/Request/Authorize3DSecureBuilder.php b/app/code/Magento/AuthorizenetCardinal/Gateway/Request/Authorize3DSecureBuilder.php
index 00def8ce2b0cf..bf8e1661a3f61 100644
--- a/app/code/Magento/AuthorizenetCardinal/Gateway/Request/Authorize3DSecureBuilder.php
+++ b/app/code/Magento/AuthorizenetCardinal/Gateway/Request/Authorize3DSecureBuilder.php
@@ -16,6 +16,9 @@
 
 /**
  * Adds the cardholder authentication information to the request
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Authorize3DSecureBuilder implements BuilderInterface
 {
diff --git a/app/code/Magento/AuthorizenetCardinal/Gateway/Validator/CavvResponseValidator.php b/app/code/Magento/AuthorizenetCardinal/Gateway/Validator/CavvResponseValidator.php
index 036c1fa332ebf..35287406a12d5 100644
--- a/app/code/Magento/AuthorizenetCardinal/Gateway/Validator/CavvResponseValidator.php
+++ b/app/code/Magento/AuthorizenetCardinal/Gateway/Validator/CavvResponseValidator.php
@@ -16,6 +16,9 @@
 
 /**
  * Validates cardholder authentication verification response code.
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class CavvResponseValidator extends AbstractValidator
 {
diff --git a/app/code/Magento/AuthorizenetCardinal/Model/Checkout/ConfigProvider.php b/app/code/Magento/AuthorizenetCardinal/Model/Checkout/ConfigProvider.php
index d0cde9c643ebf..8f09395874dce 100644
--- a/app/code/Magento/AuthorizenetCardinal/Model/Checkout/ConfigProvider.php
+++ b/app/code/Magento/AuthorizenetCardinal/Model/Checkout/ConfigProvider.php
@@ -12,6 +12,9 @@
 
 /**
  * Configuration provider.
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class ConfigProvider implements ConfigProviderInterface
 {
diff --git a/app/code/Magento/AuthorizenetCardinal/Model/Config.php b/app/code/Magento/AuthorizenetCardinal/Model/Config.php
index e70a6a2e39c1f..798fb846c160e 100644
--- a/app/code/Magento/AuthorizenetCardinal/Model/Config.php
+++ b/app/code/Magento/AuthorizenetCardinal/Model/Config.php
@@ -14,6 +14,9 @@
  * AuthorizenetCardinal integration configuration.
  *
  * Class is a proxy service for retrieving configuration settings.
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class Config
 {
diff --git a/app/code/Magento/AuthorizenetCardinal/Observer/DataAssignObserver.php b/app/code/Magento/AuthorizenetCardinal/Observer/DataAssignObserver.php
index cb2cdf64ae389..aa5fbee327fe5 100644
--- a/app/code/Magento/AuthorizenetCardinal/Observer/DataAssignObserver.php
+++ b/app/code/Magento/AuthorizenetCardinal/Observer/DataAssignObserver.php
@@ -15,11 +15,14 @@
 
 /**
  * Adds the payment info to the payment object
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class DataAssignObserver extends AbstractDataAssignObserver
 {
     /**
-     * JWT key
+     * Cardinal JWT key
      */
     private const JWT_KEY = 'cardinalJWT';
 
diff --git a/app/code/Magento/AuthorizenetGraphQl/Model/AuthorizenetDataProvider.php b/app/code/Magento/AuthorizenetGraphQl/Model/AuthorizenetDataProvider.php
index 704f0af85da06..ffbacbf6ac88c 100644
--- a/app/code/Magento/AuthorizenetGraphQl/Model/AuthorizenetDataProvider.php
+++ b/app/code/Magento/AuthorizenetGraphQl/Model/AuthorizenetDataProvider.php
@@ -13,6 +13,9 @@
 
 /**
  * SetPaymentMethod additional data provider model for Authorizenet payment method
+ *
+ * @deprecated Starting from Magento 2.3.4 Authorize.net payment method core integration is deprecated in favor of
+ * official payment integration available on the marketplace
  */
 class AuthorizenetDataProvider implements AdditionalDataProviderInterface
 {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
index bca7f13b0cee3..0a73430aad0f3 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
@@ -19,21 +19,21 @@ class Grid extends \Magento\Backend\Block\Dashboard\Grid
     protected $_collectionFactory;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $_moduleManager;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Helper\Data $backendHelper,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory,
         array $data = []
     ) {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Sales.php b/app/code/Magento/Backend/Block/Dashboard/Sales.php
index 3455ff087a799..b388339460102 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Sales.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Sales.php
@@ -18,20 +18,20 @@ class Sales extends \Magento\Backend\Block\Dashboard\Bar
     protected $_template = 'Magento_Backend::dashboard/salebar.phtml';
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $_moduleManager;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         array $data = []
     ) {
         $this->_moduleManager = $moduleManager;
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
index 7dc897a62a320..a0b1571bd17bb 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
@@ -19,21 +19,21 @@ class Ordered extends \Magento\Backend\Block\Dashboard\Grid
     protected $_collectionFactory;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $_moduleManager;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Sales\Model\ResourceModel\Report\Bestsellers\CollectionFactory $collectionFactory
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Helper\Data $backendHelper,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Sales\Model\ResourceModel\Report\Bestsellers\CollectionFactory $collectionFactory,
         array $data = []
     ) {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Totals.php b/app/code/Magento/Backend/Block/Dashboard/Totals.php
index e57a6249af47d..20bcfebe31a8d 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Totals.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Totals.php
@@ -22,20 +22,20 @@ class Totals extends \Magento\Backend\Block\Dashboard\Bar
     protected $_template = 'Magento_Backend::dashboard/totalbar.phtml';
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $_moduleManager;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Reports\Model\ResourceModel\Order\CollectionFactory $collectionFactory,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         array $data = []
     ) {
         $this->_moduleManager = $moduleManager;
diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
index 9c35cfb5df81d..2b9f70844df86 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher.php
@@ -592,7 +592,7 @@ public function getHintHtml()
                 'What is this?'
             ) . '"' . ' class="admin__field-tooltip-action action-help"><span>' . __(
                 'What is this?'
-            ) . '</span></a></span>' . ' </div>';
+            ) . '</span></a>' . ' </div>';
         }
         return $html;
     }
diff --git a/app/code/Magento/Backend/Block/System/Account/Edit/Form.php b/app/code/Magento/Backend/Block/System/Account/Edit/Form.php
index 7c5246143b2c6..c075585a6e4eb 100644
--- a/app/code/Magento/Backend/Block/System/Account/Edit/Form.php
+++ b/app/code/Magento/Backend/Block/System/Account/Edit/Form.php
@@ -68,7 +68,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _prepareForm()
     {
@@ -114,7 +114,7 @@ protected function _prepareForm()
                 'name' => 'password',
                 'label' => __('New Password'),
                 'title' => __('New Password'),
-                'class' => 'validate-admin-password admin__control-text'
+                'class' => 'validate-admin-password'
             ]
         );
 
@@ -124,7 +124,7 @@ protected function _prepareForm()
             [
                 'name' => 'password_confirmation',
                 'label' => __('Password Confirmation'),
-                'class' => 'validate-cpassword admin__control-text'
+                'class' => 'validate-cpassword'
             ]
         );
 
@@ -152,7 +152,7 @@ protected function _prepareForm()
                 'label' => __('Your Password'),
                 'id' => self::IDENTITY_VERIFICATION_PASSWORD_FIELD,
                 'title' => __('Your Password'),
-                'class' => 'validate-current-password required-entry admin__control-text',
+                'class' => 'validate-current-password required-entry',
                 'required' => true
             ]
         );
diff --git a/app/code/Magento/Backend/Block/Widget/Grid.php b/app/code/Magento/Backend/Block/Widget/Grid.php
index 66298d23389fb..86ad00bfaa7ca 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid.php
@@ -300,7 +300,10 @@ protected function _addColumnFilterToCollection($column)
         if ($this->getCollection()) {
             $field = $column->getFilterIndex() ? $column->getFilterIndex() : $column->getIndex();
             if ($column->getFilterConditionCallback()) {
-                call_user_func($column->getFilterConditionCallback(), $this->getCollection(), $column);
+                $column->getFilterConditionCallback()[0]->{$column->getFilterConditionCallback()[1]}(
+                    $this->getCollection(),
+                    $column
+                );
             } else {
                 $condition = $column->getFilter()->getCondition();
                 if ($field && isset($condition)) {
@@ -363,7 +366,7 @@ protected function _prepareCollection()
                 $this->_setFilterValues($data);
             } elseif ($filter && is_array($filter)) {
                 $this->_setFilterValues($filter);
-            } elseif (0 !== sizeof($this->_defaultFilter)) {
+            } elseif (0 !== count($this->_defaultFilter)) {
                 $this->_setFilterValues($this->_defaultFilter);
             }
 
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
index f4558594332c3..a7d85a4cfef4c 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
@@ -47,7 +47,7 @@ public function render(\Magento\Framework\DataObject $row)
             return '&nbsp;';
         }
 
-        if (sizeof($actions) == 1 && !$this->getColumn()->getNoLink()) {
+        if (count($actions) == 1 && !$this->getColumn()->getNoLink()) {
             foreach ($actions as $action) {
                 if (is_array($action)) {
                     return $this->_toLinkHtml($action, $row);
@@ -104,6 +104,7 @@ protected function _toLinkHtml($action, \Magento\Framework\DataObject $row)
         $this->_transformActionData($action, $actionCaption, $row);
 
         if (isset($action['confirm'])) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $action['onclick'] = 'return window.confirm(\'' . addslashes(
                 $this->escapeHtml($action['confirm'])
             ) . '\')';
@@ -117,8 +118,8 @@ protected function _toLinkHtml($action, \Magento\Framework\DataObject $row)
     /**
      * Prepares action data for html render
      *
-     * @param array &$action
-     * @param string &$actionCaption
+     * @param &array $action
+     * @param &string $actionCaption
      * @param \Magento\Framework\DataObject $row
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -144,7 +145,7 @@ protected function _transformActionData(&$action, &$actionCaption, \Magento\Fram
                     if (is_array($action['url']) && isset($action['field'])) {
                         $params = [$action['field'] => $this->_getValue($row)];
                         if (isset($action['url']['params'])) {
-                            $params = array_merge($action['url']['params'], $params);
+                            $params[] = $action['url']['params'];
                         }
                         $action['href'] = $this->getUrl($action['url']['base'], $params);
                         unset($action['field']);
diff --git a/app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php b/app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php
index 6eb3ecb3049a9..7cb8690b4ec27 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php
@@ -8,6 +8,7 @@
 /**
  * Adminhtml abstract  dashboard helper.
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @since 100.0.2
  */
@@ -28,6 +29,8 @@ abstract class AbstractDashboard extends \Magento\Framework\App\Helper\AbstractH
     protected $_params = [];
 
     /**
+     * Return collections
+     *
      * @return array|\Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
      */
     public function getCollection()
@@ -39,6 +42,8 @@ public function getCollection()
     }
 
     /**
+     * Init collections
+     *
      * @return void
      */
     abstract protected function _initCollection();
@@ -54,14 +59,18 @@ public function getItems()
     }
 
     /**
+     * Return items count
+     *
      * @return int
      */
     public function getCount()
     {
-        return sizeof($this->getItems());
+        return count($this->getItems());
     }
 
     /**
+     * Return column
+     *
      * @param string $index
      * @return array
      */
@@ -85,6 +94,8 @@ public function getColumn($index)
     }
 
     /**
+     * Set params with value
+     *
      * @param string $name
      * @param mixed $value
      * @return void
@@ -95,6 +106,8 @@ public function setParam($name, $value)
     }
 
     /**
+     * Set params
+     *
      * @param array $params
      * @return void
      */
@@ -104,6 +117,8 @@ public function setParams(array $params)
     }
 
     /**
+     * Get params with name
+     *
      * @param string $name
      * @return mixed
      */
@@ -117,6 +132,8 @@ public function getParam($name)
     }
 
     /**
+     * Get params
+     *
      * @return array
      */
     public function getParams()
diff --git a/app/code/Magento/Backend/Helper/Dashboard/Data.php b/app/code/Magento/Backend/Helper/Dashboard/Data.php
index 29bffbd6a9dc2..c06e7ea3ba38f 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/Data.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Data.php
@@ -68,7 +68,7 @@ public function getStores()
      */
     public function countStores()
     {
-        return sizeof($this->_stores->getItems());
+        return count($this->_stores->getItems());
     }
 
     /**
@@ -88,8 +88,7 @@ public function getDatePeriods()
     }
 
     /**
-     * Create data hash to ensure that we got valid
-     * data and it is not changed by some one else.
+     * Create data hash to ensure that we got valid data and it is not changed by some one else.
      *
      * @param string $data
      * @return string
@@ -97,6 +96,7 @@ public function getDatePeriods()
     public function getChartDataHash($data)
     {
         $secret = $this->_installDate;
+        // phpcs:disable Magento2.Security.InsecureFunction.FoundWithAlternative
         return md5($data . $secret);
     }
 }
diff --git a/app/code/Magento/Backend/Model/Auth/Session.php b/app/code/Magento/Backend/Model/Auth/Session.php
index 6d2f8f6a21d4a..809b78b7b98bc 100644
--- a/app/code/Magento/Backend/Model/Auth/Session.php
+++ b/app/code/Magento/Backend/Model/Auth/Session.php
@@ -5,20 +5,17 @@
  */
 namespace Magento\Backend\Model\Auth;
 
-use Magento\Framework\Acl;
-use Magento\Framework\AclFactory;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\CookieManagerInterface;
-use Magento\Backend\Spi\SessionUserHydratorInterface;
-use Magento\Backend\Spi\SessionAclHydratorInterface;
-use Magento\User\Model\User;
-use Magento\User\Model\UserFactory;
 
 /**
  * Backend Auth session model
  *
  * @api
+ * @method \Magento\User\Model\User|null getUser()
+ * @method \Magento\Backend\Model\Auth\Session setUser(\Magento\User\Model\User $value)
+ * @method \Magento\Framework\Acl|null getAcl()
+ * @method \Magento\Backend\Model\Auth\Session setAcl(\Magento\Framework\Acl $value)
  * @method int getUpdatedAt()
  * @method \Magento\Backend\Model\Auth\Session setUpdatedAt(int $value)
  *
@@ -59,36 +56,6 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
      */
     protected $_config;
 
-    /**
-     * @var SessionUserHydratorInterface
-     */
-    private $userHydrator;
-
-    /**
-     * @var SessionAclHydratorInterface
-     */
-    private $aclHydrator;
-
-    /**
-     * @var UserFactory
-     */
-    private $userFactory;
-
-    /**
-     * @var AclFactory
-     */
-    private $aclFactory;
-
-    /**
-     * @var User|null
-     */
-    private $user;
-
-    /**
-     * @var Acl|null
-     */
-    private $acl;
-
     /**
      * @param \Magento\Framework\App\Request\Http $request
      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
@@ -103,10 +70,6 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
      * @param \Magento\Backend\Model\UrlInterface $backendUrl
      * @param \Magento\Backend\App\ConfigInterface $config
      * @throws \Magento\Framework\Exception\SessionException
-     * @param SessionUserHydratorInterface|null $userHydrator
-     * @param SessionAclHydratorInterface|null $aclHydrator
-     * @param UserFactory|null $userFactory
-     * @param AclFactory|null $aclFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -121,19 +84,11 @@ public function __construct(
         \Magento\Framework\App\State $appState,
         \Magento\Framework\Acl\Builder $aclBuilder,
         \Magento\Backend\Model\UrlInterface $backendUrl,
-        \Magento\Backend\App\ConfigInterface $config,
-        ?SessionUserHydratorInterface $userHydrator = null,
-        ?SessionAclHydratorInterface $aclHydrator = null,
-        ?UserFactory $userFactory = null,
-        ?AclFactory $aclFactory = null
+        \Magento\Backend\App\ConfigInterface $config
     ) {
         $this->_config = $config;
         $this->_aclBuilder = $aclBuilder;
         $this->_backendUrl = $backendUrl;
-        $this->userHydrator = $userHydrator ?? ObjectManager::getInstance()->get(SessionUserHydratorInterface::class);
-        $this->aclHydrator = $aclHydrator ?? ObjectManager::getInstance()->get(SessionAclHydratorInterface::class);
-        $this->userFactory = $userFactory ?? ObjectManager::getInstance()->get(UserFactory::class);
-        $this->aclFactory = $aclFactory ?? ObjectManager::getInstance()->get(AclFactory::class);
         parent::__construct(
             $request,
             $sidResolver,
@@ -277,16 +232,6 @@ public function processLogin()
         return $this;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function destroy(array $options = null)
-    {
-        $this->user = null;
-        $this->acl = null;
-        parent::destroy($options);
-    }
-
     /**
      * Process of configuring of current auth storage when logout was performed
      *
@@ -310,142 +255,4 @@ public function isValidForPath($path)
     {
         return true;
     }
-
-    /**
-     * Logged-in user.
-     *
-     * @return User|null
-     */
-    public function getUser()
-    {
-        if (!$this->user) {
-            $userData = $this->getUserData();
-            if ($userData) {
-                /** @var User $user */
-                $user = $this->userFactory->create();
-                $this->userHydrator->hydrate($user, $userData);
-                $this->user = $user;
-            } elseif ($user = parent::getUser()) {
-                $this->setUser($user);
-            }
-        }
-
-        return $this->user;
-    }
-
-    /**
-     * Set logged-in user instance.
-     *
-     * @param User|null $user
-     * @return Session
-     */
-    public function setUser($user)
-    {
-        $this->setUserData(null);
-        if ($user) {
-            $this->setUserData($this->userHydrator->extract($user));
-        }
-        $this->user = $user;
-
-        return $this;
-    }
-
-    /**
-     * Is user logged in?
-     *
-     * @return bool
-     */
-    public function hasUser()
-    {
-        return (bool)$this->getUser();
-    }
-
-    /**
-     * Remove logged-in user.
-     *
-     * @return Session
-     */
-    public function unsUser()
-    {
-        $this->user = null;
-        parent::unsUser();
-        return $this->unsUserData();
-    }
-
-    /**
-     * Logged-in user's ACL data.
-     *
-     * @return Acl|null
-     */
-    public function getAcl()
-    {
-        if (!$this->acl) {
-            $aclData = $this->getUserAclData();
-            if ($aclData) {
-                /** @var Acl $acl */
-                $acl = $this->aclFactory->create();
-                $this->aclHydrator->hydrate($acl, $aclData);
-                $this->acl = $acl;
-            } elseif ($acl = parent::getAcl()) {
-                $this->setAcl($acl);
-            }
-        }
-
-        return $this->acl;
-    }
-
-    /**
-     * Set logged-in user's ACL data instance.
-     *
-     * @param Acl|null $acl
-     * @return Session
-     */
-    public function setAcl($acl)
-    {
-        $this->setUserAclData(null);
-        if ($acl) {
-            $this->setUserAclData($this->aclHydrator->extract($acl));
-        }
-        $this->acl = $acl;
-
-        return $this;
-    }
-
-    /**
-     * Whether ACL data is present.
-     *
-     * @return bool
-     */
-    public function hasAcl()
-    {
-        return (bool)$this->getAcl();
-    }
-
-    /**
-     * Remove ACL data.
-     *
-     * @return Session
-     */
-    public function unsAcl()
-    {
-        $this->acl = null;
-        parent::unsAcl();
-        return $this->unsUserAclData();
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function writeClose()
-    {
-        //Updating data in session in case these objects has been changed.
-        if ($this->user) {
-            $this->setUser($this->user);
-        }
-        if ($this->acl) {
-            $this->setAcl($this->acl);
-        }
-
-        parent::writeClose();
-    }
 }
diff --git a/app/code/Magento/Backend/Model/Auth/SessionAclHydrator.php b/app/code/Magento/Backend/Model/Auth/SessionAclHydrator.php
deleted file mode 100644
index 34e01be696672..0000000000000
--- a/app/code/Magento/Backend/Model/Auth/SessionAclHydrator.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\Backend\Model\Auth;
-
-use Magento\Backend\Spi\SessionAclHydratorInterface;
-use Magento\Framework\Acl;
-
-/**
- * @inheritDoc
- */
-class SessionAclHydrator extends Acl implements SessionAclHydratorInterface
-{
-    /**
-     * @inheritDoc
-     */
-    public function extract(Acl $acl): array
-    {
-        return ['rules' => $acl->_rules, 'resources' => $acl->_resources, 'roles' => $acl->_roleRegistry];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function hydrate(Acl $target, array $data): void
-    {
-        $target->_rules = $data['rules'];
-        $target->_resources = $data['resources'];
-        $target->_roleRegistry = $data['roles'];
-    }
-}
diff --git a/app/code/Magento/Backend/Model/Auth/SessionUserHydrator.php b/app/code/Magento/Backend/Model/Auth/SessionUserHydrator.php
deleted file mode 100644
index 6dee8b7b302c8..0000000000000
--- a/app/code/Magento/Backend/Model/Auth/SessionUserHydrator.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\Backend\Model\Auth;
-
-use Magento\Backend\Spi\SessionUserHydratorInterface;
-use Magento\User\Model\User;
-use Magento\Authorization\Model\Role;
-use Magento\Authorization\Model\RoleFactory;
-
-/**
- * @inheritDoc
- */
-class SessionUserHydrator implements SessionUserHydratorInterface
-{
-    /**
-     * @var RoleFactory
-     */
-    private $roleFactory;
-
-    /**
-     * @param RoleFactory $roleFactory
-     */
-    public function __construct(RoleFactory $roleFactory)
-    {
-        $this->roleFactory = $roleFactory;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function extract(User $user): array
-    {
-        return ['data' => $user->getData(), 'role_data' => $user->getRole()->getData()];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function hydrate(User $target, array $data): void
-    {
-        $target->setData($data['data']);
-        /** @var Role $role */
-        $role = $this->roleFactory->create();
-        $role->setData($data['role_data']);
-        $target->setData('extracted_role', $role);
-        $target->getRole();
-    }
-}
diff --git a/app/code/Magento/Backend/Model/Locale/Resolver.php b/app/code/Magento/Backend/Model/Locale/Resolver.php
index b9be471cd5990..9086e2af83e24 100644
--- a/app/code/Magento/Backend/Model/Locale/Resolver.php
+++ b/app/code/Magento/Backend/Model/Locale/Resolver.php
@@ -7,8 +7,10 @@
 
 /**
  * Backend locale model
+ *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Resolver extends \Magento\Framework\Locale\Resolver
 {
@@ -40,7 +42,7 @@ class Resolver extends \Magento\Framework\Locale\Resolver
      * @param Manager $localeManager
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Framework\Validator\Locale $localeValidator
-     * @param null $locale
+     * @param string|null $locale
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -76,7 +78,7 @@ public function setLocale($locale = null)
         $sessionLocale = $this->_session->getSessionLocale();
         $userLocale = $this->_localeManager->getUserInterfaceLocale();
 
-        $localeCodes = array_filter([$forceLocale, $sessionLocale, $userLocale]);
+        $localeCodes = array_filter([$forceLocale, $locale, $sessionLocale, $userLocale]);
 
         if (count($localeCodes)) {
             $locale = reset($localeCodes);
diff --git a/app/code/Magento/Backend/Model/Menu/Item.php b/app/code/Magento/Backend/Model/Menu/Item.php
index d535e9c84df24..67c6216cbbc06 100644
--- a/app/code/Magento/Backend/Model/Menu/Item.php
+++ b/app/code/Magento/Backend/Model/Menu/Item.php
@@ -145,7 +145,7 @@ class Item
     protected $_moduleList;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     private $_moduleManager;
 
@@ -163,7 +163,7 @@ class Item
      * @param \Magento\Backend\Model\MenuFactory $menuFactory
      * @param \Magento\Backend\Model\UrlInterface $urlModel
      * @param \Magento\Framework\Module\ModuleListInterface $moduleList
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
      */
     public function __construct(
@@ -173,7 +173,7 @@ public function __construct(
         \Magento\Backend\Model\MenuFactory $menuFactory,
         \Magento\Backend\Model\UrlInterface $urlModel,
         \Magento\Framework\Module\ModuleListInterface $moduleList,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         array $data = []
     ) {
         $this->_validator = $validator;
diff --git a/app/code/Magento/Backend/Model/Menu/Item/Validator.php b/app/code/Magento/Backend/Model/Menu/Item/Validator.php
index 7b72b355f551d..62225c5707c0d 100644
--- a/app/code/Magento/Backend/Model/Menu/Item/Validator.php
+++ b/app/code/Magento/Backend/Model/Menu/Item/Validator.php
@@ -6,6 +6,9 @@
 namespace Magento\Backend\Model\Menu\Item;
 
 /**
+ * Class Validator
+ *
+ * @package Magento\Backend\Model\Menu\Item
  * @api
  * @since 100.0.2
  */
@@ -49,7 +52,7 @@ public function __construct()
 
         $attributeValidator = new \Zend_Validate();
         $attributeValidator->addValidator(new \Zend_Validate_StringLength(['min' => 3]));
-        $attributeValidator->addValidator(new \Zend_Validate_Regex('/^[A-Za-z0-9\/_]+$/'));
+        $attributeValidator->addValidator(new \Zend_Validate_Regex('/^[A-Za-z0-9\/_\-]+$/'));
 
         $textValidator = new \Zend_Validate_StringLength(['min' => 3, 'max' => 50]);
 
@@ -101,6 +104,7 @@ private function checkMenuItemIsRemoved($data)
 
     /**
      * Check that menu item contains all required data
+     *
      * @param array $data
      *
      * @throws \BadMethodCallException
diff --git a/app/code/Magento/Backend/Spi/SessionAclHydratorInterface.php b/app/code/Magento/Backend/Spi/SessionAclHydratorInterface.php
deleted file mode 100644
index 7227cc92fcc8e..0000000000000
--- a/app/code/Magento/Backend/Spi/SessionAclHydratorInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\Backend\Spi;
-
-use Magento\Framework\Acl;
-
-/**
- * Extract/hydrate user's ACL data to/from session.
- */
-interface SessionAclHydratorInterface
-{
-    /**
-     * Extract ACL data to store in session.
-     *
-     * @param Acl $acl
-     * @return array Array of scalars.
-     */
-    public function extract(Acl $acl): array;
-
-    /**
-     * Fill ACL object with data from session.
-     *
-     * @param Acl $target
-     * @param array $data Data from session.
-     * @return void
-     */
-    public function hydrate(Acl $target, array $data): void;
-}
diff --git a/app/code/Magento/Backend/Spi/SessionUserHydratorInterface.php b/app/code/Magento/Backend/Spi/SessionUserHydratorInterface.php
deleted file mode 100644
index 211c7b01df3be..0000000000000
--- a/app/code/Magento/Backend/Spi/SessionUserHydratorInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\Backend\Spi;
-
-use Magento\User\Model\User;
-
-/**
- * Extract/hydrate user data to/from session.
- */
-interface SessionUserHydratorInterface
-{
-    /**
-     * Extract user data to store in session.
-     *
-     * @param User $user
-     * @return array Array of scalars.
-     */
-    public function extract(User $user): array;
-
-    /**
-     * Fill User object with data from session.
-     *
-     * @param User $target
-     * @param array $data Data from session.
-     * @return void
-     */
-    public function hydrate(User $target, array $data): void;
-}
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml
index 37fd1cb17ffe3..8d8a3f005d147 100644
--- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateMenuActionGroup.xml
@@ -17,6 +17,7 @@
             <argument name="submenuUiId" type="string"/>
         </arguments>
 
+        <waitForPageLoad stepKey="waitPageLoad"/>
         <click selector="{{AdminMenuSection.menuItem(menuUiId)}}" stepKey="clickOnMenuItem"/>
         <click selector="{{AdminMenuSection.menuItem(submenuUiId)}}" stepKey="clickOnSubmenuItem"/>
     </actionGroup>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminUserIsInGridActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminUserIsInGridActionGroup.xml
new file mode 100644
index 0000000000000..3499f4e0d951c
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminUserIsInGridActionGroup.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="AssertAdminUserIsInGridActionGroup">
+        <arguments>
+            <argument name="user" type="entity"/>
+        </arguments>
+        <click selector="{{AdminUserGridSection.resetButton}}" stepKey="resetGridFilter"/>
+        <waitForPageLoad stepKey="waitForFiltersReset" time="15"/>
+        <fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{user.username}}" stepKey="enterUserName"/>
+        <click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearch"/>
+        <waitForPageLoad stepKey="waitForGridToLoad" time="15"/>
+        <see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{user.username}}" stepKey="seeUser"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertUserRoleRestrictedAccessActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertUserRoleRestrictedAccessActionGroup.xml
new file mode 100644
index 0000000000000..0747eab31588e
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertUserRoleRestrictedAccessActionGroup.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="AssertUserRoleRestrictedAccessActionGroup">
+        <see selector="{{AdminHeaderSection.pageHeading}}" userInput="Sorry, you need permissions to view this content." stepKey="seeErrorMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/Data/AdminGeneralStoreInfomationConfigData.xml b/app/code/Magento/Backend/Test/Mftf/Data/AdminGeneralStoreInfomationConfigData.xml
new file mode 100644
index 0000000000000..a8db2f94d69ab
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Data/AdminGeneralStoreInfomationConfigData.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="AdminGeneralSetStoreNameConfigData">
+        <data key="path">general/store_information/name</data>
+        <data key="value">New Store Information</data>
+    </entity>
+    <entity name="AdminGeneralSetStorePhoneConfigData">
+        <data key="path">general/store_information/phone</data>
+    </entity>
+    <entity name="AdminGeneralSetCountryConfigData">
+        <data key="path">general/store_information/country_id</data>
+    </entity>
+    <entity name="AdminGeneralSetCityConfigData">
+        <data key="path">general/store_information/city</data>
+    </entity>
+    <entity name="AdminGeneralSetPostcodeConfigData">
+        <data key="path">general/store_information/postcode</data>
+    </entity>
+    <entity name="AdminGeneralSetStreetAddressConfigData">
+        <data key="path">general/store_information/street_line1</data>
+    </entity>
+    <entity name="AdminGeneralSetStreetAddress2ConfigData">
+        <data key="path">general/store_information/street_line2</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Backend/Test/Mftf/Data/CookieConfigData.xml b/app/code/Magento/Backend/Test/Mftf/Data/CookieConfigData.xml
index 52a6c27a37ea8..a844e962202f8 100644
--- a/app/code/Magento/Backend/Test/Mftf/Data/CookieConfigData.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Data/CookieConfigData.xml
@@ -20,4 +20,20 @@
         <data key="scope_code">base</data>
         <data key="value">''</data>
     </entity>
+    <entity name="ChangeWebCookieLifetimeConfigData">
+        <data key="path">web/cookie/cookie_lifetime</data>
+        <data key="value">60</data>
+    </entity>
+    <entity name="DefaultWebCookieLifetimeConfigData">
+        <data key="path">web/cookie/cookie_lifetime</data>
+        <data key="value">3600</data>
+    </entity>
+    <entity name="ChangeAdminSecuritySessionLifetimeConfigData">
+        <data key="path">admin/security/session_lifetime</data>
+        <data key="value">60</data>
+    </entity>
+    <entity name="DefaultAdminSecuritySessionLifetimeConfigData">
+        <data key="path">admin/security/session_lifetime</data>
+        <data key="value">7200</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Backend/Test/Mftf/Data/GeneralLocalConfigsData.xml b/app/code/Magento/Backend/Test/Mftf/Data/GeneralLocalConfigsData.xml
new file mode 100644
index 0000000000000..22d595c39407f
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Data/GeneralLocalConfigsData.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="GeneralLocalCodeConfigsForChina">
+        <data key="path">general/locale/code</data>
+        <data key="scope">websites</data>
+        <data key="scope_code">base</data>
+        <data key="value">zh_Hans_CN</data>
+    </entity>
+    <entity name="GeneralLocalCodeConfigsForUS">
+        <data key="path">general/locale/code</data>
+        <data key="scope">websites</data>
+        <data key="scope_code">base</data>
+        <data key="value">en_US</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
index bd65dea89abc2..0ad63c0f0d23a 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml
@@ -13,5 +13,6 @@
         <element name="password" type="input" selector="#login"/>
         <element name="signIn" type="button" selector=".actions .action-primary" timeout="30"/>
         <element name="forgotPasswordLink" type="button" selector=".action-forgotpassword" timeout="10"/>
+        <element name="loginBlock" type="block" selector=".adminhtml-auth-login"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
index be3ef92acf0ac..bb1123d01c867 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
@@ -14,5 +14,13 @@
         <element name="error" type="text" selector="#messages div.message-error"/>
         <element name="notice" type="text" selector=".message.message-notice.notice"/>
         <element name="messageByType" type="text" selector="#messages div.message-{{messageType}}" parameterized="true" />
+        <element name="warning" type="text" selector="#messages div.message-warning"/>
+        <element name="accessDenied" type="text" selector=".access-denied-page"/>
+        <!-- Deprecated elements, please do not use them. Use elements above-->
+        <!-- Elements below are too common and catch non messages blocks. Ex: system messages blocks-->
+        <element name="successMessage" type="text" selector=".message-success"/>
+        <element name="errorMessage" type="text" selector=".message.message-error.error"/>
+        <element name="warningMessage" type="text" selector=".message-warning"/>
+        <element name="noticeMessage" type="text" selector=".message-notice"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml
index 3ad8adf9e1b96..5aaefc383f413 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml
@@ -15,5 +15,6 @@
         <element name="localeEnabled" type="select" selector="#general_locale_code:enabled"/>
         <element name="localeDisabled" type="select" selector="#general_locale_code[disabled=disabled]"/>
         <element name="useDefault" type="checkbox" selector="#general_locale_timezone_inherit"/>
+        <element name="defaultLocale" type="checkbox" selector="#general_locale_code_inherit"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInDeveloperModeTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInDeveloperModeTest.xml
index 59a6a7e261b87..47b8715b5541c 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInDeveloperModeTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInDeveloperModeTest.xml
@@ -11,6 +11,7 @@
     <test name="AdminCheckLocaleAndDeveloperConfigInDeveloperModeTest">
         <annotations>
             <features value="Backend"/>
+            <stories value="Menu Navigation"/>
             <title value="Check locale dropdown and developer configuration page are available in developer mode"/>
             <description value="Check locale dropdown and developer configuration page are available in developer mode"/>
             <group value="backend"/>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInProductionModeTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInProductionModeTest.xml
index 2dade727ca411..ae7722b225cdd 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInProductionModeTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInProductionModeTest.xml
@@ -11,6 +11,7 @@
     <test name="AdminCheckLocaleAndDeveloperConfigInProductionModeTest">
         <annotations>
             <features value="Backend"/>
+            <stories value="Menu Navigation"/>
             <title value="Check locale dropdown and developer configuration page are not available in production mode"/>
             <description value="Check locale dropdown and developer configuration page are not available in production mode"/>
             <testCaseId value="MC-14106" />
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml
index 33561d7c3b03e..6434d74b28754 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml
@@ -25,6 +25,7 @@
         <after>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
         <click selector="{{AdminMenuSection.menuItem(AdminMenuDashboard.dataUiId)}}" stepKey="clickOnMenuItem"/>
         <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
             <argument name="title" value="{{AdminMenuDashboard.pageTitle}}"/>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminExpireAdminSessionTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminExpireAdminSessionTest.xml
new file mode 100644
index 0000000000000..88d26c052b59b
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminExpireAdminSessionTest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminExpireAdminSessionTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Admin Session Expire"/>
+            <title value="Admin Session Expire"/>
+            <description value="Admin Session Expire"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14111"/>
+            <group value="Backend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <after>
+            <!-- 4. Restore default configuration settings. -->
+            <magentoCLI command="config:set {{DefaultAdminSecuritySessionLifetimeConfigData.path}} {{DefaultAdminSecuritySessionLifetimeConfigData.value}}" stepKey="setDefaultSessionLifetime"/>
+        </after>
+        <!-- 1. Apply configuration settings. -->
+        <magentoCLI command="config:set {{ChangeAdminSecuritySessionLifetimeConfigData.path}} {{ChangeAdminSecuritySessionLifetimeConfigData.value}}" stepKey="changeCookieLifetime"/>
+
+        <!-- 2. Wait for session to expire. -->
+        <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        <wait time="60" stepKey="waitForSessionLifetime"/>
+        <reloadPage stepKey="reloadPage"/>
+
+        <!-- 3. Perform asserts. -->
+        <seeElement selector="{{AdminLoginFormSection.loginBlock}}" stepKey="assertAdminLoginPageIsAvailable"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminExpireCustomerSessionTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminExpireCustomerSessionTest.xml
new file mode 100644
index 0000000000000..88646401e3a99
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminExpireCustomerSessionTest.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="AdminExpireCustomerSessionTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Customer Session Expire"/>
+            <title value="Customer Session Expireon"/>
+            <description value="Customer Session Expire"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14110"/>
+            <group value="Backend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <after>
+            <!-- 6. Restore default configuration settings. -->
+            <magentoCLI command="config:set {{DefaultWebCookieLifetimeConfigData.path}} {{DefaultWebCookieLifetimeConfigData.value}}" stepKey="setDefaultCookieLifetime"/>
+            <!-- Delete data -->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- 1. Login to Admin. -->
+        <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+
+        <!-- 2. Create customer if needed. -->
+        <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+
+        <!-- 3. Apply configuration settings. -->
+        <magentoCLI command="config:set {{ChangeWebCookieLifetimeConfigData.path}} {{ChangeWebCookieLifetimeConfigData.value}}" stepKey="changeCookieLifetime"/>
+
+        <!-- 4. Wait for session to expire. -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$createCustomer$$" />
+        </actionGroup>
+        <wait time="60" stepKey="waitForCookieLifetime"/>
+        <reloadPage stepKey="reloadPage"/>
+
+        <!-- 5. Perform asserts. -->
+        <seeElement selector="{{StorefrontPanelHeaderSection.customerLoginLink}}" stepKey="assertAuthorizationLinkIsVisibleOnStoreFront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Backend/Test/Unit/Helper/JsTest.php b/app/code/Magento/Backend/Test/Unit/Helper/JsTest.php
new file mode 100644
index 0000000000000..ff10158a11943
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Unit/Helper/JsTest.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Test\Unit\Helper;
+
+use Magento\Backend\Helper\Js;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class JsTest
+ *
+ * Testing decoding serialized grid data
+ */
+class JsTest extends TestCase
+{
+    /**
+     * @var Js
+     */
+    private $helper;
+
+    /**
+     * Set Up
+     */
+    protected function setUp()
+    {
+        $this->helper = new Js();
+    }
+
+    /**
+     * Test decoding the serialized input
+     *
+     * @dataProvider getEncodedDataProvider
+     *
+     * @param string $encoded
+     * @param array $expected
+     */
+    public function testDecodeGridSerializedInput(string $encoded, array $expected)
+    {
+        $this->assertEquals($expected, $this->helper->decodeGridSerializedInput($encoded));
+    }
+
+    /**
+     * Get serialized grid input
+     *
+     * @return array
+     */
+    public function getEncodedDataProvider(): array
+    {
+        return [
+            'Decoding empty serialized string' => [
+                '',
+                []
+            ],
+            'Decoding a simplified serialized string' => [
+                '1&2&3&4',
+                [1, 2, 3, 4]
+            ],
+            'Decoding encoded serialized string' => [
+                '2=dGVzdC1zdHJpbmc=',
+                [
+                    2 => [
+                        'test-string' => ''
+                    ]
+                ]
+            ],
+            'Decoding multiple encoded serialized strings' => [
+                '2=dGVzdC1zdHJpbmc=&3=bmV3LXN0cmluZw==',
+                [
+                    2 => [
+                        'test-string' => ''
+                    ],
+                    3 => [
+                        'new-string' => ''
+                    ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php b/app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php
new file mode 100644
index 0000000000000..dd8e06307cecc
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php
@@ -0,0 +1,276 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Backend\Test\Unit\Model\Auth;
+
+use Magento\Backend\Model\Auth\Session;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Class SessionTest tests Magento\Backend\Model\Auth\Session
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class SessionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Backend\App\Config | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $config;
+
+    /**
+     * @var \Magento\Framework\Session\Config | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $sessionConfig;
+
+    /**
+     * @var \Magento\Framework\Stdlib\CookieManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cookieManager;
+
+    /**
+     * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cookieMetadataFactory;
+
+    /**
+     * @var \Magento\Framework\Session\Storage | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storage;
+
+    /**
+     * @var \Magento\Framework\Acl\Builder | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $aclBuilder;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->cookieMetadataFactory = $this->createPartialMock(
+            \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory::class,
+            ['createPublicCookieMetadata']
+        );
+
+        $this->config = $this->createPartialMock(\Magento\Backend\App\Config::class, ['getValue']);
+        $this->cookieManager = $this->createPartialMock(
+            \Magento\Framework\Stdlib\Cookie\PhpCookieManager::class,
+            ['getCookie', 'setPublicCookie']
+        );
+        $this->storage = $this->createPartialMock(
+            \Magento\Framework\Session\Storage::class,
+            ['getUser', 'getAcl', 'setAcl']
+        );
+        $this->sessionConfig = $this->createPartialMock(
+            \Magento\Framework\Session\Config::class,
+            ['getCookiePath', 'getCookieDomain', 'getCookieSecure', 'getCookieHttpOnly']
+        );
+        $this->aclBuilder = $this->getMockBuilder(\Magento\Framework\Acl\Builder::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $objectManager = new ObjectManager($this);
+        $this->session = $objectManager->getObject(
+            \Magento\Backend\Model\Auth\Session::class,
+            [
+                'config' => $this->config,
+                'sessionConfig' => $this->sessionConfig,
+                'cookieManager' => $this->cookieManager,
+                'cookieMetadataFactory' => $this->cookieMetadataFactory,
+                'storage' => $this->storage,
+                'aclBuilder' => $this->aclBuilder
+            ]
+        );
+    }
+
+    protected function tearDown()
+    {
+        $this->config = null;
+        $this->sessionConfig = null;
+        $this->session = null;
+    }
+
+    /**
+     * @dataProvider refreshAclDataProvider
+     * @param $isUserPassedViaParams
+     */
+    public function testRefreshAcl($isUserPassedViaParams)
+    {
+        $aclMock = $this->getMockBuilder(\Magento\Framework\Acl::class)->disableOriginalConstructor()->getMock();
+        $this->aclBuilder->expects($this->any())->method('getAcl')->willReturn($aclMock);
+        $userMock = $this->getMockBuilder(\Magento\User\Model\User::class)
+            ->setMethods(['getReloadAclFlag', 'setReloadAclFlag', 'unsetData', 'save'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $userMock->expects($this->any())->method('getReloadAclFlag')->willReturn(true);
+        $userMock->expects($this->once())->method('setReloadAclFlag')->with('0')->willReturnSelf();
+        $userMock->expects($this->once())->method('save');
+        $this->storage->expects($this->once())->method('setAcl')->with($aclMock);
+        $this->storage->expects($this->any())->method('getAcl')->willReturn($aclMock);
+        if ($isUserPassedViaParams) {
+            $this->session->refreshAcl($userMock);
+        } else {
+            $this->storage->expects($this->once())->method('getUser')->willReturn($userMock);
+            $this->session->refreshAcl();
+        }
+        $this->assertSame($aclMock, $this->session->getAcl());
+    }
+
+    /**
+     * @return array
+     */
+    public function refreshAclDataProvider()
+    {
+        return [
+            'User set via params' => [true],
+            'User set to session object' => [false]
+        ];
+    }
+
+    public function testIsLoggedInPositive()
+    {
+        $user = $this->createPartialMock(\Magento\User\Model\User::class, ['getId', '__wakeup']);
+        $user->expects($this->once())
+            ->method('getId')
+            ->will($this->returnValue(1));
+
+        $this->storage->expects($this->any())
+            ->method('getUser')
+            ->will($this->returnValue($user));
+
+        $this->assertTrue($this->session->isLoggedIn());
+    }
+
+    public function testProlong()
+    {
+        $name = session_name();
+        $cookie = 'cookie';
+        $lifetime = 900;
+        $path = '/';
+        $domain = 'magento2';
+        $secure = true;
+        $httpOnly = true;
+
+        $this->config->expects($this->once())
+            ->method('getValue')
+            ->with(\Magento\Backend\Model\Auth\Session::XML_PATH_SESSION_LIFETIME)
+            ->willReturn($lifetime);
+        $cookieMetadata = $this->createMock(\Magento\Framework\Stdlib\Cookie\PublicCookieMetadata::class);
+        $cookieMetadata->expects($this->once())
+            ->method('setDuration')
+            ->with($lifetime)
+            ->will($this->returnSelf());
+        $cookieMetadata->expects($this->once())
+            ->method('setPath')
+            ->with($path)
+            ->will($this->returnSelf());
+        $cookieMetadata->expects($this->once())
+            ->method('setDomain')
+            ->with($domain)
+            ->will($this->returnSelf());
+        $cookieMetadata->expects($this->once())
+            ->method('setSecure')
+            ->with($secure)
+            ->will($this->returnSelf());
+        $cookieMetadata->expects($this->once())
+            ->method('setHttpOnly')
+            ->with($httpOnly)
+            ->will($this->returnSelf());
+
+        $this->cookieMetadataFactory->expects($this->once())
+            ->method('createPublicCookieMetadata')
+            ->will($this->returnValue($cookieMetadata));
+
+        $this->cookieManager->expects($this->once())
+            ->method('getCookie')
+            ->with($name)
+            ->will($this->returnValue($cookie));
+        $this->cookieManager->expects($this->once())
+            ->method('setPublicCookie')
+            ->with($name, $cookie, $cookieMetadata);
+
+        $this->sessionConfig->expects($this->once())
+            ->method('getCookiePath')
+            ->will($this->returnValue($path));
+        $this->sessionConfig->expects($this->once())
+            ->method('getCookieDomain')
+            ->will($this->returnValue($domain));
+        $this->sessionConfig->expects($this->once())
+            ->method('getCookieSecure')
+            ->will($this->returnValue($secure));
+        $this->sessionConfig->expects($this->once())
+            ->method('getCookieHttpOnly')
+            ->will($this->returnValue($httpOnly));
+
+        $this->session->prolong();
+
+        $this->assertLessThanOrEqual(time(), $this->session->getUpdatedAt());
+    }
+
+    /**
+     * @dataProvider isAllowedDataProvider
+     * @param bool $isUserDefined
+     * @param bool $isAclDefined
+     * @param bool $isAllowed
+     * @param true $expectedResult
+     */
+    public function testIsAllowed($isUserDefined, $isAclDefined, $isAllowed, $expectedResult)
+    {
+        $userAclRole = 'userAclRole';
+        if ($isAclDefined) {
+            $aclMock = $this->getMockBuilder(\Magento\Framework\Acl::class)->disableOriginalConstructor()->getMock();
+            $this->storage->expects($this->any())->method('getAcl')->willReturn($aclMock);
+        }
+        if ($isUserDefined) {
+            $userMock = $this->getMockBuilder(\Magento\User\Model\User::class)->disableOriginalConstructor()->getMock();
+            $this->storage->expects($this->once())->method('getUser')->willReturn($userMock);
+        }
+        if ($isAclDefined && $isUserDefined) {
+            $userMock->expects($this->any())->method('getAclRole')->willReturn($userAclRole);
+            $aclMock->expects($this->once())->method('isAllowed')->with($userAclRole)->willReturn($isAllowed);
+        }
+
+        $this->assertEquals($expectedResult, $this->session->isAllowed('resource'));
+    }
+
+    /**
+     * @return array
+     */
+    public function isAllowedDataProvider()
+    {
+        return [
+            "Negative: User not defined" => [false, true, true, false],
+            "Negative: Acl not defined" => [true, false, true, false],
+            "Negative: Permission denied" => [true, true, false, false],
+            "Positive: Permission granted" => [true, true, false, false],
+        ];
+    }
+
+    /**
+     * @dataProvider firstPageAfterLoginDataProvider
+     * @param bool $isFirstPageAfterLogin
+     */
+    public function testFirstPageAfterLogin($isFirstPageAfterLogin)
+    {
+        $this->session->setIsFirstPageAfterLogin($isFirstPageAfterLogin);
+        $this->assertEquals($isFirstPageAfterLogin, $this->session->isFirstPageAfterLogin());
+    }
+
+    /**
+     * @return array
+     */
+    public function firstPageAfterLoginDataProvider()
+    {
+        return [
+            'First page after login' => [true],
+            'Not first page after login' => [false],
+        ];
+    }
+}
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Authorization/RoleLocatorTest.php b/app/code/Magento/Backend/Test/Unit/Model/Authorization/RoleLocatorTest.php
new file mode 100644
index 0000000000000..8264c0868eb90
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Unit/Model/Authorization/RoleLocatorTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Backend\Test\Unit\Model\Authorization;
+
+class RoleLocatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Backend\Model\Authorization\RoleLocator
+     */
+    private $_model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $_sessionMock = [];
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->_sessionMock = $this->createPartialMock(
+            \Magento\Backend\Model\Auth\Session::class,
+            ['getUser', 'getAclRole', 'hasUser']
+        );
+        $this->_model = new \Magento\Backend\Model\Authorization\RoleLocator($this->_sessionMock);
+    }
+
+    public function testGetAclRoleIdReturnsCurrentUserAclRoleId()
+    {
+        $this->_sessionMock->expects($this->once())->method('hasUser')->will($this->returnValue(true));
+        $this->_sessionMock->expects($this->once())->method('getUser')->will($this->returnSelf());
+        $this->_sessionMock->expects($this->once())->method('getAclRole')->will($this->returnValue('some_role'));
+        $this->assertEquals('some_role', $this->_model->getAclRoleId());
+    }
+}
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php b/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php
new file mode 100644
index 0000000000000..f3d62b34c46e9
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Backend\Test\Unit\Model\Locale;
+
+use Magento\Framework\Locale\Resolver;
+
+class ManagerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Backend\Model\Locale\Manager
+     */
+    private $_model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\TranslateInterface
+     */
+    private $_translator;
+
+    /**
+     * @var \Magento\Backend\Model\Session
+     */
+    private $_session;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Auth\Session
+     */
+    private $_authSession;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\App\ConfigInterface
+     */
+    private $_backendConfig;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->_session = $this->createMock(\Magento\Backend\Model\Session::class);
+
+        $this->_authSession = $this->createPartialMock(\Magento\Backend\Model\Auth\Session::class, ['getUser']);
+
+        $this->_backendConfig = $this->getMockForAbstractClass(
+            \Magento\Backend\App\ConfigInterface::class,
+            [],
+            '',
+            false
+        );
+
+        $userMock = new \Magento\Framework\DataObject();
+
+        $this->_authSession->expects($this->any())->method('getUser')->will($this->returnValue($userMock));
+
+        $this->_translator = $this->getMockBuilder(\Magento\Framework\TranslateInterface::class)
+            ->setMethods(['init', 'setLocale'])
+            ->getMockForAbstractClass();
+
+        $this->_translator->expects($this->any())->method('setLocale')->will($this->returnValue($this->_translator));
+
+        $this->_translator->expects($this->any())->method('init')->will($this->returnValue(false));
+
+        $this->_model = new \Magento\Backend\Model\Locale\Manager(
+            $this->_session,
+            $this->_authSession,
+            $this->_translator,
+            $this->_backendConfig
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function switchBackendInterfaceLocaleDataProvider()
+    {
+        return ['case1' => ['locale' => 'de_DE'], 'case2' => ['locale' => 'en_US']];
+    }
+
+    /**
+     * @param string $locale
+     * @dataProvider switchBackendInterfaceLocaleDataProvider
+     * @covers \Magento\Backend\Model\Locale\Manager::switchBackendInterfaceLocale
+     */
+    public function testSwitchBackendInterfaceLocale($locale)
+    {
+        $this->_model->switchBackendInterfaceLocale($locale);
+
+        $userInterfaceLocale = $this->_authSession->getUser()->getInterfaceLocale();
+        $this->assertEquals($userInterfaceLocale, $locale);
+
+        $sessionLocale = $this->_session->getSessionLocale();
+        $this->assertEquals($sessionLocale, null);
+    }
+
+    /**
+     * @covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
+     */
+    public function testGetUserInterfaceLocaleDefault()
+    {
+        $locale = $this->_model->getUserInterfaceLocale();
+
+        $this->assertEquals($locale, Resolver::DEFAULT_LOCALE);
+    }
+
+    /**
+     * @covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
+     */
+    public function testGetUserInterfaceLocale()
+    {
+        $this->_model->switchBackendInterfaceLocale('de_DE');
+        $locale = $this->_model->getUserInterfaceLocale();
+
+        $this->assertEquals($locale, 'de_DE');
+    }
+
+    /**
+     * @covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
+     */
+    public function testGetUserInterfaceGeneralLocale()
+    {
+        $this->_backendConfig->expects($this->any())
+            ->method('getValue')
+            ->with('general/locale/code')
+            ->willReturn('test_locale');
+        $locale = $this->_model->getUserInterfaceLocale();
+        $this->assertEquals($locale, 'test_locale');
+    }
+}
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Menu/Config/_files/invalidMenuXmlArray.php b/app/code/Magento/Backend/Test/Unit/Model/Menu/Config/_files/invalidMenuXmlArray.php
index cd3128754444b..5a4c8e978b78b 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/Menu/Config/_files/invalidMenuXmlArray.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/Menu/Config/_files/invalidMenuXmlArray.php
@@ -10,7 +10,7 @@
         ' resource="Test_Value::value"/></menu></config>',
         [
             "Element 'add', attribute 'action': [facet 'pattern'] The value '' is not accepted by the " .
-            "pattern '[a-zA-Z0-9/_]{3,}'.\nLine: 1\n",
+            "pattern '[a-zA-Z0-9/_\-]{3,}'.\nLine: 1\n",
             "Element 'add', attribute 'action': '' is not a valid value of the atomic type 'typeAction'.\nLine: 1\n"
         ],
     ],
@@ -20,7 +20,7 @@
         'resource="Test_Value::value"/></menu></config>',
         [
             "Element 'add', attribute 'action': [facet 'pattern'] The value 'ad' is not accepted by the " .
-            "pattern '[a-zA-Z0-9/_]{3,}'.\nLine: 1\n",
+            "pattern '[a-zA-Z0-9/_\-]{3,}'.\nLine: 1\n",
             "Element 'add', attribute 'action': 'ad' is not a valid value of the atomic type 'typeAction'.\nLine: 1\n"
         ],
     ],
@@ -31,7 +31,7 @@
         '</menu></config>',
         [
             "Element 'add', attribute 'action': [facet 'pattern'] The value 'adm$#@inhtml/notification' is not " .
-            "accepted by the pattern '[a-zA-Z0-9/_]{3,}'.\nLine: 1\n",
+            "accepted by the pattern '[a-zA-Z0-9/_\-]{3,}'.\nLine: 1\n",
             "Element 'add', attribute 'action': 'adm$#@inhtml/notification' is not a valid value of the atomic " .
             "type 'typeAction'.\nLine: 1\n"
         ],
@@ -452,7 +452,7 @@
         '<?xml version="1.0"?><config><menu><update action="" ' . 'id="Test_Value::some_value"/></menu></config>',
         [
             "Element 'update', attribute 'action': [facet 'pattern'] The value '' is not accepted by the " .
-            "pattern '[a-zA-Z0-9/_]{3,}'.\nLine: 1\n",
+            "pattern '[a-zA-Z0-9/_\-]{3,}'.\nLine: 1\n",
             "Element 'update', attribute 'action': '' is not a valid value of the atomic type 'typeAction'.\nLine: 1\n"
         ],
     ],
@@ -462,7 +462,7 @@
         'resource="Test_Value::value"/></menu></config>',
         [
             "Element 'update', attribute 'action': [facet 'pattern'] The value 'v' is not accepted by the " .
-            "pattern '[a-zA-Z0-9/_]{3,}'.\nLine: 1\n",
+            "pattern '[a-zA-Z0-9/_\-]{3,}'.\nLine: 1\n",
             "Element 'update', attribute 'action': 'v' is not a valid value of the atomic type 'typeAction'.\nLine: 1\n"
         ],
     ],
@@ -471,7 +471,7 @@
         'id="Test_Value::some_value"/></menu></config>',
         [
             "Element 'update', attribute 'action': [facet 'pattern'] The value '/@##gt;' is not " .
-            "accepted by the pattern '[a-zA-Z0-9/_]{3,}'.\nLine: 1\n",
+            "accepted by the pattern '[a-zA-Z0-9/_\-]{3,}'.\nLine: 1\n",
             "Element 'update', attribute 'action': '/@##gt;' is not a valid value of the atomic" .
             " type 'typeAction'.\nLine: 1\n"
         ],
diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
index 5a7884a9607fe..4862e701404f7 100644
--- a/app/code/Magento/Backend/composer.json
+++ b/app/code/Magento/Backend/composer.json
@@ -22,7 +22,6 @@
       "magento/module-store": "*",
       "magento/module-translation": "*",
       "magento/module-ui": "*",
-      "magento/module-authorization": "*",
       "magento/module-user": "*"
     },
     "suggest": {
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index 9e4960c12b215..4a92ed8124bf8 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -482,22 +482,22 @@
                 <field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Base URL</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
-                    <comment>Specify URL or {{base_url}} placeholder.</comment>
+                    <comment><![CDATA[Specify URL or {{base_url}} placeholder.]]></comment>
                 </field>
                 <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>
+                    <comment><![CDATA[May start with {{unsecure_base_url}} placeholder.]]></comment>
                 </field>
                 <field id="base_static_url" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Base URL for Static View Files</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
-                    <comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
+                    <comment><![CDATA[May be empty or start with {{unsecure_base_url}} placeholder.]]></comment>
                 </field>
                 <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>
+                    <comment><![CDATA[May be empty or start with {{unsecure_base_url}} placeholder.]]></comment>
                 </field>
             </group>
             <group id="secure" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -506,22 +506,22 @@
                 <field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Secure Base URL</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
-                    <comment>Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.</comment>
+                    <comment><![CDATA[Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
                 </field>
                 <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>
+                    <comment><![CDATA[May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.]]></comment>
                 </field>
                 <field id="base_static_url" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Secure Base URL for Static View 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>
+                    <comment><![CDATA[May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
                 </field>
                 <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>
+                    <comment><![CDATA[May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
                 </field>
                 <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>
@@ -586,11 +586,6 @@
                     <label>Validate HTTP_USER_AGENT</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="use_frontend_sid" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
-                    <label>Use SID on Storefront</label>
-                    <comment>Allows customers to stay logged in when switching between different stores.</comment>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                </field>
             </group>
         </section>
     </system>
diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
index 41db85b9323a8..c526703da9975 100644
--- a/app/code/Magento/Backend/etc/di.xml
+++ b/app/code/Magento/Backend/etc/di.xml
@@ -198,8 +198,4 @@
             <argument name="anchorRenderer" xsi:type="object">Magento\Backend\Block\AnchorRenderer</argument>
         </arguments>
     </type>
-    <preference for="Magento\Backend\Spi\SessionUserHydratorInterface"
-                type="Magento\Backend\Model\Auth\SessionUserHydrator" />
-    <preference for="Magento\Backend\Spi\SessionAclHydratorInterface"
-                type="Magento\Backend\Model\Auth\SessionAclHydrator" />
 </config>
diff --git a/app/code/Magento/Backend/etc/menu.xsd b/app/code/Magento/Backend/etc/menu.xsd
index 2619b3f5fedac..4b408e8e86a17 100644
--- a/app/code/Magento/Backend/etc/menu.xsd
+++ b/app/code/Magento/Backend/etc/menu.xsd
@@ -100,7 +100,7 @@
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[a-zA-Z0-9/_]{3,}" />
+            <xs:pattern value="[a-zA-Z0-9/_\-]{3,}" />
         </xs:restriction>
     </xs:simpleType>
 
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 b712bc6c95315..7f6f2bbd13fa5 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -170,6 +170,9 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()) : 0;
         <?php if ($block->getSortableUpdateCallback()) : ?>
                 <?= $block->escapeJs($block->getJsObjectName()) ?>.sortableUpdateCallback = <?= /* @noEscape */ $block->getSortableUpdateCallback() ?>;
         <?php endif; ?>
+        <?php if ($block->getFilterKeyPressCallback()) : ?>
+            <?= $block->escapeJs($block->getJsObjectName()) ?>.filterKeyPressCallback = <?= /* @noEscape */ $block->getFilterKeyPressCallback() ?>;
+        <?php endif; ?>
         <?= $block->escapeJs($block->getJsObjectName()) ?>.bindSortable();
         <?php if ($block->getRowInitCallback()) : ?>
                 <?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;
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 0bb453f25d7ca..527ddc436207f 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
@@ -272,6 +272,9 @@ $numColumns = count($block->getColumns());
         <?php if ($block->getCheckboxCheckCallback()) : ?>
             <?= $block->escapeJs($block->getJsObjectName()) ?>.checkboxCheckCallback = <?= /* @noEscape */ $block->getCheckboxCheckCallback() ?>;
         <?php endif; ?>
+        <?php if ($block->getFilterKeyPressCallback()) : ?>
+            <?= $block->escapeJs($block->getJsObjectName()) ?>.filterKeyPressCallback = <?= /* @noEscape */ $block->getFilterKeyPressCallback() ?>;
+        <?php endif; ?>
         <?php if ($block->getRowInitCallback()) : ?>
             <?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;
             <?= $block->escapeJs($block->getJsObjectName()) ?>.initGridRows();
diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/translate.js b/app/code/Magento/Backend/view/adminhtml/web/js/translate.js
index a9c30bf577918..d6e1547600c4e 100644
--- a/app/code/Magento/Backend/view/adminhtml/web/js/translate.js
+++ b/app/code/Magento/Backend/view/adminhtml/web/js/translate.js
@@ -4,16 +4,10 @@
  */
 
 /* eslint-disable strict */
-(function (factory) {
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'mage/mage'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+define([
+    'jquery',
+    'mage/mage'
+], function ($) {
     $.extend(true, $, {
         mage: {
             translate: (function () {
@@ -51,4 +45,4 @@
     $.mage.__ = $.proxy($.mage.translate.translate, $.mage.translate);
 
     return $.mage.__;
-}));
+});
diff --git a/app/code/Magento/Backup/etc/adminhtml/system.xml b/app/code/Magento/Backup/etc/adminhtml/system.xml
index aa6635b4dde4a..78e0aae1dd4c2 100644
--- a/app/code/Magento/Backup/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backup/etc/adminhtml/system.xml
@@ -12,7 +12,7 @@
                 <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>
+                    <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">
diff --git a/app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php b/app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php
index 58ce33305da85..2f73dd8f380dc 100644
--- a/app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php
+++ b/app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php
@@ -11,6 +11,7 @@
 use Braintree\Error\Validation;
 use Braintree\Result\Error;
 use Braintree\Result\Successful;
+use Braintree\Transaction;
 
 /**
  * Processes errors codes from Braintree response.
@@ -38,12 +39,14 @@ public function getErrorCodes($response): array
             $result[] = $error->code;
         }
 
-        if (isset($response->transaction) && $response->transaction->status === 'gateway_rejected') {
-            $result[] = $response->transaction->gatewayRejectionReason;
-        }
+        if (isset($response->transaction) && $response->transaction) {
+            if ($response->transaction->status === Transaction::GATEWAY_REJECTED) {
+                $result[] = $response->transaction->gatewayRejectionReason;
+            }
 
-        if (isset($response->transaction) && $response->transaction->status === 'processor_declined') {
-            $result[] = $response->transaction->processorResponseCode;
+            if ($response->transaction->status === Transaction::PROCESSOR_DECLINED) {
+                $result[] = $response->transaction->processorResponseCode;
+            }
         }
 
         return $result;
diff --git a/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
index ab23037b4e98e..1ba696839a95d 100644
--- a/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
+++ b/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
@@ -67,11 +67,12 @@ public function __construct(
     public function getConfig()
     {
         $storeId = $this->session->getStoreId();
+        $isActive = $this->config->isActive($storeId);
         return [
             'payment' => [
                 self::CODE => [
-                    'isActive' => $this->config->isActive($storeId),
-                    'clientToken' => $this->getClientToken(),
+                    'isActive' => $isActive,
+                    'clientToken' => $isActive ? $this->getClientToken() : null,
                     'ccTypesMapper' => $this->config->getCcTypesMapper(),
                     'sdkUrl' => $this->config->getSdkUrl(),
                     'hostedFieldsSdkUrl' => $this->config->getHostedFieldsSdkUrl(),
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 55bc2cb195d6e..fb34113be15ae 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
@@ -76,7 +76,7 @@ protected function setUp()
     }
 
     /**
-     * Run test getConfig method
+     * Ensure that get config returns correct data if payment is active or not
      *
      * @param array $config
      * @param array $expected
@@ -84,22 +84,37 @@ protected function setUp()
      */
     public function testGetConfig($config, $expected)
     {
-        $this->braintreeAdapter->expects(static::once())
-            ->method('generate')
-            ->willReturn(self::CLIENT_TOKEN);
+        if ($config['isActive']) {
+            $this->braintreeAdapter->expects($this->once())
+                ->method('generate')
+                ->willReturn(self::CLIENT_TOKEN);
+        } else {
+            $config = array_replace_recursive(
+                $this->getConfigDataProvider()[0]['config'],
+                $config
+            );
+            $expected = array_replace_recursive(
+                $this->getConfigDataProvider()[0]['expected'],
+                $expected
+            );
+            $this->braintreeAdapter->expects($this->never())
+                ->method('generate');
+        }
 
         foreach ($config as $method => $value) {
-            $this->config->expects(static::once())
+            $this->config->expects($this->once())
                 ->method($method)
                 ->willReturn($value);
         }
 
-        static::assertEquals($expected, $this->configProvider->getConfig());
+        $this->assertEquals($expected, $this->configProvider->getConfig());
     }
 
     /**
-     * @covers \Magento\Braintree\Model\Ui\ConfigProvider::getClientToken
+     * @covers       \Magento\Braintree\Model\Ui\ConfigProvider::getClientToken
      * @dataProvider getClientTokenDataProvider
+     * @param $merchantAccountId
+     * @param $params
      */
     public function testGetClientToken($merchantAccountId, $params)
     {
@@ -124,7 +139,7 @@ public function getConfigDataProvider()
             [
                 'config' => [
                     'isActive' => true,
-                    'getCcTypesMapper' => ['visa' => 'VI', 'american-express'=> 'AE'],
+                    'getCcTypesMapper' => ['visa' => 'VI', 'american-express' => 'AE'],
                     'getSdkUrl' => self::SDK_URL,
                     'getHostedFieldsSdkUrl' => 'https://sdk.com/test.js',
                     'getCountrySpecificCardTypeConfig' => [
@@ -148,7 +163,7 @@ public function getConfigDataProvider()
                             'ccTypesMapper' => ['visa' => 'VI', 'american-express' => 'AE'],
                             'sdkUrl' => self::SDK_URL,
                             'hostedFieldsSdkUrl' => 'https://sdk.com/test.js',
-                            'countrySpecificCardTypes' =>[
+                            'countrySpecificCardTypes' => [
                                 'GB' => ['VI', 'AE'],
                                 'US' => ['DI', 'JCB']
                             ],
@@ -166,6 +181,19 @@ public function getConfigDataProvider()
                         ]
                     ]
                 ]
+            ],
+            [
+                'config' => [
+                    'isActive' => false,
+                ],
+                'expected' => [
+                    'payment' => [
+                        ConfigProvider::CODE => [
+                            'isActive' => false,
+                            'clientToken' => null,
+                        ]
+                    ]
+                ]
             ]
         ];
     }
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 ac97e4fa5eb58..5f06d26e2acfc 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
@@ -246,8 +246,10 @@ define(
                             return;
                         }
 
-                        self.setPaymentPayload(payload);
-                        self.placeOrder();
+                        if (self.validateCardType()) {
+                            self.setPaymentPayload(payload);
+                            self.placeOrder();
+                        }
                     });
                 }
             },
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 9bcb5dad8b636..8da8927a3b247 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
@@ -23,7 +23,7 @@
             <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
         </div>
-        <form id="co-transparent-form-braintree" class="form" data-bind="" method="post" action="#" novalidate="novalidate">
+        <form id="co-transparent-form-braintree" class="form" data-bind="afterRender: initHostedFields" method="post" action="#" novalidate="novalidate">
             <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'payment_form_' + getCode()}">
                 <legend class="legend">
                     <span><!-- ko i18n: 'Credit Card Information'--><!-- /ko --></span>
@@ -87,7 +87,7 @@
                         <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
                     </label>
                     <div class="control _with-tooltip">
-                        <div data-bind="afterRender: initHostedFields, attr: {id: getCode() + '_cc_cid'}" class="hosted-control hosted-cid"></div>
+                        <div data-bind="attr: {id: getCode() + '_cc_cid'}" class="hosted-control hosted-cid"></div>
                         <div class="hosted-error"><!-- ko i18n: 'Please, enter valid Card Verification Number'--><!-- /ko --></div>
 
                         <div class="field-tooltip toggle">
diff --git a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
index c0a2d9d43034d..863f273225693 100644
--- a/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php
@@ -32,7 +32,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param PriceCurrencyInterface $priceCurrency
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param InterpretationStrategyInterface $messageInterpretationStrategy
      * @param Configuration $bundleProductConfiguration
      * @param array $data
@@ -46,7 +46,7 @@ public function __construct(
         \Magento\Framework\Url\Helper\Data $urlHelper,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         PriceCurrencyInterface $priceCurrency,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         InterpretationStrategyInterface $messageInterpretationStrategy,
         Configuration $bundleProductConfiguration,
         array $data = []
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
index b71853cde41ac..077ebd4422aab 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
@@ -85,7 +85,7 @@ class Price implements DimensionalIndexerInterface
     private $eventManager;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     private $moduleManager;
 
@@ -97,7 +97,7 @@ class Price implements DimensionalIndexerInterface
      * @param BasePriceModifier $basePriceModifier
      * @param JoinAttributeProcessor $joinAttributeProcessor
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param bool $fullReindexAction
      * @param string $connectionName
      *
@@ -111,7 +111,7 @@ public function __construct(
         BasePriceModifier $basePriceModifier,
         JoinAttributeProcessor $joinAttributeProcessor,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         $fullReindexAction = false,
         $connectionName = 'indexer'
     ) {
@@ -139,16 +139,16 @@ public function executeByDimensions(array $dimensions, \Traversable $entityIds)
 
         $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',
+                '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',
             ]
         );
 
@@ -335,9 +335,9 @@ private function prepareBundlePriceByType($priceType, array $dimensions, $entity
             );
             $finalPrice = $connection->getLeastSql(
                 [
-                $price,
-                $connection->getIfNullSql($specialPriceExpr, $price),
-                $connection->getIfNullSql($tierPrice, $price),
+                    $price,
+                    $connection->getIfNullSql($specialPriceExpr, $price),
+                    $connection->getIfNullSql($tierPrice, $price),
                 ]
             );
         } else {
@@ -477,8 +477,8 @@ private function calculateBundleSelectionPrice($dimensions, $priceType)
 
             $priceExpr = $connection->getLeastSql(
                 [
-                $priceExpr,
-                $connection->getIfNullSql($tierExpr, $priceExpr),
+                    $priceExpr,
+                    $connection->getIfNullSql($tierExpr, $priceExpr),
                 ]
             );
         } else {
@@ -495,8 +495,8 @@ private function calculateBundleSelectionPrice($dimensions, $priceType)
             );
             $priceExpr = $connection->getLeastSql(
                 [
-                $specialExpr,
-                $connection->getIfNullSql($tierExpr, $price),
+                    $specialExpr,
+                    $connection->getIfNullSql($tierExpr, $price),
                 ]
             );
         }
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
index 21ba1f75ba90b..7b3f6dd8bbefa 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
@@ -61,7 +61,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @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
@@ -88,7 +88,7 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \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,
diff --git a/app/code/Magento/Bundle/Setup/Patch/Schema/ChangeTmpTablesEngine.php b/app/code/Magento/Bundle/Setup/Patch/Schema/ChangeTmpTablesEngine.php
deleted file mode 100644
index c6a67cc5a110c..0000000000000
--- a/app/code/Magento/Bundle/Setup/Patch/Schema/ChangeTmpTablesEngine.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Bundle\Setup\Patch\Schema;
-
-use Magento\Framework\Setup\Patch\SchemaPatchInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * Change engine for temporary tables to InnoDB.
- */
-class ChangeTmpTablesEngine implements SchemaPatchInterface
-{
-    /**
-     * @var SchemaSetupInterface
-     */
-    private $schemaSetup;
-
-    /**
-     * @param SchemaSetupInterface $schemaSetup
-     */
-    public function __construct(SchemaSetupInterface $schemaSetup)
-    {
-        $this->schemaSetup = $schemaSetup;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function apply()
-    {
-        $this->schemaSetup->startSetup();
-
-        $tables = [
-            'catalog_product_index_price_bundle_tmp',
-            'catalog_product_index_price_bundle_sel_tmp',
-            'catalog_product_index_price_bundle_opt_tmp',
-        ];
-        foreach ($tables as $table) {
-            $tableName = $this->schemaSetup->getTable($table);
-            if ($this->schemaSetup->getConnection()->isTableExists($tableName)) {
-                $this->schemaSetup->getConnection()->changeTableEngine($tableName, 'InnoDB');
-            }
-        }
-
-        $this->schemaSetup->endSetup();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public static function getDependencies()
-    {
-        return [];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getAliases()
-    {
-        return [];
-    }
-}
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
index 2a50c5141ad4e..33740c346155a 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
@@ -146,4 +146,17 @@
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '4')}}" userInput="2" stepKey="fillQuantity5" after="fillQuantity4"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '5')}}" userInput="2" stepKey="fillQuantity6" after="fillQuantity5"/>
     </actionGroup>
+
+    <actionGroup name="deleteBundleOptionByIndex">
+        <annotations>
+            <description>Requires Navigation to Product Creation page. Removes any Bundle Option by index specified in arguments. 'deleteIndex' refers to Bundle option number.</description>
+        </annotations>
+        <arguments>
+            <argument name="deleteIndex" type="string"/>
+        </arguments>
+
+        <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
+        <scrollTo selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" stepKey="scrollUpABit"/>
+        <click selector="{{AdminProductFormBundleSection.deleteOption(deleteIndex)}}" stepKey="clickDeleteOption"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
index 6e7e4a7a16573..e5f557dd22ded 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
@@ -61,6 +61,20 @@
         <requiredEntity type="custom_attribute">CustomAttributeDynamicPrice</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributePriceView</requiredEntity>
     </entity>
+    <entity name="ApiBundleProductUnderscoredSku" 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>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
index bd13f4daa0dbd..967cf5ac49ed5 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
@@ -46,6 +46,10 @@
         <element name="currentBundleOption" type="text" selector="//div[@data-index='bundle-items']//div[contains(@class, 'admin__collapsible-title')]/span"/>
         <!--AddingAnOption-->
         <element name="addOptions" type="button" selector="//tr[@data-repeat-index='0']//td[4]" timeout="30"/>
+        <!--DragAnOption -->
+        <element name="dragOption" type="block" selector="//tr[{{dragIndex}}]//div[contains(@class, 'draggable-handle')]" timeout="30" parameterized="true"/>
+        <!--DeleteAnOption -->
+        <element name="deleteOption" type="button" selector="//tr[{{deleteIndex}}]//button[@data-index='delete_button']" timeout="30" parameterized="true"/>
         <!--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')]"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductSettingsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductSettingsTest.xml
index f7a64f943f307..42584a31651d7 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductSettingsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductSettingsTest.xml
@@ -32,6 +32,11 @@
             <!-- Delete the simple product -->
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
 
+            <!-- Delete a Website -->
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="Second Website"/>
+            </actionGroup>
+
             <!-- Log out -->
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
@@ -135,10 +140,116 @@
         <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
+    </test>
+    <test name="AdminCreateAndEditBundleProductOptionsNegativeTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Modify bundle product in Admin"/>
+            <title value="Admin should be able to remove any bundle option a bundle product"/>
+            <description value="Admin should be able to set/edit other product information when creating/editing a bundle product"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-224"/>
+            <skip>
+                <issueId value="https://github.com/magento/magento2/issues/25468"/>
+            </skip>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <!-- Create a Website -->
+            <createData entity="customWebsite" stepKey="createWebsite"/>
+
+            <!-- Create first simple product for a bundle option -->
+            <createData entity="SimpleProduct2" stepKey="createFirstSimpleProduct"/>
 
-        <!-- Delete created Website -->
-        <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-            <argument name="websiteName" value="$createWebsite.website[name]$"/>
+            <!-- Create second simple product for a bundle option -->
+            <createData entity="SimpleProduct2" stepKey="createSecondSimpleProduct"/>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Delete the simple product -->
+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
+
+            <!-- Delete the simple product -->
+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
+
+            <!-- Delete a Website -->
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="Second Website"/>
+            </actionGroup>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create new bundle product -->
+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="createBundleProduct">
+            <argument name="productType" value="bundle"/>
+        </actionGroup>
+
+        <!-- Fill all main fields -->
+        <actionGroup ref="fillMainBundleProductForm" stepKey="fillMainProductFields"/>
+
+        <!-- Add first bundle option to the product -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addFirstBundleOption">
+            <argument name="x" value="0"/>
+            <argument name="n" value="1"/>
+            <argument name="prodOneSku" value="$$createFirstSimpleProduct.sku$$"/>
+            <argument name="prodTwoSku" value="$$createSecondSimpleProduct.sku$$"/>
+            <argument name="optionTitle" value="{{RadioButtonsOption.title}}"/>
+            <argument name="inputType" value="{{RadioButtonsOption.type}}"/>
+        </actionGroup>
+
+        <!-- Add second bundle option to the product -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addSecondBundleOption">
+            <argument name="x" value="1"/>
+            <argument name="n" value="2"/>
+            <argument name="prodOneSku" value="$$createFirstSimpleProduct.sku$$"/>
+            <argument name="prodTwoSku" value="$$createSecondSimpleProduct.sku$$"/>
+            <argument name="optionTitle" value="{{CheckboxOption.title}}"/>
+            <argument name="inputType" value="{{CheckboxOption.type}}"/>
+        </actionGroup>
+
+        <!-- Add third bundle option to the product -->
+        <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addThirdBundleOption">
+            <argument name="x" value="2"/>
+            <argument name="n" value="3"/>
+            <argument name="prodOneSku" value="$$createFirstSimpleProduct.sku$$"/>
+            <argument name="prodTwoSku" value="$$createSecondSimpleProduct.sku$$"/>
+            <argument name="optionTitle" value="{{RadioButtonsOption.title}}"/>
+            <argument name="inputType" value="{{RadioButtonsOption.type}}"/>
+        </actionGroup>
+
+        <!-- Set product in created Website -->
+        <actionGroup ref="AdminAssignProductInWebsiteActionGroup" stepKey="selectProductInWebsites">
+            <argument name="website" value="$createWebsite.website[name]$"/>
+        </actionGroup>
+
+        <!-- Save product form -->
+        <actionGroup ref="saveProductForm" stepKey="saveWithThreeOptions"/>
+
+        <!-- Open created product -->
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Remove second option -->
+        <actionGroup ref="deleteBundleOptionByIndex" stepKey="deleteSecondOption">
+            <argument name="deleteIndex" value="1"/>
+        </actionGroup>
+
+        <!-- Save product form -->
+        <actionGroup ref="saveProductForm" stepKey="clickSaveProduct"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveWithTwoOptions"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!-- Delete created bundle product -->
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+            <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
index 52bce67600888..c6aab0ea54ea2 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
@@ -17,6 +17,47 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-139"/>
             <group value="Bundle"/>
+            <group value="SearchEngineElasticsearch"/>
+        </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>
+        <see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
+        <see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
+        <see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
+    </test>
+    <test name="AdvanceCatalogSearchBundleByNameMysqlTest" 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 using the MySQL search engine"/>
+            <description value="Guest customer should be able to advance search Bundle product with product name using the MySQL search engine"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-20472"/>
+            <group value="Bundle"/>
+            <group value="SearchEngineMysql"/>
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
@@ -56,7 +97,7 @@
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
             <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
-            <createData entity="ApiBundleProduct" stepKey="product"/>
+            <createData entity="ApiBundleProductUnderscoredSku" stepKey="product"/>
             <createData entity="DropDownBundleOption" stepKey="bundleOption">
                 <requiredEntity createDataKey="product"/>
             </createData>
@@ -87,6 +128,47 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-242"/>
             <group value="Bundle"/>
+            <group value="SearchEngineElasticsearch"/>
+        </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>
+        <see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
+        <see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
+        <see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
+    </test>
+    <test name="AdvanceCatalogSearchBundleByDescriptionMysqlTest" 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 using the MySQL search engine"/>
+            <description value="Guest customer should be able to advance search Bundle product with product description using the MySQL search engine"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-20473"/>
+            <group value="Bundle"/>
+            <group value="SearchEngineMysql"/>
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
@@ -122,6 +204,47 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-250"/>
             <group value="Bundle"/>
+            <group value="SearchEngineElasticsearch"/>
+        </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>
+        <see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
+        <see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
+        <see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
+    </test>
+    <test name="AdvanceCatalogSearchBundleByShortDescriptionMysqlTest" 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 using the MySQL search engine"/>
+            <description value="Guest customer should be able to advance search Bundle product with product short description using the MySQL search engine"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-20474"/>
+            <group value="Bundle"/>
+            <group value="SearchEngineMysql"/>
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
@@ -157,6 +280,56 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-251"/>
             <group value="Bundle"/>
+            <group value="SearchEngineElasticsearch"/>
+        </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>
+        <see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
+        <see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
+        <see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
+    </test>
+    <test name="AdvanceCatalogSearchBundleByPriceMysqlTest" 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 using the MySQL search engine"/>
+            <description value="Guest customer should be able to advance search Bundle product with product price the MySQL search engine"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-20475"/>
+            <group value="Bundle"/>
+            <group value="SearchEngineMysql"/>
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml
new file mode 100644
index 0000000000000..d8d6034cd1a21
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.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="StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest" 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 that contains hyphen"/>
+            <description value="Guest customer should be able to advance search Bundle product with product sku that contains hyphen"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-20359"/>
+            <group value="Bundle"/>
+            <group value="SearchEngineMysql"/>
+        </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>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml
index 9ad4b6828d6e4..88db5b64fa42d 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml
@@ -76,6 +76,10 @@
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
 
+        <!-- Perform reindex and flush cache -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <!--Go to category page-->
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
         <waitForPageLoad stepKey="waitForHomePageToload"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml
index d27cd0df88239..9ea0480e540ba 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml
@@ -39,7 +39,7 @@
                 <requiredEntity createDataKey="fixedBundleOption"/>
                 <requiredEntity createDataKey="createSimpleProductTwo"/>
             </createData>
-            <magentoCLI command="indexer:reindex" arguments="cataloginventory_stock catalogsearch_fulltext" stepKey="reindex"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         </before>
         <after>
             <deleteData createDataKey="createDynamicBundle" stepKey="deleteDynamicBundleProduct"/>
diff --git a/app/code/Magento/Bundle/etc/db_schema.xml b/app/code/Magento/Bundle/etc/db_schema.xml
index 8eafa23cbd0f3..dba9732439065 100644
--- a/app/code/Magento/Bundle/etc/db_schema.xml
+++ b/app/code/Magento/Bundle/etc/db_schema.xml
@@ -203,7 +203,7 @@
             <column name="website_id"/>
         </constraint>
     </table>
-    <table name="catalog_product_index_price_bundle_tmp" resource="default" engine="memory"
+    <table name="catalog_product_index_price_bundle_tmp" resource="default" engine="innodb"
            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"/>
@@ -265,7 +265,7 @@
             <column name="selection_id"/>
         </constraint>
     </table>
-    <table name="catalog_product_index_price_bundle_sel_tmp" resource="default" engine="memory"
+    <table name="catalog_product_index_price_bundle_sel_tmp" resource="default" engine="innodb"
            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"/>
@@ -320,7 +320,7 @@
             <column name="option_id"/>
         </constraint>
     </table>
-    <table name="catalog_product_index_price_bundle_opt_tmp" resource="default" engine="memory"
+    <table name="catalog_product_index_price_bundle_opt_tmp" resource="default" engine="innodb"
            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"/>
diff --git a/app/code/Magento/Bundle/etc/di.xml b/app/code/Magento/Bundle/etc/di.xml
index d0e956efee694..6c1a5ab2e7257 100644
--- a/app/code/Magento/Bundle/etc/di.xml
+++ b/app/code/Magento/Bundle/etc/di.xml
@@ -221,4 +221,17 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Eav\Model\Config">
+        <arguments>
+            <argument name="attributesForPreload" xsi:type="array">
+                <item name="catalog_product" xsi:type="array">
+                    <item name="price_type" xsi:type="string">catalog_product</item>
+                    <item name="price_view" xsi:type="string">catalog_product</item>
+                    <item name="shipment_type" xsi:type="string">catalog_product</item>
+                    <item name="sku_type" xsi:type="string">catalog_product</item>
+                    <item name="weight_type" xsi:type="string">catalog_product</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
index 08e89699b1f71..236f15d6b376c 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
@@ -10,7 +10,7 @@
 <?php $_selections = $_option->getSelections(); ?>
 <?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
 
-<div class="field admin__field options<?php if ($_option->getRequired()) { echo ' required _required'; } ?>">
+<div class="field admin__field options<?php if ($_option->getRequired()) { echo ' _required'; } ?>">
     <label class="label admin__field-label">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
index f4c4e3e51ae09..28b94b21b7889 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
@@ -9,7 +9,7 @@
 <?php $_option = $block->getOption(); ?>
 <?php $_selections = $_option->getSelections(); ?>
 <?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
-<div class="field admin__field <?php if ($_option->getRequired()) { echo ' required'; } ?><?php if ($_option->getDecoratedIsLast()) :?> last<?php endif; ?>">
+<div class="field admin__field <?php if ($_option->getRequired()) { echo ' _required'; } ?><?php if ($_option->getDecoratedIsLast()) :?> last<?php endif; ?>">
     <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
         <?php if (count($_selections) == 1 && $_option->getRequired()) : ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
index 0c3835fb32af8..185a9159c8ab3 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
@@ -12,7 +12,7 @@
 <?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
 
-<div class="field admin__field options<?php if ($_option->getRequired()) { echo ' required'; } ?>">
+<div class="field admin__field options<?php if ($_option->getRequired()) { echo ' _required'; } ?>">
     <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
         <div class="nested<?php if ($_option->getDecoratedIsLast()) :?> last<?php endif; ?>">
@@ -39,7 +39,7 @@
             <?php foreach ($_selections as $_selection) : ?>
                 <div class="field choice admin__field admin__field-option">
                     <input type="radio"
-                           class="radio admin__control-radio <?= $_option->getRequired() ? ' validate-one-required-by-name' : '' ?> change-container-classname"
+                           class="radio admin__control-radio <?= $_option->getRequired() ? ' required-entry' : '' ?> change-container-classname"
                            id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-<?= $block->escapeHtmlAttr($_selection->getSelectionId()) ?>"
                            name="bundle_option[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
                            <?php if ($block->isSelected($_selection)) { echo ' checked="checked"'; } ?>
@@ -66,7 +66,7 @@
                 </label>
                 <div class="control admin__field-control"><input <?php if (!$_canChangeQty) { echo ' disabled="disabled"'; } ?>
                         id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input"
-                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
+                        class="input-text admin__control-text qty validate-greater-than-zero<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
                         type="text"
                         name="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
                         value="<?= $block->escapeHtmlAttr($_defaultQty) ?>" />
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
index fbb7f7fbb7b38..047e25a65af2b 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
@@ -12,7 +12,7 @@
 <?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
 
-<div class="field admin__field option<?php if ($_option->getDecoratedIsLast()) :?> last<?php endif; ?><?php if ($_option->getRequired()) { echo ' required _required'; } ?>">
+<div class="field admin__field option<?php if ($_option->getDecoratedIsLast()) :?> last<?php endif; ?><?php if ($_option->getRequired()) { echo ' _required'; } ?>">
     <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
         <?php if ($block->showSingle()) : ?>
@@ -49,7 +49,7 @@
                 <div class="control admin__field-control">
                     <input <?php if (!$_canChangeQty) { echo ' disabled="disabled"'; } ?>
                         id="bundle-option-<?= $block->escapeHtmlAttr($_option->getId()) ?>-qty-input"
-                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
+                        class="input-text admin__control-text qty validate-greater-than-zero<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
                         type="text"
                         name="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
                         value="<?= $block->escapeHtmlAttr($_defaultQty) ?>" />
diff --git a/app/code/Magento/BundleGraphQl/Model/Cart/BundleOptionDataProvider.php b/app/code/Magento/BundleGraphQl/Model/Cart/BundleOptionDataProvider.php
new file mode 100644
index 0000000000000..5cdfdc88e7dc1
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Cart/BundleOptionDataProvider.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Cart;
+
+use Magento\Bundle\Helper\Catalog\Product\Configuration;
+use Magento\Catalog\Model\Product;
+use Magento\Quote\Model\Quote\Item;
+use Magento\Framework\Pricing\Helper\Data;
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Data provider for bundled product options
+ */
+class BundleOptionDataProvider
+{
+    /**
+     * @var Data
+     */
+    private $pricingHelper;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var Configuration
+     */
+    private $configuration;
+
+    /**
+     * @param Data $pricingHelper
+     * @param SerializerInterface $serializer
+     * @param Configuration $configuration
+     */
+    public function __construct(
+        Data $pricingHelper,
+        SerializerInterface $serializer,
+        Configuration $configuration
+    ) {
+        $this->pricingHelper = $pricingHelper;
+        $this->serializer = $serializer;
+        $this->configuration = $configuration;
+    }
+
+    /**
+     * Extract data for a bundled cart item
+     *
+     * @param Item $item
+     * @return array
+     */
+    public function getData(Item $item): array
+    {
+        $options = [];
+        $product = $item->getProduct();
+
+        /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
+        $typeInstance = $product->getTypeInstance();
+
+        $optionsQuoteItemOption = $item->getOptionByCode('bundle_option_ids');
+        $bundleOptionsIds = $optionsQuoteItemOption
+            ? $this->serializer->unserialize($optionsQuoteItemOption->getValue())
+            : [];
+
+        if ($bundleOptionsIds) {
+            /** @var \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection */
+            $optionsCollection = $typeInstance->getOptionsByIds($bundleOptionsIds, $product);
+
+            $selectionsQuoteItemOption = $item->getOptionByCode('bundle_selection_ids');
+
+            $bundleSelectionIds = $this->serializer->unserialize($selectionsQuoteItemOption->getValue());
+
+            if (!empty($bundleSelectionIds)) {
+                $selectionsCollection = $typeInstance->getSelectionsByIds($bundleSelectionIds, $product);
+                $bundleOptions = $optionsCollection->appendSelections($selectionsCollection, true);
+
+                $options = $this->buildBundleOptions($bundleOptions, $item);
+            }
+        }
+
+        return $options;
+    }
+
+    /**
+     * Build bundle product options based on current selection
+     *
+     * @param \Magento\Bundle\Model\Option[] $bundleOptions
+     * @param Item $item
+     * @return array
+     */
+    private function buildBundleOptions(array $bundleOptions, Item $item): array
+    {
+        $options = [];
+        foreach ($bundleOptions as $bundleOption) {
+            if (!$bundleOption->getSelections()) {
+                continue;
+            }
+
+            $options[] = [
+                'id' => $bundleOption->getId(),
+                'label' => $bundleOption->getTitle(),
+                'type' => $bundleOption->getType(),
+                'values' => $this->buildBundleOptionValues($bundleOption->getSelections(), $item),
+            ];
+        }
+
+        return $options;
+    }
+
+    /**
+     * Build bundle product option values based on current selection
+     *
+     * @param Product[] $selections
+     * @param Item $item
+     * @return array
+     */
+    private function buildBundleOptionValues(array $selections, Item $item): array
+    {
+        $values = [];
+
+        $product = $item->getProduct();
+        foreach ($selections as $selection) {
+            $qty = (float) $this->configuration->getSelectionQty($product, $selection->getSelectionId());
+            if (!$qty) {
+                continue;
+            }
+
+            $selectionPrice = $this->configuration->getSelectionFinalPrice($item, $selection);
+
+            $values[] = [
+                'id' => $selection->getSelectionId(),
+                'label' => $selection->getName(),
+                'quantity' => $qty,
+                'price' => $this->pricingHelper->currency($selectionPrice, false, false),
+            ];
+        }
+
+        return $values;
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/Model/Cart/BuyRequest/BundleDataProvider.php b/app/code/Magento/BundleGraphQl/Model/Cart/BuyRequest/BundleDataProvider.php
new file mode 100644
index 0000000000000..37a9309092166
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Cart/BuyRequest/BundleDataProvider.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Cart\BuyRequest;
+
+use Magento\Framework\Stdlib\ArrayManager;
+use Magento\QuoteGraphQl\Model\Cart\BuyRequest\BuyRequestDataProviderInterface;
+
+/**
+ * Data provider for bundle product buy requests
+ */
+class BundleDataProvider implements BuyRequestDataProviderInterface
+{
+    /**
+     * @var ArrayManager
+     */
+    private $arrayManager;
+
+    /**
+     * @param ArrayManager $arrayManager
+     */
+    public function __construct(
+        ArrayManager $arrayManager
+    ) {
+        $this->arrayManager = $arrayManager;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(array $cartItemData): array
+    {
+        $bundleOptions = [];
+        $bundleInputs = $this->arrayManager->get('bundle_options', $cartItemData) ?? [];
+        foreach ($bundleInputs as $bundleInput) {
+            $bundleOptions['bundle_option'][$bundleInput['id']] = $bundleInput['value'];
+            $bundleOptions['bundle_option_qty'][$bundleInput['id']] = $bundleInput['quantity'];
+        }
+
+        return $bundleOptions;
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/BundleOption.php b/app/code/Magento/BundleGraphQl/Model/Resolver/BundleOption.php
new file mode 100644
index 0000000000000..6b64310fcb1e3
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/BundleOption.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver;
+
+use Magento\BundleGraphQl\Model\Cart\BundleOptionDataProvider;
+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;
+
+/**
+ * Resolver for bundle product options
+ */
+class BundleOption implements ResolverInterface
+{
+    /**
+     * @var BundleOptionDataProvider
+     */
+    private $dataProvider;
+
+    /**
+     * @param BundleOptionDataProvider $bundleOptionDataProvider
+     */
+    public function __construct(
+        BundleOptionDataProvider $bundleOptionDataProvider
+    ) {
+        $this->dataProvider = $bundleOptionDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model'])) {
+            throw new GraphQlInputException(__('Value must contain "model" property.'));
+        }
+        return $this->dataProvider->getData($value['model']);
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/composer.json b/app/code/Magento/BundleGraphQl/composer.json
index db85c2149ec18..74149f500df8e 100644
--- a/app/code/Magento/BundleGraphQl/composer.json
+++ b/app/code/Magento/BundleGraphQl/composer.json
@@ -7,6 +7,8 @@
         "magento/module-catalog": "*",
         "magento/module-bundle": "*",
         "magento/module-catalog-graph-ql": "*",
+        "magento/module-quote": "*",
+        "magento/module-quote-graph-ql": "*",
         "magento/module-store": "*",
         "magento/framework": "*"
     },
diff --git a/app/code/Magento/BundleGraphQl/etc/di.xml b/app/code/Magento/BundleGraphQl/etc/di.xml
index 4f41f3cb8dc80..15acad7c6bf06 100644
--- a/app/code/Magento/BundleGraphQl/etc/di.xml
+++ b/app/code/Magento/BundleGraphQl/etc/di.xml
@@ -16,4 +16,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\QuoteGraphQl\Model\Resolver\CartItemTypeResolver">
+        <arguments>
+            <argument name="supportedTypes" xsi:type="array">
+                <item name="bundle" xsi:type="string">BundleCartItem</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
index 98dbe012c9002..b847a6672e046 100644
--- a/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
@@ -13,6 +13,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\QuoteGraphQl\Model\Cart\BuyRequest\BuyRequestBuilder">
+        <arguments>
+            <argument name="providers" xsi:type="array">
+                <item name="bundle" xsi:type="object">Magento\BundleGraphQl\Model\Cart\BuyRequest\BundleDataProvider</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\GraphQl\Schema\Type\Enum\DefaultDataMapper">
         <arguments>
             <argument name="map" xsi:type="array">
diff --git a/app/code/Magento/BundleGraphQl/etc/module.xml b/app/code/Magento/BundleGraphQl/etc/module.xml
index 352a46d7c171e..8d6725054867e 100644
--- a/app/code/Magento/BundleGraphQl/etc/module.xml
+++ b/app/code/Magento/BundleGraphQl/etc/module.xml
@@ -8,6 +8,7 @@
 <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_QuoteGraphQl"/>
             <module name="Magento_Catalog"/>
             <module name="Magento_BundleProduct"/>
             <module name="Magento_Store"/>
diff --git a/app/code/Magento/BundleGraphQl/etc/schema.graphqls b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
index 74e21d3feaba2..0eff0e086180e 100644
--- a/app/code/Magento/BundleGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
@@ -1,6 +1,50 @@
 # Copyright © Magento, Inc. All rights reserved.
 # See COPYING.txt for license details.
 
+type Mutation {
+    addBundleProductsToCart(input: AddBundleProductsToCartInput): AddBundleProductsToCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddSimpleProductsToCart")
+}
+
+input AddBundleProductsToCartInput {
+    cart_id: String!
+    cart_items: [BundleProductCartItemInput!]!
+}
+
+input BundleProductCartItemInput {
+    data: CartItemInput!
+    bundle_options:[BundleOptionInput!]!
+    customizable_options:[CustomizableOptionInput!]
+}
+
+input BundleOptionInput {
+    id: Int!
+    quantity: Float!
+    value: [String!]!
+}
+
+type AddBundleProductsToCartOutput {
+    cart: Cart!
+}
+
+type BundleCartItem implements CartItemInterface {
+    customizable_options: [SelectedCustomizableOption]! @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
+    bundle_options: [SelectedBundleOption!]! @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\BundleOption")
+}
+
+type SelectedBundleOption {
+    id: Int!
+    label: String!
+    type: String!
+    values: [SelectedBundleOptionValue!]!
+}
+
+type SelectedBundleOptionValue {
+    id: Int!
+    label: String!
+    quantity: Float!
+    price: Float!
+}
+
 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.")
diff --git a/app/code/Magento/Captcha/Test/Unit/CustomerData/CaptchaTest.php b/app/code/Magento/Captcha/Test/Unit/CustomerData/CaptchaTest.php
new file mode 100644
index 0000000000000..a791039fe27f9
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Unit/CustomerData/CaptchaTest.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Captcha\Test\Unit\CustomerData;
+
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Captcha\CustomerData\Captcha;
+use Magento\Captcha\Model\DefaultModel;
+use Magento\Customer\Api\Data\CustomerInterface as CustomerData;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\TestCase;
+
+class CaptchaTest extends TestCase
+{
+    /**
+     * @var CaptchaHelper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $helperMock;
+
+    /**
+     * @var CustomerSession|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerSessionMock;
+
+    /**
+     * @var Captcha
+     */
+    private $model;
+
+    /**
+     * @var array
+     */
+    private $formIds;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManagerHelper;
+
+    /**
+     * Create mocks and model
+     */
+    protected function setUp()
+    {
+        $this->helperMock = $this->createMock(CaptchaHelper::class);
+        $this->customerSessionMock = $this->createMock(CustomerSession::class);
+        $this->formIds = [
+            'user_login'
+        ];
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            Captcha::class,
+            [
+                'helper' => $this->helperMock,
+                'formIds' => $this->formIds,
+                'customerSession' => $this->customerSessionMock
+            ]
+        );
+    }
+
+    /**
+     * Test getSectionData() when user is login and require captcha
+     */
+    public function testGetSectionDataWhenLoginAndRequireCaptcha()
+    {
+        $emailLogin = 'test@localhost.com';
+
+        $userLoginModel = $this->createMock(DefaultModel::class);
+        $userLoginModel->expects($this->any())->method('isRequired')->with($emailLogin)
+            ->willReturn(true);
+        $this->helperMock->expects($this->any())->method('getCaptcha')->with('user_login')->willReturn($userLoginModel);
+
+        $this->customerSessionMock->expects($this->any())->method('isLoggedIn')
+            ->willReturn(true);
+
+        $customerDataMock = $this->createMock(CustomerData::class);
+        $customerDataMock->expects($this->any())->method('getEmail')->willReturn($emailLogin);
+        $this->customerSessionMock->expects($this->any())->method('getCustomerData')
+            ->willReturn($customerDataMock);
+
+        /* Assert to test */
+        $this->assertEquals(
+            [
+                "user_login" => [
+                    "isRequired" => true,
+                    "timestamp" => time()
+                ]
+            ],
+            $this->model->getSectionData()
+        );
+    }
+}
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Config/FontTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Config/FontTest.php
new file mode 100644
index 0000000000000..42ab3146f1321
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Unit/Model/Config/FontTest.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Captcha\Test\Unit\Model\Config;
+
+use PHPUnit\Framework\TestCase;
+use Magento\Captcha\Helper\Data as HelperData;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Captcha\Model\Config\Font;
+
+class FontTest extends TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Font
+     */
+    private $model;
+
+    /**
+     * @var HelperData|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $helperDataMock;
+
+    /**
+     * Setup Environment For Testing
+     */
+    protected function setUp()
+    {
+        $this->helperDataMock = $this->createMock(HelperData::class);
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->model = $this->objectManagerHelper->getObject(
+            Font::class,
+            [
+                'captchaData' => $this->helperDataMock
+            ]
+        );
+    }
+
+    /**
+     * Test toOptionArray() with data provider below
+     *
+     * @param array $fonts
+     * @param array $expectedResult
+     * @dataProvider toOptionArrayDataProvider
+     */
+    public function testToOptionArray($fonts, $expectedResult)
+    {
+        $this->helperDataMock->expects($this->any())->method('getFonts')
+            ->willReturn($fonts);
+
+        $this->assertEquals($expectedResult, $this->model->toOptionArray());
+    }
+
+    /**
+     * Data Provider for testing toOptionArray()
+     *
+     * @return array
+     */
+    public function toOptionArrayDataProvider()
+    {
+        return [
+            'Empty get font' => [
+                [],
+                []
+            ],
+            'Get font result' => [
+                [
+                    'arial' => [
+                        'label' => 'Arial',
+                        'path' => '/www/magento/fonts/arial.ttf'
+                    ],
+                    'verdana' => [
+                        'label' => 'Verdana',
+                        'path' => '/www/magento/fonts/verdana.ttf'
+                    ]
+                ],
+                [
+                    [
+                        'label' => 'Arial',
+                        'value' => 'arial'
+                    ],
+                    [
+                        'label' => 'Verdana',
+                        'value' => 'verdana'
+                    ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Config/Form/BackendTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Config/Form/BackendTest.php
new file mode 100644
index 0000000000000..054cc71af61bc
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Unit/Model/Config/Form/BackendTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Captcha\Test\Unit\Model\Config\Form;
+
+use Magento\Captcha\Model\Config\Form\Backend;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class BackendTest extends TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Backend
+     */
+    private $model;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * Setup Environment For Testing
+     */
+    protected function setUp()
+    {
+        $this->configMock = $this->createMock(ScopeConfigInterface::class);
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->model = $this->objectManagerHelper->getObject(
+            Backend::class,
+            [
+                'config' => $this->configMock
+            ]
+        );
+    }
+
+    /**
+     * Test toOptionArray() with data provider below
+     *
+     * @param string|array $config
+     * @param array $expectedResult
+     * @dataProvider toOptionArrayDataProvider
+     */
+    public function testToOptionArray($config, $expectedResult)
+    {
+        $this->configMock->expects($this->any())->method('getValue')
+            ->with('captcha/backend/areas', 'default')
+            ->willReturn($config);
+
+        $this->assertEquals($expectedResult, $this->model->toOptionArray());
+    }
+
+    /**
+     * Data Provider for testing toOptionArray()
+     *
+     * @return array
+     */
+    public function toOptionArrayDataProvider()
+    {
+        return [
+            'Empty captcha backend areas' => [
+                '',
+                []
+            ],
+            'With two captcha backend area' => [
+                [
+                    'backend_login' => [
+                        'label' => 'Admin Login'
+                    ],
+                    'backend_forgotpassword' => [
+                        'label' => 'Admin Forgot Password'
+                    ]
+                ],
+                [
+                    [
+                        'label' => 'Admin Login',
+                        'value' => 'backend_login'
+                    ],
+                    [
+                        'label' => 'Admin Forgot Password',
+                        'value' => 'backend_forgotpassword'
+                    ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Config/Form/FrontendTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Config/Form/FrontendTest.php
new file mode 100644
index 0000000000000..d3f40f5872a7d
--- /dev/null
+++ b/app/code/Magento/Captcha/Test/Unit/Model/Config/Form/FrontendTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Captcha\Test\Unit\Model\Config\Form;
+
+use Magento\Captcha\Model\Config\Form\Frontend;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class FrontendTest extends TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Frontend
+     */
+    private $model;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * Setup Environment For Testing
+     */
+    protected function setUp()
+    {
+        $this->configMock = $this->createMock(ScopeConfigInterface::class);
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->model = $this->objectManagerHelper->getObject(
+            Frontend::class,
+            [
+                'config' => $this->configMock
+            ]
+        );
+    }
+
+    /**
+     * Test toOptionArray() with data provider below
+     *
+     * @param string|array $config
+     * @param array $expectedResult
+     * @dataProvider toOptionArrayDataProvider
+     */
+    public function testToOptionArray($config, $expectedResult)
+    {
+        $this->configMock->expects($this->any())->method('getValue')
+            ->with('captcha/frontend/areas', 'default')
+            ->willReturn($config);
+
+        $this->assertEquals($expectedResult, $this->model->toOptionArray());
+    }
+
+    /**
+     * Data Provider for testing toOptionArray()
+     *
+     * @return array
+     */
+    public function toOptionArrayDataProvider()
+    {
+        return [
+            'Empty captcha frontend areas' => [
+                '',
+                []
+            ],
+            'With two captcha frontend area' => [
+                [
+                    'product_sendtofriend_form' => [
+                        'label' => 'Send To Friend Form'
+                    ],
+                    'sales_rule_coupon_request' => [
+                        'label' => 'Applying coupon code'
+                    ]
+                ],
+                [
+                    [
+                        'label' => 'Send To Friend Form',
+                        'value' => 'product_sendtofriend_form'
+                    ],
+                    [
+                        'label' => 'Applying coupon code',
+                        'value' => 'sales_rule_coupon_request'
+                    ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/CardinalCommerce/Test/Mftf/Page/AdminThreeDSecurePage.xml b/app/code/Magento/CardinalCommerce/Test/Mftf/Page/AdminThreeDSecurePage.xml
new file mode 100644
index 0000000000000..dae6869dbfe79
--- /dev/null
+++ b/app/code/Magento/CardinalCommerce/Test/Mftf/Page/AdminThreeDSecurePage.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="AdminThreeDSecurePage" url="admin/system_config/edit/section/three_d_secure/" area="admin" module="Magento_CardinalCommerce">
+        <section name="AdminCardinalCommerceSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/CardinalCommerce/Test/Mftf/Section/AdminCardinalCommerceSection.xml b/app/code/Magento/CardinalCommerce/Test/Mftf/Section/AdminCardinalCommerceSection.xml
new file mode 100644
index 0000000000000..1016fbaefb0ab
--- /dev/null
+++ b/app/code/Magento/CardinalCommerce/Test/Mftf/Section/AdminCardinalCommerceSection.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="AdminCardinalCommerceSection">
+        <element name="head" type="button" selector="#three_d_secure_cardinal_config-link"/>
+        <element name="enabled" type="input" selector="#three_d_secure_cardinal_config_enabled_authorize"/>
+        <element name="environment" type="input" selector="#three_d_secure_cardinal_config_environment"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/CardinalCommerce/Test/Mftf/Test/AdminCardinalCommerceSettingsHiddenTest.xml b/app/code/Magento/CardinalCommerce/Test/Mftf/Test/AdminCardinalCommerceSettingsHiddenTest.xml
new file mode 100644
index 0000000000000..a41b96f0db6e4
--- /dev/null
+++ b/app/code/Magento/CardinalCommerce/Test/Mftf/Test/AdminCardinalCommerceSettingsHiddenTest.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="AdminCardinalCommerceSettingsHiddenTest">
+        <annotations>
+            <features value="CardinalCommerce"/>
+            <title value="CardinalCommerce settings hidden" />
+            <description value="CardinalCommerce config shouldn't be visible if the 3D secure is disabled for Authorize.Net."/>
+            <severity value="MINOR"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <magentoCLI command="config:set three_d_secure/cardinal/enabled_authorizenet 1" stepKey="enableCardinalCommerce"/>
+        </before>
+
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <magentoCLI command="config:set three_d_secure/cardinal/enabled_authorizenet 0" stepKey="disableCardinalCommerce"/>
+        </after>
+
+        <amOnPage url="{{AdminThreeDSecurePage.url}}" stepKey="openCurrencyOptionsPage" />
+        <conditionalClick dependentSelector="{{AdminCardinalCommerceSection.enabled}}" visible="false" selector="{{AdminCardinalCommerceSection.head}}" stepKey="openCollapsibleBlock"/>
+        <see selector="{{AdminCardinalCommerceSection.environment}}" userInput="Production" stepKey="seeEnvironmentProduction"/>
+        <selectOption selector="{{AdminCardinalCommerceSection.enabled}}" userInput="0" stepKey="disableCardinalCommerceOption"/>
+        <dontSeeElement selector="{{AdminCardinalCommerceSection.environment}}" stepKey="dontSeeEnvironmentProduction"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CardinalCommerce/Test/Unit/Model/Response/JwtParserTest.php b/app/code/Magento/CardinalCommerce/Test/Unit/Model/Response/JwtParserTest.php
new file mode 100644
index 0000000000000..7c17c4e2e87d5
--- /dev/null
+++ b/app/code/Magento/CardinalCommerce/Test/Unit/Model/Response/JwtParserTest.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CardinalCommerce\Test\Unit\Model\Response;
+
+use Magento\CardinalCommerce\Model\Response\JwtParser;
+use Magento\CardinalCommerce\Model\Config;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\CardinalCommerce\Model\JwtManagement;
+use Magento\CardinalCommerce\Model\Response\JwtPayloadValidatorInterface;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Class \Magento\CardinalCommerce\Test\Unit\Model\Response\JwtParserTest
+ */
+class JwtParserTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var JwtParser
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject | Config
+     */
+    private $configMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject | JwtManagement
+     */
+    private $jwtManagementMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject | JwtPayloadValidatorInterface
+     */
+    private $jwtPayloadValidatorMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->configMock = $this->getMockBuilder(Config::class)
+            ->setMethods(['getApiKey', 'isDebugModeEnabled'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->jwtManagementMock = $this->getMockBuilder(JwtManagement::class)
+            ->setMethods(['decode'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->jwtPayloadValidatorMock = $this->getMockBuilder(JwtPayloadValidatorInterface::class)
+            ->setMethods(['validate'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = $this->objectManager->getObject(
+            JwtParser::class,
+            [
+                'jwtManagement' => $this->jwtManagementMock,
+                'config' => $this->configMock,
+                'tokenValidator' => $this->jwtPayloadValidatorMock
+            ]
+        );
+
+        $this->configMock->expects($this->any())
+            ->method('getApiKey')
+            ->willReturn('API Key');
+
+        $this->configMock->expects($this->any())
+            ->method('isDebugModeEnabled')
+            ->willReturn(false);
+
+        $this->jwtManagementMock->expects($this->any())
+            ->method('decode')
+            ->with('string_to_test', 'API Key')
+            ->willReturn(['mockResult' => 'jwtPayload']);
+    }
+
+    /**
+     * Tests Jwt Parser execute with the result and no exception.
+     */
+    public function testExecuteWithNoException()
+    {
+        /* Validate Success */
+        $this->jwtPayloadValidatorMock->expects($this->any())
+            ->method('validate')
+            ->with(['mockResult' => 'jwtPayload'])
+            ->willReturn(true);
+
+        /* Assert the result of function */
+        $jwtPayload = $this->model->execute('string_to_test');
+        $this->assertEquals(
+            ['mockResult' => 'jwtPayload'],
+            $jwtPayload
+        );
+    }
+
+    /**
+     * Tests Jwt Parser execute with exception and no result.
+     */
+    public function testExecuteWithException()
+    {
+        /* Validate Fail */
+        $this->jwtPayloadValidatorMock->expects($this->any())
+            ->method('validate')
+            ->with(['mockResult' => 'jwtPayload'])
+            ->willReturn(false);
+
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage(
+            'Authentication Failed. Your card issuer cannot authenticate this card. ' .
+            'Please select another card or form of payment to complete your purchase.'
+        );
+
+        /* Execute function */
+        $this->model->execute('string_to_test');
+    }
+}
diff --git a/app/code/Magento/CardinalCommerce/etc/adminhtml/system.xml b/app/code/Magento/CardinalCommerce/etc/adminhtml/system.xml
index 532fcdd0f598f..046475baba676 100644
--- a/app/code/Magento/CardinalCommerce/etc/adminhtml/system.xml
+++ b/app/code/Magento/CardinalCommerce/etc/adminhtml/system.xml
@@ -19,26 +19,41 @@
                         <label>Environment</label>
                         <source_model>Magento\CardinalCommerce\Model\Adminhtml\Source\Environment</source_model>
                         <config_path>three_d_secure/cardinal/environment</config_path>
+                        <depends>
+                            <field id="enabled_authorize">1</field>
+                        </depends>
                     </field>
                     <field id="org_unit_id" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Org Unit Id</label>
                         <config_path>three_d_secure/cardinal/org_unit_id</config_path>
                         <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                        <depends>
+                            <field id="enabled_authorize">1</field>
+                        </depends>
                     </field>
                     <field id="api_key" translate="label" type="obscure" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>API Key</label>
                         <config_path>three_d_secure/cardinal/api_key</config_path>
                         <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                        <depends>
+                            <field id="enabled_authorize">1</field>
+                        </depends>
                     </field>
                     <field id="api_identifier" translate="label" type="obscure" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>API Identifier</label>
                         <config_path>three_d_secure/cardinal/api_identifier</config_path>
                         <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                        <depends>
+                            <field id="enabled_authorize">1</field>
+                        </depends>
                     </field>
                     <field id="debug" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
                         <label>Debug</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <config_path>three_d_secure/cardinal/debug</config_path>
+                        <depends>
+                            <field id="enabled_authorize">1</field>
+                        </depends>
                     </field>
                 </group>
             </group>
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index 9a4a9fa768006..929c181bf820c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -407,6 +407,7 @@ protected function _getNodeJson($node, $level = 0)
     public function buildNodeName($node)
     {
         $result = $this->escapeHtml($node->getName());
+        $result .= ' (ID: ' . $node->getId() . ')';
         if ($this->_withProductCount) {
             $result .= ' (' . $node->getProductCount() . ')';
         }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
index a829c058d89bf..c58ed58370e3a 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
@@ -26,7 +26,7 @@ class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
     /**
      * Catalog data
      *
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $_moduleManager = null;
 
@@ -46,7 +46,7 @@ class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig
      * @param \Magento\Framework\View\LayoutInterface $layout
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Backend\Helper\Data $backendData
      * @param array $data
      */
@@ -56,7 +56,7 @@ public function __construct(
         \Magento\Framework\Escaper $escaper,
         \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig,
         \Magento\Framework\View\LayoutInterface $layout,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Backend\Helper\Data $backendData,
         array $data = []
     ) {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
index 1b6756968662f..89239a2e3e608 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -7,16 +7,20 @@
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
 use Magento\Backend\Block\Widget\Form\Generic;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Config\Model\Config\Source\Yesno;
 use Magento\Eav\Block\Adminhtml\Attribute\PropertyLocker;
 use Magento\Eav\Helper\Data;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Stdlib\DateTime;
 
 /**
- * Product attribute add/edit form main tab
+ * Product attribute add/edit advanced form tab
  *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Advanced extends Generic
 {
@@ -70,7 +74,7 @@ public function __construct(
      * Adding product form elements for editing attribute
      *
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @SuppressWarnings(PHPMD)
      */
     protected function _prepareForm()
@@ -139,7 +143,21 @@ protected function _prepareForm()
                 'label' => __('Default Value'),
                 'title' => __('Default Value'),
                 'value' => $attributeObject->getDefaultValue(),
-                'date_format' => $dateFormat
+                'date_format' => $dateFormat,
+            ]
+        );
+
+        $timeFormat = $this->_localeDate->getTimeFormat(\IntlDateFormatter::SHORT);
+        $fieldset->addField(
+            'default_value_datetime',
+            'date',
+            [
+                'name' => 'default_value_datetime',
+                'label' => __('Default Value'),
+                'title' => __('Default Value'),
+                'value' => $this->getLocalizedDateDefaultValue(),
+                'date_format' => $dateFormat,
+                'time_format' => $timeFormat,
             ]
         );
 
@@ -266,7 +284,7 @@ protected function _initFormValues()
     /**
      * Retrieve attribute object from registry
      *
-     * @return mixed
+     * @return Attribute
      */
     private function getAttributeObject()
     {
@@ -285,4 +303,28 @@ private function getPropertyLocker()
         }
         return $this->propertyLocker;
     }
+
+    /**
+     * Get localized date default value
+     *
+     * @return string
+     * @throws LocalizedException
+     */
+    private function getLocalizedDateDefaultValue(): string
+    {
+        $attributeObject = $this->getAttributeObject();
+        if (empty($attributeObject->getDefaultValue()) || $attributeObject->getFrontendInput() !== 'datetime') {
+            return (string)$attributeObject->getDefaultValue();
+        }
+
+        try {
+            $localizedDate = $this->_localeDate->date($attributeObject->getDefaultValue(), null, false);
+            $localizedDate->setTimezone(new \DateTimeZone($this->_localeDate->getConfigTimezone()));
+            $localizedDate = $localizedDate->format(DateTime::DATETIME_PHP_FORMAT);
+        } catch (\Exception $e) {
+            throw new LocalizedException(__('The default date is invalid.'));
+        }
+
+        return $localizedDate;
+    }
 }
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 85cf37a1214b5..955ea259ec9a8 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
@@ -7,60 +7,60 @@
 /**
  * Product attribute add/edit form main tab
  *
- * @author     Magento Core Team <core@magentocommerce.com>
+ * @author Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
+use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Apply as HelperApply;
 use Magento\Eav\Block\Adminhtml\Attribute\Edit\Main\AbstractMain;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Fieldset;
+use Magento\Framework\DataObject;
 
 /**
+ * Product attribute add/edit form main tab
+ *
  * @api
- * @SuppressWarnings(PHPMD.DepthOfInheritance)
  * @since 100.0.2
  */
 class Main extends AbstractMain
 {
     /**
-     * Adding product form elements for editing attribute
-     *
-     * @return $this
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * @inheritdoc
      */
     protected function _prepareForm()
     {
         parent::_prepareForm();
-        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attributeObject */
-        $attributeObject = $this->getAttributeObject();
-        /* @var $form \Magento\Framework\Data\Form */
-        $form = $this->getForm();
-        /* @var $fieldset \Magento\Framework\Data\Form\Element\Fieldset */
-        $fieldset = $form->getElement('base_fieldset');
-        $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') {
-                $fieldsToRemove[] = $element->getId();
-            }
-        }
-        foreach ($fieldsToRemove as $id) {
-            $fieldset->removeField($id);
-        }
+        $this->removeUnusedFields();
+        $this->processFrontendInputTypes();
+
+        $this->_eventManager->dispatch('product_attribute_form_build_main_tab', ['form' => $this->getForm()]);
+
+        return $this;
+    }
 
+    /**
+     * @inheritdoc
+     */
+    protected function _getAdditionalElementTypes()
+    {
+        return ['apply' => HelperApply::class];
+    }
+
+    /**
+     * Process frontend input types for product attributes
+     *
+     * @return void
+     */
+    private function processFrontendInputTypes(): void
+    {
+        $form = $this->getForm();
+        /** @var AbstractElement $frontendInputElm */
         $frontendInputElm = $form->getElement('frontend_input');
-        $additionalTypes = [
-            ['value' => 'price', 'label' => __('Price')],
-            ['value' => 'media_image', 'label' => __('Media Image')],
-        ];
-        $additionalReadOnlyTypes = ['gallery' => __('Gallery')];
-        if (isset($additionalReadOnlyTypes[$attributeObject->getFrontendInput()])) {
-            $additionalTypes[] = [
-                'value' => $attributeObject->getFrontendInput(),
-                'label' => $additionalReadOnlyTypes[$attributeObject->getFrontendInput()],
-            ];
-        }
+        $additionalTypes = $this->getAdditionalFrontendInputTypes();
 
-        $response = new \Magento\Framework\DataObject();
+        $response = new DataObject();
         $response->setTypes([]);
         $this->_eventManager->dispatch('adminhtml_product_attribute_types', ['response' => $response]);
         $_hiddenFields = [];
@@ -74,19 +74,51 @@ protected function _prepareForm()
 
         $frontendInputValues = array_merge($frontendInputElm->getValues(), $additionalTypes);
         $frontendInputElm->setValues($frontendInputValues);
+    }
 
-        $this->_eventManager->dispatch('product_attribute_form_build_main_tab', ['form' => $form]);
+    /**
+     * Get additional Frontend Input Types for product attributes
+     *
+     * @return array
+     */
+    private function getAdditionalFrontendInputTypes(): array
+    {
+        $additionalTypes = [
+            ['value' => 'price', 'label' => __('Price')],
+            ['value' => 'media_image', 'label' => __('Media Image')],
+        ];
 
-        return $this;
+        $additionalReadOnlyTypes = ['gallery' => __('Gallery')];
+        $attributeObject = $this->getAttributeObject();
+        if (isset($additionalReadOnlyTypes[$attributeObject->getFrontendInput()])) {
+            $additionalTypes[] = [
+                'value' => $attributeObject->getFrontendInput(),
+                'label' => $additionalReadOnlyTypes[$attributeObject->getFrontendInput()],
+            ];
+        }
+
+        return $additionalTypes;
     }
 
     /**
-     * Retrieve additional element types for product attributes
+     * Remove unused form fields
      *
-     * @return array
+     * @return void
      */
-    protected function _getAdditionalElementTypes()
+    private function removeUnusedFields(): void
     {
-        return ['apply' => \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Apply::class];
+        $form = $this->getForm();
+        /* @var $fieldset Fieldset */
+        $fieldset = $form->getElement('base_fieldset');
+        $fieldsToRemove = ['attribute_code', 'is_unique', 'frontend_class'];
+        foreach ($fieldset->getElements() as $element) {
+            /** @var AbstractElement $element */
+            if (substr($element->getId(), 0, strlen('default_value')) === 'default_value') {
+                $fieldsToRemove[] = $element->getId();
+            }
+        }
+        foreach ($fieldsToRemove as $id) {
+            $fieldset->removeField($id);
+        }
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
index e754ab9700517..386fe1333a7e9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
@@ -19,7 +19,7 @@ class Price extends Extended
     /**
      * Catalog data
      *
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
@@ -32,14 +32,14 @@ class Price extends Extended
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\ProductAlert\Model\PriceFactory $priceFactory
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Helper\Data $backendHelper,
         \Magento\ProductAlert\Model\PriceFactory $priceFactory,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         array $data = []
     ) {
         $this->_priceFactory = $priceFactory;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
index 2c6647fd57be6..ede478cabe783 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
@@ -19,7 +19,7 @@ class Stock extends Extended
     /**
      * Catalog data
      *
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
@@ -32,14 +32,14 @@ class Stock extends Extended
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\ProductAlert\Model\StockFactory $stockFactory
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Helper\Data $backendHelper,
         \Magento\ProductAlert\Model\StockFactory $stockFactory,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         array $data = []
     ) {
         $this->_stockFactory = $stockFactory;
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 9278b84362e77..782147e1e8ef6 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
@@ -18,7 +18,7 @@ class Inventory extends \Magento\Backend\Block\Widget
     protected $_template = 'Magento_Catalog::catalog/product/tab/inventory.phtml';
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
@@ -53,7 +53,7 @@ class Inventory extends \Magento\Backend\Block\Widget
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\CatalogInventory\Model\Source\Backorders $backorders
      * @param \Magento\CatalogInventory\Model\Source\Stock $stock
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
@@ -63,7 +63,7 @@ public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\CatalogInventory\Model\Source\Backorders $backorders,
         \Magento\CatalogInventory\Model\Source\Stock $stock,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
         \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
index 42990116e933f..5ffd3d1dda38d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
@@ -41,7 +41,7 @@ abstract class AbstractGroup extends Widget implements RendererInterface
     /**
      * Catalog data
      *
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
@@ -81,7 +81,7 @@ abstract class AbstractGroup extends Widget implements RendererInterface
      * @param \Magento\Backend\Block\Template\Context $context
      * @param GroupRepositoryInterface $groupRepository
      * @param \Magento\Directory\Helper\Data $directoryHelper
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Framework\Registry $registry
      * @param GroupManagementInterface $groupManagement
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
@@ -92,7 +92,7 @@ public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         GroupRepositoryInterface $groupRepository,
         \Magento\Directory\Helper\Data $directoryHelper,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Framework\Registry $registry,
         GroupManagementInterface $groupManagement,
         \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
index 51c326763b09c..37ad3f4bea20e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
@@ -14,7 +14,7 @@
 use Magento\Catalog\Helper\Data;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
 use Magento\Framework\Json\EncoderInterface;
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\Framework\Registry;
 use Magento\Framework\Translate\InlineInterface;
 
@@ -65,7 +65,7 @@ class Tabs extends WidgetTabs
     protected $_collectionFactory;
 
     /**
-     * @var ModuleManagerInterface
+     * @var Manager
      */
     protected $_moduleManager;
 
@@ -78,7 +78,7 @@ class Tabs extends WidgetTabs
      * @param Context $context
      * @param EncoderInterface $jsonEncoder
      * @param Session $authSession
-     * @param ModuleManagerInterface $moduleManager
+     * @param Manager $moduleManager
      * @param CollectionFactory $collectionFactory
      * @param Catalog $helperCatalog
      * @param Data $catalogData
@@ -91,7 +91,7 @@ public function __construct(
         Context $context,
         EncoderInterface $jsonEncoder,
         Session $authSession,
-        ModuleManagerInterface $moduleManager,
+        Manager $moduleManager,
         CollectionFactory $collectionFactory,
         Catalog $helperCatalog,
         Data $catalogData,
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
index 7e43f2fc064ad..01408ade56432 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
@@ -16,7 +16,7 @@
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
@@ -59,7 +59,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Catalog\Model\Product\Type $type
      * @param \Magento\Catalog\Model\Product\Attribute\Source\Status $status
      * @param \Magento\Catalog\Model\Product\Visibility $visibility
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -73,7 +73,7 @@ public function __construct(
         \Magento\Catalog\Model\Product\Type $type,
         \Magento\Catalog\Model\Product\Attribute\Source\Status $status,
         \Magento\Catalog\Model\Product\Visibility $visibility,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         array $data = []
     ) {
         $this->_websiteFactory = $websiteFactory;
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
index 088619511545f..24811d61a7715 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
@@ -46,7 +46,7 @@ class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements
     protected $_checkoutCart;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
@@ -55,7 +55,7 @@ class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements
      * @param \Magento\Checkout\Model\ResourceModel\Cart $checkoutCart
      * @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
      */
     public function __construct(
@@ -63,7 +63,7 @@ public function __construct(
         \Magento\Checkout\Model\ResourceModel\Cart $checkoutCart,
         \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
         \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         array $data = []
     ) {
         $this->_checkoutCart = $checkoutCart;
@@ -141,6 +141,7 @@ public function getIdentities()
     {
         $identities = [];
         foreach ($this->getItems() as $item) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $identities = array_merge($identities, $item->getIdentities());
         }
         return $identities;
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
index d888f44a6fbfb..fa1beaf6e0ea8 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
@@ -60,7 +60,7 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
     protected $_checkoutCart;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
@@ -69,7 +69,7 @@ class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements
      * @param \Magento\Checkout\Model\ResourceModel\Cart $checkoutCart
      * @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param array $data
      */
     public function __construct(
@@ -77,7 +77,7 @@ public function __construct(
         \Magento\Checkout\Model\ResourceModel\Cart $checkoutCart,
         \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
         \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         array $data = []
     ) {
         $this->_checkoutCart = $checkoutCart;
@@ -264,6 +264,7 @@ public function getIdentities()
     {
         $identities = [];
         foreach ($this->getItems() as $item) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $identities = array_merge($identities, $item->getIdentities());
         }
         return $identities;
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
index 1e0cb9f197a51..de8c402c7e761 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
@@ -7,10 +7,13 @@
 
 namespace Magento\Catalog\Controller\Adminhtml;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\Store;
+use Magento\Framework\Controller\ResultFactory;
 
 /**
  * Catalog category controller
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class Category extends \Magento\Backend\App\Action
 {
@@ -26,20 +29,61 @@ abstract class Category extends \Magento\Backend\App\Action
      */
     protected $dateFilter;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var \Magento\Framework\Registry
+     */
+    private $registry;
+
+    /**
+     * @var \Magento\Cms\Model\Wysiwyg\Config
+     */
+    private $wysiwigConfig;
+
+    /**
+     * @var \Magento\Backend\Model\Auth\Session
+     */
+    private $authSession;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date|null $dateFilter
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Cms\Model\Wysiwyg\Config $wysiwigConfig
+     * @param \Magento\Backend\Model\Auth\Session $authSession
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter = null
+        \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter = null,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null,
+        \Magento\Framework\Registry $registry = null,
+        \Magento\Cms\Model\Wysiwyg\Config $wysiwigConfig = null,
+        \Magento\Backend\Model\Auth\Session $authSession = null
     ) {
         $this->dateFilter = $dateFilter;
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(
+            \Magento\Store\Model\StoreManagerInterface::class
+        );
+        $this->registry = $registry ?: ObjectManager::getInstance()->get(
+            \Magento\Framework\Registry::class
+        );
+        $this->wysiwigConfig = $wysiwigConfig ?: ObjectManager::getInstance()->get(
+            \Magento\Cms\Model\Wysiwyg\Config::class
+        );
+        $this->authSession = $authSession ?: ObjectManager::getInstance()->get(
+            \Magento\Backend\Model\Auth\Session::class
+        );
         parent::__construct($context);
     }
 
     /**
      * Initialize requested category and put it into registry.
+     *
      * Root category can be returned, if inappropriate store/category is specified
      *
      * @param bool $getRootInstead
@@ -55,11 +99,7 @@ protected function _initCategory($getRootInstead = false)
         if ($categoryId) {
             $category->load($categoryId);
             if ($storeId) {
-                $rootId = $this->_objectManager->get(
-                    \Magento\Store\Model\StoreManagerInterface::class
-                )->getStore(
-                    $storeId
-                )->getRootCategoryId();
+                $rootId = $this->storeManager->getStore($storeId)->getRootCategoryId();
                 if (!in_array($rootId, $category->getPathIds())) {
                     // load root category instead wrong one
                     if ($getRootInstead) {
@@ -71,10 +111,11 @@ 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($storeId);
+        $this->registry->unregister('category');
+        $this->registry->unregister('current_category');
+        $this->registry->register('category', $category);
+        $this->registry->register('current_category', $category);
+        $this->wysiwigConfig->setStoreId($storeId);
         return $category;
     }
 
@@ -91,9 +132,8 @@ private function resolveCategoryId() : int
     }
 
     /**
-     * Resolve store id
+     * Resolve store Id, tries to take store id from store HTTP parameter
      *
-     * Tries to take store id from store HTTP parameter
      * @see Store
      *
      * @return int
@@ -121,11 +161,7 @@ protected function ajaxRequestResponse($category, $resultPage)
         $breadcrumbsPath = $category->getPath();
         if (empty($breadcrumbsPath)) {
             // but if no category, and it is deleted - prepare breadcrumbs from path, saved in session
-            $breadcrumbsPath = $this->_objectManager->get(
-                \Magento\Backend\Model\Auth\Session::class
-            )->getDeletedPath(
-                true
-            );
+            $breadcrumbsPath = $this->authSession->getDeletedPath(true);
             if (!empty($breadcrumbsPath)) {
                 $breadcrumbsPath = explode('/', $breadcrumbsPath);
                 // no need to get parent breadcrumbs if deleting category level 1
@@ -138,19 +174,21 @@ protected function ajaxRequestResponse($category, $resultPage)
             }
         }
 
-        $eventResponse = new \Magento\Framework\DataObject([
-            'content' => $resultPage->getLayout()->getUiComponent('category_form')->getFormHtml()
-                . $resultPage->getLayout()->getBlock('category.tree')
-                    ->getBreadcrumbsJavascript($breadcrumbsPath, 'editingCategoryBreadcrumbs'),
-            'messages' => $resultPage->getLayout()->getMessagesBlock()->getGroupedHtml(),
-            'toolbar' => $resultPage->getLayout()->getBlock('page.actions.toolbar')->toHtml()
-        ]);
+        $eventResponse = new \Magento\Framework\DataObject(
+            [
+                'content' => $resultPage->getLayout()->getUiComponent('category_form')->getFormHtml()
+                    . $resultPage->getLayout()->getBlock('category.tree')
+                        ->getBreadcrumbsJavascript($breadcrumbsPath, 'editingCategoryBreadcrumbs'),
+                'messages' => $resultPage->getLayout()->getMessagesBlock()->getGroupedHtml(),
+                'toolbar' => $resultPage->getLayout()->getBlock('page.actions.toolbar')->toHtml()
+            ]
+        );
         $this->_eventManager->dispatch(
             'category_prepare_ajax_response',
             ['response' => $eventResponse, 'controller' => $this]
         );
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-        $resultJson = $this->_objectManager->get(\Magento\Framework\Controller\Result\Json::class);
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
         $resultJson->setHeader('Content-type', 'application/json', true);
         $resultJson->setData($eventResponse->getData());
         return $resultJson;
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
index 752257f5b9009..9c3aeba6dc914 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/CategoriesJson.php
@@ -1,13 +1,16 @@
 <?php
 /**
- *
  * 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\Framework\App\ObjectManager;
 
+/**
+ * Class CategoriesJson
+ */
 class CategoriesJson extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface
 {
     /**
@@ -20,19 +23,28 @@ class CategoriesJson extends \Magento\Catalog\Controller\Adminhtml\Category impl
      */
     protected $layoutFactory;
 
+    /**
+     * @var \Magento\Backend\Model\Auth\Session
+     */
+    private $authSession;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
+     * @param \Magento\Backend\Model\Auth\Session $authSession
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-        \Magento\Framework\View\LayoutFactory $layoutFactory
+        \Magento\Framework\View\LayoutFactory $layoutFactory,
+        \Magento\Backend\Model\Auth\Session $authSession = null
     ) {
         parent::__construct($context);
         $this->resultJsonFactory = $resultJsonFactory;
         $this->layoutFactory = $layoutFactory;
+        $this->authSession = $authSession ?: ObjectManager::getInstance()
+            ->get(\Magento\Backend\Model\Auth\Session::class);
     }
 
     /**
@@ -43,9 +55,9 @@ public function __construct(
     public function execute()
     {
         if ($this->getRequest()->getParam('expand_all')) {
-            $this->_objectManager->get(\Magento\Backend\Model\Auth\Session::class)->setIsTreeWasExpanded(true);
+            $this->authSession->setIsTreeWasExpanded(true);
         } else {
-            $this->_objectManager->get(\Magento\Backend\Model\Auth\Session::class)->setIsTreeWasExpanded(false);
+            $this->authSession->setIsTreeWasExpanded(false);
         }
         $categoryId = (int)$this->getRequest()->getPost('id');
         if ($categoryId) {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
index 0450ff1607a09..57b5d74e1eaf5 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
@@ -1,13 +1,16 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category;
 
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\ObjectManager;
 
+/**
+ * Class Edit
+ */
 class Edit extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
 {
     /**
@@ -27,18 +30,23 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Category implements Htt
 
     /**
      * Edit constructor.
+     *
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
         parent::__construct($context);
         $this->resultPageFactory = $resultPageFactory;
         $this->resultJsonFactory = $resultJsonFactory;
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(\Magento\Store\Model\StoreManagerInterface::class);
     }
 
     /**
@@ -51,20 +59,20 @@ public function __construct(
     public function execute()
     {
         $storeId = (int)$this->getRequest()->getParam('store');
-        $store = $this->getStoreManager()->getStore($storeId);
-        $this->getStoreManager()->setCurrentStore($store->getCode());
+        $store = $this->storeManager->getStore($storeId);
+        $this->storeManager->setCurrentStore($store->getCode());
 
         $categoryId = (int)$this->getRequest()->getParam('id');
 
         if (!$categoryId) {
             if ($storeId) {
-                $categoryId = (int)$this->getStoreManager()->getStore($storeId)->getRootCategoryId();
+                $categoryId = (int)$this->storeManager->getStore($storeId)->getRootCategoryId();
             } else {
-                $defaultStoreView = $this->getStoreManager()->getDefaultStoreView();
+                $defaultStoreView = $this->storeManager->getDefaultStoreView();
                 if ($defaultStoreView) {
                     $categoryId = (int)$defaultStoreView->getRootCategoryId();
                 } else {
-                    $stores = $this->getStoreManager()->getStores();
+                    $stores = $this->storeManager->getStores();
                     if (count($stores)) {
                         $store = reset($stores);
                         $categoryId = (int)$store->getRootCategoryId();
@@ -109,16 +117,4 @@ public function execute()
 
         return $resultPage;
     }
-
-    /**
-     * @return \Magento\Store\Model\StoreManagerInterface
-     */
-    private function getStoreManager()
-    {
-        if (null === $this->storeManager) {
-            $this->storeManager = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Store\Model\StoreManagerInterface::class);
-        }
-        return $this->storeManager;
-    }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
index 77518fd9bf5cc..9684938d38477 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
@@ -8,6 +8,7 @@
 
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Catalog\Api\Data\CategoryAttributeInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -56,6 +57,11 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Category implements Htt
      */
     private $eavConfig;
 
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
     /**
      * Constructor
      *
@@ -66,6 +72,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Category implements Htt
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
      * @param StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Config $eavConfig
+     * @param \Psr\Log\LoggerInterface $logger
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -74,15 +81,18 @@ public function __construct(
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
         StoreManagerInterface $storeManager,
-        \Magento\Eav\Model\Config $eavConfig = null
+        \Magento\Eav\Model\Config $eavConfig = null,
+        \Psr\Log\LoggerInterface $logger = null
     ) {
         parent::__construct($context, $dateFilter);
         $this->resultRawFactory = $resultRawFactory;
         $this->resultJsonFactory = $resultJsonFactory;
         $this->layoutFactory = $layoutFactory;
         $this->storeManager = $storeManager;
-        $this->eavConfig = $eavConfig
-            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Eav\Model\Config::class);
+        $this->eavConfig = $eavConfig ?: ObjectManager::getInstance()
+            ->get(\Magento\Eav\Model\Config::class);
+        $this->logger = $logger ?: ObjectManager::getInstance()
+            ->get(\Psr\Log\LoggerInterface::class);
     }
 
     /**
@@ -173,29 +183,29 @@ public function execute()
                 $products = json_decode($categoryPostData['category_products'], true);
                 $category->setPostedProducts($products);
             }
-            $this->_eventManager->dispatch(
-                'catalog_category_prepare_save',
-                ['category' => $category, 'request' => $this->getRequest()]
-            );
 
-            /**
-             * Check "Use Default Value" checkboxes values
-             */
-            if (isset($categoryPostData['use_default']) && !empty($categoryPostData['use_default'])) {
-                foreach ($categoryPostData['use_default'] as $attributeCode => $attributeValue) {
-                    if ($attributeValue) {
-                        $category->setData($attributeCode, null);
+            try {
+                $this->_eventManager->dispatch(
+                    'catalog_category_prepare_save',
+                    ['category' => $category, 'request' => $this->getRequest()]
+                );
+                /**
+                 * Check "Use Default Value" checkboxes values
+                 */
+                if (isset($categoryPostData['use_default']) && !empty($categoryPostData['use_default'])) {
+                    foreach ($categoryPostData['use_default'] as $attributeCode => $attributeValue) {
+                        if ($attributeValue) {
+                            $category->setData($attributeCode, null);
+                        }
                     }
                 }
-            }
 
-            /**
-             * Proceed with $_POST['use_config']
-             * set into category model for processing through validation
-             */
-            $category->setData('use_post_data_config', $useConfig);
+                /**
+                 * Proceed with $_POST['use_config']
+                 * set into category model for processing through validation
+                 */
+                $category->setData('use_post_data_config', $useConfig);
 
-            try {
                 $categoryResource = $category->getResource();
                 if ($category->hasCustomDesignTo()) {
                     $categoryResource->getAttribute('custom_design_from')->setMaxValue($category->getCustomDesignTo());
@@ -210,7 +220,9 @@ public function execute()
                                 __('The "%1" attribute is required. Enter and try again.', $attribute)
                             );
                         } else {
-                            throw new \Exception($error);
+                            $this->messageManager->addErrorMessage(__('Something went wrong while saving the category.'));
+                            $this->logger->critical('Something went wrong while saving the category.');
+                            $this->_getSession()->setCategoryData($categoryPostData);
                         }
                     }
                 }
@@ -219,13 +231,15 @@ public function execute()
 
                 $category->save();
                 $this->messageManager->addSuccessMessage(__('You saved the category.'));
+                // phpcs:disable Magento2.Exceptions.ThrowCatch
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addExceptionMessage($e);
-                $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
+                $this->logger->critical($e);
                 $this->_getSession()->setCategoryData($categoryPostData);
-            } catch (\Exception $e) {
+                // phpcs:disable Magento2.Exceptions.ThrowCatch
+            } catch (\Throwable $e) {
                 $this->messageManager->addErrorMessage(__('Something went wrong while saving the category.'));
-                $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
+                $this->logger->critical($e);
                 $this->_getSession()->setCategoryData($categoryPostData);
             }
         }
@@ -332,11 +346,7 @@ protected function getParentCategory($parentId, $storeId)
     {
         if (!$parentId) {
             if ($storeId) {
-                $parentId = $this->_objectManager->get(
-                    \Magento\Store\Model\StoreManagerInterface::class
-                )->getStore(
-                    $storeId
-                )->getRootCategoryId();
+                $parentId = $this->storeManager->getStore($storeId)->getRootCategoryId();
             } else {
                 $parentId = \Magento\Catalog\Model\Category::TREE_ROOT_ID;
             }
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 342bbc388f872..2d10d7148fb71 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
@@ -7,8 +7,10 @@
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
 
 use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\Eav\Model\Config;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
@@ -47,6 +49,16 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      */
     private $bulkSize;
 
+    /**
+     * @var TimezoneInterface
+     */
+    private $timezone;
+
+    /**
+     * @var Config
+     */
+    private $eavConfig;
+
     /**
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
@@ -56,6 +68,9 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      * @param \Magento\Framework\Serialize\SerializerInterface $serializer
      * @param \Magento\Authorization\Model\UserContextInterface $userContext
      * @param int $bulkSize
+     * @param TimezoneInterface $timezone
+     * @param Config $eavConfig
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         Action\Context $context,
@@ -65,7 +80,9 @@ public function __construct(
         \Magento\Framework\DataObject\IdentityGeneratorInterface $identityService,
         \Magento\Framework\Serialize\SerializerInterface $serializer,
         \Magento\Authorization\Model\UserContextInterface $userContext,
-        int $bulkSize = 100
+        int $bulkSize = 100,
+        TimezoneInterface $timezone = null,
+        Config $eavConfig = null
     ) {
         parent::__construct($context, $attributeHelper);
         $this->bulkManagement = $bulkManagement;
@@ -74,6 +91,10 @@ public function __construct(
         $this->serializer = $serializer;
         $this->userContext = $userContext;
         $this->bulkSize = $bulkSize;
+        $this->timezone = $timezone ?: ObjectManager::getInstance()
+            ->get(TimezoneInterface::class);
+        $this->eavConfig = $eavConfig ?: ObjectManager::getInstance()
+            ->get(Config::class);
     }
 
     /**
@@ -122,11 +143,10 @@ public function execute()
      */
     private function sanitizeProductAttributes($attributesData)
     {
-        $dateFormat = $this->_objectManager->get(TimezoneInterface::class)->getDateFormat(\IntlDateFormatter::SHORT);
-        $config = $this->_objectManager->get(\Magento\Eav\Model\Config::class);
+        $dateFormat = $this->timezone->getDateFormat(\IntlDateFormatter::SHORT);
 
         foreach ($attributesData as $attributeCode => $value) {
-            $attribute = $config->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
+            $attribute = $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
             if (!$attribute->getAttributeId()) {
                 unset($attributesData[$attributeCode]);
                 continue;
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 30a6629dd1c29..4a3de5f6e6eb0 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
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,7 +8,11 @@
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute as AttributeAction;
+use Magento\Framework\App\ObjectManager;
 
+/**
+ * Class Validate
+ */
 class Validate extends AttributeAction implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
@@ -22,21 +25,30 @@ class Validate extends AttributeAction implements HttpGetActionInterface, HttpPo
      */
     protected $layoutFactory;
 
+    /**
+     * @var \Magento\Eav\Model\Config
+     */
+    private $eavConfig;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
+     * @param \Magento\Eav\Model\Config $eavConfig
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-        \Magento\Framework\View\LayoutFactory $layoutFactory
+        \Magento\Framework\View\LayoutFactory $layoutFactory,
+        \Magento\Eav\Model\Config $eavConfig = null
     ) {
         parent::__construct($context, $attributeHelper);
         $this->resultJsonFactory = $resultJsonFactory;
         $this->layoutFactory = $layoutFactory;
+        $this->eavConfig = $eavConfig ?: ObjectManager::getInstance()
+            ->get(\Magento\Eav\Model\Config::class);
     }
 
     /**
@@ -54,8 +66,7 @@ public function execute()
         try {
             if ($attributesData) {
                 foreach ($attributesData as $attributeCode => $value) {
-                    $attribute = $this->_objectManager->get(\Magento\Eav\Model\Config::class)
-                        ->getAttribute('catalog_product', $attributeCode);
+                    $attribute = $this->eavConfig->getAttribute('catalog_product', $attributeCode);
                     if (!$attribute->getAttributeId()) {
                         unset($attributesData[$attributeCode]);
                         continue;
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
index 09eacbbf0731c..a05602403e08f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
@@ -17,16 +17,16 @@
 use Magento\Eav\Api\Data\AttributeGroupInterfaceFactory;
 use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\Eav\Api\Data\AttributeSetInterface;
+use Magento\Framework\Api\ExtensionAttributesFactory;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
 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;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class AddAttributeToTemplate
@@ -86,20 +86,49 @@ class AddAttributeToTemplate extends Product implements HttpPostActionInterface
      * @param Context $context
      * @param Builder $productBuilder
      * @param JsonFactory $resultJsonFactory
-     * @param AttributeGroupInterfaceFactory|null $attributeGroupFactory
+     * @param AttributeGroupInterfaceFactory $attributeGroupFactory
+     * @param AttributeRepositoryInterface $attributeRepository
+     * @param AttributeSetRepositoryInterface $attributeSetRepository
+     * @param AttributeGroupRepositoryInterface $attributeGroupRepository
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param AttributeManagementInterface $attributeManagement
+     * @param LoggerInterface $logger
+     * @param ExtensionAttributesFactory $extensionAttributesFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.LongVariable)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function __construct(
         Context $context,
         Builder $productBuilder,
         JsonFactory $resultJsonFactory,
-        AttributeGroupInterfaceFactory $attributeGroupFactory = null
+        AttributeGroupInterfaceFactory $attributeGroupFactory = null,
+        AttributeRepositoryInterface $attributeRepository = null,
+        AttributeSetRepositoryInterface $attributeSetRepository = null,
+        AttributeGroupRepositoryInterface $attributeGroupRepository = null,
+        SearchCriteriaBuilder $searchCriteriaBuilder = null,
+        AttributeManagementInterface $attributeManagement = null,
+        LoggerInterface $logger = null,
+        ExtensionAttributesFactory $extensionAttributesFactory = null
     ) {
         parent::__construct($context, $productBuilder);
         $this->resultJsonFactory = $resultJsonFactory;
         $this->attributeGroupFactory = $attributeGroupFactory ?: ObjectManager::getInstance()
             ->get(AttributeGroupInterfaceFactory::class);
+        $this->attributeRepository = $attributeRepository ?: ObjectManager::getInstance()
+            ->get(AttributeRepositoryInterface::class);
+        $this->attributeSetRepository = $attributeSetRepository ?: ObjectManager::getInstance()
+            ->get(AttributeSetRepositoryInterface::class);
+        $this->attributeGroupRepository = $attributeGroupRepository ?: ObjectManager::getInstance()
+            ->get(AttributeGroupRepositoryInterface::class);
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder ?: ObjectManager::getInstance()
+            ->get(SearchCriteriaBuilder::class);
+        $this->attributeManagement = $attributeManagement ?: ObjectManager::getInstance()
+            ->get(AttributeManagementInterface::class);
+        $this->logger = $logger ?: ObjectManager::getInstance()
+            ->get(LoggerInterface::class);
+        $this->extensionAttributesFactory = $extensionAttributesFactory ?: ObjectManager::getInstance()
+            ->get(ExtensionAttributesFactory::class);
     }
 
     /**
@@ -115,13 +144,13 @@ public function execute()
 
         try {
             /** @var AttributeSetInterface $attributeSet */
-            $attributeSet = $this->getAttributeSetRepository()->get($request->getParam('templateId'));
+            $attributeSet = $this->attributeSetRepository->get($request->getParam('templateId'));
             $groupCode = $request->getParam('groupCode');
             $groupName = $request->getParam('groupName');
             $groupSortOrder = $request->getParam('groupSortOrder');
 
             $attributeSearchCriteria = $this->getBasicAttributeSearchCriteriaBuilder()->create();
-            $attributeGroupSearchCriteria = $this->getSearchCriteriaBuilder()
+            $attributeGroupSearchCriteria = $this->searchCriteriaBuilder
                 ->addFilter('attribute_set_id', $attributeSet->getAttributeSetId())
                 ->addFilter('attribute_group_code', $groupCode)
                 ->setPageSize(1)
@@ -129,22 +158,24 @@ public function execute()
 
             try {
                 /** @var AttributeGroupInterface[] $attributeGroupItems */
-                $attributeGroupItems = $this->getAttributeGroupRepository()->getList($attributeGroupSearchCriteria)
+                $attributeGroupItems = $this->attributeGroupRepository
+                    ->getList($attributeGroupSearchCriteria)
                     ->getItems();
 
-                if (!$attributeGroupItems) {
-                    throw new NoSuchEntityException;
+                if ($attributeGroupItems) {
+                    /** @var AttributeGroupInterface $attributeGroup */
+                    $attributeGroup = reset($attributeGroupItems);
+                } else {
+                    /** @var AttributeGroupInterface $attributeGroup */
+                    $attributeGroup = $this->attributeGroupFactory->create();
                 }
-
-                /** @var AttributeGroupInterface $attributeGroup */
-                $attributeGroup = reset($attributeGroupItems);
             } catch (NoSuchEntityException $e) {
                 /** @var AttributeGroupInterface $attributeGroup */
                 $attributeGroup = $this->attributeGroupFactory->create();
             }
 
             $extensionAttributes = $attributeGroup->getExtensionAttributes()
-                ?: $this->getExtensionAttributesFactory()->create(AttributeGroupInterface::class);
+                ?: $this->extensionAttributesFactory->create(AttributeGroupInterface::class);
 
             $extensionAttributes->setAttributeGroupCode($groupCode);
             $extensionAttributes->setSortOrder($groupSortOrder);
@@ -152,28 +183,31 @@ public function execute()
             $attributeGroup->setAttributeSetId($attributeSet->getAttributeSetId());
             $attributeGroup->setExtensionAttributes($extensionAttributes);
 
-            $this->getAttributeGroupRepository()->save($attributeGroup);
+            $this->attributeGroupRepository->save($attributeGroup);
 
             /** @var AttributeInterface[] $attributesItems */
-            $attributesItems = $this->getAttributeRepository()->getList(
+            $attributesItems = $this->attributeRepository->getList(
                 ProductAttributeInterface::ENTITY_TYPE_CODE,
                 $attributeSearchCriteria
             )->getItems();
 
-            array_walk($attributesItems, function (AttributeInterface $attribute) use ($attributeSet, $attributeGroup) {
-                $this->getAttributeManagement()->assign(
-                    ProductAttributeInterface::ENTITY_TYPE_CODE,
-                    $attributeSet->getAttributeSetId(),
-                    $attributeGroup->getAttributeGroupId(),
-                    $attribute->getAttributeCode(),
-                    '0'
-                );
-            });
+            array_walk(
+                $attributesItems,
+                function (AttributeInterface $attribute) use ($attributeSet, $attributeGroup) {
+                    $this->attributeManagement->assign(
+                        ProductAttributeInterface::ENTITY_TYPE_CODE,
+                        $attributeSet->getAttributeSetId(),
+                        $attributeGroup->getAttributeGroupId(),
+                        $attribute->getAttributeCode(),
+                        '0'
+                    );
+                }
+            );
         } catch (LocalizedException $e) {
             $response->setError(true);
             $response->setMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->getLogger()->critical($e);
+            $this->logger->critical($e);
             $response->setError(true);
             $response->setMessage(__('Unable to add attribute'));
         }
@@ -195,105 +229,10 @@ private function getBasicAttributeSearchCriteriaBuilder()
             throw new LocalizedException(__('Attributes were missing and must be specified.'));
         }
 
-        return $this->getSearchCriteriaBuilder()
-            ->addFilter('attribute_id', [$attributeIds['selected']], 'in');
-    }
-
-    /**
-     * Get AttributeRepositoryInterface
-     *
-     * @return AttributeRepositoryInterface
-     */
-    private function getAttributeRepository()
-    {
-        if (null === $this->attributeRepository) {
-            $this->attributeRepository = ObjectManager::getInstance()
-                ->get(AttributeRepositoryInterface::class);
-        }
-        return $this->attributeRepository;
-    }
-
-    /**
-     * Get AttributeSetRepositoryInterface
-     *
-     * @return AttributeSetRepositoryInterface
-     */
-    private function getAttributeSetRepository()
-    {
-        if (null === $this->attributeSetRepository) {
-            $this->attributeSetRepository = ObjectManager::getInstance()
-                ->get(AttributeSetRepositoryInterface::class);
-        }
-        return $this->attributeSetRepository;
-    }
-
-    /**
-     * Get AttributeGroupInterface
-     *
-     * @return AttributeGroupRepositoryInterface
-     */
-    private function getAttributeGroupRepository()
-    {
-        if (null === $this->attributeGroupRepository) {
-            $this->attributeGroupRepository = ObjectManager::getInstance()
-                ->get(AttributeGroupRepositoryInterface::class);
-        }
-        return $this->attributeGroupRepository;
-    }
-
-    /**
-     * Get SearchCriteriaBuilder
-     *
-     * @return SearchCriteriaBuilder
-     */
-    private function getSearchCriteriaBuilder()
-    {
-        if (null === $this->searchCriteriaBuilder) {
-            $this->searchCriteriaBuilder = ObjectManager::getInstance()
-                ->get(SearchCriteriaBuilder::class);
-        }
-        return $this->searchCriteriaBuilder;
-    }
-
-    /**
-     * Get AttributeManagementInterface
-     *
-     * @return AttributeManagementInterface
-     */
-    private function getAttributeManagement()
-    {
-        if (null === $this->attributeManagement) {
-            $this->attributeManagement = ObjectManager::getInstance()
-                ->get(AttributeManagementInterface::class);
-        }
-        return $this->attributeManagement;
-    }
-
-    /**
-     * Get LoggerInterface
-     *
-     * @return LoggerInterface
-     */
-    private function getLogger()
-    {
-        if (null === $this->logger) {
-            $this->logger = ObjectManager::getInstance()
-                ->get(LoggerInterface::class);
-        }
-        return $this->logger;
-    }
-
-    /**
-     * Get ExtensionAttributesFactory.
-     *
-     * @return ExtensionAttributesFactory
-     */
-    private function getExtensionAttributesFactory()
-    {
-        if (null === $this->extensionAttributesFactory) {
-            $this->extensionAttributesFactory = ObjectManager::getInstance()
-                ->get(ExtensionAttributesFactory::class);
-        }
-        return $this->extensionAttributesFactory;
+        return $this->searchCriteriaBuilder->addFilter(
+            'attribute_id',
+            [$attributeIds['selected']],
+            'in'
+        );
     }
 }
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 c74a382724a00..dcb7074c0d036 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -13,6 +12,7 @@
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
+use Magento\Framework\Escaper;
 use Magento\Framework\Serialize\Serializer\FormData;
 
 /**
@@ -49,6 +49,11 @@ class Validate extends AttributeAction implements HttpGetActionInterface, HttpPo
      */
     private $attributeCodeValidator;
 
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
     /**
      * Constructor
      *
@@ -61,6 +66,8 @@ class Validate extends AttributeAction implements HttpGetActionInterface, HttpPo
      * @param array $multipleAttributeList
      * @param FormData|null $formDataSerializer
      * @param AttributeCodeValidator|null $attributeCodeValidator
+     * @param Escaper $escaper
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -71,7 +78,8 @@ public function __construct(
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         array $multipleAttributeList = [],
         FormData $formDataSerializer = null,
-        AttributeCodeValidator $attributeCodeValidator = null
+        AttributeCodeValidator $attributeCodeValidator = null,
+        Escaper $escaper = null
     ) {
         parent::__construct($context, $attributeLabelCache, $coreRegistry, $resultPageFactory);
         $this->resultJsonFactory = $resultJsonFactory;
@@ -79,9 +87,10 @@ public function __construct(
         $this->multipleAttributeList = $multipleAttributeList;
         $this->formDataSerializer = $formDataSerializer ?: ObjectManager::getInstance()
             ->get(FormData::class);
-        $this->attributeCodeValidator = $attributeCodeValidator ?: ObjectManager::getInstance()->get(
-            AttributeCodeValidator::class
-        );
+        $this->attributeCodeValidator = $attributeCodeValidator ?: ObjectManager::getInstance()
+            ->get(AttributeCodeValidator::class);
+        $this->escaper = $escaper ?: ObjectManager::getInstance()
+            ->get(Escaper::class);
     }
 
     /**
@@ -99,8 +108,10 @@ public function execute()
             $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.");
+            $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);
         }
@@ -138,7 +149,7 @@ public function execute()
             $attributeSet = $this->_objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class);
             $attributeSet->setEntityTypeId($this->_entityTypeId)->load($setName, 'attribute_set_name');
             if ($attributeSet->getId()) {
-                $setName = $this->_objectManager->get(\Magento\Framework\Escaper::class)->escapeHtml($setName);
+                $setName = $this->escaper->escapeHtml($setName);
                 $this->messageManager->addErrorMessage(__('An attribute set named \'%1\' already exists.', $setName));
 
                 $layout = $this->layoutFactory->create();
@@ -241,7 +252,7 @@ private function checkUniqueOption(DataObject $response, array $options = null)
     private function checkEmptyOption(DataObject $response, array $optionsForCheck = null)
     {
         foreach ($optionsForCheck as $optionValues) {
-            if (isset($optionValues[0]) && $optionValues[0] == '') {
+            if (isset($optionValues[0]) && trim($optionValues[0]) == '') {
                 $this->setMessageToResponse($response, [__("The value of Admin scope can't be empty.")]);
                 $response->setError(true);
             }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
index 78ad9f423871f..1f959a22b1ba1 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
@@ -115,6 +115,9 @@ public function build(RequestInterface $request): ProductInterface
         $store = $this->storeFactory->create();
         $store->load($storeId);
 
+        $this->registry->unregister('product');
+        $this->registry->unregister('current_product');
+        $this->registry->unregister('current_store');
         $this->registry->register('product', $product);
         $this->registry->register('current_product', $product);
         $this->registry->register('current_store', $store);
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
index 63e52eead064c..90b8ee3164183 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Duplicate.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -8,25 +7,39 @@
 
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\ObjectManager;
 
-class Duplicate extends \Magento\Catalog\Controller\Adminhtml\Product
+/**
+ * Class Duplicate
+ */
+class Duplicate extends \Magento\Catalog\Controller\Adminhtml\Product implements
+    \Magento\Framework\App\Action\HttpGetActionInterface
 {
     /**
      * @var \Magento\Catalog\Model\Product\Copier
      */
     protected $productCopier;
 
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param Action\Context $context
      * @param Builder $productBuilder
      * @param \Magento\Catalog\Model\Product\Copier $productCopier
+     * @param \Psr\Log\LoggerInterface $logger
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         Product\Builder $productBuilder,
-        \Magento\Catalog\Model\Product\Copier $productCopier
+        \Magento\Catalog\Model\Product\Copier $productCopier,
+        \Psr\Log\LoggerInterface $logger = null
     ) {
         $this->productCopier = $productCopier;
+        $this->logger = $logger ?: ObjectManager::getInstance()
+            ->get(\Psr\Log\LoggerInterface::class);
         parent::__construct($context, $productBuilder);
     }
 
@@ -46,7 +59,7 @@ public function execute()
             $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->logger->critical($e);
             $this->messageManager->addErrorMessage($e->getMessage());
             $resultRedirect->setPath('catalog/*/edit', ['_current' => true]);
         }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
index c31ceabcda655..d6781be1edc01 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
@@ -1,13 +1,17 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\ObjectManager;
 
+/**
+ *  Edit product
+ */
 class Edit extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface
 {
     /**
@@ -22,18 +26,27 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Product implements Http
      */
     protected $resultPageFactory;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder,
-        \Magento\Framework\View\Result\PageFactory $resultPageFactory
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
         parent::__construct($context, $productBuilder);
         $this->resultPageFactory = $resultPageFactory;
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(\Magento\Store\Model\StoreManagerInterface::class);
     }
 
     /**
@@ -43,15 +56,13 @@ public function __construct(
      */
     public function execute()
     {
-        /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
-        $storeManager = $this->_objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
         $storeId = (int) $this->getRequest()->getParam('store', 0);
-        $store = $storeManager->getStore($storeId);
-        $storeManager->setCurrentStore($store->getCode());
+        $store = $this->storeManager->getStore($storeId);
+        $this->storeManager->setCurrentStore($store->getCode());
         $productId = (int) $this->getRequest()->getParam('id');
         $product = $this->productBuilder->build($this->getRequest());
 
-        if (($productId && !$product->getEntityId())) {
+        if ($productId && !$product->getEntityId()) {
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultRedirectFactory->create();
             $this->messageManager->addErrorMessage(__('This product doesn\'t exist.'));
@@ -72,9 +83,8 @@ public function execute()
         $resultPage->getConfig()->getTitle()->prepend(__('Products'));
         $resultPage->getConfig()->getTitle()->prepend($product->getName());
 
-        if (!$this->_objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->isSingleStoreMode()
-            &&
-            ($switchBlock = $resultPage->getLayout()->getBlock('store_switcher'))
+        if (!$this->storeManager->isSingleStoreMode()
+            && ($switchBlock = $resultPage->getLayout()->getBlock('store_switcher'))
         ) {
             $switchBlock->setDefaultStoreName(__('Default Values'))
                 ->setWebsiteIds($product->getWebsiteIds())
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 ff7311e931755..d43b313c43b3e 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -8,7 +7,12 @@
 
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
 
+/**
+ * Class Upload
+ */
 class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
@@ -23,19 +27,58 @@ class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterf
      */
     protected $resultRawFactory;
 
+    /**
+     * @var array
+     */
+    private $allowedMimeTypes = [
+        'jpg' => 'image/jpg',
+        'jpeg' => 'image/jpeg',
+        'gif' => 'image/png',
+        'png' => 'image/gif'
+    ];
+
+    /**
+     * @var \Magento\Framework\Image\AdapterFactory
+     */
+    private $adapterFactory;
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var \Magento\Catalog\Model\Product\Media\Config
+     */
+    private $productMediaConfig;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param \Magento\Framework\Image\AdapterFactory $adapterFactory
+     * @param \Magento\Framework\Filesystem $filesystem
+     * @param \Magento\Catalog\Model\Product\Media\Config $productMediaConfig
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        \Magento\Framework\Image\AdapterFactory $adapterFactory = null,
+        \Magento\Framework\Filesystem $filesystem = null,
+        \Magento\Catalog\Model\Product\Media\Config $productMediaConfig = null
     ) {
         parent::__construct($context);
         $this->resultRawFactory = $resultRawFactory;
+        $this->adapterFactory = $adapterFactory ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\Image\AdapterFactory::class);
+        $this->filesystem = $filesystem ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\Filesystem::class);
+        $this->productMediaConfig = $productMediaConfig ?: ObjectManager::getInstance()
+            ->get(\Magento\Catalog\Model\Product\Media\Config::class);
     }
 
     /**
+     * Upload image(s) to the product gallery.
+     *
      * @return \Magento\Framework\Controller\Result\Raw
      */
     public function execute()
@@ -45,17 +88,15 @@ public function execute()
                 \Magento\MediaStorage\Model\File\Uploader::class,
                 ['fileId' => 'image']
             );
-            $uploader->setAllowedExtensions(['jpg', 'jpeg', 'gif', 'png']);
-            /** @var \Magento\Framework\Image\Adapter\AdapterInterface $imageAdapter */
-            $imageAdapter = $this->_objectManager->get(\Magento\Framework\Image\AdapterFactory::class)->create();
+            $uploader->setAllowedExtensions($this->getAllowedExtensions());
+            $imageAdapter = $this->adapterFactory->create();
             $uploader->addValidateCallback('catalog_product_image', $imageAdapter, 'validateUploadFile');
             $uploader->setAllowRenameFiles(true);
             $uploader->setFilesDispersion(true);
-            /** @var \Magento\Framework\Filesystem\Directory\Read $mediaDirectory */
-            $mediaDirectory = $this->_objectManager->get(\Magento\Framework\Filesystem::class)
-                ->getDirectoryRead(DirectoryList::MEDIA);
-            $config = $this->_objectManager->get(\Magento\Catalog\Model\Product\Media\Config::class);
-            $result = $uploader->save($mediaDirectory->getAbsolutePath($config->getBaseTmpMediaPath()));
+            $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
+            $result = $uploader->save(
+                $mediaDirectory->getAbsolutePath($this->productMediaConfig->getBaseTmpMediaPath())
+            );
 
             $this->_eventManager->dispatch(
                 'catalog_product_gallery_upload_image_after',
@@ -65,8 +106,7 @@ public function execute()
             unset($result['tmp_name']);
             unset($result['path']);
 
-            $result['url'] = $this->_objectManager->get(\Magento\Catalog\Model\Product\Media\Config::class)
-                ->getTmpMediaUrl($result['file']);
+            $result['url'] = $this->productMediaConfig->getTmpMediaUrl($result['file']);
             $result['file'] = $result['file'] . '.tmp';
         } catch (\Exception $e) {
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
@@ -78,4 +118,14 @@ public function execute()
         $response->setContents(json_encode($result));
         return $response;
     }
+
+    /**
+     * Get the set of allowed file extensions.
+     *
+     * @return array
+     */
+    private function getAllowedExtensions()
+    {
+        return array_keys($this->allowedMimeTypes);
+    }
 }
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 f11d16755ef0d..2ae97223d6359 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -6,34 +6,43 @@
 
 namespace Magento\Catalog\Controller\Adminhtml\Product\Initialization;
 
+use Magento\Backend\Helper\Js;
 use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory as CustomOptionFactory;
 use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory as ProductLinkFactory;
+use Magento\Catalog\Api\Data\ProductLinkTypeInterface;
 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\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Authorization as ProductAuthorization;
+use Magento\Catalog\Model\Product\Filter\DateTime as DateTimeFilter;
 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;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Locale\FormatInterface;
+use Magento\Framework\Stdlib\DateTime\Filter\Date;
+use Magento\Store\Model\StoreManagerInterface;
+use Zend_Filter_Input;
 
 /**
  * Product helper
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  * @since 100.0.2
  */
 class Helper
 {
     /**
-     * @var \Magento\Framework\App\RequestInterface
+     * @var RequestInterface
      */
     protected $request;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
@@ -43,12 +52,12 @@ class Helper
     protected $stockFilter;
 
     /**
-     * @var \Magento\Backend\Helper\Js
+     * @var Js
      */
     protected $jsHelper;
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
+     * @var Date
      * @deprecated 101.0.0
      */
     protected $dateFilter;
@@ -81,11 +90,6 @@ class Helper
      */
     private $linkResolver;
 
-    /**
-     * @var \Magento\Framework\Stdlib\DateTime\Filter\DateTime
-     */
-    private $dateTimeFilter;
-
     /**
      * @var LinkTypeProvider
      */
@@ -96,34 +100,55 @@ class Helper
      */
     private $attributeFilter;
 
+    /**
+     * @var ProductAuthorization
+     */
+    private $productAuthorization;
+
+    /**
+     * @var FormatInterface
+     */
+    private $localeFormat;
+
+    /**
+     * @var DateTimeFilter
+     */
+    private $dateTimeFilter;
+
     /**
      * Constructor
      *
-     * @param \Magento\Framework\App\RequestInterface $request
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param RequestInterface $request
+     * @param StoreManagerInterface $storeManager
      * @param StockDataFilter $stockFilter
      * @param ProductLinks $productLinks
-     * @param \Magento\Backend\Helper\Js $jsHelper
-     * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
+     * @param Js $jsHelper
+     * @param Date $dateFilter
      * @param CustomOptionFactory|null $customOptionFactory
      * @param ProductLinkFactory|null $productLinkFactory
      * @param ProductRepositoryInterface|null $productRepository
      * @param LinkTypeProvider|null $linkTypeProvider
      * @param AttributeFilter|null $attributeFilter
+     * @param FormatInterface|null $localeFormat
+     * @param ProductAuthorization|null $productAuthorization
+     * @param DateTimeFilter|null $dateTimeFilter
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\App\RequestInterface $request,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        RequestInterface $request,
+        StoreManagerInterface $storeManager,
         StockDataFilter $stockFilter,
-        \Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks $productLinks,
-        \Magento\Backend\Helper\Js $jsHelper,
-        \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
+        ProductLinks $productLinks,
+        Js $jsHelper,
+        Date $dateFilter,
         CustomOptionFactory $customOptionFactory = null,
         ProductLinkFactory $productLinkFactory = null,
         ProductRepositoryInterface $productRepository = null,
         LinkTypeProvider $linkTypeProvider = null,
-        AttributeFilter $attributeFilter = null
+        AttributeFilter $attributeFilter = null,
+        FormatInterface $localeFormat = null,
+        ?ProductAuthorization $productAuthorization = null,
+        ?DateTimeFilter $dateTimeFilter = null
     ) {
         $this->request = $request;
         $this->storeManager = $storeManager;
@@ -132,26 +157,29 @@ public function __construct(
         $this->jsHelper = $jsHelper;
         $this->dateFilter = $dateFilter;
 
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $objectManager = 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);
+        $this->localeFormat = $localeFormat ?: $objectManager->get(FormatInterface::class);
+        $this->productAuthorization = $productAuthorization ?? $objectManager->get(ProductAuthorization::class);
+        $this->dateTimeFilter = $dateTimeFilter ?? $objectManager->get(DateTimeFilter::class);
     }
 
     /**
      * Initialize product from data
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @param array $productData
-     * @return \Magento\Catalog\Model\Product
+     * @return Product
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @since 101.0.0
      */
-    public function initializeFromData(\Magento\Catalog\Model\Product $product, array $productData)
+    public function initializeFromData(Product $product, array $productData)
     {
         unset($productData['custom_attributes'], $productData['extension_attributes']);
 
@@ -161,7 +189,6 @@ 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;
@@ -185,12 +212,12 @@ public function initializeFromData(\Magento\Catalog\Model\Product $product, arra
         foreach ($attributes as $attrKey => $attribute) {
             if ($attribute->getBackend()->getType() == 'datetime') {
                 if (array_key_exists($attrKey, $productData) && $productData[$attrKey] != '') {
-                    $dateFieldFilters[$attrKey] = $this->getDateTimeFilter();
+                    $dateFieldFilters[$attrKey] = $this->dateTimeFilter;
                 }
             }
         }
 
-        $inputFilter = new \Zend_Filter_Input($dateFieldFilters, [], $productData);
+        $inputFilter = new Zend_Filter_Input($dateFieldFilters, [], $productData);
         $productData = $inputFilter->getUnescaped();
 
         if (isset($productData['options'])) {
@@ -201,7 +228,7 @@ 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', []);
+        $useDefaults = (array) $this->request->getPost('use_default', []);
         $productData = $this->attributeFilter->prepareProductAttributes($product, $productData, $useDefaults);
         $product->addData($productData);
 
@@ -222,24 +249,27 @@ public function initializeFromData(\Magento\Catalog\Model\Product $product, arra
     /**
      * Initialize product before saving
      *
-     * @param \Magento\Catalog\Model\Product $product
-     * @return \Magento\Catalog\Model\Product
+     * @param Product $product
+     * @return Product
      */
-    public function initialize(\Magento\Catalog\Model\Product $product)
+    public function initialize(Product $product)
     {
         $productData = $this->request->getPost('product', []);
-        return $this->initializeFromData($product, $productData);
+        $product = $this->initializeFromData($product, $productData);
+        $this->productAuthorization->authorizeSavingOf($product);
+
+        return $product;
     }
 
     /**
      * Setting product links
      *
-     * @param \Magento\Catalog\Model\Product $product
-     * @return \Magento\Catalog\Model\Product
+     * @param Product $product
+     * @return Product
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @since 101.0.0
      */
-    protected function setProductLinks(\Magento\Catalog\Model\Product $product)
+    protected function setProductLinks(Product $product)
     {
         $links = $this->getLinkResolver()->getLinks();
 
@@ -249,7 +279,7 @@ protected function setProductLinks(\Magento\Catalog\Model\Product $product)
         $productLinks = $product->getProductLinks();
         $linkTypes = [];
 
-        /** @var \Magento\Catalog\Api\Data\ProductLinkTypeInterface $linkTypeObject */
+        /** @var ProductLinkTypeInterface $linkTypeObject */
         foreach ($this->linkTypeProvider->getItems() as $linkTypeObject) {
             $linkTypes[$linkTypeObject->getName()] = $product->getData($linkTypeObject->getName() . '_readonly');
         }
@@ -261,7 +291,7 @@ protected function setProductLinks(\Magento\Catalog\Model\Product $product)
 
         foreach ($linkTypes as $linkType => $readonly) {
             if (isset($links[$linkType]) && !$readonly) {
-                foreach ((array)$links[$linkType] as $linkData) {
+                foreach ((array) $links[$linkType] as $linkData) {
                     if (empty($linkData['id'])) {
                         continue;
                     }
@@ -271,7 +301,7 @@ protected function setProductLinks(\Magento\Catalog\Model\Product $product)
                     $link->setSku($product->getSku())
                         ->setLinkedProductSku($linkProduct->getSku())
                         ->setLinkType($linkType)
-                        ->setPosition(isset($linkData['position']) ? (int)$linkData['position'] : 0);
+                        ->setPosition(isset($linkData['position']) ? (int) $linkData['position'] : 0);
                     $productLinks[] = $link;
                 }
             }
@@ -377,22 +407,8 @@ private function getLinkResolver()
         if (!is_object($this->linkResolver)) {
             $this->linkResolver = ObjectManager::getInstance()->get(LinkResolver::class);
         }
-        return $this->linkResolver;
-    }
 
-    /**
-     * Get DateTimeFilter instance
-     *
-     * @return \Magento\Framework\Stdlib\DateTime\Filter\DateTime
-     * @deprecated 101.0.0
-     */
-    private function getDateTimeFilter()
-    {
-        if ($this->dateTimeFilter === null) {
-            $this->dateTimeFilter = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\Stdlib\DateTime\Filter\DateTime::class);
-        }
-        return $this->dateTimeFilter;
+        return $this->linkResolver;
     }
 
     /**
@@ -407,7 +423,7 @@ private function getDateTimeFilter()
     private function filterWebsiteIds($websiteIds)
     {
         if (!$this->storeManager->isSingleStoreMode()) {
-            $websiteIds = array_filter((array)$websiteIds);
+            $websiteIds = array_filter((array) $websiteIds);
         } else {
             $websiteIds[$this->storeManager->getWebsite(true)->getId()] = 1;
         }
@@ -448,9 +464,17 @@ private function fillProductOptions(Product $product, array $productOptions)
             }
 
             if (isset($customOptionData['values'])) {
-                $customOptionData['values'] = array_filter($customOptionData['values'], function ($valueData) {
-                    return empty($valueData['is_delete']);
-                });
+                $customOptionData['values'] = array_filter(
+                    $customOptionData['values'],
+                    function ($valueData) {
+                        return empty($valueData['is_delete']);
+                    }
+                );
+            }
+
+            if (isset($customOptionData['price'])) {
+                // Make sure we're working with a number here and no localized value.
+                $customOptionData['price'] = $this->localeFormat->getNumber($customOptionData['price']);
             }
 
             $customOption = $this->customOptionFactory->create(['data' => $customOptionData]);
@@ -460,20 +484,4 @@ 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/MassStatus.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
index 9d7273fb3f23c..b6c4db6c64382 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
@@ -7,8 +7,8 @@
 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\App\ObjectManager;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
@@ -37,22 +37,31 @@ class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product implement
     protected $collectionFactory;
 
     /**
-     * @param Action\Context $context
+     * @var \Magento\Catalog\Model\Product\Action
+     */
+    private $productAction;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
      * @param Builder $productBuilder
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
+     * @param \Magento\Catalog\Model\Product\Action $productAction
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         Product\Builder $productBuilder,
         \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
         Filter $filter,
-        CollectionFactory $collectionFactory
+        CollectionFactory $collectionFactory,
+        \Magento\Catalog\Model\Product\Action $productAction = null
     ) {
         $this->filter = $filter;
         $this->collectionFactory = $collectionFactory;
         $this->_productPriceIndexerProcessor = $productPriceIndexerProcessor;
+        $this->productAction = $productAction ?: ObjectManager::getInstance()
+            ->get(\Magento\Catalog\Model\Product\Action::class);
         parent::__construct($context, $productBuilder);
     }
 
@@ -94,8 +103,7 @@ public function execute()
 
         try {
             $this->_validateMassStatus($productIds, $status);
-            $this->_objectManager->get(\Magento\Catalog\Model\Product\Action::class)
-                ->updateAttributes($productIds, ['status' => $status], (int) $storeId);
+            $this->productAction->updateAttributes($productIds, ['status' => $status], (int) $storeId);
             $this->messageManager->addSuccessMessage(
                 __('A total of %1 record(s) have been updated.', count($productIds))
             );
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
index 825d0ee032d6c..5c3e27334cb66 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -11,6 +10,7 @@
 use Magento\Backend\App\Action;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\Request\DataPersistorInterface;
 
@@ -56,12 +56,12 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product implements Http
     private $storeManager;
 
     /**
-     * @var \Magento\Framework\Escaper|null
+     * @var \Magento\Framework\Escaper
      */
     private $escaper;
 
     /**
-     * @var null|\Psr\Log\LoggerInterface
+     * @var \Psr\Log\LoggerInterface
      */
     private $logger;
 
@@ -74,8 +74,11 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product implements Http
      * @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
+     * @param \Magento\Framework\Escaper $escaper
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Catalog\Api\CategoryLinkManagementInterface $categoryLinkManagement
+     * @param StoreManagerInterface $storeManager
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -85,15 +88,23 @@ public function __construct(
         \Magento\Catalog\Model\Product\TypeTransitionManager $productTypeManager,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Framework\Escaper $escaper = null,
-        \Psr\Log\LoggerInterface $logger = null
+        \Psr\Log\LoggerInterface $logger = null,
+        \Magento\Catalog\Api\CategoryLinkManagementInterface $categoryLinkManagement = null,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
+        parent::__construct($context, $productBuilder);
         $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);
+        $this->escaper = $escaper ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\Escaper::class);
+        $this->logger = $logger ?: ObjectManager::getInstance()
+            ->get(\Psr\Log\LoggerInterface::class);
+        $this->categoryLinkManagement = $categoryLinkManagement ?: ObjectManager::getInstance()
+            ->get(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(\Magento\Store\Model\StoreManagerInterface::class);
     }
 
     /**
@@ -106,8 +117,8 @@ public function __construct(
     public function execute()
     {
         $storeId = $this->getRequest()->getParam('store', 0);
-        $store = $this->getStoreManager()->getStore($storeId);
-        $this->getStoreManager()->setCurrentStore($store->getCode());
+        $store = $this->storeManager->getStore($storeId);
+        $this->storeManager->setCurrentStore($store->getCode());
         $redirectBack = $this->getRequest()->getParam('back', false);
         $productId = $this->getRequest()->getParam('id');
         $resultRedirect = $this->resultRedirectFactory->create();
@@ -130,7 +141,7 @@ public function execute()
                 $canSaveCustomOptions = $product->getCanSaveCustomOptions();
                 $product->save();
                 $this->handleImageRemoveError($data, $product->getId());
-                $this->getCategoryLinkManagement()->assignProductToCategories(
+                $this->categoryLinkManagement->assignProductToCategories(
                     $product->getSku(),
                     $product->getCategoryIds()
                 );
@@ -236,11 +247,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
      */
     protected function copyToStores($data, $productId)
@@ -250,19 +259,7 @@ protected function copyToStores($data, $productId)
                 if (isset($data['product']['website_ids'][$websiteId])
                     && (bool)$data['product']['website_ids'][$websiteId]) {
                     foreach ($group as $store) {
-                        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();
-                            }
-                        }
+                        $this->copyToStore($data, $productId, $store);
                     }
                 }
             }
@@ -270,32 +267,30 @@ protected function copyToStores($data, $productId)
     }
 
     /**
-     * Get categoryLinkManagement in a backward compatible way.
+     * Do copying data to stores
      *
-     * @return \Magento\Catalog\Api\CategoryLinkManagementInterface
-     */
-    private function getCategoryLinkManagement()
-    {
-        if (null === $this->categoryLinkManagement) {
-            $this->categoryLinkManagement = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
-        }
-        return $this->categoryLinkManagement;
-    }
-
-    /**
-     * Get storeManager in a backward compatible way.
+     * 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.
      *
-     * @return StoreManagerInterface
-     * @deprecated 101.0.0
+     * @param array $data
+     * @param int $productId
+     * @param array $store
      */
-    private function getStoreManager()
+    private function copyToStore($data, $productId, $store)
     {
-        if (null === $this->storeManager) {
-            $this->storeManager = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Store\Model\StoreManagerInterface::class);
+        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();
+            }
         }
-        return $this->storeManager;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
index c0bb9f60c1878..e7d576e5e941f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
@@ -1,12 +1,17 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-class Wysiwyg extends \Magento\Catalog\Controller\Adminhtml\Product
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Class Wysiwyg
+ */
+class Wysiwyg extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
@@ -18,21 +23,30 @@ class Wysiwyg extends \Magento\Catalog\Controller\Adminhtml\Product
      */
     protected $layoutFactory;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder,
         \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
-        \Magento\Framework\View\LayoutFactory $layoutFactory
+        \Magento\Framework\View\LayoutFactory $layoutFactory,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
         parent::__construct($context, $productBuilder);
         $this->resultRawFactory = $resultRawFactory;
         $this->layoutFactory = $layoutFactory;
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(\Magento\Store\Model\StoreManagerInterface::class);
     }
 
     /**
@@ -42,10 +56,11 @@ public function __construct(
      */
     public function execute()
     {
+        // @codingStandardsIgnoreStart
         $elementId = $this->getRequest()->getParam('element_id', md5(microtime()));
+        // @codingStandardsIgnoreEnd
         $storeId = $this->getRequest()->getParam('store_id', 0);
-        $storeMediaUrl = $this->_objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)
-            ->getStore($storeId)
+        $storeMediaUrl = $this->storeManager->getStore($storeId)
             ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
 
         $content = $this->layoutFactory->create()
diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
index da3d99a8d2745..eea448e0fdb0b 100644
--- a/app/code/Magento/Catalog/Controller/Category/View.php
+++ b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -7,6 +7,7 @@
 namespace Magento\Catalog\Controller\Category;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Helper\Category as CategoryHelper;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Design;
 use Magento\Catalog\Model\Layer\Resolver;
@@ -18,6 +19,7 @@
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\Result\ForwardFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\DataObject;
@@ -28,6 +30,7 @@
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface;
+use Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager;
 
 /**
  * View a category on storefront. Needs to be accessible by POST because of the store switching.
@@ -94,6 +97,21 @@ class View extends Action implements HttpGetActionInterface, HttpPostActionInter
      */
     private $toolbarMemorizer;
 
+    /**
+     * @var LayoutUpdateManager
+     */
+    private $customLayoutManager;
+
+    /**
+     * @var CategoryHelper
+     */
+    private $categoryHelper;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * Constructor
      *
@@ -108,6 +126,9 @@ class View extends Action implements HttpGetActionInterface, HttpPostActionInter
      * @param Resolver $layerResolver
      * @param CategoryRepositoryInterface $categoryRepository
      * @param ToolbarMemorizer|null $toolbarMemorizer
+     * @param LayoutUpdateManager|null $layoutUpdateManager
+     * @param CategoryHelper $categoryHelper
+     * @param LoggerInterface $logger
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -121,7 +142,10 @@ public function __construct(
         ForwardFactory $resultForwardFactory,
         Resolver $layerResolver,
         CategoryRepositoryInterface $categoryRepository,
-        ToolbarMemorizer $toolbarMemorizer = null
+        ToolbarMemorizer $toolbarMemorizer = null,
+        ?LayoutUpdateManager $layoutUpdateManager = null,
+        CategoryHelper $categoryHelper = null,
+        LoggerInterface $logger = null
     ) {
         parent::__construct($context);
         $this->_storeManager = $storeManager;
@@ -133,7 +157,13 @@ public function __construct(
         $this->resultForwardFactory = $resultForwardFactory;
         $this->layerResolver = $layerResolver;
         $this->categoryRepository = $categoryRepository;
-        $this->toolbarMemorizer = $toolbarMemorizer ?: $context->getObjectManager()->get(ToolbarMemorizer::class);
+        $this->toolbarMemorizer = $toolbarMemorizer ?: ObjectManager::getInstance()->get(ToolbarMemorizer::class);
+        $this->customLayoutManager = $layoutUpdateManager
+            ?? ObjectManager::getInstance()->get(LayoutUpdateManager::class);
+        $this->categoryHelper = $categoryHelper ?: ObjectManager::getInstance()
+            ->get(CategoryHelper::class);
+        $this->logger = $logger ?: ObjectManager::getInstance()
+            ->get(LoggerInterface::class);
     }
 
     /**
@@ -153,7 +183,7 @@ protected function _initCategory()
         } catch (NoSuchEntityException $e) {
             return false;
         }
-        if (!$this->_objectManager->get(\Magento\Catalog\Helper\Category::class)->canShow($category)) {
+        if (!$this->categoryHelper->canShow($category)) {
             return false;
         }
         $this->_catalogSession->setLastVisitedCategoryId($category->getId());
@@ -165,7 +195,7 @@ protected function _initCategory()
                 ['category' => $category, 'controller_action' => $this]
             );
         } catch (LocalizedException $e) {
-            $this->_objectManager->get(LoggerInterface::class)->critical($e);
+            $this->logger->critical($e);
             return false;
         }
 
@@ -258,5 +288,10 @@ private function applyLayoutUpdates(
                 $page->addPageLayoutHandles(['layout_update' => sha1($layoutUpdate)], null, false);
             }
         }
+
+        //Selected files
+        if ($settings->getPageLayoutHandles()) {
+            $page->addPageLayoutHandles($settings->getPageLayoutHandles());
+        }
     }
 }
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
index f5c3171a3fe90..8b854361fd4ef 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Add.php
@@ -6,14 +6,72 @@
  */
 namespace Magento\Catalog\Controller\Product\Compare;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\ViewModel\Product\Checker\AddToCompareAvailability;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\View\Result\PageFactory;
 
 /**
  * Add item to compare list action.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Add extends \Magento\Catalog\Controller\Product\Compare implements HttpPostActionInterface
 {
+    /**
+     * @var AddToCompareAvailability
+     */
+    private $compareAvailability;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Catalog\Model\Product\Compare\ItemFactory $compareItemFactory
+     * @param \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory $itemCollectionFactory
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Customer\Model\Visitor $customerVisitor
+     * @param \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList
+     * @param \Magento\Catalog\Model\Session $catalogSession
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param Validator $formKeyValidator
+     * @param PageFactory $resultPageFactory
+     * @param ProductRepositoryInterface $productRepository
+     * @param AddToCompareAvailability|null $compareAvailability
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Catalog\Model\Product\Compare\ItemFactory $compareItemFactory,
+        \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory $itemCollectionFactory,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Customer\Model\Visitor $customerVisitor,
+        \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList,
+        \Magento\Catalog\Model\Session $catalogSession,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        Validator $formKeyValidator,
+        PageFactory $resultPageFactory,
+        ProductRepositoryInterface $productRepository,
+        AddToCompareAvailability $compareAvailability = null
+    ) {
+        parent::__construct(
+            $context,
+            $compareItemFactory,
+            $itemCollectionFactory,
+            $customerSession,
+            $customerVisitor,
+            $catalogProductCompareList,
+            $catalogSession,
+            $storeManager,
+            $formKeyValidator,
+            $resultPageFactory,
+            $productRepository
+        );
+
+        $this->compareAvailability = $compareAvailability
+            ?: $this->_objectManager->get(AddToCompareAvailability::class);
+    }
+
     /**
      * Add item to compare list.
      *
@@ -36,7 +94,7 @@ public function execute()
                 $product = null;
             }
 
-            if ($product && $product->isSalable()) {
+            if ($product && $this->compareAvailability->isAvailableForCompare($product)) {
                 $this->_catalogProductCompareList->addProduct($product);
                 $productName = $this->_objectManager->get(
                     \Magento\Framework\Escaper::class
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
index acf0f1b754c12..f5d56dc9e6b0e 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Remove.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\Catalog\Controller\Product\Compare;
 
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 
@@ -17,12 +18,13 @@ class Remove extends \Magento\Catalog\Controller\Product\Compare implements Http
     /**
      * Remove item from compare list.
      *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         $productId = (int)$this->getRequest()->getParam('product');
-        if ($productId) {
+        if ($this->_formKeyValidator->validate($this->getRequest()) && $productId) {
             $storeId = $this->_storeManager->getStore()->getId();
             try {
                 /** @var \Magento\Catalog\Model\Product $product */
@@ -31,7 +33,7 @@ public function execute()
                 $product = null;
             }
 
-            if ($product && $product->isSalable()) {
+            if ($product && (int)$product->getStatus() !== Status::STATUS_DISABLED) {
                 /** @var $item \Magento\Catalog\Model\Product\Compare\Item */
                 $item = $this->_compareItemFactory->create();
                 if ($this->_customerSession->isLoggedIn()) {
diff --git a/app/code/Magento/Catalog/Controller/Product/View.php b/app/code/Magento/Catalog/Controller/Product/View.php
index 024123e15150d..570b8f541b762 100644
--- a/app/code/Magento/Catalog/Controller/Product/View.php
+++ b/app/code/Magento/Catalog/Controller/Product/View.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,11 +8,14 @@
 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\App\ObjectManager;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Catalog\Controller\Product as ProductAction;
 
 /**
- * View a product on storefront. Needs to be accessible by POST because of the store switching.
+ * View a product on storefront. Needs to be accessible by POST because of the store switching
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class View extends ProductAction implements HttpGetActionInterface, HttpPostActionInterface
 {
@@ -32,6 +34,16 @@ class View extends ProductAction implements HttpGetActionInterface, HttpPostActi
      */
     protected $resultPageFactory;
 
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var \Magento\Framework\Json\Helper\Data
+     */
+    private $jsonHelper;
+
     /**
      * Constructor
      *
@@ -39,17 +51,25 @@ class View extends ProductAction implements HttpGetActionInterface, HttpPostActi
      * @param \Magento\Catalog\Helper\Product\View $viewHelper
      * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
      * @param PageFactory $resultPageFactory
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      */
     public function __construct(
         Context $context,
         \Magento\Catalog\Helper\Product\View $viewHelper,
         \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory,
-        PageFactory $resultPageFactory
+        PageFactory $resultPageFactory,
+        \Psr\Log\LoggerInterface $logger = null,
+        \Magento\Framework\Json\Helper\Data $jsonHelper = null
     ) {
+        parent::__construct($context);
         $this->viewHelper = $viewHelper;
         $this->resultForwardFactory = $resultForwardFactory;
         $this->resultPageFactory = $resultPageFactory;
-        parent::__construct($context);
+        $this->logger = $logger ?: ObjectManager::getInstance()
+            ->get(\Psr\Log\LoggerInterface::class);
+        $this->jsonHelper = $jsonHelper ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\Json\Helper\Data::class);
     }
 
     /**
@@ -84,21 +104,23 @@ 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->addNoticeMessage($notice);
             }
-            
+
             if ($this->getRequest()->isAjax()) {
                 $this->getResponse()->representJson(
-                    $this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
-                        'backUrl' => $this->_redirect->getRedirectUrl()
-                    ])
+                    $this->jsonHelper->jsonEncode(
+                        [
+                            'backUrl' => $this->_redirect->getRedirectUrl()
+                        ]
+                    )
                 );
                 return;
             }
@@ -120,7 +142,7 @@ public function execute()
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
             return $this->noProductRedirect();
         } catch (\Exception $e) {
-            $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
+            $this->logger->critical($e);
             $resultForward = $this->resultForwardFactory->create();
             $resultForward->forward('noroute');
             return $resultForward;
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index 9b8d0ad75a8c9..110b798df9df9 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -213,31 +213,29 @@ protected function setImageProperties()
 
         // Set 'keep frame' flag
         $frame = $this->getFrame();
-        if (!empty($frame)) {
-            $this->_getModel()->setKeepFrame($frame);
-        }
+        $this->_getModel()->setKeepFrame($frame);
 
         // Set 'constrain only' flag
         $constrain = $this->getAttribute('constrain');
-        if (!empty($constrain)) {
+        if (null !== $constrain) {
             $this->_getModel()->setConstrainOnly($constrain);
         }
 
         // Set 'keep aspect ratio' flag
         $aspectRatio = $this->getAttribute('aspect_ratio');
-        if (!empty($aspectRatio)) {
+        if (null !== $aspectRatio) {
             $this->_getModel()->setKeepAspectRatio($aspectRatio);
         }
 
         // Set 'transparency' flag
         $transparency = $this->getAttribute('transparency');
-        if (!empty($transparency)) {
+        if (null !== $transparency) {
             $this->_getModel()->setKeepTransparency($transparency);
         }
 
         // Set background color
         $background = $this->getAttribute('background');
-        if (!empty($background)) {
+        if (null !== $background) {
             $this->_getModel()->setBackgroundColor($background);
         }
 
diff --git a/app/code/Magento/Catalog/Helper/Output.php b/app/code/Magento/Catalog/Helper/Output.php
index 33e261dc353b4..93b67965e7234 100644
--- a/app/code/Magento/Catalog/Helper/Output.php
+++ b/app/code/Magento/Catalog/Helper/Output.php
@@ -9,9 +9,21 @@
 
 use Magento\Catalog\Model\Category as ModelCategory;
 use Magento\Catalog\Model\Product as ModelProduct;
+use Magento\Eav\Model\Config;
+use Magento\Framework\App\Helper\AbstractHelper;
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\Escaper;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filter\Template;
+use function is_object;
+use function method_exists;
+use function preg_match;
+use function strtolower;
 
-class Output extends \Magento\Framework\App\Helper\AbstractHelper
+/**
+ * Html output
+ */
+class Output extends AbstractHelper
 {
     /**
      * Array of existing handlers
@@ -37,12 +49,12 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * Eav config
      *
-     * @var \Magento\Eav\Model\Config
+     * @var Config
      */
     protected $_eavConfig;
 
     /**
-     * @var \Magento\Framework\Escaper
+     * @var Escaper
      */
     protected $_escaper;
 
@@ -53,27 +65,32 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * Output constructor.
-     * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Eav\Model\Config $eavConfig
+     * @param Context $context
+     * @param Config $eavConfig
      * @param Data $catalogData
-     * @param \Magento\Framework\Escaper $escaper
+     * @param Escaper $escaper
      * @param array $directivePatterns
+     * @param array $handlers
      */
     public function __construct(
-        \Magento\Framework\App\Helper\Context $context,
-        \Magento\Eav\Model\Config $eavConfig,
+        Context $context,
+        Config $eavConfig,
         Data $catalogData,
-        \Magento\Framework\Escaper $escaper,
-        $directivePatterns = []
+        Escaper $escaper,
+        $directivePatterns = [],
+        array $handlers = []
     ) {
         $this->_eavConfig = $eavConfig;
         $this->_catalogData = $catalogData;
         $this->_escaper = $escaper;
         $this->directivePatterns = $directivePatterns;
+        $this->_handlers = $handlers;
         parent::__construct($context);
     }
 
     /**
+     * Return template processor
+     *
      * @return Template
      */
     protected function _getTemplateProcessor()
@@ -115,8 +132,7 @@ public function addHandler($method, $handler)
      */
     public function getHandlers($method)
     {
-        $method = strtolower($method);
-        return $this->_handlers[$method] ?? [];
+        return $this->_handlers[strtolower($method)] ?? [];
     }
 
     /**
@@ -145,21 +161,21 @@ public function process($method, $result, $params)
      * @param string $attributeName
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function productAttribute($product, $attributeHtml, $attributeName)
     {
         $attribute = $this->_eavConfig->getAttribute(ModelProduct::ENTITY, $attributeName);
         if ($attribute &&
             $attribute->getId() &&
-            $attribute->getFrontendInput() != 'media_image' &&
+            $attribute->getFrontendInput() !== 'media_image' &&
             (!$attribute->getIsHtmlAllowedOnFront() &&
             !$attribute->getIsWysiwygEnabled())
         ) {
-            if ($attribute->getFrontendInput() != 'price') {
+            if ($attribute->getFrontendInput() !== 'price') {
                 $attributeHtml = $this->_escaper->escapeHtml($attributeHtml);
             }
-            if ($attribute->getFrontendInput() == 'textarea') {
+            if ($attribute->getFrontendInput() === 'textarea') {
                 $attributeHtml = nl2br($attributeHtml);
             }
         }
@@ -187,14 +203,14 @@ public function productAttribute($product, $attributeHtml, $attributeName)
      * @param string $attributeHtml
      * @param string $attributeName
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function categoryAttribute($category, $attributeHtml, $attributeName)
     {
         $attribute = $this->_eavConfig->getAttribute(ModelCategory::ENTITY, $attributeName);
 
         if ($attribute &&
-            $attribute->getFrontendInput() != 'image' &&
+            $attribute->getFrontendInput() !== 'image' &&
             (!$attribute->getIsHtmlAllowedOnFront() &&
             !$attribute->getIsWysiwygEnabled())
         ) {
diff --git a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
index 2c1bacdb99e12..09d53427a3043 100644
--- a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
@@ -3,15 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * Adminhtml catalog product action attribute update helper
- */
 namespace Magento\Catalog\Helper\Product\Edit\Action;
 
 /**
- * Class Attribute
+ * Adminhtml catalog product action attribute update helper.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Attribute extends \Magento\Backend\Helper\Data
 {
@@ -32,7 +32,7 @@ class Attribute extends \Magento\Backend\Helper\Data
     /**
      * Excluded from batch update attribute codes
      *
-     * @var string[]
+     * @var array
      */
     protected $_excludedAttributes = ['url_key'];
 
@@ -92,6 +92,7 @@ public function __construct(
 
     /**
      * Return product collection with selected product filter
+     *
      * Product collection didn't load
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
@@ -171,8 +172,8 @@ public function getAttributes()
                 $this->getProductsSetIds()
             );
 
-            if ($this->_excludedAttributes) {
-                $this->_attributes->addFieldToFilter('attribute_code', ['nin' => $this->_excludedAttributes]);
+            if ($excludedAttributes = $this->getExcludedAttributes()) {
+                $this->_attributes->addFieldToFilter('attribute_code', ['nin' => $excludedAttributes]);
             }
 
             // check product type apply to limitation and remove attributes that impossible to change in mass-update
@@ -193,11 +194,24 @@ public function getAttributes()
     }
 
     /**
+     * Gets website id.
+     *
      * @param int $storeId
      * @return int
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getStoreWebsiteId($storeId)
     {
         return $this->_storeManager->getStore($storeId)->getWebsiteId();
     }
+
+    /**
+     * Retrieve excluded attributes.
+     *
+     * @return array
+     */
+    public function getExcludedAttributes(): array
+    {
+        return $this->_excludedAttributes;
+    }
 }
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index 74f40a18971d5..cf5b15cadc997 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Catalog\Helper\Product;
 
+use Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Result\Page as ResultPage;
 
 /**
@@ -66,6 +68,11 @@ class View extends \Magento\Framework\App\Helper\AbstractHelper
      */
     private $string;
 
+    /**
+     * @var LayoutUpdateManager
+     */
+    private $layoutUpdateManager;
+
     /**
      * Constructor
      *
@@ -78,6 +85,8 @@ class View extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator
      * @param array $messageGroups
      * @param \Magento\Framework\Stdlib\StringUtils|null $string
+     * @param LayoutUpdateManager|null $layoutUpdateManager
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -88,7 +97,8 @@ public function __construct(
         \Magento\Framework\Message\ManagerInterface $messageManager,
         \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator,
         array $messageGroups = [],
-        \Magento\Framework\Stdlib\StringUtils $string = null
+        \Magento\Framework\Stdlib\StringUtils $string = null,
+        ?LayoutUpdateManager $layoutUpdateManager = null
     ) {
         $this->_catalogSession = $catalogSession;
         $this->_catalogDesign = $catalogDesign;
@@ -97,8 +107,9 @@ 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);
+        $this->string = $string ?: ObjectManager::getInstance()->get(\Magento\Framework\Stdlib\StringUtils::class);
+        $this->layoutUpdateManager = $layoutUpdateManager
+            ?? ObjectManager::getInstance()->get(LayoutUpdateManager::class);
         parent::__construct($context);
     }
 
@@ -203,6 +214,9 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
                 }
             }
         }
+        if ($settings->getPageLayoutHandles()) {
+            $resultPage->addPageLayoutHandles($settings->getPageLayoutHandles());
+        }
 
         $currentCategory = $this->_coreRegistry->registry('current_category');
         $controllerClass = $this->_request->getFullActionName();
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/AbstractLayoutUpdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/AbstractLayoutUpdate.php
new file mode 100644
index 0000000000000..1aa7ab7e5880f
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/AbstractLayoutUpdate.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Attribute\Backend;
+
+use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Catalog\Model\AbstractModel;
+
+/**
+ * Custom layout file attribute.
+ */
+abstract class AbstractLayoutUpdate extends AbstractBackend
+{
+    public const VALUE_USE_UPDATE_XML = '__existing__';
+
+    public const VALUE_NO_UPDATE = '__no_update__';
+
+    /**
+     * Extract attribute value.
+     *
+     * @param AbstractModel $model
+     * @return mixed
+     */
+    private function extractAttributeValue(AbstractModel $model)
+    {
+        $code = $this->getAttribute()->getAttributeCode();
+
+        return $model->getData($code);
+    }
+
+    /**
+     * Compose list of available files (layout handles) for given entity.
+     *
+     * @param AbstractModel $forModel
+     * @return string[]
+     */
+    abstract protected function listAvailableValues(AbstractModel $forModel): array;
+
+    /**
+     * Extracts prepare attribute value to be saved.
+     *
+     * @throws LocalizedException
+     * @param AbstractModel $model
+     * @return string|null
+     */
+    private function prepareValue(AbstractModel $model): ?string
+    {
+        $value = $this->extractAttributeValue($model);
+        if (!is_string($value)) {
+            $value = null;
+        }
+        if ($value
+            && $value !== self::VALUE_USE_UPDATE_XML
+            && $value !== self::VALUE_NO_UPDATE
+            && !in_array($value, $this->listAvailableValues($model), true)
+        ) {
+            throw new LocalizedException(__('Selected layout update is not available'));
+        }
+
+        return $value;
+    }
+
+    /**
+     * Set value for the object.
+     *
+     * @param string|null $value
+     * @param AbstractModel $forObject
+     * @param string|null $attrCode
+     * @return void
+     */
+    private function setAttributeValue(?string $value, AbstractModel $forObject, ?string $attrCode = null): void
+    {
+        $attrCode = $attrCode ?? $this->getAttribute()->getAttributeCode();
+        if ($forObject->hasData(AbstractModel::CUSTOM_ATTRIBUTES)) {
+            $forObject->setCustomAttribute($attrCode, $value);
+        }
+        $forObject->setData($attrCode, $value);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param AbstractModel $object
+     */
+    public function validate($object)
+    {
+        $valid = parent::validate($object);
+        if ($valid) {
+            $this->prepareValue($object);
+        }
+
+        return $valid;
+    }
+
+    /**
+     * @inheritDoc
+     * @param AbstractModel $object
+     * @throws LocalizedException
+     */
+    public function beforeSave($object)
+    {
+        $value = $this->prepareValue($object);
+        if ($value && ($value === self::VALUE_NO_UPDATE || $value !== self::VALUE_USE_UPDATE_XML)) {
+            $this->setAttributeValue(null, $object, 'custom_layout_update');
+        }
+        if (!$value || $value === self::VALUE_USE_UPDATE_XML || $value === self::VALUE_NO_UPDATE) {
+            $value = null;
+        }
+        $this->setAttributeValue($value, $object);
+
+        return $this;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
index a994446881189..b5aa5e2035100 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
@@ -5,8 +5,10 @@
  */
 namespace Magento\Catalog\Model\Attribute\Backend;
 
+use Magento\Catalog\Model\AbstractModel;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\View\Model\Layout\Update\ValidatorFactory;
-use Magento\Eav\Model\Entity\Attribute\Exception;
+use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
 
 /**
  * Layout update attribute backend
@@ -16,18 +18,15 @@
  * @SuppressWarnings(PHPMD.LongVariable)
  * @since 100.0.2
  */
-class Customlayoutupdate extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
+class Customlayoutupdate extends AbstractBackend
 {
     /**
-     * Layout update validator factory
-     *
      * @var ValidatorFactory
+     * @deprecated Is not used anymore.
      */
     protected $_layoutUpdateValidatorFactory;
 
     /**
-     * Construct the custom layout update class
-     *
      * @param ValidatorFactory $layoutUpdateValidatorFactory
      */
     public function __construct(ValidatorFactory $layoutUpdateValidatorFactory)
@@ -36,31 +35,95 @@ public function __construct(ValidatorFactory $layoutUpdateValidatorFactory)
     }
 
     /**
-     * Validate the custom layout update
+     * Extract an attribute value.
      *
-     * @param \Magento\Framework\DataObject $object
-     * @return bool
-     * @throws Exception
+     * @param AbstractModel $object
+     * @return mixed
      */
-    public function validate($object)
+    private function extractValue(AbstractModel $object)
+    {
+        $attributeCode = $attributeCode ?? $this->getAttribute()->getName();
+        $value = $object->getData($attributeCode);
+        if (!$value || !is_string($value)) {
+            $value = null;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Extract old attribute value.
+     *
+     * @param AbstractModel $object
+     * @return mixed Old value or null.
+     */
+    private function extractOldValue(AbstractModel $object)
     {
-        $attributeName = $this->getAttribute()->getName();
-        $xml = trim($object->getData($attributeName));
+        if (!empty($object->getId())) {
+            $attr = $this->getAttribute()->getAttributeCode();
+
+            if ($object->getOrigData()) {
+                return $object->getOrigData($attr);
+            }
 
-        if (!$this->getAttribute()->getIsRequired() && empty($xml)) {
-            return true;
+            $oldObject = clone $object;
+            $oldObject->unsetData();
+            $oldObject->load($object->getId());
+
+            return $oldObject->getData($attr);
         }
 
-        /** @var $validator \Magento\Framework\View\Model\Layout\Update\Validator */
-        $validator = $this->_layoutUpdateValidatorFactory->create();
-        if (!$validator->isValid($xml)) {
-            $messages = $validator->getMessages();
-            //Add first message to exception
-            $message = array_shift($messages);
-            $eavExc = new Exception(__($message));
-            $eavExc->setAttributeCode($attributeName);
-            throw $eavExc;
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param AbstractModel $object
+     */
+    public function validate($object)
+    {
+        if (parent::validate($object)) {
+            if ($object instanceof AbstractModel) {
+                $value = $this->extractValue($object);
+                $oldValue = $this->extractOldValue($object);
+                if ($value && $oldValue !== $value) {
+                    throw new LocalizedException(__('Custom layout update text cannot be changed, only removed'));
+                }
+            }
         }
+
         return true;
     }
+
+    /**
+     * Put an attribute value.
+     *
+     * @param AbstractModel $object
+     * @param string|null $value
+     * @return void
+     */
+    private function putValue(AbstractModel $object, ?string $value): void
+    {
+        $attributeCode = $this->getAttribute()->getName();
+        if ($object->hasData(AbstractModel::CUSTOM_ATTRIBUTES)) {
+            $object->setCustomAttribute($attributeCode, $value);
+        }
+        $object->setData($attributeCode, $value);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param AbstractModel $object
+     * @throws LocalizedException
+     */
+    public function beforeSave($object)
+    {
+        //Validate first, validation might have been skipped.
+        $this->validate($object);
+        $this->putValue($object, $this->extractValue($object));
+
+        return parent::beforeSave($object);
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php b/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php
index 0940ca7a234a3..cf194615b1f3b 100644
--- a/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php
+++ b/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php
@@ -81,7 +81,7 @@ public function containsValue($entityType, $entity, $attributeCode, $storeId)
         if ((int)$storeId === Store::DEFAULT_STORE_ID) {
             return false;
         }
-        if ($this->attributesValues === null) {
+        if (!isset($this->attributesValues[$storeId])) {
             $this->initAttributeValues($entityType, $entity, (int)$storeId);
         }
 
@@ -110,6 +110,8 @@ public function getDefaultValues($entityType, $entity)
     }
 
     /**
+     * Init attribute values.
+     *
      * @param string $entityType
      * @param \Magento\Catalog\Model\AbstractModel $entity
      * @param int $storeId
@@ -158,6 +160,8 @@ private function initAttributeValues($entityType, $entity, $storeId)
     }
 
     /**
+     * Returns entity attributes.
+     *
      * @param string $entityType
      * @return \Magento\Eav\Api\Data\AttributeInterface[]
      */
diff --git a/app/code/Magento/Catalog/Model/Attribute/Source/AbstractLayoutUpdate.php b/app/code/Magento/Catalog/Model/Attribute/Source/AbstractLayoutUpdate.php
new file mode 100644
index 0000000000000..0003b9996c84b
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Attribute/Source/AbstractLayoutUpdate.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\Attribute\Source;
+
+use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
+use Magento\Eav\Model\Entity\Attribute\Source\SpecificSourceInterface;
+use Magento\Framework\Api\CustomAttributesDataInterface;
+use Magento\Catalog\Model\Attribute\Backend\AbstractLayoutUpdate as Backend;
+use Magento\Framework\Model\AbstractExtensibleModel;
+
+/**
+ * List of layout updates available for a catalog entity.
+ */
+abstract class AbstractLayoutUpdate extends AbstractSource implements SpecificSourceInterface
+{
+    /**
+     * @var string[]
+     */
+    private $optionsText;
+
+    /**
+     * @inheritDoc
+     */
+    public function getAllOptions()
+    {
+        $default = Backend::VALUE_NO_UPDATE;
+        $defaultText = 'No update';
+        $this->optionsText[$default] = $defaultText;
+
+        return [['label' => $defaultText, 'value' => $default]];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOptionText($value)
+    {
+        if (is_scalar($value) && array_key_exists($value, $this->optionsText)) {
+            return $this->optionsText[$value];
+        }
+
+        return false;
+    }
+
+    /**
+     * Extract attribute value.
+     *
+     * @param CustomAttributesDataInterface|AbstractExtensibleModel $entity
+     * @return mixed
+     */
+    private function extractAttributeValue(CustomAttributesDataInterface $entity)
+    {
+        $attrCode = 'custom_layout_update';
+        if ($entity instanceof AbstractExtensibleModel
+            && !$entity->hasData(CustomAttributesDataInterface::CUSTOM_ATTRIBUTES)
+        ) {
+            //Custom attributes were not loaded yet, using data array
+            return $entity->getData($attrCode);
+        }
+        //Fallback to customAttribute method
+        $attr = $entity->getCustomAttribute($attrCode);
+
+        return $attr ? $attr->getValue() : null;
+    }
+
+    /**
+     * List available layout update options for the entity.
+     *
+     * @param CustomAttributesDataInterface $entity
+     * @return string[]
+     */
+    abstract protected function listAvailableOptions(CustomAttributesDataInterface $entity): array;
+
+    /**
+     * @inheritDoc
+     *
+     * @param CustomAttributesDataInterface|AbstractExtensibleModel $entity
+     */
+    public function getOptionsFor(CustomAttributesDataInterface $entity): array
+    {
+        $options = $this->getAllOptions();
+        if ($this->extractAttributeValue($entity)) {
+            $existingValue = Backend::VALUE_USE_UPDATE_XML;
+            $existingLabel = 'Use existing';
+            $options[] = ['label' => $existingLabel, 'value' => $existingValue];
+            $this->optionsText[$existingValue] = $existingLabel;
+        }
+        foreach ($this->listAvailableOptions($entity) as $handle) {
+            $options[] = ['label' => $handle, 'value' => $handle];
+            $this->optionsText[$handle] = $handle;
+        }
+
+        return $options;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index 4ddfd1f3b63a8..330debdc32469 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -5,13 +5,10 @@
  */
 namespace Magento\Catalog\Model;
 
-use Magento\Authorization\Model\UserContextInterface;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 use Magento\Framework\Api\AttributeValueFactory;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\Convert\ConvertArray;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Profiler;
@@ -131,7 +128,8 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
         'page_layout',
         'custom_layout_update',
         'custom_apply_to_products',
-        'custom_use_parent_settings',
+        'custom_layout_update_file',
+        'custom_use_parent_settings'
     ];
 
     /**
@@ -215,16 +213,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $metadataService;
 
-    /**
-     * @var UserContextInterface
-     */
-    private $userContext;
-
-    /**
-     * @var AuthorizationInterface
-     */
-    private $authorization;
-
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -495,7 +483,7 @@ public function getProductCollection()
      * Retrieve all customer attributes
      *
      * @param bool $noDesignAttributes
-     * @return array
+     * @return \Magento\Eav\Api\Data\AttributeInterface[]
      * @todo Use with Flat Resource
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
@@ -764,7 +752,7 @@ public function getCustomDesignDate()
     /**
      * Retrieve design attributes array
      *
-     * @return array
+     * @return \Magento\Eav\Api\Data\AttributeInterface[]
      */
     public function getDesignAttributes()
     {
@@ -936,60 +924,6 @@ public function beforeDelete()
         return parent::beforeDelete();
     }
 
-    /**
-     * Get user context.
-     *
-     * @return UserContextInterface
-     */
-    private function getUserContext(): UserContextInterface
-    {
-        if (!$this->userContext) {
-            $this->userContext = ObjectManager::getInstance()->get(UserContextInterface::class);
-        }
-
-        return $this->userContext;
-    }
-
-    /**
-     * Get authorization service.
-     *
-     * @return AuthorizationInterface
-     */
-    private function getAuthorization(): AuthorizationInterface
-    {
-        if (!$this->authorization) {
-            $this->authorization = ObjectManager::getInstance()->get(AuthorizationInterface::class);
-        }
-
-        return $this->authorization;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function beforeSave()
-    {
-        //Validate changing of design.
-        $userType = $this->getUserContext()->getUserType();
-        if ((
-                $userType === UserContextInterface::USER_TYPE_ADMIN
-                || $userType === UserContextInterface::USER_TYPE_INTEGRATION
-            )
-            && !$this->getAuthorization()->isAllowed('Magento_Catalog::edit_category_design')
-        ) {
-            foreach ($this->_designAttributes as $attributeCode) {
-                $this->setData($attributeCode, $value = $this->getOrigData($attributeCode));
-                if (!empty($this->_data[self::CUSTOM_ATTRIBUTES])
-                    && array_key_exists($attributeCode, $this->_data[self::CUSTOM_ATTRIBUTES])) {
-                    //In case custom attribute were used to update the entity.
-                    $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode]->setValue($value);
-                }
-            }
-        }
-
-        return parent::beforeSave();
-    }
-
     /**
      * Retrieve anchors above
      *
@@ -1201,8 +1135,6 @@ public function reindex()
                 || $this->dataHasChangedFor('is_active')) {
             if (!$productIndexer->isScheduled()) {
                 $productIndexer->reindexList($this->getPathIds());
-            } else {
-                $productIndexer->invalidate();
             }
         }
     }
@@ -1360,6 +1292,7 @@ public function getChildrenData()
 
     //@codeCoverageIgnoreEnd
 
+    // phpcs:disable PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames
     /**
      * Return Data Object data in array format.
      *
@@ -1368,6 +1301,7 @@ public function getChildrenData()
      */
     public function __toArray()
     {
+        // phpcs:enable PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames
         $data = $this->_data;
         $hasToArray = function ($model) {
             return is_object($model) && method_exists($model, '__toArray') && is_callable([$model, '__toArray']);
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/LayoutUpdate.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/LayoutUpdate.php
new file mode 100644
index 0000000000000..215fe1c19bd8d
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/LayoutUpdate.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\Category\Attribute\Backend;
+
+use Magento\Catalog\Model\AbstractModel;
+use Magento\Catalog\Model\Attribute\Backend\AbstractLayoutUpdate;
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager;
+
+/**
+ * Allows to select a layout file to merge when rendering the category's page.
+ */
+class LayoutUpdate extends AbstractLayoutUpdate
+{
+
+    /**
+     * @var LayoutUpdateManager
+     */
+    private $manager;
+
+    /**
+     * @param LayoutUpdateManager $manager
+     */
+    public function __construct(LayoutUpdateManager $manager)
+    {
+        $this->manager = $manager;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param AbstractModel|Category $forModel
+     */
+    protected function listAvailableValues(AbstractModel $forModel): array
+    {
+        return $this->manager->fetchAvailableFiles($forModel);
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/LayoutUpdateManager.php b/app/code/Magento/Catalog/Model/Category/Attribute/LayoutUpdateManager.php
new file mode 100644
index 0000000000000..f5694a46d3fb2
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/LayoutUpdateManager.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\Model\Category\Attribute;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Framework\App\Area;
+use Magento\Framework\DataObject;
+use Magento\Framework\View\Design\Theme\FlyweightFactory;
+use Magento\Framework\View\DesignInterface;
+use Magento\Framework\View\Model\Layout\Merge as LayoutProcessor;
+use Magento\Framework\View\Model\Layout\MergeFactory as LayoutProcessorFactory;
+
+/**
+ * Manage available layout updates for categories.
+ */
+class LayoutUpdateManager
+{
+
+    /**
+     * @var FlyweightFactory
+     */
+    private $themeFactory;
+
+    /**
+     * @var DesignInterface
+     */
+    private $design;
+
+    /**
+     * @var LayoutProcessorFactory
+     */
+    private $layoutProcessorFactory;
+
+    /**
+     * @var LayoutProcessor|null
+     */
+    private $layoutProcessor;
+
+    /**
+     * @param FlyweightFactory $themeFactory
+     * @param DesignInterface $design
+     * @param LayoutProcessorFactory $layoutProcessorFactory
+     */
+    public function __construct(
+        FlyweightFactory $themeFactory,
+        DesignInterface $design,
+        LayoutProcessorFactory $layoutProcessorFactory
+    ) {
+        $this->themeFactory = $themeFactory;
+        $this->design = $design;
+        $this->layoutProcessorFactory = $layoutProcessorFactory;
+    }
+
+    /**
+     * Get the processor instance.
+     *
+     * @return LayoutProcessor
+     */
+    private function getLayoutProcessor(): LayoutProcessor
+    {
+        if (!$this->layoutProcessor) {
+            $this->layoutProcessor = $this->layoutProcessorFactory->create(
+                [
+                    'theme' => $this->themeFactory->create(
+                        $this->design->getConfigurationDesignTheme(Area::AREA_FRONTEND)
+                    )
+                ]
+            );
+            $this->themeFactory = null;
+            $this->design = null;
+        }
+
+        return $this->layoutProcessor;
+    }
+
+    /**
+     * Fetch list of available files/handles for the category.
+     *
+     * @param CategoryInterface $category
+     * @return string[]
+     */
+    public function fetchAvailableFiles(CategoryInterface $category): array
+    {
+        if (!$category->getId()) {
+            return [];
+        }
+
+        $handles = $this->getLayoutProcessor()->getAvailableHandles();
+
+        return array_filter(
+            array_map(
+                function (string $handle) use ($category) : ?string {
+                    preg_match(
+                        '/^catalog\_category\_view\_selectable\_' .$category->getId() .'\_([a-z0-9]+)/i',
+                        $handle,
+                        $selectable
+                    );
+                    if (!empty($selectable[1])) {
+                        return $selectable[1];
+                    }
+
+                    return null;
+                },
+                $handles
+            )
+        );
+    }
+
+    /**
+     * Extract custom layout attribute value.
+     *
+     * @param CategoryInterface $category
+     * @return mixed
+     */
+    private function extractAttributeValue(CategoryInterface $category)
+    {
+        if ($category instanceof Category && !$category->hasData(CategoryInterface::CUSTOM_ATTRIBUTES)) {
+            return $category->getData('custom_layout_update_file');
+        }
+        if ($attr = $category->getCustomAttribute('custom_layout_update_file')) {
+            return $attr->getValue();
+        }
+
+        return null;
+    }
+
+    /**
+     * Extract selected custom layout settings.
+     *
+     * If no update is selected none will apply.
+     *
+     * @param CategoryInterface $category
+     * @param DataObject $intoSettings
+     * @return void
+     */
+    public function extractCustomSettings(CategoryInterface $category, DataObject $intoSettings): void
+    {
+        if ($category->getId() && $value = $this->extractAttributeValue($category)) {
+            $handles = $intoSettings->getPageLayoutHandles() ?? [];
+            $handles = array_merge_recursive(
+                $handles,
+                ['selectable' => $category->getId() . '_' . $value]
+            );
+            $intoSettings->setPageLayoutHandles($handles);
+        }
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/LayoutUpdate.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/LayoutUpdate.php
new file mode 100644
index 0000000000000..1c307220aa9f8
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/LayoutUpdate.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Category\Attribute\Source;
+
+use Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager;
+use Magento\Framework\Api\CustomAttributesDataInterface;
+use Magento\Catalog\Model\Attribute\Source\AbstractLayoutUpdate;
+
+/**
+ * List of layout updates available for a category.
+ */
+class LayoutUpdate extends AbstractLayoutUpdate
+{
+    /**
+     * @var LayoutUpdateManager
+     */
+    private $manager;
+
+    /**
+     * @param LayoutUpdateManager $manager
+     */
+    public function __construct(LayoutUpdateManager $manager)
+    {
+        $this->manager = $manager;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function listAvailableOptions(CustomAttributesDataInterface $entity): array
+    {
+        return $this->manager->fetchAvailableFiles($entity);
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php
index 97bc00bc7dd64..4dda2fe5786e3 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Sortby.php
@@ -40,7 +40,7 @@ protected function _getCatalogConfig()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAllOptions()
     {
@@ -49,7 +49,7 @@ public function getAllOptions()
             foreach ($this->_getCatalogConfig()->getAttributesUsedForSortBy() as $attribute) {
                 $this->_options[] = [
                     'label' => __($attribute['frontend_label']),
-                    'value' => $attribute['attribute_code'],
+                    'value' => $attribute['attribute_code']
                 ];
             }
         }
diff --git a/app/code/Magento/Catalog/Model/Category/Authorization.php b/app/code/Magento/Catalog/Model/Category/Authorization.php
new file mode 100644
index 0000000000000..629a3c2319472
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Category/Authorization.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Category;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Category as CategoryModel;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\Exception\AuthorizationException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Catalog\Model\Category\Attribute\Backend\LayoutUpdate;
+
+/**
+ * Additional authorization for category operations.
+ */
+class Authorization
+{
+    /**
+     * @var AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * @var CategoryFactory
+     */
+    private $categoryFactory;
+
+    /**
+     * @param AuthorizationInterface $authorization
+     * @param CategoryFactory $factory
+     */
+    public function __construct(AuthorizationInterface $authorization, CategoryFactory $factory)
+    {
+        $this->authorization = $authorization;
+        $this->categoryFactory = $factory;
+    }
+
+    /**
+     * Extract attribute value from the model.
+     *
+     * @param CategoryModel $category
+     * @param AttributeInterface $attr
+     * @throws \RuntimeException When no new value is present.
+     * @return mixed
+     */
+    private function extractAttributeValue(CategoryModel $category, AttributeInterface $attr)
+    {
+        if ($category->hasData($attr->getAttributeCode())) {
+            $newValue = $category->getData($attr->getAttributeCode());
+        } elseif ($category->hasData(CategoryModel::CUSTOM_ATTRIBUTES)
+            && $attrValue = $category->getCustomAttribute($attr->getAttributeCode())
+        ) {
+            $newValue = $attrValue->getValue();
+        } else {
+            throw new \RuntimeException('New value is not set');
+        }
+
+        if (empty($newValue)
+            || ($attr->getBackend() instanceof LayoutUpdate
+                && ($newValue === LayoutUpdate::VALUE_USE_UPDATE_XML || $newValue === LayoutUpdate::VALUE_NO_UPDATE)
+            )
+        ) {
+            $newValue = null;
+        }
+
+        return $newValue;
+    }
+
+    /**
+     * Find values to compare the new one.
+     *
+     * @param AttributeInterface $attribute
+     * @param array|null $oldCategory
+     * @return mixed[]
+     */
+    private function fetchOldValue(AttributeInterface $attribute, ?array $oldCategory): array
+    {
+        $oldValues = [null];
+        $attrCode = $attribute->getAttributeCode();
+        if ($oldCategory) {
+            //New value must match saved value exactly
+            $oldValues = [!empty($oldCategory[$attrCode]) ? $oldCategory[$attrCode] : null];
+            if (empty($oldValues[0])) {
+                $oldValues[0] = null;
+            }
+        } else {
+            //New value can be either empty or default value.
+            $oldValues[] = $attribute->getDefaultValue();
+        }
+
+        return $oldValues;
+    }
+
+    /**
+     * Determine whether a category has design properties changed.
+     *
+     * @param CategoryModel $category
+     * @param array|null $oldCategory
+     * @return bool
+     */
+    private function hasChanges(CategoryModel $category, ?array $oldCategory): bool
+    {
+        foreach ($category->getDesignAttributes() as $designAttribute) {
+            $oldValues = $this->fetchOldValue($designAttribute, $oldCategory);
+            try {
+                $newValue = $this->extractAttributeValue($category, $designAttribute);
+            } catch (\RuntimeException $exception) {
+                //No new value
+                continue;
+            }
+
+            if (!in_array($newValue, $oldValues, true)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Authorize saving of a category.
+     *
+     * @throws AuthorizationException
+     * @throws NoSuchEntityException When a category with invalid ID given.
+     * @param CategoryInterface|CategoryModel $category
+     * @return void
+     */
+    public function authorizeSavingOf(CategoryInterface $category): void
+    {
+        if (!$this->authorization->isAllowed('Magento_Catalog::edit_category_design')) {
+            $oldData = null;
+            if ($category->getId()) {
+                if ($category->getOrigData()) {
+                    $oldData = $category->getOrigData();
+                } else {
+                    /** @var CategoryModel $savedCategory */
+                    $savedCategory = $this->categoryFactory->create();
+                    $savedCategory->load($category->getId());
+                    if (!$savedCategory->getName()) {
+                        throw NoSuchEntityException::singleField('id', $category->getId());
+                    }
+                    $oldData = $savedCategory->getData();
+                }
+            }
+
+            if ($this->hasChanges($category, $oldData)) {
+                throw new AuthorizationException(__('Not allowed to edit the category\'s design attributes'));
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php
index c96b2aae36059..283e3f87686b9 100644
--- a/app/code/Magento/Catalog/Model/Category/DataProvider.php
+++ b/app/code/Magento/Catalog/Model/Category/DataProvider.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\Category;
 
 use Magento\Catalog\Api\Data\CategoryInterface;
@@ -15,11 +17,13 @@
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
 use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\Source\SpecificSourceInterface;
 use Magento\Eav\Model\Entity\Type;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Framework\Stdlib\ArrayUtils;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Form\Field;
@@ -28,10 +32,9 @@
 use Magento\Framework\AuthorizationInterface;
 
 /**
- * Class DataProvider
+ * Category form data provider.
  *
  * @api
- *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @since 101.0.0
@@ -52,6 +55,7 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
 
     /**
      * EAV attribute properties to fetch from meta storage
+     *
      * @var array
      * @since 101.0.0
      */
@@ -66,6 +70,8 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
         'size' => 'multiline_count',
     ];
 
+    private $boolMetaProperties = ['visible', 'required'];
+
     /**
      * Form element mapping
      *
@@ -143,6 +149,11 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
      */
     private $arrayManager;
 
+    /**
+     * @var ArrayUtils
+     */
+    private $arrayUtils;
+
     /**
      * @var Filesystem
      */
@@ -154,8 +165,6 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
     private $auth;
 
     /**
-     * DataProvider constructor
-     *
      * @param string $name
      * @param string $primaryFieldName
      * @param string $requestFieldName
@@ -170,6 +179,8 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
      * @param array $data
      * @param PoolInterface|null $pool
      * @param AuthorizationInterface|null $auth
+     * @param ArrayUtils|null $arrayUtils
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -186,7 +197,8 @@ public function __construct(
         array $meta = [],
         array $data = [],
         PoolInterface $pool = null,
-        ?AuthorizationInterface $auth = null
+        ?AuthorizationInterface $auth = null,
+        ?ArrayUtils $arrayUtils = null
     ) {
         $this->eavValidationRules = $eavValidationRules;
         $this->collection = $categoryCollectionFactory->create();
@@ -197,6 +209,7 @@ public function __construct(
         $this->request = $request;
         $this->categoryFactory = $categoryFactory;
         $this->auth = $auth ?? ObjectManager::getInstance()->get(AuthorizationInterface::class);
+        $this->arrayUtils = $arrayUtils ?? ObjectManager::getInstance()->get(ArrayUtils::class);
 
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data, $pool);
     }
@@ -226,7 +239,7 @@ public function getMeta()
      * @param array $meta
      * @return array
      */
-    private function addUseDefaultValueCheckbox(Category $category, array $meta)
+    private function addUseDefaultValueCheckbox(Category $category, array $meta): array
     {
         /** @var EavAttributeInterface $attribute */
         foreach ($category->getAttributes() as $attribute) {
@@ -290,7 +303,7 @@ public function prepareMeta($meta)
      * @param array $fieldsMeta
      * @return array
      */
-    private function prepareFieldsMeta($fieldsMap, $fieldsMeta)
+    private function prepareFieldsMeta(array $fieldsMap, array $fieldsMeta): array
     {
         $canEditDesign = $this->auth->isAllowed('Magento_Catalog::edit_category_design');
 
@@ -350,6 +363,8 @@ public function getAttributesMeta(Type $entityType)
     {
         $meta = [];
         $attributes = $entityType->getAttributeCollection();
+        $fields = $this->getFields();
+        $category = $this->getCurrentCategory();
         /* @var EavAttribute $attribute */
         foreach ($attributes as $attribute) {
             $code = $attribute->getAttributeCode();
@@ -357,13 +372,26 @@ public function getAttributesMeta(Type $entityType)
             foreach ($this->metaProperties as $metaName => $origName) {
                 $value = $attribute->getDataUsingMethod($origName);
                 $meta[$code][$metaName] = $value;
+                if (in_array($metaName, $this->boolMetaProperties, true)) {
+                    $meta[$code][$metaName] = (bool)$meta[$code][$metaName];
+                }
                 if ('frontend_input' === $origName) {
                     $meta[$code]['formElement'] = isset($this->formElement[$value])
                         ? $this->formElement[$value]
                         : $value;
                 }
                 if ($attribute->usesSource()) {
-                    $meta[$code]['options'] = $attribute->getSource()->getAllOptions();
+                    $source = $attribute->getSource();
+                    $currentCategory = $this->getCurrentCategory();
+                    if ($source instanceof SpecificSourceInterface && $currentCategory) {
+                        $options = $source->getOptionsFor($currentCategory);
+                    } else {
+                        $options = $source->getAllOptions();
+                    }
+                    foreach ($options as &$option) {
+                        $option['__disableTmpl'] = true;
+                    }
+                    $meta[$code]['options'] = $options;
                 }
             }
 
@@ -374,6 +402,16 @@ public function getAttributesMeta(Type $entityType)
 
             $meta[$code]['scopeLabel'] = $this->getScopeLabel($attribute);
             $meta[$code]['componentType'] = Field::NAME;
+
+            // disable fields
+            if ($category) {
+                $attributeIsLocked = $category->isLockedAttribute($code);
+                $meta[$code]['disabled'] = $attributeIsLocked;
+                $hasUseConfigField = (bool) array_search('use_config.' . $code, $fields, true);
+                if ($hasUseConfigField && $meta[$code]['disabled']) {
+                    $meta['use_config.' . $code]['disabled'] = true;
+                }
+            }
         }
 
         $result = [];
@@ -505,9 +543,15 @@ protected function filterFields($categoryData)
      * @param array $categoryData
      * @return array
      */
-    private function convertValues($category, $categoryData)
+    private function convertValues($category, $categoryData): array
     {
         foreach ($category->getAttributes() as $attributeCode => $attribute) {
+            if ($attributeCode === 'custom_layout_update_file') {
+                if (!empty($categoryData['custom_layout_update'])) {
+                    $categoryData['custom_layout_update_file']
+                        = \Magento\Catalog\Model\Category\Attribute\Backend\LayoutUpdate::VALUE_USE_UPDATE_XML;
+                }
+            }
             if (!isset($categoryData[$attributeCode])) {
                 continue;
             }
@@ -604,6 +648,7 @@ protected function getFieldsMap()
                     'custom_design',
                     'page_layout',
                     'custom_layout_update',
+                    'custom_layout_update_file'
                 ],
             'schedule_design_update' => [
                     'custom_design_from',
@@ -616,13 +661,24 @@ protected function getFieldsMap()
         ];
     }
 
+    /**
+     * Return list of fields names.
+     *
+     * @return array
+     */
+    private function getFields(): array
+    {
+        $fieldsMap = $this->getFieldsMap();
+        return $this->arrayUtils->flatten($fieldsMap);
+    }
+
     /**
      * Retrieve scope overridden value
      *
      * @return ScopeOverriddenValue
      * @deprecated 101.1.0
      */
-    private function getScopeOverriddenValue()
+    private function getScopeOverriddenValue(): ScopeOverriddenValue
     {
         if (null === $this->scopeOverriddenValue) {
             $this->scopeOverriddenValue = \Magento\Framework\App\ObjectManager::getInstance()->get(
@@ -639,7 +695,7 @@ private function getScopeOverriddenValue()
      * @return ArrayManager
      * @deprecated 101.1.0
      */
-    private function getArrayManager()
+    private function getArrayManager(): ArrayManager
     {
         if (null === $this->arrayManager) {
             $this->arrayManager = \Magento\Framework\App\ObjectManager::getInstance()->get(
@@ -657,7 +713,7 @@ private function getArrayManager()
      *
      * @deprecated 101.1.0
      */
-    private function getFileInfo()
+    private function getFileInfo(): FileInfo
     {
         if ($this->fileInfo === null) {
             $this->fileInfo = ObjectManager::getInstance()->get(FileInfo::class);
diff --git a/app/code/Magento/Catalog/Model/Config.php b/app/code/Magento/Catalog/Model/Config.php
index 5dce940308a4f..c4ff12bbf0f94 100644
--- a/app/code/Magento/Catalog/Model/Config.php
+++ b/app/code/Magento/Catalog/Model/Config.php
@@ -9,6 +9,8 @@
 use Magento\Framework\Serialize\SerializerInterface;
 
 /**
+ * Catalog config model.
+ *
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -133,6 +135,7 @@ class Config extends \Magento\Eav\Model\Config
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param SerializerInterface $serializer
+     * @param array $attributesForPreload
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -149,7 +152,8 @@ public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $setCollectionFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Config $eavConfig,
-        SerializerInterface $serializer = null
+        SerializerInterface $serializer = null,
+        $attributesForPreload = []
     ) {
         $this->_scopeConfig = $scopeConfig;
         $this->_configFactory = $configFactory;
@@ -165,7 +169,9 @@ public function __construct(
             $entityTypeCollectionFactory,
             $cacheState,
             $universalFactory,
-            $serializer
+            $serializer,
+            $scopeConfig,
+            $attributesForPreload
         );
     }
 
diff --git a/app/code/Magento/Catalog/Model/Design.php b/app/code/Magento/Catalog/Model/Design.php
index 853bbeac8eb38..fed18a5a60913 100644
--- a/app/code/Magento/Catalog/Model/Design.php
+++ b/app/code/Magento/Catalog/Model/Design.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Model;
 
+use Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager as CategoryLayoutManager;
+use Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager as ProductLayoutManager;
+use Magento\Framework\App\ObjectManager;
 use \Magento\Framework\TranslateInterface;
 
 /**
@@ -14,6 +17,7 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Design extends \Magento\Framework\Model\AbstractModel
 {
@@ -38,6 +42,16 @@ class Design extends \Magento\Framework\Model\AbstractModel
      */
     private $translator;
 
+    /**
+     * @var CategoryLayoutManager
+     */
+    private $categoryLayoutUpdates;
+
+    /**
+     * @var ProductLayoutManager
+     */
+    private $productLayoutUpdates;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -47,6 +61,9 @@ class Design extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      * @param TranslateInterface|null $translator
+     * @param CategoryLayoutManager|null $categoryLayoutManager
+     * @param ProductLayoutManager|null $productLayoutManager
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -56,12 +73,17 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        TranslateInterface $translator = null
+        TranslateInterface $translator = null,
+        ?CategoryLayoutManager $categoryLayoutManager = null,
+        ?ProductLayoutManager $productLayoutManager = null
     ) {
         $this->_localeDate = $localeDate;
         $this->_design = $design;
-        $this->translator = $translator ?:
-            \Magento\Framework\App\ObjectManager::getInstance()->get(TranslateInterface::class);
+        $this->translator = $translator ?? ObjectManager::getInstance()->get(TranslateInterface::class);
+        $this->categoryLayoutUpdates = $categoryLayoutManager
+            ?? ObjectManager::getInstance()->get(CategoryLayoutManager::class);
+        $this->productLayoutUpdates = $productLayoutManager
+            ?? ObjectManager::getInstance()->get(ProductLayoutManager::class);
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -81,12 +103,12 @@ public function applyCustomDesign($design)
     /**
      * Get custom layout settings
      *
-     * @param \Magento\Catalog\Model\Category|\Magento\Catalog\Model\Product $object
+     * @param Category|Product $object
      * @return \Magento\Framework\DataObject
      */
     public function getDesignSettings($object)
     {
-        if ($object instanceof \Magento\Catalog\Model\Product) {
+        if ($object instanceof Product) {
             $currentCategory = $object->getCategory();
         } else {
             $currentCategory = $object;
@@ -97,7 +119,7 @@ public function getDesignSettings($object)
             $category = $currentCategory->getParentDesignCategory($currentCategory);
         }
 
-        if ($object instanceof \Magento\Catalog\Model\Product) {
+        if ($object instanceof Product) {
             if ($category && $category->getCustomApplyToProducts()) {
                 return $this->_mergeSettings($this->_extractSettings($category), $this->_extractSettings($object));
             } else {
@@ -111,7 +133,7 @@ public function getDesignSettings($object)
     /**
      * Extract custom layout settings from category or product object
      *
-     * @param \Magento\Catalog\Model\Category|\Magento\Catalog\Model\Product $object
+     * @param Category|Product $object
      * @return \Magento\Framework\DataObject
      */
     protected function _extractSettings($object)
@@ -140,6 +162,11 @@ protected function _extractSettings($object)
             )->setLayoutUpdates(
                 (array)$object->getCustomLayoutUpdate()
             );
+            if ($object instanceof Category) {
+                $this->categoryLayoutUpdates->extractCustomSettings($object, $settings);
+            } elseif ($object instanceof Product) {
+                $this->productLayoutUpdates->extractCustomSettings($object, $settings);
+            }
         }
         return $settings;
     }
diff --git a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
index 22cb3c3264df5..d9893be3125fe 100644
--- a/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
+++ b/app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php
@@ -21,7 +21,7 @@ class Container extends \Magento\Eav\Model\Entity\Attribute\Source\Config
     public function getOptionText($value)
     {
         $options = $this->getAllOptions();
-        if (sizeof($options) > 0) {
+        if (count($options) > 0) {
             foreach ($options as $option) {
                 if (isset($option['value']) && $option['value'] == $value) {
                     return __($option['label']);
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product.php
index af1cda41d8c46..c18404bda1fc8 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product.php
@@ -137,10 +137,11 @@ protected function executeAction($ids)
 
         /** @var Product\Action\Rows $action */
         $action = $this->rowsActionFactory->create();
-        if ($indexer->isWorking()) {
+        if ($indexer->isScheduled()) {
             $action->execute($ids, true);
+        } else {
+            $action->execute($ids);
         }
-        $action->execute($ids);
 
         return $this;
     }
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 3bd4910767587..5d81c1405efe0 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
@@ -5,6 +5,25 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Product\Action;
 
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Indexer\CacheContext;
+use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\Config;
+use Magento\Catalog\Model\Category;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Catalog\Model\Indexer\Product\Category as ProductCategoryIndexer;
+
+/**
+ * Reindex multiple rows action.
+ *
+ * @package Magento\Catalog\Model\Indexer\Category\Product\Action
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
 {
     /**
@@ -14,25 +33,121 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      */
     protected $limitationByCategories;
 
+    /**
+     * @var CacheContext
+     */
+    private $cacheContext;
+
+    /**
+     * @var EventManagerInterface|null
+     */
+    private $eventManager;
+
+    /**
+     * @var IndexerRegistry
+     */
+    private $indexerRegistry;
+
+    /**
+     * @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
+     * @param IndexerRegistry|null $indexerRegistry
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        StoreManagerInterface $storeManager,
+        Config $config,
+        QueryGenerator $queryGenerator = null,
+        MetadataPool $metadataPool = null,
+        CacheContext $cacheContext = null,
+        EventManagerInterface $eventManager = null,
+        IndexerRegistry $indexerRegistry = null
+    ) {
+        parent::__construct($resource, $storeManager, $config, $queryGenerator, $metadataPool);
+        $this->cacheContext = $cacheContext ?: ObjectManager::getInstance()->get(CacheContext::class);
+        $this->eventManager = $eventManager ?: ObjectManager::getInstance()->get(EventManagerInterface::class);
+        $this->indexerRegistry = $indexerRegistry ?: ObjectManager::getInstance()->get(IndexerRegistry::class);
+    }
+
     /**
      * Refresh entities index
      *
      * @param int[] $entityIds
      * @param bool $useTempTable
      * @return $this
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute(array $entityIds = [], $useTempTable = false)
     {
-        $this->limitationByCategories = $entityIds;
+        foreach ($entityIds as $entityId) {
+            $this->limitationByCategories[] = (int)$entityId;
+            $path = $this->getPathFromCategoryId($entityId);
+            if (!empty($path)) {
+                $pathIds = explode('/', $path);
+                foreach ($pathIds as $pathId) {
+                    $this->limitationByCategories[] = (int)$pathId;
+                }
+            }
+        }
+        $this->limitationByCategories = array_unique($this->limitationByCategories);
         $this->useTempTable = $useTempTable;
+        $indexer = $this->indexerRegistry->get(ProductCategoryIndexer::INDEXER_ID);
+        $workingState = $indexer->isWorking();
 
-        $this->removeEntries();
+        if ($useTempTable && !$workingState && $indexer->isScheduled()) {
+            foreach ($this->storeManager->getStores() as $store) {
+                $this->connection->truncateTable($this->getIndexTable($store->getId()));
+            }
+        } else {
+            $this->removeEntries();
+        }
 
         $this->reindex();
 
+        if ($useTempTable && !$workingState && $indexer->isScheduled()) {
+            foreach ($this->storeManager->getStores() as $store) {
+                $removalCategoryIds = array_diff($this->limitationByCategories, [$this->getRootCategoryId($store)]);
+                $this->connection->delete(
+                    $this->tableMaintainer->getMainTable($store->getId()),
+                    ['category_id IN (?)' => $removalCategoryIds]
+                );
+                $select = $this->connection->select()
+                    ->from($this->tableMaintainer->getMainReplicaTable($store->getId()));
+                $this->connection->query(
+                    $this->connection->insertFromSelect(
+                        $select,
+                        $this->tableMaintainer->getMainTable($store->getId()),
+                        [],
+                        AdapterInterface::INSERT_ON_DUPLICATE
+                    )
+                );
+            }
+        }
+
+        $this->registerCategories($entityIds);
+        $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->cacheContext]);
+
         return $this;
     }
 
+    /**
+     * Register categories assigned to products
+     *
+     * @param array $categoryIds
+     * @return void
+     */
+    private function registerCategories(array $categoryIds)
+    {
+        if ($categoryIds) {
+            $this->cacheContext->registerEntities(Category::CACHE_TAG, $categoryIds);
+        }
+    }
+
     /**
      * Return array of all category root IDs + tree root ID
      *
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 15ba6c8f3758b..ec3d0d57330ec 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
@@ -15,6 +15,9 @@
 use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
 use Magento\Framework\Indexer\CacheContext;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Catalog\Model\Indexer\Category\Product as CategoryProductIndexer;
 
 /**
  * Category rows indexer.
@@ -40,6 +43,11 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      */
     private $eventManager;
 
+    /**
+     * @var IndexerRegistry
+     */
+    private $indexerRegistry;
+
     /**
      * @param ResourceConnection $resource
      * @param StoreManagerInterface $storeManager
@@ -48,6 +56,7 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      * @param MetadataPool|null $metadataPool
      * @param CacheContext|null $cacheContext
      * @param EventManagerInterface|null $eventManager
+     * @param IndexerRegistry|null $indexerRegistry
      */
     public function __construct(
         ResourceConnection $resource,
@@ -56,11 +65,13 @@ public function __construct(
         QueryGenerator $queryGenerator = null,
         MetadataPool $metadataPool = null,
         CacheContext $cacheContext = null,
-        EventManagerInterface $eventManager = null
+        EventManagerInterface $eventManager = null,
+        IndexerRegistry $indexerRegistry = null
     ) {
         parent::__construct($resource, $storeManager, $config, $queryGenerator, $metadataPool);
         $this->cacheContext = $cacheContext ?: ObjectManager::getInstance()->get(CacheContext::class);
         $this->eventManager = $eventManager ?: ObjectManager::getInstance()->get(EventManagerInterface::class);
+        $this->indexerRegistry = $indexerRegistry ?: ObjectManager::getInstance()->get(IndexerRegistry::class);
     }
 
     /**
@@ -78,12 +89,37 @@ public function execute(array $entityIds = [], $useTempTable = false)
 
         $this->limitationByProducts = $idsToBeReIndexed;
         $this->useTempTable = $useTempTable;
+        $indexer = $this->indexerRegistry->get(CategoryProductIndexer::INDEXER_ID);
+        $workingState = $indexer->isWorking();
 
         $affectedCategories = $this->getCategoryIdsFromIndex($idsToBeReIndexed);
 
-        $this->removeEntries();
-
+        if ($useTempTable && !$workingState && $indexer->isScheduled()) {
+            foreach ($this->storeManager->getStores() as $store) {
+                $this->connection->truncateTable($this->getIndexTable($store->getId()));
+            }
+        } else {
+            $this->removeEntries();
+        }
         $this->reindex();
+        if ($useTempTable && !$workingState && $indexer->isScheduled()) {
+            foreach ($this->storeManager->getStores() as $store) {
+                $this->connection->delete(
+                    $this->tableMaintainer->getMainTable($store->getId()),
+                    ['product_id IN (?)' => $this->limitationByProducts]
+                );
+                $select = $this->connection->select()
+                    ->from($this->tableMaintainer->getMainReplicaTable($store->getId()));
+                $this->connection->query(
+                    $this->connection->insertFromSelect(
+                        $select,
+                        $this->tableMaintainer->getMainTable($store->getId()),
+                        [],
+                        AdapterInterface::INSERT_ON_DUPLICATE
+                    )
+                );
+            }
+        }
 
         $affectedCategories = array_merge($affectedCategories, $this->getCategoryIdsFromIndex($idsToBeReIndexed));
 
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
index ebad10e197622..a0acacd4dfd2f 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
@@ -254,10 +254,12 @@ protected function _updateRelationProducts($storeId, $productIds = null)
      *
      * @param int $storeId
      * @return \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _cleanRelationProducts($storeId)
     {
-        if (!$this->_productIndexerHelper->isAddChildData()) {
+        if (!$this->_productIndexerHelper->isAddChildData() || !$this->_isFlatTableExists($storeId)) {
             return $this;
         }
 
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 d1aee8c4c5ba6..229844fbe84b5 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
@@ -10,6 +10,9 @@
 use Magento\Framework\Registry;
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * Data provider for price filter in layered navigation
+ */
 class Price
 {
     /**
@@ -103,6 +106,8 @@ public function __construct(
     }
 
     /**
+     * Getter  for interval
+     *
      * @return array
      */
     public function getInterval()
@@ -111,6 +116,8 @@ public function getInterval()
     }
 
     /**
+     * Setter for interval
+     *
      * @param array $interval
      * @return void
      */
@@ -120,6 +127,10 @@ public function setInterval($interval)
     }
 
     /**
+     * Retrieves price layered navigation modes
+     *
+     * @see RANGE_CALCULATION_AUTO
+     *
      * @return mixed
      */
     public function getRangeCalculationValue()
@@ -131,6 +142,8 @@ public function getRangeCalculationValue()
     }
 
     /**
+     * Retrieves range step
+     *
      * @return mixed
      */
     public function getRangeStepValue()
@@ -142,6 +155,8 @@ public function getRangeStepValue()
     }
 
     /**
+     * Retrieves one price interval
+     *
      * @return mixed
      */
     public function getOnePriceIntervalValue()
@@ -179,6 +194,8 @@ public function getRangeMaxIntervalsValue()
     }
 
     /**
+     * Retrieves Catalog Layer object
+     *
      * @return Layer
      */
     public function getLayer()
@@ -276,6 +293,8 @@ public function getMaxPrice()
     }
 
     /**
+     * Retrieve list of prior filters
+     *
      * @param string $filterParams
      * @return array
      */
@@ -310,7 +329,7 @@ public function validateFilter($filter)
             return false;
         }
         foreach ($filter as $v) {
-            if ($v !== '' && $v !== '0' && (double)$v <= 0 || is_infinite((double)$v)) {
+            if ($v !== '' && $v !== '0' && (!is_numeric($v) || (double)$v <= 0 || is_infinite((double)$v))) {
                 return false;
             }
         }
@@ -339,6 +358,8 @@ public function getResetValue()
     }
 
     /**
+     * Getter for prior intervals
+     *
      * @return array
      */
     public function getPriorIntervals()
@@ -347,6 +368,8 @@ public function getPriorIntervals()
     }
 
     /**
+     * Setter for prior intervals
+     *
      * @param array $priorInterval
      * @return void
      */
@@ -356,6 +379,8 @@ public function setPriorIntervals($priorInterval)
     }
 
     /**
+     * Get Resource model for price filter
+     *
      * @return \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price
      */
     public function getResource()
@@ -364,6 +389,8 @@ public function getResource()
     }
 
     /**
+     * Retrieves additional request data
+     *
      * @return string
      */
     public function getAdditionalRequestData()
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index 1b7552c82276d..7015fa0295cfb 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Model;
 
-use Magento\Authorization\Model\UserContextInterface;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -15,7 +14,6 @@
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Pricing\SaleableInterface;
 
@@ -177,7 +175,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
     protected $_catalogProduct = null;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
@@ -355,16 +353,6 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     private $filterCustomAttribute;
 
-    /**
-     * @var UserContextInterface
-     */
-    private $userContext;
-
-    /**
-     * @var AuthorizationInterface
-     */
-    private $authorization;
-
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -381,7 +369,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * @param Product\Attribute\Source\Status $catalogProductStatus
      * @param Product\Media\Config $catalogProductMediaConfig
      * @param Product\Type $catalogProductType
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Catalog\Helper\Product $catalogProduct
      * @param ResourceModel\Product $resource
      * @param ResourceModel\Product\Collection $resourceCollection
@@ -422,7 +410,7 @@ public function __construct(
         \Magento\Catalog\Model\Product\Attribute\Source\Status $catalogProductStatus,
         \Magento\Catalog\Model\Product\Media\Config $catalogProductMediaConfig,
         Product\Type $catalogProductType,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Catalog\Helper\Product $catalogProduct,
         \Magento\Catalog\Model\ResourceModel\Product $resource,
         \Magento\Catalog\Model\ResourceModel\Product\Collection $resourceCollection,
@@ -837,11 +825,12 @@ public function getStoreIds()
                 }
                 foreach ($websiteIds as $websiteId) {
                     $websiteStores = $this->_storeManager->getWebsite($websiteId)->getStoreIds();
-                    foreach ($websiteStores as $websiteStore) {
-                        $storeIds []= $websiteStore;
-                    }
+                    $storeIds[] = $websiteStores;
                 }
             }
+            if ($storeIds) {
+                $storeIds = array_merge(...$storeIds);
+            }
             $this->setStoreIds($storeIds);
         }
         return $this->getData('store_ids');
@@ -874,34 +863,6 @@ public function getAttributes($groupId = null, $skipSuper = false)
         return $attributes;
     }
 
-    /**
-     * Get user context.
-     *
-     * @return UserContextInterface
-     */
-    private function getUserContext(): UserContextInterface
-    {
-        if (!$this->userContext) {
-            $this->userContext = ObjectManager::getInstance()->get(UserContextInterface::class);
-        }
-
-        return $this->userContext;
-    }
-
-    /**
-     * Get authorization service.
-     *
-     * @return AuthorizationInterface
-     */
-    private function getAuthorization(): AuthorizationInterface
-    {
-        if (!$this->authorization) {
-            $this->authorization = ObjectManager::getInstance()->get(AuthorizationInterface::class);
-        }
-
-        return $this->authorization;
-    }
-
     /**
      * Check product options and type options and save them, too
      *
@@ -919,22 +880,6 @@ public function beforeSave()
 
         $this->getTypeInstance()->beforeSave($this);
 
-        //Validate changing of design.
-        $userType = $this->getUserContext()->getUserType();
-        if ((
-            $userType === UserContextInterface::USER_TYPE_ADMIN
-                || $userType === UserContextInterface::USER_TYPE_INTEGRATION
-        )
-            && !$this->getAuthorization()->isAllowed('Magento_Catalog::edit_product_design')
-        ) {
-            $this->setData('custom_design', $this->getOrigData('custom_design'));
-            $this->setData('page_layout', $this->getOrigData('page_layout'));
-            $this->setData('options_container', $this->getOrigData('options_container'));
-            $this->setData('custom_layout_update', $this->getOrigData('custom_layout_update'));
-            $this->setData('custom_design_from', $this->getOrigData('custom_design_from'));
-            $this->setData('custom_design_to', $this->getOrigData('custom_design_to'));
-        }
-
         $hasOptions = false;
         $hasRequiredOptions = false;
 
@@ -1326,12 +1271,11 @@ public function getSpecialToDate()
     public function getRelatedProducts()
     {
         if (!$this->hasRelatedProducts()) {
-            $products = [];
-            $collection = $this->getRelatedProductCollection();
-            foreach ($collection as $product) {
-                $products[] = $product;
+            //Loading all linked products.
+            $this->getProductLinks();
+            if (!$this->hasRelatedProducts()) {
+                $this->setRelatedProducts([]);
             }
-            $this->setRelatedProducts($products);
         }
         return $this->getData('related_products');
     }
@@ -1388,12 +1332,13 @@ public function getRelatedLinkCollection()
     public function getUpSellProducts()
     {
         if (!$this->hasUpSellProducts()) {
-            $products = [];
-            foreach ($this->getUpSellProductCollection() as $product) {
-                $products[] = $product;
+            //Loading all linked products.
+            $this->getProductLinks();
+            if (!$this->hasUpSellProducts()) {
+                $this->setUpSellProducts([]);
             }
-            $this->setUpSellProducts($products);
         }
+
         return $this->getData('up_sell_products');
     }
 
@@ -1449,12 +1394,13 @@ public function getUpSellLinkCollection()
     public function getCrossSellProducts()
     {
         if (!$this->hasCrossSellProducts()) {
-            $products = [];
-            foreach ($this->getCrossSellProductCollection() as $product) {
-                $products[] = $product;
+            //Loading all linked products.
+            $this->getProductLinks();
+            if (!$this->hasCrossSellProducts()) {
+                $this->setCrossSellProducts([]);
             }
-            $this->setCrossSellProducts($products);
         }
+
         return $this->getData('cross_sell_products');
     }
 
@@ -1510,7 +1456,11 @@ public function getCrossSellLinkCollection()
     public function getProductLinks()
     {
         if ($this->_links === null) {
-            $this->_links = $this->getLinkRepository()->getList($this);
+            if ($this->getSku() && $this->getId()) {
+                $this->_links = $this->getLinkRepository()->getList($this);
+            } else {
+                $this->_links = [];
+            }
         }
         return $this->_links;
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/LayoutUpdate.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/LayoutUpdate.php
new file mode 100644
index 0000000000000..fa5a218824eea
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/LayoutUpdate.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\Product\Attribute\Backend;
+
+use Magento\Catalog\Model\AbstractModel;
+use Magento\Catalog\Model\Attribute\Backend\AbstractLayoutUpdate;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager;
+
+/**
+ * Allows to select a layout file to merge when rendering the product's page.
+ */
+class LayoutUpdate extends AbstractLayoutUpdate
+{
+
+    /**
+     * @var LayoutUpdateManager
+     */
+    private $manager;
+
+    /**
+     * @param LayoutUpdateManager $manager
+     */
+    public function __construct(LayoutUpdateManager $manager)
+    {
+        $this->manager = $manager;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param AbstractModel|Product $forModel
+     */
+    protected function listAvailableValues(AbstractModel $forModel): array
+    {
+        return $this->manager->fetchAvailableFiles($forModel);
+    }
+}
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
index f1943bc108878..0daa1dfb5c8eb 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php
@@ -96,12 +96,7 @@ public function execute($entity, $arguments = [])
             $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());
-            }
-
+            $origPrices = $entity->getOrigData($attribute->getName());
             $old = $this->prepareOldTierPriceToCompare($origPrices);
             // prepare data for save
             $new = $this->prepareNewDataForSave($priceRows, $isGlobal);
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/LayoutUpdateManager.php b/app/code/Magento/Catalog/Model/Product/Attribute/LayoutUpdateManager.php
new file mode 100644
index 0000000000000..92ae989500076
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/LayoutUpdateManager.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Attribute;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\App\Area;
+use Magento\Framework\DataObject;
+use Magento\Framework\View\Design\Theme\FlyweightFactory;
+use Magento\Framework\View\DesignInterface;
+use Magento\Framework\View\Model\Layout\Merge as LayoutProcessor;
+use Magento\Framework\View\Model\Layout\MergeFactory as LayoutProcessorFactory;
+
+/**
+ * Manage available layout updates for products.
+ */
+class LayoutUpdateManager
+{
+
+    /**
+     * @var FlyweightFactory
+     */
+    private $themeFactory;
+
+    /**
+     * @var DesignInterface
+     */
+    private $design;
+
+    /**
+     * @var LayoutProcessorFactory
+     */
+    private $layoutProcessorFactory;
+
+    /**
+     * @var LayoutProcessor|null
+     */
+    private $layoutProcessor;
+
+    /**
+     * @param FlyweightFactory $themeFactory
+     * @param DesignInterface $design
+     * @param LayoutProcessorFactory $layoutProcessorFactory
+     */
+    public function __construct(
+        FlyweightFactory $themeFactory,
+        DesignInterface $design,
+        LayoutProcessorFactory $layoutProcessorFactory
+    ) {
+        $this->themeFactory = $themeFactory;
+        $this->design = $design;
+        $this->layoutProcessorFactory = $layoutProcessorFactory;
+    }
+
+    /**
+     * Adopt product's SKU to be used as layout handle.
+     *
+     * @param ProductInterface $product
+     * @return string
+     */
+    private function sanitizeSku(ProductInterface $product): string
+    {
+        return rawurlencode($product->getSku());
+    }
+
+    /**
+     * Get the processor instance.
+     *
+     * @return LayoutProcessor
+     */
+    private function getLayoutProcessor(): LayoutProcessor
+    {
+        if (!$this->layoutProcessor) {
+            $this->layoutProcessor = $this->layoutProcessorFactory->create(
+                [
+                    'theme' => $this->themeFactory->create(
+                        $this->design->getConfigurationDesignTheme(Area::AREA_FRONTEND)
+                    )
+                ]
+            );
+            $this->themeFactory = null;
+            $this->design = null;
+        }
+
+        return $this->layoutProcessor;
+    }
+
+    /**
+     * Fetch list of available files/handles for the product.
+     *
+     * @param ProductInterface $product
+     * @return string[]
+     */
+    public function fetchAvailableFiles(ProductInterface $product): array
+    {
+        if (!$product->getSku()) {
+            return [];
+        }
+
+        $identifier = $this->sanitizeSku($product);
+        $handles = $this->getLayoutProcessor()->getAvailableHandles();
+
+        return array_filter(
+            array_map(
+                function (string $handle) use ($identifier) : ?string {
+                    preg_match(
+                        '/^catalog\_product\_view\_selectable\_' .preg_quote($identifier) .'\_([a-z0-9]+)/i',
+                        $handle,
+                        $selectable
+                    );
+                    if (!empty($selectable[1])) {
+                        return $selectable[1];
+                    }
+
+                    return null;
+                },
+                $handles
+            )
+        );
+    }
+
+    /**
+     * Extract custom layout attribute value.
+     *
+     * @param ProductInterface $product
+     * @return mixed
+     */
+    private function extractAttributeValue(ProductInterface $product)
+    {
+        if ($product instanceof Product && !$product->hasData(ProductInterface::CUSTOM_ATTRIBUTES)) {
+            return $product->getData('custom_layout_update_file');
+        }
+        if ($attr = $product->getCustomAttribute('custom_layout_update_file')) {
+            return $attr->getValue();
+        }
+
+        return null;
+    }
+
+    /**
+     * Extract selected custom layout settings.
+     *
+     * If no update is selected none will apply.
+     *
+     * @param ProductInterface $product
+     * @param DataObject $intoSettings
+     * @return void
+     */
+    public function extractCustomSettings(ProductInterface $product, DataObject $intoSettings): void
+    {
+        if ($product->getSku() && $value = $this->extractAttributeValue($product)) {
+            $handles = $intoSettings->getPageLayoutHandles() ?? [];
+            $handles = array_merge_recursive(
+                $handles,
+                ['selectable' => $this->sanitizeSku($product) . '_' . $value]
+            );
+            $intoSettings->setPageLayoutHandles($handles);
+        }
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/LayoutUpdate.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/LayoutUpdate.php
new file mode 100644
index 0000000000000..0ddb528e768cc
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/LayoutUpdate.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Attribute\Source;
+
+use Magento\Catalog\Model\Attribute\Source\AbstractLayoutUpdate;
+use Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager;
+use Magento\Framework\Api\CustomAttributesDataInterface;
+
+/**
+ * List of layout updates available for a product.
+ */
+class LayoutUpdate extends AbstractLayoutUpdate
+{
+    /**
+     * @var LayoutUpdateManager
+     */
+    private $manager;
+
+    /**
+     * @param LayoutUpdateManager $manager
+     */
+    public function __construct(LayoutUpdateManager $manager)
+    {
+        $this->manager = $manager;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function listAvailableOptions(CustomAttributesDataInterface $entity): array
+    {
+        return $this->manager->fetchAvailableFiles($entity);
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/AttributeSet/Options.php b/app/code/Magento/Catalog/Model/Product/AttributeSet/Options.php
index d0c7103851499..57d08916bcd40 100644
--- a/app/code/Magento/Catalog/Model/Product/AttributeSet/Options.php
+++ b/app/code/Magento/Catalog/Model/Product/AttributeSet/Options.php
@@ -5,10 +5,13 @@
  */
 namespace Magento\Catalog\Model\Product\AttributeSet;
 
+/**
+ * Attribute Set Options
+ */
 class Options implements \Magento\Framework\Data\OptionSourceInterface
 {
     /**
-     * @var null|array
+     * @var array
      */
     protected $options;
 
@@ -25,7 +28,7 @@ public function __construct(
     }
 
     /**
-     * @return array|null
+     * @inheritDoc
      */
     public function toOptionArray()
     {
@@ -33,7 +36,15 @@ public function toOptionArray()
             $this->options = $this->collectionFactory->create()
                 ->setEntityTypeFilter($this->product->getTypeId())
                 ->toOptionArray();
+
+            array_walk(
+                $this->options,
+                function (&$option) {
+                    $option['__disableTmpl'] = true;
+                }
+            );
         }
+
         return $this->options;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Authorization.php b/app/code/Magento/Catalog/Model/Product/Authorization.php
new file mode 100644
index 0000000000000..b8aa8f70ba70f
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Authorization.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product as ProductModel;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\Exception\AuthorizationException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Catalog\Model\Product\Attribute\Backend\LayoutUpdate;
+
+/**
+ * Additional authorization for product operations.
+ */
+class Authorization
+{
+    /**
+     * @var AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * @var ProductFactory
+     */
+    private $productFactory;
+
+    /**
+     * @param AuthorizationInterface $authorization
+     * @param ProductFactory $factory
+     */
+    public function __construct(AuthorizationInterface $authorization, ProductFactory $factory)
+    {
+        $this->authorization = $authorization;
+        $this->productFactory = $factory;
+    }
+
+    /**
+     * Extract attribute value from the model.
+     *
+     * @param ProductModel $product
+     * @param AttributeInterface $attr
+     * @return mixed
+     * @throws \RuntimeException When no new value is present.
+     */
+    private function extractAttributeValue(ProductModel $product, AttributeInterface $attr)
+    {
+        if ($product->hasData($attr->getAttributeCode())) {
+            $newValue = $product->getData($attr->getAttributeCode());
+        } elseif ($product->hasData(ProductModel::CUSTOM_ATTRIBUTES)
+            && $attrValue = $product->getCustomAttribute($attr->getAttributeCode())
+        ) {
+            $newValue = $attrValue->getValue();
+        } else {
+            throw new \RuntimeException('No new value is present');
+        }
+
+        if (empty($newValue)
+            || ($attr->getBackend() instanceof LayoutUpdate
+                && ($newValue === LayoutUpdate::VALUE_USE_UPDATE_XML || $newValue === LayoutUpdate::VALUE_NO_UPDATE)
+            )
+        ) {
+            $newValue = null;
+        }
+
+        return $newValue;
+    }
+
+    /**
+     * Prepare old values to compare to.
+     *
+     * @param AttributeInterface $attribute
+     * @param array|null $oldProduct
+     * @return array
+     */
+    private function fetchOldValues(AttributeInterface $attribute, ?array $oldProduct): array
+    {
+        $attrCode = $attribute->getAttributeCode();
+        if ($oldProduct) {
+            //New value may only be the saved value
+            $oldValues = [!empty($oldProduct[$attrCode]) ? $oldProduct[$attrCode] : null];
+            if (empty($oldValues[0])) {
+                $oldValues[0] = null;
+            }
+        } else {
+            //New value can be empty or default
+            $oldValues[] = $attribute->getDefaultValue();
+        }
+
+        return $oldValues;
+    }
+
+    /**
+     * Check whether the product has changed.
+     *
+     * @param ProductModel $product
+     * @param array|null $oldProduct
+     * @return bool
+     */
+    private function hasProductChanged(ProductModel $product, ?array $oldProduct = null): bool
+    {
+        $designAttributes = [
+            'custom_design',
+            'page_layout',
+            'options_container',
+            'custom_layout_update',
+            'custom_design_from',
+            'custom_design_to',
+            'custom_layout_update_file'
+        ];
+        $attributes = $product->getAttributes();
+
+        foreach ($designAttributes as $designAttribute) {
+            if (!array_key_exists($designAttribute, $attributes)) {
+                continue;
+            }
+            $attribute = $attributes[$designAttribute];
+            $oldValues = $this->fetchOldValues($attribute, $oldProduct);
+            try {
+                $newValue = $this->extractAttributeValue($product, $attribute);
+            } catch (\RuntimeException $exception) {
+                //No new value
+                continue;
+            }
+            if (!in_array($newValue, $oldValues, true)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Authorize saving of a product.
+     *
+     * @throws AuthorizationException
+     * @throws NoSuchEntityException When product with invalid ID given.
+     * @param ProductInterface|ProductModel $product
+     * @return void
+     */
+    public function authorizeSavingOf(ProductInterface $product): void
+    {
+        if (!$this->authorization->isAllowed('Magento_Catalog::edit_product_design')) {
+            $oldData = null;
+            if ($product->getId()) {
+                if ($product->getOrigData()) {
+                    $oldData = $product->getOrigData();
+                } else {
+                    /** @var ProductModel $savedProduct */
+                    $savedProduct = $this->productFactory->create();
+                    $savedProduct->load($product->getId());
+                    if (!$savedProduct->getSku()) {
+                        throw NoSuchEntityException::singleField('id', $product->getId());
+                    }
+                    $oldData = $product->getOrigData();
+                }
+            }
+            if ($this->hasProductChanged($product, $oldData)) {
+                throw new AuthorizationException(__('Not allowed to edit the product\'s design attributes'));
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php
index 12dbaf0c29f4e..9ccb86441812c 100644
--- a/app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php
+++ b/app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php
@@ -5,13 +5,17 @@
  */
 namespace Magento\Catalog\Model\Product\Compare;
 
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Product Compare List Model
  *
  * @api
  * @SuppressWarnings(PHPMD.LongVariable)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
 class ListCompare extends \Magento\Framework\DataObject
@@ -51,6 +55,11 @@ class ListCompare extends \Magento\Framework\DataObject
      */
     protected $_compareItemFactory;
 
+    /**
+     * @var ProductRepository
+     */
+    private $productRepository;
+
     /**
      * Constructor
      *
@@ -60,6 +69,7 @@ class ListCompare extends \Magento\Framework\DataObject
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param array $data
+     * @param ProductRepository|null $productRepository
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Compare\ItemFactory $compareItemFactory,
@@ -67,13 +77,15 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Compare\Item $catalogProductCompareItem,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\Visitor $customerVisitor,
-        array $data = []
+        array $data = [],
+        ProductRepository $productRepository = null
     ) {
         $this->_compareItemFactory = $compareItemFactory;
         $this->_itemCollectionFactory = $itemCollectionFactory;
         $this->_catalogProductCompareItem = $catalogProductCompareItem;
         $this->_customerSession = $customerSession;
         $this->_customerVisitor = $customerVisitor;
+        $this->productRepository = $productRepository ?: ObjectManager::getInstance()->create(ProductRepository::class);
         parent::__construct($data);
     }
 
@@ -82,6 +94,7 @@ public function __construct(
      *
      * @param int|\Magento\Catalog\Model\Product $product
      * @return $this
+     * @throws \Exception
      */
     public function addProduct($product)
     {
@@ -90,7 +103,7 @@ public function addProduct($product)
         $this->_addVisitorToItem($item);
         $item->loadByProduct($product);
 
-        if (!$item->getId()) {
+        if (!$item->getId() && $this->productExists($product)) {
             $item->addProductData($product);
             $item->save();
         }
@@ -98,6 +111,25 @@ public function addProduct($product)
         return $this;
     }
 
+    /**
+     * Check product exists.
+     *
+     * @param int|\Magento\Catalog\Model\Product $product
+     * @return bool
+     */
+    private function productExists($product)
+    {
+        if ($product instanceof \Magento\Catalog\Model\Product && $product->getId()) {
+            return true;
+        }
+        try {
+            $product = $this->productRepository->getById((int)$product);
+            return !empty($product->getId());
+        } catch (NoSuchEntityException $e) {
+            return false;
+        }
+    }
+
     /**
      * Add products to compare list
      *
diff --git a/app/code/Magento/Catalog/Model/Product/Copier.php b/app/code/Magento/Catalog/Model/Product/Copier.php
index 44ebdf0f1f283..a7f7bad1a5167 100644
--- a/app/code/Magento/Catalog/Model/Product/Copier.php
+++ b/app/code/Magento/Catalog/Model/Product/Copier.php
@@ -6,7 +6,9 @@
 namespace Magento\Catalog\Model\Product;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ProductFactory;
 
 /**
  * Catalog product copier.
@@ -28,7 +30,7 @@ class Copier
     protected $copyConstructor;
 
     /**
-     * @var \Magento\Catalog\Model\ProductFactory
+     * @var ProductFactory
      */
     protected $productFactory;
 
@@ -36,17 +38,24 @@ class Copier
      * @var \Magento\Framework\EntityManager\MetadataPool
      */
     protected $metadataPool;
+    /**
+     * @var ScopeOverriddenValue
+     */
+    private $scopeOverriddenValue;
 
     /**
      * @param CopyConstructorInterface $copyConstructor
-     * @param \Magento\Catalog\Model\ProductFactory $productFactory
+     * @param ProductFactory $productFactory
+     * @param ScopeOverriddenValue $scopeOverriddenValue
      */
     public function __construct(
         CopyConstructorInterface $copyConstructor,
-        \Magento\Catalog\Model\ProductFactory $productFactory
+        ProductFactory $productFactory,
+        ScopeOverriddenValue $scopeOverriddenValue
     ) {
         $this->productFactory = $productFactory;
         $this->copyConstructor = $copyConstructor;
+        $this->scopeOverriddenValue = $scopeOverriddenValue;
     }
 
     /**
@@ -121,19 +130,20 @@ private function setStoresUrl(Product $product, Product $duplicate) : void
         $storeIds = $duplicate->getStoreIds();
         $productId = $product->getId();
         $productResource = $product->getResource();
-        $defaultUrlKey = $productResource->getAttributeRawValue(
-            $productId,
-            'url_key',
-            \Magento\Store\Model\Store::DEFAULT_STORE_ID
-        );
         $duplicate->setData('save_rewrites_history', false);
         foreach ($storeIds as $storeId) {
+            $useDefault = !$this->scopeOverriddenValue->containsValue(
+                ProductInterface::class,
+                $product,
+                'url_key',
+                $storeId
+            );
+            if ($useDefault) {
+                continue;
+            }
             $isDuplicateSaved = false;
             $duplicate->setStoreId($storeId);
             $urlKey = $productResource->getAttributeRawValue($productId, 'url_key', $storeId);
-            if ($urlKey === $defaultUrlKey) {
-                continue;
-            }
             do {
                 $urlKey = $this->modifyUrl($urlKey);
                 $duplicate->setUrlKey($urlKey);
diff --git a/app/code/Magento/Catalog/Model/Product/Filter/DateTime.php b/app/code/Magento/Catalog/Model/Product/Filter/DateTime.php
new file mode 100644
index 0000000000000..93b7d55458a9f
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Filter/DateTime.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\Product\Filter;
+
+use Magento\Framework\Stdlib\DateTime as StdlibDateTime;
+use Magento\Framework\Stdlib\DateTime\Filter\DateTime as StdlibDateTimeFilter;
+
+/**
+ * Product datetime fields values filter
+ */
+class DateTime implements \Zend_Filter_Interface
+{
+    /**
+     * @var StdlibDateTimeFilter
+     */
+    private $stdlibDateTimeFilter;
+
+    /**
+     * Initializes dependencies.
+     *
+     * @param StdlibDateTimeFilter $stdlibDateTimeFilter
+     */
+    public function __construct(StdlibDateTimeFilter $stdlibDateTimeFilter)
+    {
+        $this->stdlibDateTimeFilter = $stdlibDateTimeFilter;
+    }
+
+    /**
+     * Convert datetime from locale format to internal format;
+     *
+     * Make an additional check for MySql date format which is wrongly parsed by IntlDateFormatter
+     *
+     * @param mixed $value
+     * @return mixed|string
+     * @throws \Exception
+     */
+    public function filter($value)
+    {
+        if (is_string($value)) {
+            $value = $this->createDateFromMySqlFormat($value) ?? $value;
+        }
+        return $this->stdlibDateTimeFilter->filter($value);
+    }
+
+    /**
+     * Parse a string in MySql date format into a new DateTime object
+     *
+     * @param string $value
+     * @return \DateTime|null
+     */
+    private function createDateFromMySqlFormat(string $value): ?\DateTime
+    {
+        $datetime = date_create_from_format(StdlibDateTime::DATETIME_PHP_FORMAT, $value);
+        if ($datetime === false) {
+            $datetime = date_create_from_format(StdlibDateTime::DATE_PHP_FORMAT, $value);
+            if ($datetime !== false) {
+                $datetime->setTime(0, 0, 0, 0);
+            }
+        }
+        return $datetime instanceof \DateTime ? $datetime : null;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
index e06e85e90a2d8..225a3a4c44a9b 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
@@ -3,11 +3,16 @@
  * 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\Api\Data\ProductInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 use Magento\MediaStorage\Model\File\Uploader as FileUploader;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Create handler for catalog product gallery
@@ -74,6 +79,16 @@ class CreateHandler implements ExtensionInterface
      */
     private $mediaAttributeCodes;
 
+    /**
+     * @var array
+     */
+    private $imagesGallery;
+
+    /**
+     * @var  \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository
@@ -82,6 +97,8 @@ class CreateHandler implements ExtensionInterface
      * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDb
+     * @param \Magento\Store\Model\StoreManagerInterface|null $storeManager
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     public function __construct(
         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
@@ -90,7 +107,8 @@ public function __construct(
         \Magento\Framework\Json\Helper\Data $jsonHelper,
         \Magento\Catalog\Model\Product\Media\Config $mediaConfig,
         \Magento\Framework\Filesystem $filesystem,
-        \Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDb
+        \Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDb,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
         $this->metadata = $metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
         $this->attributeRepository = $attributeRepository;
@@ -99,6 +117,7 @@ public function __construct(
         $this->mediaConfig = $mediaConfig;
         $this->mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $this->fileStorageDb = $fileStorageDb;
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -137,9 +156,13 @@ public function execute($product, $arguments = [])
 
         if ($product->getIsDuplicate() != true) {
             foreach ($value['images'] as &$image) {
+                if (!empty($image['removed']) && !$this->canRemoveImage($product, $image['file'])) {
+                    $image['removed'] = '';
+                }
+
                 if (!empty($image['removed'])) {
                     $clearImages[] = $image['file'];
-                } elseif (empty($image['value_id'])) {
+                } elseif (empty($image['value_id']) || !empty($image['recreate'])) {
                     $newFile = $this->moveImageFromTmp($image['file']);
                     $image['new_file'] = $newFile;
                     $newImages[$image['file']] = $image;
@@ -152,6 +175,10 @@ public function execute($product, $arguments = [])
             // For duplicating we need copy original images.
             $duplicate = [];
             foreach ($value['images'] as &$image) {
+                if (!empty($image['removed']) && !$this->canRemoveImage($product, $image['file'])) {
+                    $image['removed'] = '';
+                }
+
                 if (empty($image['value_id']) || !empty($image['removed'])) {
                     continue;
                 }
@@ -538,4 +565,46 @@ private function processMediaAttributeLabel(
             );
         }
     }
+
+    /**
+     * Get product images for all stores
+     *
+     * @param ProductInterface $product
+     * @return array
+     */
+    private function getImagesForAllStores(ProductInterface $product)
+    {
+        if ($this->imagesGallery ===  null) {
+            $storeIds = array_keys($this->storeManager->getStores());
+            $storeIds[] = 0;
+
+            $this->imagesGallery = $this->resourceModel->getProductImages($product, $storeIds);
+        }
+
+        return $this->imagesGallery;
+    }
+
+    /**
+     * Check possibility to remove image
+     *
+     * @param ProductInterface $product
+     * @param string $imageFile
+     * @return bool
+     */
+    private function canRemoveImage(ProductInterface $product, string $imageFile) :bool
+    {
+        $canRemoveImage = true;
+        $gallery = $this->getImagesForAllStores($product);
+        $storeId = $product->getStoreId();
+
+        if (!empty($gallery)) {
+            foreach ($gallery as $image) {
+                if ($image['filepath'] === $imageFile && (int) $image['store_id'] !== $storeId) {
+                    $canRemoveImage = false;
+                }
+            }
+        }
+
+        return $canRemoveImage;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
index 9e5cf084c25a1..a9afb7cec45e2 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
@@ -71,10 +71,12 @@ public function create($sku, ProductAttributeMediaGalleryEntryInterface $entry)
         $product->setMediaGalleryEntries($existingMediaGalleryEntries);
         try {
             $product = $this->productRepository->save($product);
-        } catch (InputException $inputException) {
-            throw $inputException;
         } catch (\Exception $e) {
-            throw new StateException(__("The product can't be saved."));
+            if ($e instanceof InputException) {
+                throw $e;
+            } else {
+                throw new StateException(__("The product can't be saved."));
+            }
         }
 
         foreach ($product->getMediaGalleryEntries() as $entry) {
@@ -98,19 +100,13 @@ public function update($sku, ProductAttributeMediaGalleryEntryInterface $entry)
             );
         }
         $found = false;
+        $entryTypes = (array)$entry->getTypes();
         foreach ($existingMediaGalleryEntries as $key => $existingEntry) {
-            $entryTypes = (array)$entry->getTypes();
-            $existingEntryTypes = (array)$existingMediaGalleryEntries[$key]->getTypes();
-            $existingMediaGalleryEntries[$key]->setTypes(array_diff($existingEntryTypes, $entryTypes));
+            $existingEntryTypes = (array)$existingEntry->getTypes();
+            $existingEntry->setTypes(array_diff($existingEntryTypes, $entryTypes));
 
             if ($existingEntry->getId() == $entry->getId()) {
                 $found = true;
-
-                $file = $entry->getContent();
-
-                if ($file && $file->getBase64EncodedData() || $entry->getFile()) {
-                    $entry->setId(null);
-                }
                 $existingMediaGalleryEntries[$key] = $entry;
             }
         }
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php b/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
index e1b788bc3941b..f1d27c38e9456 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
@@ -167,10 +167,10 @@ public function addImage(
         }
 
         $fileName = \Magento\MediaStorage\Model\File\Uploader::getCorrectFileName($pathinfo['basename']);
-        $dispretionPath = \Magento\MediaStorage\Model\File\Uploader::getDispersionPath($fileName);
-        $fileName = $dispretionPath . '/' . $fileName;
+        $dispersionPath = \Magento\MediaStorage\Model\File\Uploader::getDispersionPath($fileName);
+        $fileName = $dispersionPath . '/' . $fileName;
 
-        $fileName = $this->getNotDuplicatedFilename($fileName, $dispretionPath);
+        $fileName = $this->getNotDuplicatedFilename($fileName, $dispersionPath);
 
         $destinationFile = $this->mediaConfig->getTmpMediaPath($fileName);
 
@@ -465,27 +465,27 @@ protected function getUniqueFileName($file, $forTmp = false)
      * Get filename which is not duplicated with other files in media temporary and media directories
      *
      * @param string $fileName
-     * @param string $dispretionPath
+     * @param string $dispersionPath
      * @return string
      * @since 101.0.0
      */
-    protected function getNotDuplicatedFilename($fileName, $dispretionPath)
+    protected function getNotDuplicatedFilename($fileName, $dispersionPath)
     {
-        $fileMediaName = $dispretionPath . '/'
+        $fileMediaName = $dispersionPath . '/'
             . \Magento\MediaStorage\Model\File\Uploader::getNewFileName($this->mediaConfig->getMediaPath($fileName));
-        $fileTmpMediaName = $dispretionPath . '/'
+        $fileTmpMediaName = $dispersionPath . '/'
             . \Magento\MediaStorage\Model\File\Uploader::getNewFileName($this->mediaConfig->getTmpMediaPath($fileName));
 
         if ($fileMediaName != $fileTmpMediaName) {
             if ($fileMediaName != $fileName) {
                 return $this->getNotDuplicatedFilename(
                     $fileMediaName,
-                    $dispretionPath
+                    $dispersionPath
                 );
             } elseif ($fileTmpMediaName != $fileName) {
                 return $this->getNotDuplicatedFilename(
                     $fileTmpMediaName,
-                    $dispretionPath
+                    $dispersionPath
                 );
             }
         }
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
index 189135776b68b..049846ef36490 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Catalog\Model\Product\Gallery;
 
+use Magento\Catalog\Model\ResourceModel\Product\Gallery;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 
 /**
@@ -75,6 +76,16 @@ protected function processNewImage($product, array &$image)
                 $image['value_id'],
                 $product->getData($this->metadata->getLinkField())
             );
+        } elseif (!empty($image['recreate'])) {
+            $data['value_id'] = $image['value_id'];
+            $data['value'] = $image['file'];
+            $data['attribute_id'] = $this->getAttribute()->getAttributeId();
+
+            if (!empty($image['media_type'])) {
+                $data['media_type'] = $image['media_type'];
+            }
+
+            $this->resourceModel->saveDataRow(Gallery::GALLERY_TABLE, $data);
         }
 
         return $data;
diff --git a/app/code/Magento/Catalog/Model/Product/Hydrator.php b/app/code/Magento/Catalog/Model/Product/Hydrator.php
new file mode 100644
index 0000000000000..dcdce7202b212
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Hydrator.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product;
+
+use Magento\Framework\EntityManager\HydratorInterface;
+
+/**
+ * Class is used to extract data and populate entity with data
+ */
+class Hydrator implements HydratorInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function extract($entity)
+    {
+        return $entity->getData();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function hydrate($entity, array $data)
+    {
+        $lockedAttributes = $entity->getLockedAttributes();
+        $entity->unlockAttributes();
+        $entity->setData(array_merge($entity->getData(), $data));
+        foreach ($lockedAttributes as $attribute) {
+            $entity->lockAttribute($attribute);
+        }
+
+        return $entity;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php b/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php
index 4b7a623b15c19..c0f4e83ef3de4 100644
--- a/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php
+++ b/app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php
@@ -130,10 +130,12 @@ private function getWatermark(string $type, int $scopeId = null): array
         );
 
         if ($file) {
-            $size = $this->scopeConfig->getValue(
-                "design/watermark/{$type}_size",
-                ScopeInterface::SCOPE_STORE,
-                $scopeId
+            $size = explode(
+                'x',
+                $this->scopeConfig->getValue(
+                    "design/watermark/{$type}_size",
+                    ScopeInterface::SCOPE_STORE
+                )
             );
             $opacity = $this->scopeConfig->getValue(
                 "design/watermark/{$type}_imageOpacity",
@@ -145,8 +147,8 @@ private function getWatermark(string $type, int $scopeId = null): array
                 ScopeInterface::SCOPE_STORE,
                 $scopeId
             );
-            $width = !empty($size['width']) ? $size['width'] : null;
-            $height = !empty($size['height']) ? $size['height'] : null;
+            $width = !empty($size['0']) ? $size['0'] : null;
+            $height = !empty($size['1']) ? $size['1'] : null;
 
             return [
                 'watermark_file' => $file,
diff --git a/app/code/Magento/Catalog/Model/Product/Link/SaveHandler.php b/app/code/Magento/Catalog/Model/Product/Link/SaveHandler.php
index a7468bcb1e77f..4a8e6431d6ce8 100644
--- a/app/code/Magento/Catalog/Model/Product/Link/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Link/SaveHandler.php
@@ -4,14 +4,17 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Product\Link;
 
 use Magento\Catalog\Api\ProductLinkRepositoryInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Link;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Api\Data\ProductLinkInterface;
 
 /**
- * Class SaveProductLinks
+ * Save product links.
  */
 class SaveHandler
 {
@@ -47,8 +50,10 @@ public function __construct(
     }
 
     /**
-     * @param string $entityType
-     * @param object $entity
+     * Save product links for the product.
+     *
+     * @param string $entityType Product type.
+     * @param \Magento\Catalog\Api\Data\ProductInterface $entity
      * @return \Magento\Catalog\Api\Data\ProductInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -56,13 +61,13 @@ 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 */
             foreach ($this->productLinkRepository->getList($entity) as $link) {
                 $this->productLinkRepository->delete($link);
             }
         }
 
         // Build links per type
+        /** @var ProductLinkInterface[][] $linksByType */
         $linksByType = [];
         foreach ($entity->getProductLinks() as $link) {
             $linksByType[$link->getLinkType()][] = $link;
@@ -71,13 +76,17 @@ public function execute($entityType, $entity)
         // 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);
-                });
+                array_walk(
+                    $linksByType[$linkType],
+                    function (ProductLinkInterface $productLink, $position) {
+                        $productLink->setPosition(++$position);
+                    }
+                );
             }
         }
 
         // Flatten multi-dimensional linksByType in ProductLinks
+        /** @var ProductLinkInterface[] $productLinks */
         $productLinks = array_reduce($linksByType, 'array_merge', []);
 
         if (count($productLinks) > 0) {
@@ -90,13 +99,14 @@ public function execute($entityType, $entity)
 
     /**
      * Check if at least one link without position
-     * @param array $links
+     *
+     * @param ProductLinkInterface[] $links
      * @return bool
      */
-    private function hasPosition(array $links)
+    private function hasPosition(array $links): bool
     {
         foreach ($links as $link) {
-            if (!array_key_exists('position', $link->getData())) {
+            if ($link->getPosition() === null) {
                 return false;
             }
         }
diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php
index 4f730834412e4..3a0920fb1c530 100644
--- a/app/code/Magento/Catalog/Model/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Product/Option.php
@@ -11,6 +11,11 @@
 use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Option\Type\Date;
+use Magento\Catalog\Model\Product\Option\Type\DefaultType;
+use Magento\Catalog\Model\Product\Option\Type\File;
+use Magento\Catalog\Model\Product\Option\Type\Select;
+use Magento\Catalog\Model\Product\Option\Type\Text;
 use Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection;
 use Magento\Catalog\Pricing\Price\BasePrice;
 use Magento\Framework\EntityManager\MetadataPool;
@@ -98,6 +103,16 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
      */
     protected $validatorPool;
 
+    /**
+     * @var string[]
+     */
+    private $optionGroups;
+
+    /**
+     * @var string[]
+     */
+    private $optionTypesToGroups;
+
     /**
      * @var MetadataPool
      */
@@ -121,6 +136,8 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @param ProductCustomOptionValuesInterfaceFactory|null $customOptionValuesFactory
+     * @param array $optionGroups
+     * @param array $optionTypesToGroups
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -135,14 +152,34 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        ProductCustomOptionValuesInterfaceFactory $customOptionValuesFactory = null
+        ProductCustomOptionValuesInterfaceFactory $customOptionValuesFactory = null,
+        array $optionGroups = [],
+        array $optionTypesToGroups = []
     ) {
         $this->productOptionValue = $productOptionValue;
         $this->optionTypeFactory = $optionFactory;
-        $this->validatorPool = $validatorPool;
         $this->string = $string;
+        $this->validatorPool = $validatorPool;
         $this->customOptionValuesFactory = $customOptionValuesFactory ?:
             \Magento\Framework\App\ObjectManager::getInstance()->get(ProductCustomOptionValuesInterfaceFactory::class);
+        $this->optionGroups = $optionGroups ?: [
+            self::OPTION_GROUP_DATE => Date::class,
+            self::OPTION_GROUP_FILE => File::class,
+            self::OPTION_GROUP_SELECT => Select::class,
+            self::OPTION_GROUP_TEXT => Text::class,
+        ];
+        $this->optionTypesToGroups = $optionTypesToGroups ?: [
+            self::OPTION_TYPE_FIELD => self::OPTION_GROUP_TEXT,
+            self::OPTION_TYPE_AREA => self::OPTION_GROUP_TEXT,
+            self::OPTION_TYPE_FILE => self::OPTION_GROUP_FILE,
+            self::OPTION_TYPE_DROP_DOWN => self::OPTION_GROUP_SELECT,
+            self::OPTION_TYPE_RADIO => self::OPTION_GROUP_SELECT,
+            self::OPTION_TYPE_CHECKBOX => self::OPTION_GROUP_SELECT,
+            self::OPTION_TYPE_MULTIPLE => self::OPTION_GROUP_SELECT,
+            self::OPTION_TYPE_DATE => self::OPTION_GROUP_DATE,
+            self::OPTION_TYPE_DATE_TIME => self::OPTION_GROUP_DATE,
+            self::OPTION_TYPE_TIME => self::OPTION_GROUP_DATE,
+        ];
 
         parent::__construct(
             $context,
@@ -314,36 +351,22 @@ public function getGroupByType($type = null)
         if ($type === null) {
             $type = $this->getType();
         }
-        $optionGroupsToTypes = [
-            self::OPTION_TYPE_FIELD => self::OPTION_GROUP_TEXT,
-            self::OPTION_TYPE_AREA => self::OPTION_GROUP_TEXT,
-            self::OPTION_TYPE_FILE => self::OPTION_GROUP_FILE,
-            self::OPTION_TYPE_DROP_DOWN => self::OPTION_GROUP_SELECT,
-            self::OPTION_TYPE_RADIO => self::OPTION_GROUP_SELECT,
-            self::OPTION_TYPE_CHECKBOX => self::OPTION_GROUP_SELECT,
-            self::OPTION_TYPE_MULTIPLE => self::OPTION_GROUP_SELECT,
-            self::OPTION_TYPE_DATE => self::OPTION_GROUP_DATE,
-            self::OPTION_TYPE_DATE_TIME => self::OPTION_GROUP_DATE,
-            self::OPTION_TYPE_TIME => self::OPTION_GROUP_DATE,
-        ];
 
-        return $optionGroupsToTypes[$type] ?? '';
+        return $this->optionTypesToGroups[$type] ?? '';
     }
 
     /**
      * Group model factory
      *
      * @param string $type Option type
-     * @return \Magento\Catalog\Model\Product\Option\Type\DefaultType
+     * @return DefaultType
      * @throws LocalizedException
      */
     public function groupFactory($type)
     {
         $group = $this->getGroupByType($type);
-        if (!empty($group)) {
-            return $this->optionTypeFactory->create(
-                'Magento\Catalog\Model\Product\Option\Type\\' . $this->string->upperCaseWords($group)
-            );
+        if (!empty($group) && isset($this->optionGroups[$group])) {
+            return $this->optionTypeFactory->create($this->optionGroups[$group]);
         }
         throw new LocalizedException(__('The option type to get group instance is incorrect.'));
     }
diff --git a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
index b96aff148e750..7b25533ff72b8 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider.php
@@ -4,8 +4,11 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\ProductLink;
 
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductLink\Converter\ConverterPool;
 use Magento\Framework\Exception\NoSuchEntityException;
 
@@ -19,6 +22,11 @@ class CollectionProvider
      */
     protected $providers;
 
+    /**
+     * @var MapProviderInterface[]
+     */
+    private $mapProviders;
+
     /**
      * @var ConverterPool
      */
@@ -27,43 +35,169 @@ class CollectionProvider
     /**
      * @param ConverterPool $converterPool
      * @param CollectionProviderInterface[] $providers
+     * @param MapProviderInterface[] $mapProviders
      */
-    public function __construct(ConverterPool $converterPool, array $providers = [])
+    public function __construct(ConverterPool $converterPool, array $providers = [], array $mapProviders = [])
     {
         $this->converterPool = $converterPool;
         $this->providers = $providers;
+        $this->mapProviders = $mapProviders;
+    }
+
+    /**
+     * Extract link data from linked products.
+     *
+     * @param Product[] $linkedProducts
+     * @param string $type
+     * @return array
+     */
+    private function prepareList(array $linkedProducts, string $type): array
+    {
+        $converter = $this->converterPool->getConverter($type);
+        $links = [];
+        foreach ($linkedProducts as $item) {
+            $itemId = $item->getId();
+            $links[$itemId] = $converter->convert($item);
+            $links[$itemId]['position'] = $links[$itemId]['position'] ?? 0;
+            $links[$itemId]['link_type'] = $type;
+        }
+
+        return $links;
     }
 
     /**
      * Get product collection by link type
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @param string $type
      * @return array
      * @throws NoSuchEntityException
      */
-    public function getCollection(\Magento\Catalog\Model\Product $product, $type)
+    public function getCollection(Product $product, $type)
     {
         if (!isset($this->providers[$type])) {
             throw new NoSuchEntityException(__("The collection provider isn't registered."));
         }
 
         $products = $this->providers[$type]->getLinkedProducts($product);
-        $converter = $this->converterPool->getConverter($type);
-        $sorterItems = [];
-        foreach ($products as $item) {
-            $itemId = $item->getId();
-            $sorterItems[$itemId] = $converter->convert($item);
-            $sorterItems[$itemId]['position'] = $sorterItems[$itemId]['position'] ?? 0;
+
+        $linkData = $this->prepareList($products, $type);
+        usort(
+            $linkData,
+            function (array $itemA, array $itemB): int {
+                $posA = (int)$itemA['position'];
+                $posB = (int)$itemB['position'];
+
+                return $posA <=> $posB;
+            }
+        );
+
+        return $linkData;
+    }
+
+    /**
+     * Load maps from map providers.
+     *
+     * @param array $map
+     * @param array $typeProcessors
+     * @param Product[] $products
+     * @return void
+     */
+    private function retrieveMaps(array &$map, array $typeProcessors, array $products): void
+    {
+        /**
+         * @var MapProviderInterface $processor
+         * @var string[] $types
+         */
+        foreach ($typeProcessors as $processorIndex => $types) {
+            $typeMap = $this->mapProviders[$processorIndex]->fetchMap($products, $types);
+            /**
+             * @var string $sku
+             * @var Product[][] $links
+             */
+            foreach ($typeMap as $sku => $links) {
+                $linkData = [];
+                foreach ($links as $linkType => $linkedProducts) {
+                    $linkData[] = $this->prepareList($linkedProducts, $linkType);
+                }
+                if ($linkData) {
+                    $existing = [];
+                    if (array_key_exists($sku, $map)) {
+                        $existing = $map[$sku];
+                    }
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
+                    $map[$sku] = array_merge($existing, ...$linkData);
+                }
+            }
+        }
+    }
+
+    /**
+     * Load links for each product separately.
+     *
+     * @param \SplObjectStorage $map
+     * @param string[] $types
+     * @param Product[] $products
+     * @return void
+     * @throws NoSuchEntityException
+     */
+    private function retrieveSingles(array &$map, array $types, array $products): void
+    {
+        foreach ($products as $product) {
+            $linkData = [];
+            foreach ($types as $type) {
+                $linkData[] = $this->getCollection($product, $type);
+            }
+            $linkData = array_filter($linkData);
+            if ($linkData) {
+                $existing = [];
+                if (array_key_exists($product->getSku(), $map)) {
+                    $existing = $map[$product->getSku()];
+                }
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
+                $map[$product->getSku()] = array_merge($existing, ...$linkData);
+            }
         }
+    }
 
-        usort($sorterItems, function ($itemA, $itemB) {
-            $posA = (int)$itemA['position'];
-            $posB = (int)$itemB['position'];
+    /**
+     * Load map of linked product data.
+     *
+     * Link data consists of link_type, type, sku, position, extension attributes? and custom_attributes?.
+     *
+     * @param Product[] $products
+     * @param array $types Keys - string names, values - codes.
+     * @return array Keys - SKUs, values containing link data.
+     * @throws NoSuchEntityException
+     * @throws \InvalidArgumentException
+     */
+    public function getMap(array $products, array $types): array
+    {
+        if (!$types) {
+            throw new \InvalidArgumentException('Types are required');
+        }
+        $map = [];
+        $typeProcessors = [];
+        /** @var string[] $singleProcessors */
+        $singleProcessors = [];
+        //Finding map processors
+        foreach ($types as $type => $typeCode) {
+            foreach ($this->mapProviders as $i => $mapProvider) {
+                if ($mapProvider->canProcessLinkType($type)) {
+                    if (!array_key_exists($i, $typeProcessors)) {
+                        $typeProcessors[$i] = [];
+                    }
+                    $typeProcessors[$i][$type] = $typeCode;
+                    continue 2;
+                }
+            }
+            //No map processor found, will process 1 by 1
+            $singleProcessors[] = $type;
+        }
 
-            return $posA <=> $posB;
-        });
+        $this->retrieveMaps($map, $typeProcessors, $products);
+        $this->retrieveSingles($map, $singleProcessors, $products);
 
-        return $sorterItems;
+        return $map;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/LinkedMapProvider.php b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/LinkedMapProvider.php
new file mode 100644
index 0000000000000..6be2d2e52cf23
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ProductLink/CollectionProvider/LinkedMapProvider.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ProductLink\CollectionProvider;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ProductLink\MapProviderInterface;
+use Magento\Catalog\Model\Product\Link;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection as LinkedProductCollection;
+use Magento\Catalog\Model\ResourceModel\Product\Link\Product\CollectionFactory as LinkedProductCollectionFactory;
+
+/**
+ * Provides linked products.
+ */
+class LinkedMapProvider implements MapProviderInterface
+{
+    /**
+     * Link types supported.
+     */
+    private const TYPES = ['crosssell', 'related', 'upsell'];
+
+    /**
+     * Type name => Product model cache key.
+     */
+    private const PRODUCT_CACHE_KEY_MAP = [
+        'crosssell' => 'cross_sell_products',
+        'upsell' => 'up_sell_products',
+        'related' => 'related_products'
+    ];
+
+    /**
+     * @var Link
+     */
+    private $linkModel;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadata;
+
+    /**
+     * @var LinkedProductCollectionFactory
+     */
+    private $productCollectionFactory;
+
+    /**
+     * LinkedMapProvider constructor.
+     * @param Link $linkModel
+     * @param MetadataPool $metadataPool
+     * @param LinkedProductCollectionFactory $productCollectionFactory
+     */
+    public function __construct(
+        Link $linkModel,
+        MetadataPool $metadataPool,
+        LinkedProductCollectionFactory $productCollectionFactory
+    ) {
+        $this->linkModel = $linkModel;
+        $this->metadata = $metadataPool;
+        $this->productCollectionFactory = $productCollectionFactory;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canProcessLinkType(string $linkType): bool
+    {
+        return in_array($linkType, self::TYPES, true);
+    }
+
+    /**
+     * Add linked products to the map.
+     *
+     * @param Product[][] $map
+     * @param string $sku
+     * @param string $type
+     * @param Product[] $linked
+     * @return void
+     */
+    private function addLinkedToMap(array &$map, string $sku, string $type, array $linked): void
+    {
+        if (!array_key_exists($sku, $map)) {
+            $map[$sku] = [];
+        }
+        if (!array_key_exists($type, $map[$sku])) {
+            $map[$sku][$type] = [];
+        }
+        $map[$sku][$type] = array_merge($map[$sku][$type], $linked);
+    }
+
+    /**
+     * Extract cached linked products from entities and find root products that do need a query.
+     *
+     * @param Product[] $products Products mapped by link field value.
+     * @param int[] $types Type requested.
+     * @param Product[][] $map Map of linked products.
+     * @return string[][] {Type name => Product link field values} map.
+     */
+    private function processCached(array $products, array $types, array &$map): array
+    {
+        /** @var string[][] $query */
+        $query = [];
+
+        foreach ($products as $productId => $product) {
+            $sku = $product->getSku();
+            foreach (array_keys($types) as $type) {
+                if (array_key_exists($type, self::PRODUCT_CACHE_KEY_MAP)
+                    && $product->hasData(self::PRODUCT_CACHE_KEY_MAP[$type])
+                ) {
+                    $this->addLinkedToMap($map, $sku, $type, $product->getData(self::PRODUCT_CACHE_KEY_MAP[$type]));
+                    //Cached found, no need to load.
+                    continue;
+                }
+
+                if (!array_key_exists($type, $query)) {
+                    $query[$type] = [];
+                }
+                $query[$type][] = $productId;
+            }
+        }
+
+        return $query;
+    }
+
+    /**
+     * Load products linked to given products.
+     *
+     * @param string[][] $productIds {Type name => Product IDs (link field values)} map.
+     * @param int[] $types Type name => type ID map.
+     * @return Product[][] Type name => Product list map.
+     */
+    private function queryLinkedProducts(array $productIds, array $types): array
+    {
+        $found = [];
+        foreach ($types as $type => $typeId) {
+            if (!array_key_exists($type, $productIds)) {
+                continue;
+            }
+
+            /** @var LinkedProductCollection $collection */
+            $collection = $this->productCollectionFactory->create(['productIds' => $productIds[$type]]);
+            $this->linkModel->setLinkTypeId($typeId);
+            $collection->setLinkModel($this->linkModel);
+            $collection->setIsStrongMode();
+            $found[$type] = $collection->getItems();
+        }
+
+        return $found;
+    }
+
+    /**
+     * Cache found linked products for existing root product instances.
+     *
+     * @param Product[] $forProducts
+     * @param Product[][] $map
+     * @param int[] $linkTypesRequested Link types that were queried.
+     * @return void
+     */
+    private function cacheLinked(array $forProducts, array $map, array $linkTypesRequested): void
+    {
+        foreach ($forProducts as $product) {
+            $sku = $product->getSku();
+            if (!array_key_exists($sku, $map)) {
+                $found = [];
+            } else {
+                $found = $map[$sku];
+            }
+            foreach (array_keys($linkTypesRequested) as $linkName) {
+                if (!array_key_exists($linkName, $found)) {
+                    $found[$linkName] = [];
+                }
+            }
+
+            foreach (self::PRODUCT_CACHE_KEY_MAP as $typeName => $cacheKey) {
+                if (!array_key_exists($typeName, $linkTypesRequested)) {
+                    //If products were not queried for current type then moving on
+                    continue;
+                }
+
+                $product->setData($cacheKey, $found[$typeName]);
+            }
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function fetchMap(array $products, array $linkTypes): array
+    {
+        if (!$products || !$linkTypes) {
+            throw new \InvalidArgumentException('Products and link types are required.');
+        }
+
+        //Gathering products information
+        $productActualIdField = $this->metadata->getMetadata(ProductInterface::class)->getLinkField();
+        /** @var Product[] $rootProducts */
+        $rootProducts = [];
+        /** @var Product $product */
+        foreach ($products as $product) {
+            if ($id = $product->getData($productActualIdField)) {
+                $rootProducts[$id] = $product;
+            }
+        }
+        unset($product);
+        //Cannot load without persisted products
+        if (!$rootProducts) {
+            return [];
+        }
+
+        //Finding linked.
+        $map = [];
+        $query = $this->processCached($rootProducts, $linkTypes, $map);
+        $foundLinked = $this->queryLinkedProducts($query, $linkTypes);
+
+        //Filling map with what we've found.
+        foreach ($foundLinked as $linkType => $linkedProducts) {
+            foreach ($linkedProducts as $linkedProduct) {
+                $product = $rootProducts[$linkedProduct->getData('_linked_to_product_id')];
+                $this->addLinkedToMap($map, $product->getSku(), $linkType, [$linkedProduct]);
+            }
+        }
+
+        $this->cacheLinked($rootProducts, $map, $linkTypes);
+
+        return $map;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Data/ListCriteria.php b/app/code/Magento/Catalog/Model/ProductLink/Data/ListCriteria.php
new file mode 100644
index 0000000000000..4ba59e1fd08e2
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ProductLink/Data/ListCriteria.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ProductLink\Data;
+
+use Magento\Catalog\Model\Product;
+
+/**
+ * @inheritDoc
+ */
+class ListCriteria implements ListCriteriaInterface
+{
+    /**
+     * @var string
+     */
+    private $productSku;
+
+    /**
+     * @var Product|null
+     */
+    private $product;
+
+    /**
+     * @var string[]|null
+     */
+    private $linkTypes;
+
+    /**
+     * ListCriteria constructor.
+     * @param string $belongsToProductSku
+     * @param string[]|null $linkTypes
+     * @param Product|null $belongsToProduct
+     */
+    public function __construct(
+        string $belongsToProductSku,
+        ?array $linkTypes = null,
+        ?Product $belongsToProduct = null
+    ) {
+        $this->productSku = $belongsToProductSku;
+        $this->linkTypes = $linkTypes;
+        if ($belongsToProduct) {
+            $this->productSku = $belongsToProduct->getSku();
+            $this->product = $belongsToProduct;
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBelongsToProductSku(): string
+    {
+        return $this->productSku;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLinkTypes(): ?array
+    {
+        return $this->linkTypes;
+    }
+
+    /**
+     * Product model.
+     *
+     * @see getBelongsToProductSku()
+     * @return Product|null
+     */
+    public function getBelongsToProduct(): ?Product
+    {
+        return $this->product;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Data/ListCriteriaInterface.php b/app/code/Magento/Catalog/Model/ProductLink/Data/ListCriteriaInterface.php
new file mode 100644
index 0000000000000..0291be5b9e783
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ProductLink/Data/ListCriteriaInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ProductLink\Data;
+
+/**
+ * Criteria for finding lists.
+ */
+interface ListCriteriaInterface
+{
+    /**
+     * Links belong to this product.
+     *
+     * @return string
+     */
+    public function getBelongsToProductSku(): string;
+
+    /**
+     * Limit links by type (in).
+     *
+     * @return string[]|null
+     */
+    public function getLinkTypes(): ?array;
+}
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Data/ListResult.php b/app/code/Magento/Catalog/Model/ProductLink/Data/ListResult.php
new file mode 100644
index 0000000000000..4828837d790fb
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ProductLink/Data/ListResult.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ProductLink\Data;
+
+use Magento\Catalog\Api\Data\ProductLinkInterface;
+
+/**
+ * @inheritDoc
+ */
+class ListResult implements ListResultInterface
+{
+    /**
+     * @var ProductLinkInterface[]|null
+     */
+    private $result;
+
+    /**
+     * @var \Throwable|null
+     */
+    private $error;
+
+    /**
+     * ListResult constructor.
+     * @param ProductLinkInterface[]|null $result
+     * @param \Throwable|null $error
+     */
+    public function __construct(?array $result, ?\Throwable $error)
+    {
+        $this->result = $result;
+        $this->error = $error;
+        if ($this->result === null && $this->error === null) {
+            throw new \InvalidArgumentException('Result must either contain values or an error.');
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getResult(): ?array
+    {
+        return $this->result;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getError(): ?\Throwable
+    {
+        return $this->error;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Data/ListResultInterface.php b/app/code/Magento/Catalog/Model/ProductLink/Data/ListResultInterface.php
new file mode 100644
index 0000000000000..f5c0454e7a542
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ProductLink/Data/ListResultInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ProductLink\Data;
+
+use Magento\Catalog\Api\Data\ProductLinkInterface;
+
+/**
+ * Result of finding a list of links.
+ */
+interface ListResultInterface
+{
+    /**
+     * Found links, null if error occurred.
+     *
+     * @return ProductLinkInterface[]|null
+     */
+    public function getResult(): ?array;
+
+    /**
+     * Error that occurred during retrieval of the list.
+     *
+     * @return \Throwable|null
+     */
+    public function getError(): ?\Throwable;
+}
diff --git a/app/code/Magento/Catalog/Model/ProductLink/MapProviderInterface.php b/app/code/Magento/Catalog/Model/ProductLink/MapProviderInterface.php
new file mode 100644
index 0000000000000..31951ab10f5b4
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ProductLink/MapProviderInterface.php
@@ -0,0 +1,36 @@
+<?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\Model\Product;
+
+/**
+ * Provide link data for products.
+ */
+interface MapProviderInterface
+{
+    /**
+     * Whether a provider can provide data for given link type.
+     *
+     * @param string $linkType
+     * @return bool
+     */
+    public function canProcessLinkType(string $linkType): bool;
+
+    /**
+     * Load linked products.
+     *
+     * Must return map with keys as product objects, values as maps of link types and products linked.
+     *
+     * @param Product[] $products With SKUs as keys.
+     * @param string[] $linkTypes List of supported link types to process, keys - names, values - codes.
+     * @return Product[][]
+     */
+    public function fetchMap(array $products, array $linkTypes): array;
+}
diff --git a/app/code/Magento/Catalog/Model/ProductLink/ProductLinkQuery.php b/app/code/Magento/Catalog/Model/ProductLink/ProductLinkQuery.php
new file mode 100644
index 0000000000000..4bc400605a429
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ProductLink/ProductLinkQuery.php
@@ -0,0 +1,245 @@
+<?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\Model\Product\LinkTypeProvider;
+use Magento\Catalog\Model\ProductLink\Data\ListCriteria;
+use Magento\Catalog\Model\ProductLink\Data\ListResult;
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SimpleDataObjectConverter;
+use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductLinkExtensionFactory;
+use Magento\Framework\Exception\InputException;
+
+/**
+ * Search for product links by criteria.
+ *
+ * Batch contract for getting product links.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ProductLinkQuery
+{
+    /**
+     * @var LinkTypeProvider
+     */
+    private $linkTypeProvider;
+
+    /**
+     * @var ProductRepository
+     */
+    private $productRepository;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $criteriaBuilder;
+
+    /**
+     * @var CollectionProvider
+     */
+    private $collectionProvider;
+
+    /**
+     * @var ProductLinkInterfaceFactory
+     */
+    private $productLinkFactory;
+
+    /**
+     * @var ProductLinkExtensionFactory
+     */
+    private $productLinkExtensionFactory;
+
+    /**
+     * @param LinkTypeProvider $linkTypeProvider
+     * @param ProductRepository $productRepository
+     * @param SearchCriteriaBuilder $criteriaBuilder
+     * @param CollectionProvider $collectionProvider
+     * @param ProductLinkInterfaceFactory $productLinkFactory
+     * @param ProductLinkExtensionFactory $productLinkExtensionFactory
+     */
+    public function __construct(
+        LinkTypeProvider $linkTypeProvider,
+        ProductRepository $productRepository,
+        SearchCriteriaBuilder $criteriaBuilder,
+        CollectionProvider $collectionProvider,
+        ProductLinkInterfaceFactory $productLinkFactory,
+        ProductLinkExtensionFactory $productLinkExtensionFactory
+    ) {
+        $this->linkTypeProvider = $linkTypeProvider;
+        $this->productRepository = $productRepository;
+        $this->criteriaBuilder = $criteriaBuilder;
+        $this->collectionProvider = $collectionProvider;
+        $this->productLinkFactory = $productLinkFactory;
+        $this->productLinkExtensionFactory = $productLinkExtensionFactory;
+    }
+
+    /**
+     * Extract all link types requested.
+     *
+     * @param \Magento\Catalog\Model\ProductLink\Data\ListCriteriaInterface[] $criteria
+     * @return string[]
+     */
+    private function extractRequestedLinkTypes(array $criteria): array
+    {
+        $linkTypes = $this->linkTypeProvider->getLinkTypes();
+        $linkTypesToLoad = [];
+        foreach ($criteria as $listCriteria) {
+            if ($listCriteria->getLinkTypes() === null) {
+                //All link types are to be returned.
+                $linkTypesToLoad = null;
+                break;
+            }
+            $linkTypesToLoad[] = $listCriteria->getLinkTypes();
+        }
+        if ($linkTypesToLoad !== null) {
+            if (count($linkTypesToLoad) === 1) {
+                $linkTypesToLoad = $linkTypesToLoad[0];
+            } else {
+                $linkTypesToLoad = array_merge(...$linkTypesToLoad);
+            }
+            $linkTypesToLoad = array_flip($linkTypesToLoad);
+            $linkTypes = array_filter(
+                $linkTypes,
+                function (string $code) use ($linkTypesToLoad) {
+                    return array_key_exists($code, $linkTypesToLoad);
+                },
+                ARRAY_FILTER_USE_KEY
+            );
+        }
+
+        return $linkTypes;
+    }
+
+    /**
+     * Load products links were requested for.
+     *
+     * @param \Magento\Catalog\Model\ProductLink\Data\ListCriteriaInterface[] $criteria
+     * @return \Magento\Catalog\Model\Product[] Keys are SKUs.
+     */
+    private function loadProductsByCriteria(array $criteria): array
+    {
+        $products = [];
+        $skusToLoad = [];
+        foreach ($criteria as $listCriteria) {
+            if ($listCriteria instanceof ListCriteria
+                && $listCriteria->getBelongsToProduct()
+            ) {
+                $products[$listCriteria->getBelongsToProduct()->getSku()] = $listCriteria->getBelongsToProduct();
+            } else {
+                $skusToLoad[] = $listCriteria->getBelongsToProductSku();
+            }
+        }
+
+        $skusToLoad = array_filter(
+            $skusToLoad,
+            function ($sku) use ($products) {
+                return !array_key_exists($sku, $products);
+            }
+        );
+        if ($skusToLoad) {
+            $loaded = $this->productRepository->getList(
+                $this->criteriaBuilder->addFilter('sku', $skusToLoad, 'in')->create()
+            );
+            foreach ($loaded->getItems() as $product) {
+                $products[$product->getSku()] = $product;
+            }
+        }
+
+        return $products;
+    }
+
+    /**
+     * Convert links data to DTOs.
+     *
+     * @param string $productSku SKU of the root product.
+     * @param array[] $linksData Links data returned from collection.
+     * @param string[]|null $acceptedTypes Link types that are accepted.
+     * @return \Magento\Catalog\Api\Data\ProductLinkInterface[]
+     */
+    private function convertLinksData(string $productSku, array $linksData, ?array $acceptedTypes): array
+    {
+        $list = [];
+        foreach ($linksData as $linkData) {
+            if ($acceptedTypes && !in_array($linkData['link_type'], $acceptedTypes, true)) {
+                continue;
+            }
+            /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
+            $productLink = $this->productLinkFactory->create();
+            $productLink->setSku($productSku)
+                ->setLinkType($linkData['link_type'])
+                ->setLinkedProductSku($linkData['sku'])
+                ->setLinkedProductType($linkData['type'])
+                ->setPosition($linkData['position']);
+            if (isset($linkData['custom_attributes'])) {
+                $productLinkExtension = $productLink->getExtensionAttributes();
+                if ($productLinkExtension === null) {
+                    /** @var \Magento\Catalog\Api\Data\ProductLinkExtensionInterface $productLinkExtension */
+                    $productLinkExtension = $this->productLinkExtensionFactory->create();
+                }
+                foreach ($linkData['custom_attributes'] as $option) {
+                    $name = $option['attribute_code'];
+                    $value = $option['value'];
+                    $setterName = 'set' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($name);
+                    // Check if setter exists
+                    if (method_exists($productLinkExtension, $setterName)) {
+                        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                        call_user_func([$productLinkExtension, $setterName], $value);
+                    }
+                }
+                $productLink->setExtensionAttributes($productLinkExtension);
+            }
+            $list[] = $productLink;
+        }
+
+        return $list;
+    }
+
+    /**
+     * Get list of product links found by criteria.
+     *
+     * Results are returned in the same order as criteria items.
+     *
+     * @param \Magento\Catalog\Model\ProductLink\Data\ListCriteriaInterface[] $criteria
+     * @return \Magento\Catalog\Model\ProductLink\Data\ListResultInterface[]
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function search(array $criteria): array
+    {
+        if (!$criteria) {
+            throw InputException::requiredField('criteria');
+        }
+
+        //Requested link types.
+        $linkTypes = $this->extractRequestedLinkTypes($criteria);
+        //Requested products.
+        $products = $this->loadProductsByCriteria($criteria);
+        //Map of products and their linked products' data.
+        $map = $this->collectionProvider->getMap($products, $linkTypes);
+
+        //Batch contract results.
+        $results = [];
+        foreach ($criteria as $listCriteria) {
+            $productSku = $listCriteria->getBelongsToProductSku();
+            if (!array_key_exists($productSku, $map)) {
+                $results[] = new ListResult([], null);
+                continue;
+            }
+            try {
+                $list = $this->convertLinksData($productSku, $map[$productSku], $listCriteria->getLinkTypes());
+                $results[] = new ListResult($list, null);
+            } catch (\Throwable $error) {
+                $results[] = new ListResult(null, $error);
+            }
+        }
+
+        return $results;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Repository.php b/app/code/Magento/Catalog/Model/ProductLink/Repository.php
index 98977de7effaf..960044efbc2ec 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Repository.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Repository.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\ProductLink;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -10,6 +13,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\Catalog\Model\ProductLink\Data\ListCriteria;
 use Magento\Framework\Api\SimpleDataObjectConverter;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -17,6 +21,8 @@
 use Magento\Framework\App\ObjectManager;
 
 /**
+ * Product link entity repository.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Repository implements \Magento\Catalog\Api\ProductLinkRepositoryInterface
@@ -48,11 +54,14 @@ class Repository implements \Magento\Catalog\Api\ProductLinkRepositoryInterface
 
     /**
      * @var CollectionProvider
+     * @deprecated Not used anymore.
+     * @see query
      */
     protected $entityCollectionProvider;
 
     /**
      * @var LinksInitializer
+     * @deprecated Not used.
      */
     protected $linkInitializer;
 
@@ -68,14 +77,23 @@ class Repository implements \Magento\Catalog\Api\ProductLinkRepositoryInterface
 
     /**
      * @var ProductLinkInterfaceFactory
+     * @deprecated Not used anymore, search delegated.
+     * @see getList()
      */
     protected $productLinkFactory;
 
     /**
      * @var ProductLinkExtensionFactory
+     * @deprecated Not used anymore, search delegated.
+     * @see getList()
      */
     protected $productLinkExtensionFactory;
 
+    /**
+     * @var ProductLinkQuery
+     */
+    private $query;
+
     /**
      * Constructor
      *
@@ -86,6 +104,7 @@ class Repository implements \Magento\Catalog\Api\ProductLinkRepositoryInterface
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
      * @param \Magento\Catalog\Api\Data\ProductLinkInterfaceFactory|null $productLinkFactory
      * @param \Magento\Catalog\Api\Data\ProductLinkExtensionFactory|null $productLinkExtensionFactory
+     * @param ProductLinkQuery|null $query
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -95,7 +114,8 @@ public function __construct(
         \Magento\Catalog\Model\ProductLink\Management $linkManagement,
         \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor,
         \Magento\Catalog\Api\Data\ProductLinkInterfaceFactory $productLinkFactory = null,
-        \Magento\Catalog\Api\Data\ProductLinkExtensionFactory $productLinkExtensionFactory = null
+        \Magento\Catalog\Api\Data\ProductLinkExtensionFactory $productLinkExtensionFactory = null,
+        ?ProductLinkQuery $query = null
     ) {
         $this->productRepository = $productRepository;
         $this->entityCollectionProvider = $entityCollectionProvider;
@@ -106,10 +126,11 @@ public function __construct(
             ->get(\Magento\Catalog\Api\Data\ProductLinkInterfaceFactory::class);
         $this->productLinkExtensionFactory = $productLinkExtensionFactory ?: ObjectManager::getInstance()
             ->get(\Magento\Catalog\Api\Data\ProductLinkExtensionFactory::class);
+        $this->query = $query ?? ObjectManager::getInstance()->get(ProductLinkQuery::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function save(\Magento\Catalog\Api\Data\ProductLinkInterface $entity)
     {
@@ -146,47 +167,25 @@ public function save(\Magento\Catalog\Api\Data\ProductLinkInterface $entity)
     /**
      * Get product links list
      *
-     * @param \Magento\Catalog\Api\Data\ProductInterface $product
+     * @param \Magento\Catalog\Api\Data\ProductInterface|\Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Api\Data\ProductLinkInterface[]
      */
     public function getList(\Magento\Catalog\Api\Data\ProductInterface $product)
     {
-        $output = [];
-        $linkTypes = $this->getLinkTypeProvider()->getLinkTypes();
-        foreach (array_keys($linkTypes) as $linkTypeName) {
-            $collection = $this->entityCollectionProvider->getCollection($product, $linkTypeName);
-            foreach ($collection as $item) {
-                /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
-                $productLink = $this->productLinkFactory->create();
-                $productLink->setSku($product->getSku())
-                    ->setLinkType($linkTypeName)
-                    ->setLinkedProductSku($item['sku'])
-                    ->setLinkedProductType($item['type'])
-                    ->setPosition($item['position']);
-                if (isset($item['custom_attributes'])) {
-                    $productLinkExtension = $productLink->getExtensionAttributes();
-                    if ($productLinkExtension === null) {
-                        $productLinkExtension = $this->productLinkExtensionFactory()->create();
-                    }
-                    foreach ($item['custom_attributes'] as $option) {
-                        $name = $option['attribute_code'];
-                        $value = $option['value'];
-                        $setterName = 'set' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($name);
-                        // Check if setter exists
-                        if (method_exists($productLinkExtension, $setterName)) {
-                            call_user_func([$productLinkExtension, $setterName], $value);
-                        }
-                    }
-                    $productLink->setExtensionAttributes($productLinkExtension);
-                }
-                $output[] = $productLink;
-            }
+        if (!$product->getSku() || !$product->getId()) {
+            return $product->getProductLinks();
         }
-        return $output;
+        $criteria = new ListCriteria($product->getSku(), null, $product);
+        $result = $this->query->search([$criteria])[0];
+
+        if ($result->getError()) {
+            throw $result->getError();
+        }
+        return $result->getResult();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function delete(\Magento\Catalog\Api\Data\ProductLinkInterface $entity)
     {
@@ -219,7 +218,7 @@ public function delete(\Magento\Catalog\Api\Data\ProductLinkInterface $entity)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function deleteById($sku, $type, $linkedProductSku)
     {
@@ -243,6 +242,8 @@ public function deleteById($sku, $type, $linkedProductSku)
     }
 
     /**
+     * Get Link resource instance.
+     *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Link
      */
     private function getLinkResource()
@@ -255,6 +256,8 @@ private function getLinkResource()
     }
 
     /**
+     * Get LinkTypeProvider instance.
+     *
      * @return LinkTypeProvider
      */
     private function getLinkTypeProvider()
@@ -267,6 +270,8 @@ private function getLinkTypeProvider()
     }
 
     /**
+     * Get MetadataPool instance.
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      */
     private function getMetadataPool()
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Search.php b/app/code/Magento/Catalog/Model/ProductLink/Search.php
index 8750345aa222b..ad7f3370ab3fe 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Search.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Search.php
@@ -10,7 +10,9 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 
-/** Returns collection of product visible in catalog by search key */
+/**
+ * Returns collection of product visible in catalog by search key
+ */
 class Search
 {
     /**
@@ -58,7 +60,6 @@ public function prepareCollection(
     ): \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);
diff --git a/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php b/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php
index fdcf2956dbdef..2aa92b8f0316e 100644
--- a/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php
+++ b/app/code/Magento/Catalog/Model/ProductRepository/MediaGalleryProcessor.php
@@ -92,7 +92,17 @@ public function processMediaGallery(ProductInterface $product, array $mediaGalle
                     if ($updatedEntry['file'] === null) {
                         unset($updatedEntry['file']);
                     }
-                    $existingMediaGallery[$key] = array_merge($existingEntry, $updatedEntry);
+                    if (isset($updatedEntry['content'])) {
+                        //need to recreate image and reset object
+                        $existingEntry['recreate'] = true;
+                        // phpcs:ignore Magento2.Performance.ForeachArrayMerge
+                        $newEntry = array_merge($existingEntry, $updatedEntry);
+                        $newEntries[] = $newEntry;
+                        unset($existingMediaGallery[$key]);
+                    } else {
+                        // phpcs:ignore Magento2.Performance.ForeachArrayMerge
+                        $existingMediaGallery[$key] = array_merge($existingEntry, $updatedEntry);
+                    }
                 } else {
                     //set the removed flag
                     $existingEntry['removed'] = true;
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
index 797ce72ae9b7a..c4980c917d069 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -18,6 +18,8 @@
 use Magento\Framework\DataObject;
 use Magento\Framework\EntityManager\EntityManager;
 use Magento\Catalog\Setup\CategorySetup;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * Resource model for category entity
@@ -95,6 +97,11 @@ class Category extends AbstractResource
      */
     private $indexerProcessor;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * Category constructor.
      * @param \Magento\Eav\Model\Entity\Context $context
@@ -106,6 +113,7 @@ class Category extends AbstractResource
      * @param Processor $indexerProcessor
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param MetadataPool|null $metadataPool
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -117,7 +125,8 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
         Processor $indexerProcessor,
         $data = [],
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        MetadataPool $metadataPool = null
     ) {
         parent::__construct(
             $context,
@@ -132,6 +141,7 @@ public function __construct(
         $this->indexerProcessor = $indexerProcessor;
         $this->serializer = $serializer ?: ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
     }
 
     /**
@@ -761,6 +771,8 @@ public function getParentDesignCategory($category)
             'custom_layout_update'
         )->addAttributeToSelect(
             'custom_apply_to_products'
+        )->addAttributeToSelect(
+            'custom_layout_update_file'
         )->addFieldToFilter(
             'entity_id',
             ['in' => $pathIds]
@@ -1160,13 +1172,14 @@ public function getCategoryWithChildren(int $categoryId): array
             return [];
         }
 
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         $select = $connection->select()
             ->from(
                 ['cce' => $this->getTable('catalog_category_entity')],
-                ['entity_id', 'parent_id', 'path']
+                [$linkField, 'parent_id', 'path']
             )->join(
                 ['cce_int' => $this->getTable('catalog_category_entity_int')],
-                'cce.entity_id = cce_int.entity_id',
+                'cce.' . $linkField . ' = cce_int.' . $linkField,
                 ['is_anchor' => 'cce_int.value']
             )->where(
                 'cce_int.attribute_id = ?',
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
index 355561c5e384d..a396ae57c2ccd 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
@@ -236,7 +236,7 @@ public function afterSave()
         ) {
             $this->_indexerEavProcessor->markIndexerAsInvalid();
         }
-        
+
         $this->_source = null;
 
         return parent::afterSave();
@@ -845,9 +845,6 @@ public function afterDelete()
     /**
      * @inheritdoc
      * @since 100.0.9
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -861,9 +858,6 @@ public function __sleep()
     /**
      * @inheritdoc
      * @since 100.0.9
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product.php b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
index b0b15cfd69d13..c5587d3b25665 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
@@ -6,10 +6,12 @@
 namespace Magento\Catalog\Model\ResourceModel;
 
 use Magento\Catalog\Model\ResourceModel\Product\Website\Link as ProductWebsiteLink;
+use Magento\Eav\Api\AttributeManagementInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 use Magento\Catalog\Model\Product as ProductEntity;
 use Magento\Eav\Model\Entity\Attribute\UniqueValidationInterface;
+use Magento\Framework\DataObject;
 use Magento\Framework\EntityManager\EntityManager;
 use Magento\Framework\Model\AbstractModel;
 
@@ -93,6 +95,11 @@ class Product extends AbstractResource
      */
     private $tableMaintainer;
 
+    /**
+     * @var AttributeManagementInterface
+     */
+    private $eavAttributeManagement;
+
     /**
      * @param \Magento\Eav\Model\Entity\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -106,7 +113,7 @@ class Product extends AbstractResource
      * @param array $data
      * @param TableMaintainer|null $tableMaintainer
      * @param UniqueValidationInterface|null $uniqueValidator
-     *
+     * @param AttributeManagementInterface|null $eavAttributeManagement
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -121,7 +128,8 @@ public function __construct(
         \Magento\Catalog\Model\Product\Attribute\DefaultAttributes $defaultAttributes,
         $data = [],
         TableMaintainer $tableMaintainer = null,
-        UniqueValidationInterface $uniqueValidator = null
+        UniqueValidationInterface $uniqueValidator = null,
+        AttributeManagementInterface $eavAttributeManagement = null
     ) {
         $this->_categoryCollectionFactory = $categoryCollectionFactory;
         $this->_catalogCategory = $catalogCategory;
@@ -138,6 +146,8 @@ public function __construct(
         );
         $this->connectionName  = 'catalog';
         $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
+        $this->eavAttributeManagement = $eavAttributeManagement
+            ?? ObjectManager::getInstance()->get(AttributeManagementInterface::class);
     }
 
     /**
@@ -268,10 +278,10 @@ public function getIdBySku($sku)
     /**
      * Process product data before save
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @return $this
      */
-    protected function _beforeSave(\Magento\Framework\DataObject $object)
+    protected function _beforeSave(DataObject $object)
     {
         $self = parent::_beforeSave($object);
         /**
@@ -286,15 +296,73 @@ protected function _beforeSave(\Magento\Framework\DataObject $object)
     /**
      * Save data related with product
      *
-     * @param \Magento\Framework\DataObject $product
+     * @param DataObject $product
      * @return $this
      */
-    protected function _afterSave(\Magento\Framework\DataObject $product)
+    protected function _afterSave(DataObject $product)
     {
+        $this->removeNotInSetAttributeValues($product);
         $this->_saveWebsiteIds($product)->_saveCategories($product);
         return parent::_afterSave($product);
     }
 
+    /**
+     * Remove attribute values that absent in product attribute set
+     *
+     * @param DataObject $product
+     * @return DataObject
+     */
+    private function removeNotInSetAttributeValues(DataObject $product): DataObject
+    {
+        $oldAttributeSetId = $product->getOrigData(ProductEntity::ATTRIBUTE_SET_ID);
+        if ($oldAttributeSetId && $product->dataHasChangedFor(ProductEntity::ATTRIBUTE_SET_ID)) {
+            $newAttributes = $product->getAttributes();
+            $newAttributesCodes = array_keys($newAttributes);
+            $oldAttributes = $this->eavAttributeManagement->getAttributes(
+                ProductEntity::ENTITY,
+                $oldAttributeSetId
+            );
+            $oldAttributesCodes = [];
+            foreach ($oldAttributes as $oldAttribute) {
+                $oldAttributesCodes[] = $oldAttribute->getAttributecode();
+            }
+            $notInSetAttributeCodes = array_diff($oldAttributesCodes, $newAttributesCodes);
+            if (!empty($notInSetAttributeCodes)) {
+                $this->deleteSelectedEntityAttributeRows($product, $notInSetAttributeCodes);
+            }
+        }
+
+        return $product;
+    }
+
+    /**
+     * Clear selected entity attribute rows
+     *
+     * @param DataObject $product
+     * @param array $attributeCodes
+     * @return void
+     */
+    private function deleteSelectedEntityAttributeRows(DataObject $product, array $attributeCodes): void
+    {
+        $backendTables = [];
+        foreach ($attributeCodes as $attributeCode) {
+            $attribute = $this->getAttribute($attributeCode);
+            $backendTable = $attribute->getBackendTable();
+            if (!$attribute->isStatic() && $backendTable) {
+                $backendTables[$backendTable][] = $attribute->getId();
+            }
+        }
+
+        $entityIdField = $this->getLinkField();
+        $entityId = $product->getData($entityIdField);
+        foreach ($backendTables as $backendTable => $attributes) {
+            $connection = $this->getConnection();
+            $where = $connection->quoteInto('attribute_id IN (?)', $attributes);
+            $where .= $connection->quoteInto(" AND {$entityIdField} = ?", $entityId);
+            $connection->delete($backendTable, $where);
+        }
+    }
+
     /**
      * @inheritdoc
      */
@@ -337,12 +405,12 @@ protected function _saveWebsiteIds($product)
     /**
      * Save product category relations
      *
-     * @param \Magento\Framework\DataObject $object
+     * @param DataObject $object
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @deprecated 101.1.0
      */
-    protected function _saveCategories(\Magento\Framework\DataObject $object)
+    protected function _saveCategories(DataObject $object)
     {
         return $this;
     }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index 42d55892b6ec6..e31180d4ff6cf 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -193,7 +193,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
     /**
      * Catalog data
      *
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager = null;
 
@@ -322,7 +322,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @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
@@ -352,7 +352,7 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \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,
@@ -1595,6 +1595,8 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
         } else {
             return parent::addAttributeToFilter($attribute, $condition, $joinType);
         }
+
+        return $this;
     }
 
     /**
@@ -2113,13 +2115,14 @@ private function getChildrenCategories(int $categoryId): array
 
         $firstCategory = array_shift($categories);
         if ($firstCategory['is_anchor'] == 1) {
-            $anchorCategory[] = (int)$firstCategory['entity_id'];
+            $linkField = $this->getProductEntityMetadata()->getLinkField();
+            $anchorCategory[] = (int)$firstCategory[$linkField];
             foreach ($categories as $category) {
                 if (in_array($category['parent_id'], $categoryIds)
                     && in_array($category['parent_id'], $anchorCategory)) {
-                    $categoryIds[] = (int)$category['entity_id'];
+                    $categoryIds[] = (int)$category[$linkField];
                     if ($category['is_anchor'] == 1) {
-                        $anchorCategory[] = (int)$category['entity_id'];
+                        $anchorCategory[] = (int)$category[$linkField];
                     }
                 }
             }
@@ -2517,10 +2520,10 @@ public function getPricesCount()
     /**
      * Add is_saleable attribute to filter
      *
-     * @param array|null $condition
+     * @param mixed $condition
      * @return $this
      */
-    private function addIsSaleableAttributeToFilter(?array $condition): self
+    private function addIsSaleableAttributeToFilter($condition): self
     {
         $columns = $this->getSelect()->getPart(Select::COLUMNS);
         foreach ($columns as $columnEntry) {
@@ -2548,10 +2551,10 @@ private function addIsSaleableAttributeToFilter(?array $condition): self
      * Add tier price attribute to filter
      *
      * @param string $attribute
-     * @param array|null $condition
+     * @param mixed $condition
      * @return $this
      */
-    private function addTierPriceAttributeToFilter(string $attribute, ?array $condition): self
+    private function addTierPriceAttributeToFilter(string $attribute, $condition): self
     {
         $attrCode = $attribute;
         $connection = $this->getConnection();
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php
index dc3411743a066..92741cf9ba88e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php
@@ -64,7 +64,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @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
@@ -76,6 +76,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param \Magento\Catalog\Model\ResourceModel\Product\Compare\Item $catalogProductCompareItem
      * @param \Magento\Catalog\Helper\Product\Compare $catalogProductCompare
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
+     *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -89,7 +90,7 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \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,
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 9643f4c3a7181..b64cca4ff1b26 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
@@ -40,7 +40,7 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
     /**
      * Core data
      *
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
@@ -73,7 +73,7 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
      * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param string|null $connectionName
      * @param IndexTableStructureFactory $indexTableStructureFactory
      * @param PriceModifierInterface[] $priceModifiers
@@ -83,7 +83,7 @@ public function __construct(
         \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         $connectionName = null,
         IndexTableStructureFactory $indexTableStructureFactory = null,
         array $priceModifiers = []
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
index a3f463d53e7a8..77407ed699fbd 100644
--- 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
@@ -37,7 +37,7 @@ class BaseFinalPrice
     private $joinAttributeProcessor;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     private $moduleManager;
 
@@ -69,7 +69,7 @@ class BaseFinalPrice
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param JoinAttributeProcessor $joinAttributeProcessor
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param string $connectionName
@@ -77,7 +77,7 @@ class BaseFinalPrice
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
         JoinAttributeProcessor $joinAttributeProcessor,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
         $connectionName = 'indexer'
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
index 5724496d7ebdc..f1d4552cf37f0 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
@@ -5,6 +5,14 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Product\Link\Product;
 
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
+use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
+use Magento\Catalog\Model\ResourceModel\Category;
+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Indexer\DimensionFactory;
+
 /**
  * Catalog product linked products collection
  *
@@ -50,6 +58,111 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     protected $_hasLinkFilter = false;
 
+    /**
+     * @var string[]|null Root product link fields values.
+     */
+    private $productIds;
+
+    /**
+     * @var string|null
+     */
+    private $linkField;
+
+    /**
+     * 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 GroupManagementInterface $groupManagement
+     * @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
+     * @param Category|null $categoryResourceModel
+     * @param string[]|null $productIds Root product IDs (linkFields, not entity_ids).
+     * @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,
+        GroupManagementInterface $groupManagement,
+        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
+        ProductLimitationFactory $productLimitationFactory = null,
+        MetadataPool $metadataPool = null,
+        TableMaintainer $tableMaintainer = null,
+        PriceTableResolver $priceTableResolver = null,
+        DimensionFactory $dimensionFactory = null,
+        Category $categoryResourceModel = null,
+        ?array $productIds = 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,
+            $priceTableResolver,
+            $dimensionFactory,
+            $categoryResourceModel
+        );
+
+        if ($productIds) {
+            $this->productIds = $productIds;
+            $this->_hasLinkFilter = true;
+        }
+    }
+
     /**
      * Declare link model and initialize type attributes join
      *
@@ -98,6 +211,7 @@ public function setProduct(\Magento\Catalog\Model\Product $product)
         if ($product && $product->getId()) {
             $this->_hasLinkFilter = true;
             $this->setStore($product->getStore());
+            $this->productIds = [$product->getData($this->getLinkField())];
         }
         return $this;
     }
@@ -142,7 +256,7 @@ public function addProductFilter($products)
             if (!is_array($products)) {
                 $products = [$products];
             }
-            $identifierField = $this->getProductEntityMetadata()->getIdentifierField();
+            $identifierField = $this->getLinkField();
             $this->getSelect()->where("product_entity_table.$identifierField IN (?)", $products);
             $this->_hasLinkFilter = true;
         }
@@ -202,21 +316,20 @@ protected function _joinLinks()
             $connection->quoteInto('links.link_type_id = ?', $this->_linkTypeId),
         ];
         $joinType = 'join';
-        $linkField = $this->getProductEntityMetadata()->getLinkField();
-        if ($this->getProduct() && $this->getProduct()->getId()) {
-            $linkFieldId = $this->getProduct()->getData(
-                $linkField
-            );
+        $linkField = $this->getLinkField();
+        if ($this->productIds) {
             if ($this->_isStrongMode) {
-                $this->getSelect()->where('links.product_id = ?', (int)$linkFieldId);
+                $this->getSelect()->where('links.product_id in (?)', $this->productIds);
             } else {
                 $joinType = 'joinLeft';
-                $joinCondition[] = $connection->quoteInto('links.product_id = ?', $linkFieldId);
+                $joinCondition[] = $connection->quoteInto('links.product_id in (?)', $this->productIds);
+            }
+            if (count($this->productIds) === 1) {
+                $this->addFieldToFilter(
+                    $linkField,
+                    ['neq' => array_values($this->productIds)[0]]
+                );
             }
-            $this->addFieldToFilter(
-                $linkField,
-                ['neq' => $linkFieldId]
-            );
         } elseif ($this->_isStrongMode) {
             $this->addFieldToFilter(
                 $linkField,
@@ -227,7 +340,7 @@ protected function _joinLinks()
             $select->{$joinType}(
                 ['links' => $this->getTable('catalog_product_link')],
                 implode(' AND ', $joinCondition),
-                ['link_id']
+                ['link_id' => 'link_id', '_linked_to_product_id' => 'product_id']
             );
             $this->joinAttributes();
         }
@@ -347,13 +460,14 @@ public function addLinkAttributeToFilter($code, $condition)
 
     /**
      * Join Product To Links
+     *
      * @return void
      */
     private function joinProductsToLinks()
     {
         if ($this->_hasLinkFilter) {
             $metaDataPool = $this->getProductEntityMetadata();
-            $linkField = $metaDataPool->getLinkField();
+            $linkField = $this->getLinkField();
             $entityTable = $metaDataPool->getEntityTable();
             $this->getSelect()
                 ->join(
@@ -363,4 +477,18 @@ private function joinProductsToLinks()
                 );
         }
     }
+
+    /**
+     * Get product entity's identifier field.
+     *
+     * @return string
+     */
+    private function getLinkField(): string
+    {
+        if (!$this->linkField) {
+            $this->linkField = $this->getProductEntityMetadata()->getLinkField();
+        }
+
+        return $this->linkField;
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/View/Asset/Image.php b/app/code/Magento/Catalog/Model/View/Asset/Image.php
index dfae9f4b0da9c..c547ec612bb94 100644
--- a/app/code/Magento/Catalog/Model/View/Asset/Image.php
+++ b/app/code/Magento/Catalog/Model/View/Asset/Image.php
@@ -88,7 +88,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getUrl()
     {
@@ -96,7 +96,7 @@ public function getUrl()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getContentType()
     {
@@ -104,7 +104,7 @@ public function getContentType()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPath()
     {
@@ -112,7 +112,7 @@ public function getPath()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSourceFile()
     {
@@ -131,7 +131,7 @@ public function getSourceContentType()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getContent()
     {
@@ -139,7 +139,7 @@ public function getContent()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFilePath()
     {
@@ -147,7 +147,8 @@ public function getFilePath()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @return ContextInterface
      */
     public function getContext()
@@ -156,7 +157,7 @@ public function getContext()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getModule()
     {
@@ -191,20 +192,21 @@ private function getImageInfo()
 
     /**
      * Converting bool into a string representation
-     * @param $miscParams
+     *
+     * @param array $miscParams
      * @return array
      */
-    private function convertToReadableFormat($miscParams)
+    private function convertToReadableFormat(array $miscParams)
     {
         $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'])
+        $miscParams['keep_aspect_ratio'] = (!empty($miscParams['keep_aspect_ratio']) ? '' : 'non') . 'proportional';
+        $miscParams['keep_frame'] = (!empty($miscParams['keep_frame']) ? '' : 'no') . 'frame';
+        $miscParams['keep_transparency'] = (!empty($miscParams['keep_transparency']) ? '' : 'no') . 'transparency';
+        $miscParams['constrain_only'] = (!empty($miscParams['constrain_only']) ? 'do' : 'not') . 'constrainonly';
+        $miscParams['background'] = !empty($miscParams['background'])
             ? 'rgb' . implode(',', $miscParams['background'])
             : 'nobackground';
         return $miscParams;
diff --git a/app/code/Magento/Catalog/Observer/CategoryDesignAuthorization.php b/app/code/Magento/Catalog/Observer/CategoryDesignAuthorization.php
new file mode 100644
index 0000000000000..94977485b95b3
--- /dev/null
+++ b/app/code/Magento/Catalog/Observer/CategoryDesignAuthorization.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\Observer;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Category\Authorization;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Exception\AuthorizationException;
+
+/**
+ * Employ additional authorization logic when a category is saved.
+ */
+class CategoryDesignAuthorization implements ObserverInterface
+{
+    /**
+     * @var Authorization
+     */
+    private $authorization;
+
+    /**
+     * @param Authorization $authorization
+     */
+    public function __construct(Authorization $authorization)
+    {
+        $this->authorization = $authorization;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @throws AuthorizationException
+     */
+    public function execute(Observer $observer)
+    {
+        /** @var CategoryInterface $category */
+        $category = $observer->getEvent()->getData('category');
+        $this->authorization->authorizeSavingOf($category);
+    }
+}
diff --git a/app/code/Magento/Catalog/Plugin/CategoryAuthorization.php b/app/code/Magento/Catalog/Plugin/CategoryAuthorization.php
new file mode 100644
index 0000000000000..af2dccb96f937
--- /dev/null
+++ b/app/code/Magento/Catalog/Plugin/CategoryAuthorization.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\Plugin;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Model\Category\Authorization;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Perform additional authorization for category operations.
+ */
+class CategoryAuthorization
+{
+    /**
+     * @var Authorization
+     */
+    private $authorization;
+
+    /**
+     * @param Authorization $authorization
+     */
+    public function __construct(Authorization $authorization)
+    {
+        $this->authorization = $authorization;
+    }
+
+    /**
+     * Authorize saving of a category.
+     *
+     * @param CategoryRepositoryInterface $subject
+     * @param CategoryInterface $category
+     * @throws LocalizedException
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeSave(CategoryRepositoryInterface $subject, CategoryInterface $category): array
+    {
+        $this->authorization->authorizeSavingOf($category);
+
+        return [$category];
+    }
+}
diff --git a/app/code/Magento/Catalog/Plugin/ProductAuthorization.php b/app/code/Magento/Catalog/Plugin/ProductAuthorization.php
new file mode 100644
index 0000000000000..ce2fe19cf1aee
--- /dev/null
+++ b/app/code/Magento/Catalog/Plugin/ProductAuthorization.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Plugin;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Authorization;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Perform additional authorization for product operations.
+ */
+class ProductAuthorization
+{
+    /**
+     * @var Authorization
+     */
+    private $authorization;
+
+    /**
+     * @param Authorization $authorization
+     */
+    public function __construct(Authorization $authorization)
+    {
+        $this->authorization = $authorization;
+    }
+
+    /**
+     * Authorize saving of a product.
+     *
+     * @param ProductRepositoryInterface $subject
+     * @param ProductInterface $product
+     * @param bool $saveOptions
+     * @throws LocalizedException
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeSave(
+        ProductRepositoryInterface $subject,
+        ProductInterface $product,
+        $saveOptions = false
+    ): array {
+        $this->authorization->authorizeSavingOf($product);
+
+        return [$product, $saveOptions];
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateCustomLayoutAttributes.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateCustomLayoutAttributes.php
new file mode 100644
index 0000000000000..81fd35ccd3178
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateCustomLayoutAttributes.php
@@ -0,0 +1,121 @@
+<?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;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Category;
+
+/**
+ * Add new custom layout related attributes.
+ */
+class UpdateCustomLayoutAttributes implements DataPatchInterface
+{
+    /**
+     * @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 static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply()
+    {
+        /** @var CategorySetup $eavSetup */
+        $eavSetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $eavSetup->addAttribute(
+            Product::ENTITY,
+            'custom_layout_update_file',
+            [
+                'type' => 'varchar',
+                'label' => 'Custom Layout Update',
+                'input' => 'select',
+                'source' => \Magento\Catalog\Model\Product\Attribute\Source\LayoutUpdate::class,
+                'required' => false,
+                'sort_order' => 51,
+                'backend' => \Magento\Catalog\Model\Product\Attribute\Backend\LayoutUpdate::class,
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                'group' => 'Design',
+                'is_used_in_grid' => false,
+                'is_visible_in_grid' => false,
+                'is_filterable_in_grid' => false
+            ]
+        );
+
+        $eavSetup->addAttribute(
+            Category::ENTITY,
+            'custom_layout_update_file',
+            [
+                'type' => 'varchar',
+                'label' => 'Custom Layout Update',
+                'input' => 'select',
+                'source' => \Magento\Catalog\Model\Category\Attribute\Source\LayoutUpdate::class,
+                'required' => false,
+                'sort_order' => 51,
+                'backend' => \Magento\Catalog\Model\Category\Attribute\Backend\LayoutUpdate::class,
+                'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
+                'group' => 'Custom Design',
+                'is_used_in_grid' => false,
+                'is_visible_in_grid' => false,
+                'is_filterable_in_grid' => false
+            ]
+        );
+
+        $eavSetup->updateAttribute(
+            Product::ENTITY,
+            'custom_layout_update',
+            'is_visible',
+            false
+        );
+
+        $eavSetup->updateAttribute(
+            Category::ENTITY,
+            'custom_layout_update',
+            'is_visible',
+            false
+        );
+    }
+}
diff --git a/app/code/Magento/Catalog/Setup/Patch/Schema/ChangeTmpTablesEngine.php b/app/code/Magento/Catalog/Setup/Patch/Schema/ChangeTmpTablesEngine.php
deleted file mode 100644
index c39247f9b30df..0000000000000
--- a/app/code/Magento/Catalog/Setup/Patch/Schema/ChangeTmpTablesEngine.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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\Patch\SchemaPatchInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * Change engine for temporary tables to InnoDB.
- */
-class ChangeTmpTablesEngine implements SchemaPatchInterface
-{
-    /**
-     * @var SchemaSetupInterface
-     */
-    private $schemaSetup;
-
-    /**
-     * @param SchemaSetupInterface $schemaSetup
-     */
-    public function __construct(SchemaSetupInterface $schemaSetup)
-    {
-        $this->schemaSetup = $schemaSetup;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function apply()
-    {
-        $this->schemaSetup->startSetup();
-
-        $tables = [
-            'catalog_product_index_price_cfg_opt_agr_tmp',
-            'catalog_product_index_price_cfg_opt_tmp',
-            'catalog_product_index_price_final_tmp',
-            'catalog_product_index_price_opt_tmp',
-            'catalog_product_index_price_opt_agr_tmp',
-            'catalog_product_index_eav_tmp',
-            'catalog_product_index_eav_decimal_tmp',
-            'catalog_product_index_price_tmp',
-            'catalog_category_product_index_tmp',
-        ];
-        foreach ($tables as $table) {
-            $tableName = $this->schemaSetup->getTable($table);
-            if ($this->schemaSetup->getConnection()->isTableExists($tableName)) {
-                $this->schemaSetup->getConnection()->changeTableEngine($tableName, 'InnoDB');
-            }
-        }
-
-        $this->schemaSetup->endSetup();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public static function getDependencies()
-    {
-        return [];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getAliases()
-    {
-        return [];
-    }
-}
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssertProductEditPageCreateAttributeSaveInAttributeSetPopUpShownActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssertProductEditPageCreateAttributeSaveInAttributeSetPopUpShownActionGroup.xml
new file mode 100644
index 0000000000000..602bd494d599c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssertProductEditPageCreateAttributeSaveInAttributeSetPopUpShownActionGroup.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="AdminAssertProductEditPageCreateAttributeSaveInAttributeSetPopUpShownActionGroup">
+        <annotations>
+            <description>Asserts that after click on "Save In New Attribute Set" poup shown  .</description>
+        </annotations>
+        <see userInput="Enter Name for New Attribute Set" stepKey="seeContent"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml
index c6492754515fb..e5cefda0aca96 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml
@@ -15,8 +15,8 @@
         <arguments>
             <argument name="image"/>
         </arguments>
-
-        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggleState('closed')}}" dependentSelector="{{AdminProductImagesSection.productImagesToggleState('open')}}" visible="false" stepKey="clickSectionImage"/>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageFile(image.fileName)}}" visible="false" stepKey="expandImages"/>
+        <waitForElementVisible selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="seeProductImageName"/>
         <click selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="clickProductImage"/>
         <waitForElementVisible selector="{{AdminProductImagesSection.altText}}" stepKey="seeAltTextSection"/>
         <checkOption selector="{{AdminProductImagesSection.roleBase}}" stepKey="checkRoleBase"/>
@@ -25,4 +25,14 @@
         <checkOption selector="{{AdminProductImagesSection.roleSwatch}}" stepKey="checkRoleSwatch"/>
         <click selector="{{AdminSlideOutDialogSection.closeButton}}" stepKey="clickCloseButton"/>
     </actionGroup>
+    <actionGroup name="AdminAssignImageRolesIfUnassignedActionGroup" extends="AdminAssignImageRolesActionGroup">
+        <annotations>
+            <description>Requires the navigation to the Product Creation page. Assign the Base, Small, Thumbnail, and Swatch Roles to image.</description>
+        </annotations>
+
+        <conditionalClick selector="{{AdminProductImagesSection.roleBase}}" dependentSelector="{{AdminProductImagesSection.isRoleChecked('Base')}}" visible="false" stepKey="checkRoleBase"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleSmall}}" dependentSelector="{{AdminProductImagesSection.isRoleChecked('Small')}}" visible="false" stepKey="checkRoleSmall"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleThumbnail}}" dependentSelector="{{AdminProductImagesSection.isRoleChecked('Thumbnail')}}" visible="false" stepKey="checkRoleThumbnail"/>
+        <conditionalClick selector="{{AdminProductImagesSection.roleSwatch}}" dependentSelector="{{AdminProductImagesSection.isRoleChecked('Swatch')}}" visible="false" stepKey="checkRoleSwatch"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
index b9b31b780c8f7..afc332cc28378 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
@@ -191,6 +191,18 @@
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
         <dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryEntity.name)}}" stepKey="dontSeeCategoryInTree"/>
     </actionGroup>
+    <actionGroup name="AdminDeleteCategoryByName" extends="DeleteCategory">
+        <arguments>
+            <argument name="categoryName" type="string" defaultValue="category1"/>
+        </arguments>
+        <remove keyForRemoval="clickCategoryLink"/>
+        <remove keyForRemoval="dontSeeCategoryInTree"/>
+        <remove keyForRemoval="expandToSeeAllCategories"/>
+        <conditionalClick selector="{{AdminCategorySidebarTreeSection.expandAll}}" dependentSelector="{{AdminCategorySidebarTreeSection.categoryByName(categoryName)}}" visible="false" stepKey="expandCategories" after="waitForCategoryPageLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryByName(categoryName)}}" stepKey="clickCategory" after="expandCategories"/>
+        <conditionalClick selector="{{AdminCategorySidebarTreeSection.expandAll}}" dependentSelector="{{AdminCategorySidebarTreeSection.categoryByName(categoryName)}}" visible="false" stepKey="expandCategoriesToSeeAll" after="seeDeleteSuccess"/>
+        <dontSee selector="{{AdminCategorySidebarTreeSection.categoryByName(categoryName)}}" stepKey="dontSeeCategory" after="expandCategoriesToSeeAll"/>
+    </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 -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickAddAttributeOnProductEditPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickAddAttributeOnProductEditPageActionGroup.xml
new file mode 100644
index 0000000000000..488d905a8dc40
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickAddAttributeOnProductEditPageActionGroup.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="AdminClickAddAttributeOnProductEditPageActionGroup">
+        <annotations>
+            <description>Clicks on 'Add Attribute'.  Admin Product creation/edit page .</description>
+        </annotations>
+        <click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickAddAttributeBtn"/>
+        <waitForPageLoad stepKey="waitForSidePanel"/>
+        <see userInput="Select Attribute" stepKey="checkNewAttributePopUpAppeared"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickCreateNewAttributeFromProductEditPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickCreateNewAttributeFromProductEditPageActionGroup.xml
new file mode 100644
index 0000000000000..658c76ebabeee
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickCreateNewAttributeFromProductEditPageActionGroup.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="AdminClickCreateNewAttributeFromProductEditPageActionGroup">
+        <annotations>
+            <description>Clicks on 'Create New Attribute'.  Admin Product creation/edit page .</description>
+        </annotations>
+        <click selector="{{AdminProductFormAttributeSection.createNewAttribute}}" stepKey="clickCreateNewAttribute"/>
+        <waitForPageLoad stepKey="waitForSidePanel"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickOnAdvancedInventoryLinkActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickOnAdvancedInventoryLinkActionGroup.xml
index 60438e23e084c..a0cff133cbbed 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickOnAdvancedInventoryLinkActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminClickOnAdvancedInventoryLinkActionGroup.xml
@@ -18,4 +18,15 @@
         <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink"/>
         <waitForPageLoad stepKey="waitForAdvancedInventoryPageToLoad"/>
     </actionGroup>
+
+    <!-- ActionGroup click on Advanced Inventory Button in product form;
+         You must already be on the product form page -->
+    <actionGroup name="AdminClickOnAdvancedInventoryButtonActionGroup">
+        <annotations>
+            <description>Clicks on the 'Advanced Inventory' link on the Admin Product creation/edit page.</description>
+        </annotations>
+
+        <click selector="{{AdminProductFormSection.advancedInventoryButton}}" stepKey="clickOnAdvancedInventoryLink"/>
+        <waitForPageLoad stepKey="waitForAdvancedInventoryPageToLoad"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
index 45e2ed6205b20..f3ebbc6370f87 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
@@ -16,7 +16,27 @@
         <selectOption selector="{{AdminCatalogProductWidgetSection.productAttributesToShow}}" parameterArray="['Name', 'Image', 'Price']" stepKey="selectAllProductAttributes"/>
         <selectOption selector="{{AdminCatalogProductWidgetSection.productButtonsToShow}}" parameterArray="['Add to Cart', 'Add to Compare', 'Add to Wishlist']" stepKey="selectAllProductButtons"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForSuccessMessageAppears"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageAppears"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
+    </actionGroup>
+
+    <actionGroup name="AdminCreateCatalogProductWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
+        <annotations>
+            <description>EXTENDS: AdminCreateWidgetActionGroup. Creates Catalog Category Link Widget.</description>
+        </annotations>
+        <arguments>
+            <argument name="categoryName" type="string" defaultValue="{{DefaultCategory.name}}"/>
+        </arguments>
+
+        <waitForElementVisible selector="{{AdminNewWidgetSection.selectCategory}}" after="clickWidgetOptions" stepKey="waitForSelectCategoryButtonVisible"/>
+        <click selector="{{AdminNewWidgetSection.selectCategory}}" stepKey="clickOnSelectCategory"/>
+        <waitForPageLoad stepKey="waitForCategoryTreeLoaded"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandRootCategoryByName(DefaultCategory.name)}}" stepKey="clickToExpandDefaultCategory"/>
+        <waitForElementVisible selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryName)}}" stepKey="waitForCategoryVisible"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryName)}}" stepKey="selectCategory"/>
+        <waitForPageLoad stepKey="waitForWidgetPageLoaded"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveButton"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The widget instance has been saved" stepKey="seeSuccessMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillAttributeDataProductFormNewAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillAttributeDataProductFormNewAttributeActionGroup.xml
new file mode 100644
index 0000000000000..560b3a7e9acef
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillAttributeDataProductFormNewAttributeActionGroup.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="AdminFillAttributeDataProductFormNewAttributeActionGroup">
+        <arguments>
+            <argument name="attributeName" type="string"  defaultValue="TestAttributeName"/>
+            <argument name="attributeType" type="string" defaultValue="Text Field"/>
+        </arguments>
+        <annotations>
+            <description>Fill attribute data on 'Create New Attribute' page  Admin Product creation/edit page .</description>
+        </annotations>
+        <fillField selector="{{AdminProductFormNewAttributeSection.attributeLabel}}" userInput="{{attributeName}}"
+                   stepKey="fillAttributeLabel"/>
+        <selectOption selector="{{AdminProductFormNewAttributeSection.attributeType}}" userInput="{{attributeType}}"
+                      stepKey="selectAttributeType"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 5c5ee0f9cb321..428b3828901cd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -24,7 +24,7 @@
         <seeInCurrentUrl url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, product.type_id)}}" stepKey="seeNewProductUrl"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Product" stepKey="seeNewProductTitle"/>
     </actionGroup>
-    
+
     <!--Navigate to create product page directly via ID-->
     <actionGroup name="goToProductPageViaID">
         <annotations>
@@ -108,6 +108,12 @@
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductName"/>
         <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="fillProductSku"/>
     </actionGroup>
+    <actionGroup name="AdminFillProductCountryOfManufactureActionGroup">
+        <arguments>
+            <argument name="countryId" type="string" defaultValue="US"/>
+        </arguments>
+        <selectOption selector="{{AdminProductFormBundleSection.countryOfManufactureDropDown}}" userInput="{{countryId}}" stepKey="countryOfManufactureDropDown"/>
+    </actionGroup>
 
     <!--Check that required fields are actually required-->
     <actionGroup name="checkRequiredFieldsInProductForm">
@@ -184,6 +190,18 @@
         <click selector="{{AdminProductImagesSection.removeImageButton}}" stepKey="clickRemoveImage"/>
     </actionGroup>
 
+    <!--Remove Product image by name-->
+    <actionGroup name="RemoveProductImageByName" extends="removeProductImage">
+        <annotations>
+            <description>Removes a Product Image on the Admin Products creation/edit page by name.</description>
+        </annotations>
+
+        <arguments>
+            <argument name="image" defaultValue="ProductImage"/>
+        </arguments>
+        <click selector="{{AdminProductImagesSection.removeImageButtonForExactImage(image.fileName)}}" stepKey="clickRemoveImage"/>
+    </actionGroup>
+
     <!-- Assert product image in Admin Product page -->
     <actionGroup name="assertProductImageAdminProductPage">
         <annotations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
index 3e54574c553e3..004b63b1108e0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
@@ -17,6 +17,7 @@
         </arguments>
 
         <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
         <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{ProductAttribute.attribute_code}}" stepKey="setAttributeCode"/>
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
         <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
@@ -213,6 +214,7 @@
         </arguments>
 
         <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <waitForPageLoad stepKey="waitForAttributeGridPageLoad"/>
         <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{ProductAttributeCode}}" stepKey="setAttributeCode"/>
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
         <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
@@ -319,6 +321,11 @@
         <selectOption selector="{{AttributePropertiesSection.ValueRequired}}" stepKey="checkRequired" userInput="{{attribute.is_required_admin}}"/>
         <click stepKey="saveAttribute" selector="{{AttributePropertiesSection.Save}}"/>
     </actionGroup>
+    <actionGroup name="AdminCreateSearchableProductAttribute" extends="createProductAttribute" insertAfter="checkRequired">
+        <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="goToStorefrontPropertiesTab"/>
+        <waitForElementVisible selector="{{StorefrontPropertiesSection.PageTitle}}" stepKey="waitTabLoad"/>
+        <selectOption selector="{{AdvancedAttributePropertiesSection.UseInSearch}}" userInput="Yes" stepKey="setSearchable"/>
+    </actionGroup>
 
     <!-- Inputs text default value and attribute code-->
     <actionGroup name="createProductAttributeWithTextField" extends="createProductAttribute" insertAfter="checkRequired">
@@ -345,6 +352,23 @@
         <fillField stepKey="fillDefaultValue" selector="{{AdvancedAttributePropertiesSection.DefaultValueDate}}" userInput="{{date}}"/>
     </actionGroup>
 
+    <!-- Inputs datetime default value and attribute code-->
+    <actionGroup name="CreateProductAttributeWithDatetimeField" extends="createProductAttribute" insertAfter="checkRequired">
+        <annotations>
+            <description>EXTENDS: createProductAttribute. Fills in the Attribute Code and Default Value (Attribute Type: Date and Time Field).</description>
+        </annotations>
+        <arguments>
+            <argument name="date" type="string"/>
+        </arguments>
+
+        <scrollTo selector="{{AdvancedAttributePropertiesSection.AdvancedAttributePropertiesSectionToggle}}" stepKey="scrollToAdvancedSection"/>
+        <conditionalClick selector="{{AdvancedAttributePropertiesSection.AdvancedAttributePropertiesSectionToggle}}" dependentSelector="{{AdvancedAttributePropertiesSection.AttributeCode}}" visible="false" stepKey="openAdvancedSection"/>
+        <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.AttributeCode}}" stepKey="waitForSlideOutAdvancedSection"/>
+        <fillField selector="{{AdvancedAttributePropertiesSection.AttributeCode}}" userInput="{{attribute.attribute_code}}" stepKey="fillCode"/>
+        <scrollTo selector="{{AdvancedAttributePropertiesSection.defaultValueDatetime}}" stepKey="scrollToDefaultField"/>
+        <fillField selector="{{AdvancedAttributePropertiesSection.defaultValueDatetime}}" userInput="{{date}}" stepKey="fillDefaultValue"/>
+    </actionGroup>
+
     <!-- Creates dropdown option at row without saving-->
     <actionGroup name="createAttributeDropdownNthOption">
         <annotations>
@@ -370,4 +394,15 @@
 
         <checkOption selector="{{AttributePropertiesSection.dropdownNthOptionIsDefault(row)}}" stepKey="setAsDefault" after="fillStoreView"/>
     </actionGroup>
+
+    <!-- Go to advanced attribute properties -->
+    <actionGroup name="AdminNavigateToProductAttributeAdvancedSection">
+        <annotations>
+            <description>Navigate and open Advanced Attribute Properties section on product attribute page</description>
+        </annotations>
+
+        <scrollTo selector="{{AdvancedAttributePropertiesSection.AdvancedAttributePropertiesSectionToggle}}" stepKey="scrollToSection"/>
+        <conditionalClick selector="{{AdvancedAttributePropertiesSection.AdvancedAttributePropertiesSectionToggle}}" dependentSelector="{{AdvancedAttributePropertiesSection.AttributeCode}}" visible="false" stepKey="openSection"/>
+        <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.AttributeCode}}" stepKey="waitForSlideOutSection"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeMassUpdateActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeMassUpdateActionGroup.xml
index 57b180ada1536..d20b44b0162f0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeMassUpdateActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeMassUpdateActionGroup.xml
@@ -23,7 +23,7 @@
         <click selector="{{AdminUpdateAttributesSection.toggleDescription}}" stepKey="clickToChangeDescription"/>
         <fillField selector="{{AdminUpdateAttributesSection.description}}" userInput="{{product.description}}" stepKey="fillFieldDescription"/>
         <click selector="{{AdminUpdateAttributesSection.saveButton}}" stepKey="save"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitVisibleSuccessMessage"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeSuccessMessage"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitVisibleSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="Message is added to queue" stepKey="seeSuccessMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
index e20b5f113a7ec..a7d5a3864c052 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
@@ -64,6 +64,16 @@
         <fillField selector="{{AdminProductAttributeSetSection.name}}" userInput="{{label}}" stepKey="fillName"/>
         <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSave1"/>
     </actionGroup>
+    <actionGroup name="AdminAddUnassignedAttributeToGroup" extends="CreateDefaultAttributeSet">
+        <arguments>
+            <argument name="firstOption" type="string" defaultValue="color"/>
+            <argument name="secondOption" type="string" defaultValue="material"/>
+            <argument name="group" type="string" defaultValue="Product Details"/>
+        </arguments>
+        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute(firstOption)}}" selector2="{{AdminProductAttributeSetSection.attribute(group)}}" stepKey="unassign1"/>
+        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute(secondOption)}}" selector2="{{AdminProductAttributeSetSection.attribute(group)}}" stepKey="unassign2"/>
+        <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSaveButton"/>
+    </actionGroup>
 
     <actionGroup name="goToAttributeGridPage">
         <annotations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
index aef79e651b584..320a322fc5f8e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -389,7 +389,7 @@
         <waitForPageLoad stepKey="waitForGridLoad"/>
     </actionGroup>
 
-    <!--Filter and select the the product  -->
+    <!--Filter and select the product  -->
     <actionGroup name="filterAndSelectProduct">
         <annotations>
             <description>Goes to the Admin Products grid. Filters the Product grid by the provided Product SKU.</description>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductStockStatusActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductStockStatusActionGroup.xml
new file mode 100644
index 0000000000000..887845b1b51a5
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductStockStatusActionGroup.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="AssertAdminProductStockStatusActionGroup">
+        <arguments>
+            <argument name="productId" type="string"/>
+            <argument name="stockStatus" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminProductEditPage.url(productId)}}" stepKey="goToProductEditPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <seeOptionIsSelected selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{stockStatus}}"
+                             stepKey="checkProductStatus"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml
index 7fbe71cbee301..6f58299fe1446 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CheckProductsOrderActionGroup.xml
@@ -13,12 +13,17 @@
             <description>Goes to the Storefront. Validates that the 2 provided Products appear in the correct order.</description>
         </annotations>
         <arguments>
+            <argument name="page" defaultValue="{{StorefrontHomePage.url}}" type="string"/>
             <argument name="product_1"/>
             <argument name="product_2"/>
         </arguments>
 
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
-        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <amOnPage url="{{page}}" stepKey="goToHomePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad5" time="60"/>
+        <executeJS function="window.localStorage.clear()" stepKey="clearWidgetCache" />
+        <reloadPage stepKey="goToHomePageAfterCacheCleared"/>
+        <waitForPageLoad stepKey="waitForPageLoad5AfterCacheCleared" time="60"/>
+        <waitForElement selector="{{StorefrontCategoryProductSection.ProductImageByNumber('1')}}" time="120" stepKey="waitCompareWidgetLoad" />
         <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByNumber('1')}}" userInput="alt" stepKey="grabFirstProductName1_1"/>
         <assertEquals  expected="{{product_1.name}}" actual="($grabFirstProductName1_1)" message="notExpectedOrder" stepKey="compare1"/>
         <grabAttributeFrom selector="{{StorefrontCategoryProductSection.ProductImageByNumber('2')}}" userInput="alt" stepKey="grabFirstProductName2_2"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DisableProductLabelActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DisableProductLabelActionGroup.xml
new file mode 100644
index 0000000000000..a416957dabc2b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DisableProductLabelActionGroup.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="DisableProductLabelActionGroup">
+        <annotations>
+            <description>Disable Product Label and Change Attribute Set.</description>
+        </annotations>
+        <arguments>
+            <argument name="createAttributeSet"/>
+        </arguments>
+
+        <checkOption selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="disableProduct"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad time="30" stepKey="waitForChangeAttrSet"/>
+        <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
+        <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{createAttributeSet.attribute_set_name}}" stepKey="searchForAttrSet"/>
+        <click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet"/>
+         <dontSeeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="dontSeeCheckboxEnableProductIsChecked"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductAttributeFromSearchResultInGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductAttributeFromSearchResultInGridActionGroup.xml
index 2994533d79ed0..b8803fabda00d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductAttributeFromSearchResultInGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/OpenProductAttributeFromSearchResultInGridActionGroup.xml
@@ -16,7 +16,7 @@
             <argument name="productAttributeCode" type="string"/>
         </arguments>
 
-        <waitForElementVisible selector="{{AdminProductAttributeGridSection.AttributeCode(productAttributeCode)}}" stepKey="waitForAdminProductAttributeGridLoad"/>
+        <waitForElementVisible selector="{{AdminProductAttributeGridSection.AttributeCode(productAttributeCode)}}" before="seeAttributeCodeInGrid" stepKey="waitForAdminProductAttributeGridLoad"/>
         <click selector="{{AdminProductAttributeGridSection.AttributeCode(productAttributeCode)}}" stepKey="clickAttributeToView"/>
         <waitForPageLoad stepKey="waitForViewAdminProductAttributeLoad"/>
     </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceConfigData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceConfigData.xml
new file mode 100644
index 0000000000000..50ce7f2da18c7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceConfigData.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="CatalogPriceScopeWebsiteConfigData">
+        <data key="path">catalog/price/scope</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="CatalogPriceScopeGlobalConfigData">
+        <data key="path">catalog/price/scope</data>
+        <data key="value">0</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
index 7bd392f0aa74a..1effb4ed0664e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CustomAttributeData.xml
@@ -55,4 +55,20 @@
         <data key="attribute_code">is_anchor</data>
         <data key="value">0</data>
     </entity>
+    <entity name="ProductDescriptionAdvancedSearchABC" type="custom_attribute">
+        <data key="attribute_code">description</data>
+        <data key="value">&lt;p&gt;adc_Full&lt;/p&gt;</data>
+    </entity>
+    <entity name="ProductShortDescriptionAdvancedSearch" type="custom_attribute">
+        <data key="attribute_code">short_description</data>
+        <data key="value">&lt;p&gt;abc_short&lt;/p&gt;</data>
+    </entity>
+    <entity name="ProductDescriptionAdvancedSearchADC123" type="custom_attribute">
+        <data key="attribute_code">description</data>
+        <data key="value">&lt;p&gt;dfj_full&lt;/p&gt;</data>
+    </entity>
+    <entity name="ProductShortDescriptionAdvancedSearchADC123" type="custom_attribute">
+        <data key="attribute_code">short_description</data>
+        <data key="value">&lt;p&gt;dfj_short&lt;/p&gt;</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
index 6614fa4b5dbeb..e4a91902cb79b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
@@ -108,6 +108,10 @@
         <data key="used_for_sort_by">true</data>
         <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
     </entity>
+    <entity name="multipleSelectProductAttribute" extends="productDropDownAttribute" type="ProductAttribute">
+        <data key="frontend_input">multiselect</data>
+        <data key="frontend_input_admin">Multiple Select</data>
+    </entity>
     <entity name="productDropDownAttributeNotSearchable" type="ProductAttribute">
         <data key="attribute_code" unique="suffix">attribute</data>
         <data key="frontend_input">select</data>
@@ -309,6 +313,10 @@
         <data key="frontend_input">date</data>
         <data key="is_required_admin">No</data>
     </entity>
+    <entity name="DatetimeProductAttribute" extends="productAttributeWysiwyg" type="ProductAttribute">
+        <data key="frontend_input">datetime</data>
+        <data key="is_required_admin">No</data>
+    </entity>
     <entity name="priceProductAttribute" extends="productAttributeWysiwyg" type="ProductAttribute">
         <data key="frontend_input">date</data>
         <data key="is_required_admin">No</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
index bb0e85bcbb40b..a8646a58ae39c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
@@ -86,6 +86,14 @@
         <data key="label" unique="suffix">White</data>
         <data key="value" unique="suffix">white</data>
     </entity>
+    <entity name="ProductAttributeOption9" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">Blue</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">3</data>
+        <requiredEntity type="StoreLabel">Option11Store0</requiredEntity>
+        <requiredEntity type="StoreLabel">Option11Store1</requiredEntity>
+    </entity>
     <!-- Product attribute options from file "export_import_configurable_product.csv" -->
     <entity name="ProductAttributeOptionOneForExportImport" extends="productAttributeOption1" type="ProductAttributeOption">
         <data key="label">option1</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 55b5089e5b0a2..bd02bc0e4b340 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -39,6 +39,10 @@
         <data key="name">Pursuit Lumaflex&#38;trade; Tone Band</data>
         <data key="sku" unique="suffix">x&#38;trade;</data>
     </entity>
+    <entity name="SimpleProduct_25" type="product" extends="SimpleProduct2">
+        <data key="quantity">25</data>
+        <requiredEntity type="product_extension_attribute">EavStock25</requiredEntity>
+    </entity>
     <entity name="ApiSimpleProductWithCustomPrice" type="product" extends="ApiSimpleProduct">
         <data key="price">100</data>
     </entity>
@@ -64,6 +68,23 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="ProductWithSpecialSymbols" extends="SimpleProduct" type="product">
+        <data key="name">SimpleProduct -+~/\\&lt;&gt;\’“:*\$#@()!,.?`=%&amp;^</data>
+    </entity>
+    <entity name="SimpleProductBeforeUpdate" type="product">
+        <data key="sku">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">simpleProduct</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
     <entity name="SimpleProductAfterImport1" type="product">
         <data key="sku">SimpleProductForTest1</data>
         <data key="type_id">simple</data>
@@ -438,6 +459,34 @@
         <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
+    <entity name="ApiProductNameWithNoSpaces" 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">ApiSimpleProduct</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="ApiProductWithDescriptionAndUnderscoredSku" 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>
@@ -531,6 +580,20 @@
         <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
+    <entity name="ApiVirtualProductWithDescriptionAndUnderscoredSku" 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>
@@ -1026,6 +1089,10 @@
     <entity name="productAlphabeticalB" type="product" extends="_defaultProduct">
         <data key="name" unique="suffix">BBB Product</data>
     </entity>
+    <entity name="simpleProductWithShortNameAndSku" type="product" extends="defaultSimpleProduct">
+        <data key="name">Test_Product</data>
+        <data key="sku">test_sku</data>
+    </entity>
     <entity name="productWithSpecialCharacters" type="product" extends="_defaultProduct">
         <data key="name" unique="suffix">Product "!@#$%^&amp;*()+:;\|}{][?=~` </data>
         <data key="nameWithSafeChars" unique="suffix">|}{][?=~` </data>
@@ -1224,6 +1291,34 @@
         <requiredEntity type="product_extension_attribute">EavStock1</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
+    <entity name="ABC_dfj_SimpleProduct" type="product">
+        <data key="name" unique="suffix">abc_dfj_</data>
+        <data key="sku" unique="suffix">abc_dfj</data>
+        <data key="price">50.00</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</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">ProductDescriptionAdvancedSearchABC</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ProductShortDescriptionAdvancedSearch</requiredEntity>
+    </entity>
+    <entity name="ABC_123_SimpleProduct" type="product">
+        <data key="name" unique="suffix">adc_123_</data>
+        <data key="sku" unique="suffix">adc_123</data>
+        <data key="price">100.00</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</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">ProductDescriptionAdvancedSearchADC123</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ProductShortDescriptionAdvancedSearchADC123</requiredEntity>
+    </entity>
     <entity name="SimpleProductUpdatePrice11" type="product2">
         <data key="price">11.00</data>
     </entity>
@@ -1233,4 +1328,9 @@
     <entity name="SimpleProductUpdatePrice16" type="product2">
         <data key="price">16.00</data>
     </entity>
+    <entity name="ProductWithTwoTextFieldOptions" type="product">
+        <var key="sku" entityType="product" entityKey="sku" />
+        <requiredEntity type="product_option">ProductOptionField</requiredEntity>
+        <requiredEntity type="product_option">ProductOptionField2</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
index 5a6a0b5dd9518..2576d8cdd7022 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductExtensionAttributeData.xml
@@ -26,4 +26,7 @@
     <entity name="EavStock777" type="product_extension_attribute">
         <requiredEntity type="stock_item">Qty_777</requiredEntity>
     </entity>
+    <entity name="EavStock25" type="product_extension_attribute">
+        <requiredEntity type="stock_item">Qty_25</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductFormData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductFormData.xml
new file mode 100644
index 0000000000000..933276edd834c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductFormData.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="ProductFormMessages" type="message">
+        <data key="remove_image_notice">The image cannot be removed as it has been assigned to the other image role</data>
+        <data key="save_success">You saved the product.</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
index 720087917aad4..404a4771a0e73 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml
@@ -11,6 +11,7 @@
     <entity name="ProductOptionField" type="product_option">
         <var key="product_sku" entityType="product" entityKey="sku" />
         <data key="title">OptionField</data>
+        <data key="sku">OptionField</data>
         <data key="type">field</data>
         <data key="is_require">true</data>
         <data key="sort_order">1</data>
@@ -21,6 +22,7 @@
     <entity name="ProductOptionField2" type="product_option">
         <var key="product_sku" entityType="product" entityKey="sku" />
         <data key="title">OptionField2</data>
+        <data key="sku">OptionField2</data>
         <data key="type">field</data>
         <data key="is_require">true</data>
         <data key="sort_order">1</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
index 32f4dc1404dd7..bef0b9f56eab6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/StockItemData.xml
@@ -40,4 +40,8 @@
         <data key="qty">777</data>
         <data key="is_in_stock">true</data>
     </entity>
+    <entity name="Qty_25" type="stock_item">
+        <data key="qty">25</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
index 0e51995ac72e8..dcd7fde92283c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
@@ -72,4 +72,12 @@
         <data key="store_id">1</data>
         <data key="label">Red</data>
     </entity>
+    <entity name="Option11Store0" type="StoreLabel">
+        <data key="store_id">0</data>
+        <data key="label">Blue</data>
+    </entity>
+    <entity name="Option11Store1" type="StoreLabel">
+        <data key="store_id">1</data>
+        <data key="label">Blue</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/WidgetsData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/WidgetsData.xml
index 18564ff101fd9..291ff115302f2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/WidgetsData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/WidgetsData.xml
@@ -32,4 +32,15 @@
         <data key="display_on">All Pages</data>
         <data key="container">Sidebar Additional</data>
     </entity>
+    <entity name="CatalogCategoryLinkWidget" type="widget">
+        <data key="type">Catalog Category Link</data>
+        <data key="design_theme">Magento Luma</data>
+        <data key="name" unique="suffix">Test Widget</data>
+        <array key="store_ids">
+            <item>All Store Views</item>
+        </array>
+        <data key="sort_order">0</data>
+        <data key="display_on">All Pages</data>
+        <data key="container">Main Content Area</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml
index 469c153d38b88..416e0d27a1824 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/StorefrontCategoryPage.xml
@@ -8,7 +8,7 @@
 
 <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">
+    <page name="StorefrontCategoryPage" url="/{{var1}}.html" area="storefront" module="Magento_Catalog" parameterized="true">
         <section name="StorefrontCategoryMainSection"/>
         <section name="WYSIWYGToolbarSection"/>
     </page>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml
index e8adede5b2de6..4aca4a09602b3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryMainActionsSection.xml
@@ -13,6 +13,7 @@
         <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="CategoryStoreViewOptionSelected" type="button" selector="//div[contains(@class, 'store-switcher')]//div[contains(@class,'actions')]//button[contains(text(),'{{store}}')]" parameterized="true"/>
         <element name="CategoryStoreViewModalAccept" type="button" selector=".modal-popup.confirm._show .action-accept"/>
         <element name="allStoreViews" type="button" selector=".store-switcher .store-switcher-all" timeout="30"/>
         <element name="storeSwitcher" type="text" selector=".store-switcher"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
index e9ff40f98bb16..8a993a74a58d1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml
@@ -11,5 +11,6 @@
     <section name="AdminCategoryProductsSection">
         <element name="sectionHeader" type="button" selector="div[data-index='assign_products']" timeout="30"/>
         <element name="addProducts" type="button" selector="#catalog_category_add_product_tabs" timeout="30"/>
+        <element name="addProductsDisabled" type="button" selector="#catalog_category_add_product_tabs[disabled]" timeout="30"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
index bc552721e6ab8..304c34b404ea5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
@@ -19,5 +19,7 @@
         <element name="lastCreatedCategory" type="block" selector=".x-tree-root-ct li li:last-child" />
         <element name="treeContainer" type="block" selector=".tree-holder" />
         <element name="expandRootCategory" type="text" selector="img.x-tree-elbow-end-plus"/>
+        <element name="expandRootCategoryByName" type="button" selector="//div[@class='x-tree-root-node']/li/div/a/span[contains(., '{{categoryName}}')]/../../img[contains(@class, 'x-tree-elbow-end-plus')]" parameterized="true" timeout="30"/>
+        <element name="categoryByName" type="text" selector="//div[contains(@class, 'categories-side-col')]//a/span[contains(text(), '{{categoryName}}')]" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
index 462f721913b9c..0934e39dcb062 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml
@@ -93,6 +93,7 @@
         <element name="DefaultValueText" type="textarea" selector="#default_value_text"/>
         <element name="DefaultValueTextArea" type="textarea" selector="#default_value_textarea"/>
         <element name="DefaultValueDate" type="textarea" selector="#default_value_date"/>
+        <element name="defaultValueDatetime" type="date" selector="#default_value_datetime"/>
         <element name="DefaultValueYesNo" type="textarea" selector="#default_value_yesno"/>
         <element name="Scope" type="select" selector="#is_global"/>
         <element name="UniqueValue" type="select" selector="#is_unique"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSection.xml
index 5329ad48c8f43..8bc9c03642c15 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -10,5 +10,6 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminNewWidgetSection">
         <element name="selectProduct" type="button" selector=".btn-chooser" timeout="30"/>
+        <element name="selectCategory" type="button" selector="button[title='Select Category...']" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
index 6d4d5d86ef798..fa2f9feffdf91 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
@@ -59,12 +59,12 @@
         <element name="importOptions" type="button" selector="//button[@data-index='button_import']" timeout="30"/>
     </section>
     <section name="AdminProductImportOptionsSection">
-        <element name="selectProductTitle" type="text" selector="//h1[contains(text(), 'Select Product')]" timeout="30"/>
-        <element name="filterButton" type="button" selector="//button[@data-action='grid-filter-expand']" timeout="30"/>
-        <element name="nameField" type="input" selector="//input[@name='name']" timeout="30"/>
-        <element name="applyFiltersButton" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
-        <element name="resetFiltersButton" type="button" selector="//button[@data-action='grid-filter-reset']" timeout="30"/>
-        <element name="firstRowItemCheckbox" type="input" selector="//input[@data-action='select-row']" timeout="30"/>
-        <element name="importButton" type="button" selector="//button[contains(@class, 'action-primary')]/span[contains(text(), 'Import')]" timeout="30"/>
+        <element name="selectProductTitle" type="text" selector="//aside[contains(@class, 'product_form_product_form_import_options_modal')]//h1[contains(text(), 'Select Product')]" timeout="30"/>
+        <element name="filterButton" type="button" selector="aside.product_form_product_form_import_options_modal button[data-action='grid-filter-expand']" timeout="30"/>
+        <element name="nameField" type="input" selector="aside.product_form_product_form_import_options_modal input[name='name']" timeout="30"/>
+        <element name="applyFiltersButton" type="button" selector="aside.product_form_product_form_import_options_modal button[data-action='grid-filter-apply']" timeout="30"/>
+        <element name="resetFiltersButton" type="button" selector="aside.product_form_product_form_import_options_modal button[data-action='grid-filter-reset']" timeout="30"/>
+        <element name="firstRowItemCheckbox" type="input" selector="aside.product_form_product_form_import_options_modal input[data-action='select-row']" timeout="30"/>
+        <element name="importButton" type="button" selector="//aside[contains(@class, 'product_form_product_form_import_options_modal')]//button[contains(@class, 'action-primary')]/span[contains(text(), 'Import')]" 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
index 98b23a4669b72..7649f6c344c3a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -8,6 +8,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductFormSection">
+        <element name="additionalOptions" type="select" selector=".admin__control-multiselect"/>
+        <element name="datepickerNewAttribute" type="input" selector="[data-index='{{attrName}}'] input" timeout="30" parameterized="true"/>
         <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"/>
@@ -37,7 +39,7 @@
         <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']" timeout="30"/>
         <element name="unselectCategories" type="button" selector="//span[@class='admin__action-multiselect-crumb']/span[contains(.,'{{category}}')]/../button[@data-action='remove-selected-item']" parameterized="true" timeout="30"/>
         <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
-        <element name="advancedInventoryLink" type="button" selector="//button[contains(@data-index, 'advanced_inventory_button')]" timeout="30"/>
+        <element name="advancedInventoryLink" type="button" selector="button[data-index='advanced_inventory_button'].action-additional" timeout="30"/>
         <element name="productStockStatus" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]']" timeout="30"/>
         <element name="productStockStatusDisabled" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]'][disabled=true]"/>
         <element name="stockStatus" type="select" selector="[data-index='product-details'] select[name='product[quantity_and_stock_status][is_in_stock]']"/>
@@ -156,6 +158,7 @@
         <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="FolderContainer" type="button" selector="div[data-role='tree']" />
         <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')]" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
index 3b6f24c0f259d..4e86f14611c24 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
@@ -36,5 +36,7 @@
         <element name="productCount" type="text" selector="#catalog_category_products-total-count"/>
         <element name="productPerPage" type="select" selector="#catalog_category_products_page-limit"/>
         <element name="storeViewDropdown" type="text" selector="//select[@name='store_id']/option[contains(.,'{{storeView}}')]" parameterized="true"/>
+        <element name="inputByCodeRangeFrom" type="input" selector="input.admin__control-text[name='{{code}}[from]']" parameterized="true"/>
+        <element name="inputByCodeRangeTo" type="input" selector="input.admin__control-text[name='{{code}}[to]']" 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
index 89eb1ed678cc9..f20e9b3a11e5e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml
@@ -14,6 +14,7 @@
         <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="removeImageButtonForExactImage" type="button" selector="[id='media_gallery_content'] img[src*='{{imageName}}'] + div[class='actions']  button[class='action-remove']" parameterized="true"/>
         <element name="modalOkBtn" type="button" selector="button.action-primary.action-accept"/>
         <element name="uploadProgressBar" type="text" selector=".uploader .file-row"/>
         <element name="productImagesToggleState" type="button" selector="[data-index='gallery'] > [data-state-collapsible='{{status}}']" parameterized="true"/>
@@ -27,6 +28,7 @@
         <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="isRoleChecked" type="button" selector="//div[contains(@class, 'field-image-role')]//ul/li/label[normalize-space(.) = '{{role}}']/parent::li[contains(@class,'selected')]" parameterized="true"/>
 
         <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']"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
index ac7a15daf56aa..9a84f90edcfc0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
@@ -34,5 +34,6 @@
         <element name="productsList" type="block" selector="#maincontent .column.main"/>
         <element name="productName" type="text" selector=".product-item-name"/>
         <element name="productOptionList" type="text" selector="#narrow-by-list"/>
+        <element name="productNameByPosition" type="text" selector=".products-grid li:nth-of-type({{position}}) .product-item-name a" 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
index 136a8ceadb89e..2ec7997f87b7e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection.xml
@@ -8,6 +8,7 @@
 
 <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="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"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontWidgetsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontWidgetsSection.xml
index 87aab45bd8cb7..ca0c32f142852 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontWidgetsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontWidgetsSection.xml
@@ -12,5 +12,6 @@
         <element name="widgetRecentlyViewedProductsGrid" type="block" selector=".block.widget.block-viewed-products-grid"/>
         <element name="widgetRecentlyComparedProductsGrid" type="block" selector=".block.widget.block-compared-products-grid"/>
         <element name="widgetRecentlyOrderedProductsGrid" type="block" selector=".block.block-reorder"/>
+        <element name="widgetCategoryLinkByName" type="text" selector="//div[contains(@class, 'block-category-link')]/a/span[contains(., '{{categoryName}}')]" parameterized="true"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
index 31204c7b4b0bf..9a0f5ad002725 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
@@ -18,13 +18,10 @@
             <testCaseId value="MAGETWO-98644"/>
             <useCaseId value="MAGETWO-98522"/>
             <group value="Catalog"/>
-            <skip>
-                <issueId value="MC-15930"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <magentoCLI command="config:set cataloginventory/options/show_out_of_stock 0" stepKey="displayOutOfStockNo"/>
+            <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/>
             <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <createData entity="SimpleSubCategory" stepKey="category"/>
             <createData entity="SimpleProduct4" stepKey="product">
@@ -32,7 +29,7 @@
             </createData>
         </before>
         <after>
-            <magentoCLI command="config:set cataloginventory/options/show_out_of_stock 0" stepKey="displayOutOfStockNo2"/>
+            <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/>
             <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <deleteData createDataKey="product" stepKey="deleteProduct"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
@@ -40,23 +37,24 @@
         </after>
         <!--Open product page-->
         <comment userInput="Open product page" stepKey="openProdPage"/>
-        <amOnPage url="{{StorefrontProductPage.url($$product.name$$)}}" stepKey="goToSimpleProductPage"/>
+        <amOnPage url="{{StorefrontProductPage.url($$product.custom_attributes[url_key]$$)}}" stepKey="goToSimpleProductPage"/>
         <waitForPageLoad stepKey="waitForSimpleProductPage"/>
         <!--'Add to compare' link is not available-->
         <comment userInput="'Add to compare' link is not available" stepKey="addToCompareLinkAvailability"/>
         <dontSeeElement selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="dontSeeAddToCompareLink"/>
         <!--Turn on 'out on stock' config-->
         <comment userInput="Turn on 'out of stock' config" stepKey="onOutOfStockConfig"/>
-        <magentoCLI command="config:set cataloginventory/options/show_out_of_stock 1" stepKey="displayOutOfStockYes"/>
+        <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockEnable.path}} {{CatalogInventoryOptionsShowOutOfStockEnable.value}}" stepKey="setConfigShowOutOfStockTrue"/>
         <!--Clear cache and reindex-->
         <comment userInput="Clear cache and reindex" stepKey="cleanCache"/>
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
         <!--Open product page-->
         <comment userInput="Open product page" stepKey="openProductPage"/>
-        <amOnPage url="{{StorefrontProductPage.url($$product.name$$)}}" stepKey="goToSimpleProductPage2"/>
+        <amOnPage url="{{StorefrontProductPage.url($$product.custom_attributes[url_key]$$)}}" stepKey="goToSimpleProductPage2"/>
         <waitForPageLoad stepKey="waitForSimpleProductPage2"/>
         <!--Click on 'Add to Compare' link-->
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="seeAddToCompareLink"/>
         <comment userInput="Click on 'Add to Compare' link" stepKey="clickOnAddToCompareLink"/>
         <click selector="{{StorefrontProductInfoMainSection.productAddToCompare}}" stepKey="clickOnAddToCompare"/>
         <waitForPageLoad stepKey="waitForProdAddToCmpList"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
index 50d192a27e46d..c36c29ce594d0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
@@ -51,6 +51,9 @@
         <seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>
         <seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
         <after>
+            <actionGroup ref="DeleteCategory" stepKey="DeleteCategory">
+                <argument name="categoryEntity" value="SimpleSubCategory"/>
+            </actionGroup>
             <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
index ee105320c5f29..4044490c92334 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
@@ -70,11 +70,12 @@
         <scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="scrollToTinyMCE4" />
         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="clickInsertImageIcon2" />
         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Browse}}" stepKey="clickBrowse2" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading13"/>
         <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.CancelBtn}}" stepKey="waitForCancelButton2"/>
         <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn2" />
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading13"/>
+        <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.CreateFolder}}" stepKey="waitForCreateFolderBtn2"/>
         <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn2" />
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading14"/>
+        <see selector="{{ProductDescriptionWYSIWYGToolbarSection.FolderContainer}}" userInput="Storage Root" stepKey="seeFolderContainer" />
         <click userInput="Storage Root" stepKey="clickOnRootFolder" />
         <waitForLoadingMaskToDisappear stepKey="waitForLoading15"/>
         <dontSeeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn3" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
index feb4fffd12f5d..51ef7fb77d74c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
@@ -60,6 +60,9 @@
         <click selector="{{AdminProductFormActionSection.saveButton}}"  stepKey="clickOnSaveButton"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
+        <!--Clear cache and reindex-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
         <!--Verify product is visible in category front page -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="openCategoryStoreFrontPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml
index e1cb45be22b4e..a863de2716c97 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml
@@ -63,6 +63,10 @@
         <click selector="{{AdminProductFormActionSection.saveButton}}"  stepKey="clickOnSaveButton"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Run re-index task -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <!--Verify product is visible in category front page -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="openCategoryStoreFrontPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
index 9115004ad9585..a6890c2ad4905 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
@@ -64,6 +64,9 @@
         <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
         <!--Verify the Category Title-->
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
+        <!--Clear cache and reindex-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
         <!--Verify Product in store front page-->
         <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name_lwr)}}"  stepKey="amOnCategoryPage"/>
         <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDatetimeProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDatetimeProductAttributeTest.xml
new file mode 100644
index 0000000000000..e46114ff752f6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDatetimeProductAttributeTest.xml
@@ -0,0 +1,49 @@
+<?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="AdminCreateDatetimeProductAttributeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Datetime product attributes support"/>
+            <title value="Datetime product attribute type is supported"/>
+            <description value="Admin should be able to create datetime product attribute"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-21451"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
+                <argument name="ProductAttribute" value="DatetimeProductAttribute"/>
+            </actionGroup>
+            <actionGroup ref="AdminGridFilterResetActionGroup" stepKey="resetGridFilter"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Generate the datetime default value -->
+        <generateDate date="now" format="m/j/y g:i A" stepKey="generateDefaultValue"/>
+        <!-- Create new datetime product attribute -->
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
+        <waitForPageLoad stepKey="waitForPageLoadAttributes"/>
+        <actionGroup ref="CreateProductAttributeWithDatetimeField" stepKey="createAttribute">
+            <argument name="attribute" value="DatetimeProductAttribute"/>
+            <argument name="date" value="{$generateDefaultValue}"/>
+        </actionGroup>
+        <!-- Navigate to created product attribute -->
+        <actionGroup ref="navigateToCreatedProductAttribute" stepKey="navigateToAttribute">
+            <argument name="ProductAttribute" value="DatetimeProductAttribute"/>
+        </actionGroup>
+        <!-- Check the saved datetime default value -->
+        <actionGroup ref="AdminNavigateToProductAttributeAdvancedSection" stepKey="goToAdvancedSection"/>
+        <scrollTo selector="{{AdvancedAttributePropertiesSection.defaultValueDatetime}}" stepKey="scrollToDefaultValue"/>
+        <seeInField userInput="{$generateDefaultValue}"
+             selector="{{AdvancedAttributePropertiesSection.defaultValueDatetime}}"
+             stepKey="checkDefaultValue"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewAttributeFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewAttributeFromProductPageTest.xml
new file mode 100644
index 0000000000000..2706d00038e4b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewAttributeFromProductPageTest.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="AdminCreateNewAttributeFromProductPageTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="We should validate the form when the user click Save in New Attribute Set"/>
+            <title value="We should validate the form when the user click Save in New Attribute Set"/>
+            <description
+                    value="Admin should be able to create product attribute and validate the form when the user click Save in New Attribute Set"/>
+            <testCaseId value="https://github.com/magento/magento2/pull/25132"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <actionGroup ref="GoToProductCatalogPage" stepKey="goToProductCatalogPage"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="AdminClickAddAttributeOnProductEditPageActionGroup" stepKey="clickAddAttribute"/>
+        <actionGroup ref="AdminClickCreateNewAttributeFromProductEditPageActionGroup" stepKey="clickCreateNewAttribute1" />
+        <actionGroup ref="AdminFillAttributeDataProductFormNewAttributeActionGroup" stepKey="fillAttributeData" />
+
+        <click selector="{{AdminProductFormNewAttributeSection.saveInNewSet}}" stepKey="saveAttributeInSet"/>
+        <actionGroup ref="AdminAssertProductEditPageCreateAttributeSaveInAttributeSetPopUpShownActionGroup" stepKey="assertPopUp"/>
+        <click selector="{{ModalConfirmationSection.CancelButton}}" stepKey="cancelButton"/>
+
+        <actionGroup ref="AdminFillAttributeDataProductFormNewAttributeActionGroup" stepKey="emptyAttributeData" >
+            <argument name="attributeName" value=" "/>
+            <argument name="attributeType" value=" "/>
+        </actionGroup>
+
+        <click selector="{{AdminProductFormNewAttributeSection.saveInNewSet}}" stepKey="clickSaveInSet"/>
+        <see userInput="This is a required field." stepKey="seeThisIsRequiredField"/>
+        <dontSee userInput="Enter Name for New Attribute Set" stepKey="dontSeePopUp" />
+
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
index 5c798db29b976..63a964f4b5e91 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
@@ -90,6 +90,9 @@
         <waitForPageLoad stepKey="waitForProductToSave"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
+        <!--Run Re-Index task -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <!--Verify product attribute added in product form -->
         <scrollTo selector="{{AdminProductFormSection.contentTab}}" stepKey="scrollToContentTab"/>
         <waitForElementVisible selector="{{AdminProductFormSection.attributeTab}}" stepKey="waitForAttributeToVisible"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithDatetimeAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithDatetimeAttributeTest.xml
new file mode 100644
index 0000000000000..6772e95b6ec27
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithDatetimeAttributeTest.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="AdminCreateSimpleProductWithDatetimeAttributeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Datetime product attributes support"/>
+            <title value="Set datetime attribute to product"/>
+            <description value="Admin should be able to specify datetime attribute to product and find by them in product grid"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-21461"/>
+            <group value="catalog"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createDatetimeAttribute" stepKey="deleteDatetimeAttribute"/>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFiltersOnProductIndexPage"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Generate default value -->
+        <generateDate date="now" format="m/j/Y g:i A" stepKey="generateDefaultValue"/>
+        <generateDate date="now" format="M j, Y g:i:00 A" stepKey="generateDefaultGridValue"/>
+        <generateDate date="+1 minute" format="m/j/Y g:i A" stepKey="generateFilterToDate"/>
+        <!-- Create new datetime product attribute -->
+        <createData entity="DatetimeProductAttribute" stepKey="createDatetimeAttribute">
+            <field key="default_value">{$generateDefaultValue}</field>
+        </createData>
+        <!-- Open the new simple product page -->
+        <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="openNewProductPage"/>
+        <actionGroup ref="fillMainProductForm" stepKey="fillDefaultProductFields"/>
+        <!-- Add datetime attribute -->
+        <actionGroup ref="addProductAttributeInProductModal" stepKey="addDatetimeAttribute">
+            <argument name="attributeCode" value="$createDatetimeAttribute.attribute_code$"/>
+        </actionGroup>
+        <!-- Flush config cache to reset product attributes in attribute set -->
+        <magentoCLI command="cache:flush" arguments="config" stepKey="flushConfigCache"/>
+        <!-- Save the product -->
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        <!-- Check default value -->
+        <scrollTo selector="{{AdminProductAttributesSection.sectionHeader}}" stepKey="goToAttributesSection"/>
+        <click selector="{{AdminProductAttributesSection.sectionHeader}}" stepKey="openAttributesSection"/>
+        <waitForElementVisible selector="{{AdminProductAttributesSection.attributeTextInputByCode($createDatetimeAttribute.attribute_code$)}}" stepKey="waitForSlideOutAttributes"/>
+        <seeInField selector="{{AdminProductAttributesSection.attributeTextInputByCode($createDatetimeAttribute.attribute_code$)}}" userInput="$generateDefaultValue" stepKey="checkDefaultValue"/>
+        <!-- Check datetime grid filter -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToAdminProductIndexPage"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.inputByCodeRangeFrom($createDatetimeAttribute.attribute_code$)}}" userInput="{$generateDefaultValue}" stepKey="fillProductDatetimeFromFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.inputByCodeRangeTo($createDatetimeAttribute.attribute_code$)}}" userInput="{$generateFilterToDate}" stepKey="fillProductDatetimeToFilter"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <see selector="{{AdminDataGridTableSection.gridCell('1', 'Name')}}" userInput="{{_defaultProduct.name}}" stepKey="checkAppliedDatetimeFilter"/>
+        <see selector="{{AdminDataGridTableSection.rowTemplateStrict(_defaultProduct.name)}}" userInput="{$generateDefaultGridValue}" stepKey="checkDefaultValueInGrid"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml
index 94d488f216b49..eb4f2b5c25281 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml
@@ -31,6 +31,8 @@
             <argument name="category" value="$$createPreReqCategory$$"/>
             <argument name="simpleProduct" value="ProductWithUnicode"/>
         </actionGroup>
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
         <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1">
             <argument name="category" value="$$createPreReqCategory$$"/>
             <argument name="product" value="ProductWithUnicode"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
index 58737dd509743..23f772a395a7d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
@@ -117,6 +117,8 @@
 
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
 
         <!-- Verify customer see created virtual product with custom options suite and import options(from above step) on storefront page and is searchable by sku -->
         <amOnPage url="{{StorefrontProductPage.url(virtualProductCustomImportOptions.urlKey)}}" stepKey="goToProductPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
index 78247f4943596..9055e961f889f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
@@ -24,6 +24,9 @@
             <createData entity="Simple_US_CA_Customer" stepKey="customer" />
         </before>
         <after>
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteVirtualProduct">
+                <argument name="product" value="virtualProductGeneralGroup"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
             <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
             <actionGroup ref="logout" stepKey="logout"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
index 6ef2569945fa6..40f26761e7b6d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
@@ -97,6 +97,10 @@
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{virtualProductBigQty.name}}" stepKey="seeVirtualProductNameOnCategoryPage"/>
 
+        <!--Run full reindex and clear caches -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <!-- Verify customer see created virtual product with tier price(from above step) on storefront page and is searchable by sku -->
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml
new file mode 100644
index 0000000000000..f334cbc218b7c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDeleteProductsImageInCaseOfMultipleStoresTest">
+        <annotations>
+            <stories value="MultipleStores"/>
+            <features value="Catalog"/>
+            <title value="Delete products image in case of multiple stores"/>
+            <description value="Delete products image in case of multiple stores"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-11466"/>
+            <useCaseId value="MC-15391"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <!--Login as admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create new website, store and store view-->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
+                <argument name="newWebsiteName" value="{{NewWebSiteData.name}}"/>
+                <argument name="websiteCode" value="{{NewWebSiteData.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
+                <argument name="website" value="{{NewWebSiteData.name}}"/>
+                <argument name="storeGroupName" value="{{NewStoreData.name}}"/>
+                <argument name="storeGroupCode" value="{{NewStoreData.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
+                <argument name="StoreGroup" value="NewStoreData"/>
+                <argument name="customStore" value="NewStoreViewData"/>
+            </actionGroup>
+            <!--Create Product-->
+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
+            <createData entity="SubCategory" stepKey="createSubCategory"/>
+            <createData entity="NewRootCategory" stepKey="createRootCategory"/>
+            <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="visitAdminProductPage"/>
+            <waitForPageLoad stepKey="waitForProductPageLoad0"/>
+            <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="['Default Category', $$createRootCategory.name$$, $$createSubCategory.name$$]" stepKey="fillCategory"/>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+            <!--Add images to the product-->
+            <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="visitAdminProductPage2"/>
+            <waitForPageLoad stepKey="waitForProductPageLoad1"/>
+            <actionGroup ref="addProductImage" stepKey="addImageToProduct">
+                <argument name="image" value="ProductImage"/>
+            </actionGroup>
+            <actionGroup ref="addProductImage" stepKey="addImage1ToProduct">
+                <argument name="image" value="TestImageNew"/>
+            </actionGroup>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
+            <!--Enable config to view created store view on store front-->
+            <createData entity="EnableWebUrlOptionsConfig" stepKey="enableWebUrlOptionsConfig"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="{{NewWebSiteData.name}}"/>
+            </actionGroup>
+            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
+            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+            <deleteData createDataKey="createSubCategory" stepKey="deleteSubCategory"/>
+            <deleteData createDataKey="createRootCategory" stepKey="deleteRootCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <createData entity="DefaultWebUrlOptionsConfig" stepKey="defaultWebUrlOptionsConfig"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Grab new store view code-->
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToNewWebsitePage"/>
+        <waitForPageLoad stepKey="waitForStoresPageLoad"/>
+        <fillField userInput="{{NewWebSiteData.name}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickFirstRow"/>
+        <grabValueFrom selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="grabStoreViewCode"/>
+        <click selector="{{AdminNewStoreViewActionsSection.backButton}}" stepKey="clickBack"/>
+        <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickResetButton"/>
+        <waitForPageLoad stepKey="waitForStorePageLoad"/>
+        <!--Open product page on admin-->
+        <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="openProductEditPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+        <!--Enable the newly created website and save the product-->
+        <actionGroup ref="SelectProductInWebsitesActionGroup" stepKey="selectWebsiteInProduct2">
+            <argument name="website" value="{{NewWebSiteData.name}}"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct2"/>
+        <!--Reindex and flush cache-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <!--Switch to 'Default Store View' scope and open product page-->
+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="SwitchDefaultStoreView">
+            <argument name="storeViewName" value="'Default Store View'"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForProductPageLoad3"/>
+        <!--Assign all roles to first image on default store view-->
+        <actionGroup ref="AdminAssignImageRolesIfUnassignedActionGroup" stepKey="assignAllRolesToFirstImage">
+            <argument name="image" value="ProductImage"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct3"/>
+        <!--Switch to newly created Store View scope and open product page-->
+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="SwitchNewStoreView">
+            <argument name="storeViewName" value="{{NewStoreViewData.name}}"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForProductPageLoad4"/>
+        <!--Assign all roles to first image on new store view-->
+        <actionGroup ref="AdminAssignImageRolesIfUnassignedActionGroup" stepKey="assignAllRolesToFirstImage2">
+            <argument name="image" value="ProductImage"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct4"/>
+        <!--Switch to 'All Store Views' scope and open product page-->
+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="SwitchAllStoreView">
+            <argument name="storeViewName" value="'All Store Views'"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForProductPageLoad5"/>
+        <!--Remove product image and save-->
+        <actionGroup ref="RemoveProductImageByName" stepKey="removeProductImage">
+            <argument name="image" value="ProductImage"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct5"/>
+        <!--Assert notification and success messages-->
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="{{ProductFormMessages.save_success}}" stepKey="seeSuccessMessage"/>
+        <see selector="{{StorefrontMessagesSection.noticeMessage}}" userInput="{{ProductFormMessages.remove_image_notice}}" stepKey="seeNotification"/>
+        <!--Reopen image tab and see the image is not deleted-->
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesTab"/>
+        <waitForPageLoad stepKey="waitForImagesLoad"/>
+        <seeElement selector="{{AdminProductImagesSection.imageFile(ProductImage.fileName)}}" stepKey="seeImageIsNotDeleted"/>
+        <!--Switch to newly created Store View scope and open product page-->
+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="SwitchNewStoreView2">
+            <argument name="storeViewName" value="{{NewStoreViewData.name}}"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForProductPageLoad6"/>
+        <!--Assign all roles to second image on default store view-->
+        <actionGroup ref="AdminAssignImageRolesIfUnassignedActionGroup" stepKey="assignAllRolesToSecondImage">
+            <argument name="image" value="TestImageNew"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct6"/>
+        <!--Switch to 'All Store Views' scope and open product page-->
+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="SwitchAllStoreView2">
+            <argument name="storeViewName" value="'All Store Views'"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForProductPageLoad7"/>
+        <!--Remove product image and save-->
+        <actionGroup ref="RemoveProductImageByName" stepKey="removeProductFirstImage">
+            <argument name="image" value="ProductImage"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct7"/>
+        <!--Assert notification and success messages-->
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="{{ProductFormMessages.save_success}}" stepKey="seeSuccessMessage2"/>
+        <see selector="{{StorefrontMessagesSection.noticeMessage}}" userInput="{{ProductFormMessages.remove_image_notice}}" stepKey="seeNotification2"/>
+        <!--Reopen image tab and see the image is not deleted-->
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesTab2"/>
+        <waitForPageLoad stepKey="waitForImagesLoad2"/>
+        <seeElement selector="{{AdminProductImagesSection.imageFile(ProductImage.fileName)}}" stepKey="seeImageIsNotDeleted2"/>
+        <!--Switch to newly created Store View scope and open product page-->
+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="SwitchNewStoreView3">
+            <argument name="storeViewName" value="{{NewStoreViewData.name}}"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForProductPageLoad8"/>
+        <!--Remove second image and save-->
+        <actionGroup ref="RemoveProductImageByName" stepKey="removeProductSecondImage">
+            <argument name="image" value="TestImageNew"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct8"/>
+        <!--Assert success messages-->
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="{{ProductFormMessages.save_success}}" stepKey="seeSuccessMessage3"/>
+        <!--Reopen image tab and see the image is deleted-->
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesTab3"/>
+        <waitForPageLoad stepKey="waitForImagesLoad3"/>
+        <dontSeeElement selector="{{AdminProductImagesSection.imageFile(TestImageNew.fileName)}}" stepKey="seeImageIsDeleted"/>
+        <!--Open Storefront on Default store view and assert image existence-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createSubCategory.name$$)}}" stepKey="navigateToCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad0"/>
+        <grabAttributeFrom userInput="src" selector="{{StorefrontCategoryMainSection.mediaDescription($$createProduct.name$$)}}" stepKey="grabAttributeFromImage"/>
+        <assertContains expectedType="string" expected="{{ProductImage.filename}}" actual="$grabAttributeFromImage" stepKey="assertProductImageAbsence"/>
+        <!--Open Storefront on newly created store view and assert image absence-->
+        <amOnPage url="$grabStoreViewCode" stepKey="navigateToHomePageOfSpecificStore"/>
+        <waitForPageLoad stepKey="waitForHomePageLoad"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createSubCategory.name$$)}}" stepKey="clickCategory"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad1"/>
+        <grabAttributeFrom userInput="src" selector="{{StorefrontCategoryMainSection.mediaDescription($$createProduct.name$$)}}" stepKey="grabAttributeFromImage2"/>
+        <assertContains expectedType="string" expected="small_image" actual="$grabAttributeFromImage2" stepKey="assertProductImageAbsence2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDisableProductOnChangingAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDisableProductOnChangingAttributeSetTest.xml
new file mode 100644
index 0000000000000..dab1704d50bf3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDisableProductOnChangingAttributeSetTest.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="AdminDisableProductOnChangingAttributeSetTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Disabled product is enabled when change attribute set"/>
+            <title value="Verify product status while changing attribute set"/>
+            <description value="Value set for enabled product has to be shown when attribute set is changed"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-19716"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/$$createAttributeSet.attribute_set_id$$/" stepKey="onAttributeSetEdit"/>
+        <actionGroup ref="SaveAttributeSet" stepKey="SaveAttributeSet"/>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="DisableProductLabelActionGroup" stepKey="disableWhileChangingAttributeSet" >
+            <argument name="createAttributeSet" value="$$createAttributeSet$$"/>
+        </actionGroup>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
index 5c434ecabf80d..501a5bd2282be 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
@@ -131,7 +131,6 @@
              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$$)}}"
@@ -151,7 +150,6 @@
              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$$)}}"
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
index df6ddfa169029..eb4a561760070 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
@@ -25,9 +25,7 @@
             <comment userInput="Clear product grid" stepKey="commentClearProductGrid"/>
             <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
             <waitForPageLoad stepKey="waitForProductIndexPage"/>
-            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
-                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridToDefaultView"/>
             <actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteProductIfTheyExist"/>
             <createData stepKey="category1" entity="SimpleSubCategory"/>
             <createData stepKey="product1" entity="SimpleProduct">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
index b1f00a2f51a95..dfadfdf00481b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
@@ -15,55 +15,44 @@
             <title value="Import customizable options to a product with existing SKU"/>
             <description value="Import customizable options to a product with existing SKU"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-98211"/>
+            <testCaseId value="MC-16471"/>
             <useCaseId value="MAGETWO-70232"/>
             <group value="catalog"/>
-            <skip>
-                <issueId value="MC-17140"/>
-            </skip>
         </annotations>
         <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <!--Create category-->
-            <comment userInput="Create category" stepKey="commentCreateCategory"/>
             <createData entity="ApiCategory" stepKey="createCategory"/>
-            <!-- Create two product -->
-            <comment userInput="Create two product" stepKey="commentCreateTwoProduct"/>
+            <!-- Create two products -->
             <createData entity="SimpleProduct2" stepKey="createFirstProduct"/>
+            <updateData entity="ProductWithTwoTextFieldOptions" createDataKey="createFirstProduct" stepKey="updateFirstProductWithCustomOptions">
+                <requiredEntity createDataKey="createFirstProduct"/>
+            </updateData>
             <createData entity="ApiSimpleProduct" stepKey="createSecondProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
+
+            <!-- TODO: REMOVE AFTER FIX MC-21717 -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
             <!--Delete second product with changed sku-->
-            <comment userInput="Delete second product with changed sku" stepKey="commentDeleteProduct"/>
             <actionGroup ref="deleteProductBySku" stepKey="deleteSecondProduct">
                 <argument name="sku" value="$$createFirstProduct.sku$$-1"/>
             </actionGroup>
-            <!--Delete created data-->
-            <comment userInput="Delete created data" stepKey="commentDeleteCreatedData"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductGridFilter"/>
             <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
         </after>
-        <!--Go to product page -->
-        <comment userInput="Go to product page" stepKey="commentGoToProductPage"/>
-        <amOnPage url="{{AdminProductEditPage.url($$createFirstProduct.id$$)}}" stepKey="goToProductEditPage"/>
-        <waitForPageLoad stepKey="waitForProductEditPageLoad"/>
-        <actionGroup ref="AddProductCustomOptionField" stepKey="addCutomOption1">
-            <argument name="option" value="ProductOptionField"/>
-        </actionGroup>
-        <actionGroup ref="AddProductCustomOptionField" stepKey="addCutomOption2">
-            <argument name="option" value="ProductOptionField2"/>
-        </actionGroup>
-        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
         <!--Change second product sku to first product sku-->
-        <comment userInput="Change second product sku to first product sku" stepKey="commentChangeSecondProduct"/>
         <amOnPage url="{{AdminProductEditPage.url($$createSecondProduct.id$$)}}" stepKey="goToProductEditPage1"/>
         <waitForPageLoad stepKey="waitForProductEditPageLoad1"/>
         <fillField selector="{{AdminProductFormSection.productSku}}" userInput="$$createFirstProduct.sku$$" stepKey="fillProductSku1"/>
         <!--Import customizable options and check-->
-        <comment userInput="Import customizable options and check" stepKey="commentImportOptions"/>
         <conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
         <actionGroup ref="importProductCustomizableOptions" stepKey="importOptions">
             <argument name="productName" value="$$createFirstProduct.name$$"/>
@@ -77,8 +66,7 @@
             <argument name="optionIndex" value="1"/>
         </actionGroup>
         <!--Save product and check sku changed message-->
-        <comment userInput="Save product and check sku changed message" stepKey="commentSAveProductAndCheck"/>
-        <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
-        <see userInput="SKU for product $$createSecondProduct.name$$ has been changed to $$createFirstProduct.sku$$-1." stepKey="seeSkuChangedMessage"/>
+        <actionGroup ref="saveProductForm" stepKey="saveSecondProduct"/>
+        <see selector="{{AdminMessagesSection.notice}}" userInput="SKU for product $$createSecondProduct.name$$ has been changed to $$createFirstProduct.sku$$-1." stepKey="seeSkuChangedMessage"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
index 87e0bf3d2e9a0..989431941b279 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
@@ -16,14 +16,12 @@
             <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"/>
-            <skip>
-                <issueId value="MC-17140"/>
-            </skip>
+            <group value="catalog"/>
+            <group value="product_attributes"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="deleteAllProductsUsingProductGrid" stepKey="deleteAllProducts"/>
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="ApiSimpleProduct" stepKey="createProductOne">
@@ -38,7 +36,9 @@
             <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="AdminDeleteStoreViewActionGroup"/>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+            <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductFilter"/>
+            <actionGroup ref="logout" stepKey="amOnLogoutPage"/>
         </after>
 
         <!-- Search and select products -->
@@ -58,36 +58,38 @@
         <!-- Switch store view -->
         <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="AdminSwitchStoreViewActionGroup"/>
         <!-- Update attribute -->
-        <click selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" stepKey="toggleToChangePrice"/>
+        <checkOption 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="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" time="60" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="Message is added to queue" stepKey="seeAttributeUpdateSuccessMsg"/>
 
         <!-- Run cron twice -->
-        <magentoCLI command="cron:run" stepKey="runCron1"/>
-        <magentoCLI command="cron:run" stepKey="runCron2"/>
-        <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitFormToReload1"/>
+        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron2"/>
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
 
         <!-- Assert on storefront default view -->
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="searchByNameDefault">
-            <argument name="name" value="$$createProductOne.name$$"/>
+            <argument name="name" value="&quot;$$createProductOne.name$$&quot;"/>
             <argument name="priceFrom" value="$$createProductOne.price$$0"/>
             <argument name="priceTo" value="$$createProductOne.price$$0"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault"/>
+        <waitForElementVisible selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="waitForSearchResultInDefaultView"/>
         <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="name" value="&quot;$$createProductOne.name$$&quot;"/>
             <argument name="priceFrom" value="$$createProductOne.price$$0"/>
             <argument name="priceTo" value="$$createProductOne.price$$0"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultCustom"/>
+        <waitForElementVisible selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="waitForSearchResultInCustomView"/>
         <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInCustom"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
index bee13bec370da..18d4b9e341cc6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
@@ -18,6 +18,85 @@
             <testCaseId value="MC-128"/>
             <group value="Catalog"/>
             <group value="Product Attributes"/>
+            <group value="SearchEngineElasticsearch"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
+            <createData entity="ApiProductWithDescription" stepKey="createProductOne"/>
+            <createData entity="ApiProductWithDescription" stepKey="createProductTwo"/>
+            <createData entity="ApiProductNameWithNoSpaces" stepKey="createProductThree"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
+            <deleteData createDataKey="createProductThree" stepKey="deleteProductThree"/>
+            <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="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
+
+
+        <!-- Assert on storefront default view with partial word of product name -->
+        <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="2 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefault"/>
+
+        <!-- Assert on storefront custom view with partial word of product name  -->
+        <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="2 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInCustom"/>
+
+        <!-- Assert Storefront default view with exact product name -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault1"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameDefault1">
+            <argument name="name" value="$$createProductThree.name$$"/>
+            <argument name="description" value="$$createProductThree.custom_attributes[description]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault1"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefault1"/>
+    </test>
+    <test name="AdminMassUpdateProductAttributesStoreViewScopeMysqlTest">
+        <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 using the Mysql search engine"/>
+            <description value="Admin should be able to mass update product attributes in store view scope using the Mysql search engine"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-20467"/>
+            <group value="Catalog"/>
+            <group value="Product Attributes"/>
+            <group value="SearchEngineMysql"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest.xml
index e9b54e3f1a3dc..02e8157282dee 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest.xml
@@ -18,6 +18,157 @@
             <testCaseId value="MAGETWO-59361"/>
             <group value="Catalog"/>
             <group value="Product Attributes"/>
+            <group value="SearchEngineElasticsearch"/>
+        </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 with first product -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameDefault">
+            <argument name="name" value="{{simpleProductForMassUpdate.name}}"/>
+            <argument name="description" value=""/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefault"/>
+
+        <!-- Assert on storefront default view with second product -->
+        <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefaultToSearchSecondProduct"/>
+        <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameDefaultWithSecondProduct">
+            <argument name="name" value="{{simpleProductForMassUpdate2.name}}"/>
+            <argument name="description" value=""/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefaultForSecondProduct"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefaultSecondProductResults"/>
+
+        <!--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>
+    <test name="AdminMassUpdateProductStatusStoreViewScopeMysqlTest">
+        <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 using the Mysql search engine"/>
+            <description value="Admin should be able to mass update product statuses in store view scope using the Mysql search engine"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-20471"/>
+            <group value="Catalog"/>
+            <group value="Product Attributes"/>
+            <group value="SearchEngineMysql"/>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
@@ -147,5 +298,5 @@
         </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>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
index 247711295a555..a8a8ede297b44 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
@@ -69,6 +69,10 @@
         <waitForPageLoad stepKey="waitForSecondCategoryToSave2"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage2"/>
 
+        <!-- TODO: REMOVE AFTER FIX MC-21717 -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <!--Open Category in store front page-->
         <amOnPage url="/$$createDefaultCategory.name$$/{{FirstLevelSubCat.name}}/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
         <waitForPageLoad  stepKey="waitForStoreFrontPageLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
index d17078d794b42..b613068893b0e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
@@ -59,6 +59,9 @@
         <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
 
+        <!--Run re-index task -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <!--Verify category displayed in store front page-->
         <amOnPage url="/$$createDefaultCategory.name$$/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
         <waitForPageLoad  stepKey="waitForStoreFrontPageLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml
index ec0d86ac066fd..41d3ca3020c98 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml
@@ -18,6 +18,9 @@
             <testCaseId value="MC-11146"/>
             <group value="catalog"/>
             <group value="indexer"/>
+            <skip>
+                <issueId value="MC-20392"/>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByCustomAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByCustomAttributeTest.xml
new file mode 100644
index 0000000000000..72c270aad585c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByCustomAttributeTest.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="AdminProductGridFilteringByCustomAttributeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Product grid"/>
+            <title value="Sorting the product grid by custom product attribute"/>
+            <description value="Sorting the product grid by custom product attribute should sort Alphabetically instead of value id"/>
+            <severity value="MAJOR"/>
+            <useCaseId value="MC-19031"/>
+            <testCaseId value="MC-20329"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <!--Login as admin and delete all products -->
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <actionGroup ref="deleteAllProductsUsingProductGrid" stepKey="deleteAllProducts"/>
+            <!--Create dropdown product attribute-->
+            <createData entity="productDropDownAttribute" stepKey="createDropdownAttribute"/>
+            <!--Create attribute options-->
+            <createData entity="ProductAttributeOption7" stepKey="createFirstProductAttributeOption">
+                <requiredEntity createDataKey="createDropdownAttribute"/>
+            </createData>
+            <createData entity="ProductAttributeOption8" stepKey="createSecondProductAttributeOption">
+                <requiredEntity createDataKey="createDropdownAttribute"/>
+            </createData>
+            <createData entity="ProductAttributeOption9" stepKey="createThirdProductAttributeOption">
+                <requiredEntity createDataKey="createDropdownAttribute"/>
+            </createData>
+            <!--Add attribute to default attribute set-->
+            <createData entity="AddToDefaultSet" stepKey="addAttributeToDefaultSet">
+                <requiredEntity createDataKey="createDropdownAttribute"/>
+            </createData>
+            <!--Create category-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <!--Create 3 products-->
+            <createData entity="ApiSimpleProduct" stepKey="createFirstProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createSecondProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createThirdProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!--Update first product-->
+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForFirstProduct">
+                <argument name="product" value="$$createFirstProduct$$"/>
+            </actionGroup>
+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="editFirstProduct">
+                <argument name="product" value="$$createFirstProduct$$"/>
+            </actionGroup>
+            <selectOption selector="{{AdminProductFormSection.customSelectField($$createDropdownAttribute.attribute[attribute_code]$$)}}" userInput="$$createFirstProductAttributeOption.option[store_labels][0][label]$$" stepKey="setFirstAttributeValue"/>
+            <actionGroup ref="saveProductForm" stepKey="saveFirstProduct"/>
+            <!--Update second product-->
+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSecondProduct">
+                <argument name="product" value="$$createSecondProduct$$"/>
+            </actionGroup>
+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="editSecondProduct">
+                <argument name="product" value="$$createSecondProduct$$"/>
+            </actionGroup>
+            <selectOption selector="{{AdminProductFormSection.customSelectField($$createDropdownAttribute.attribute[attribute_code]$$)}}" userInput="$$createSecondProductAttributeOption.option[store_labels][0][label]$$" stepKey="setSecondAttributeValue"/>
+            <actionGroup ref="saveProductForm" stepKey="saveSecondProduct"/>
+            <!--Update third product-->
+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForThirdProduct">
+                <argument name="product" value="$$createThirdProduct$$"/>
+            </actionGroup>
+            <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="editThirdProduct">
+                <argument name="product" value="$$createThirdProduct$$"/>
+            </actionGroup>
+            <selectOption selector="{{AdminProductFormSection.customSelectField($$createDropdownAttribute.attribute[attribute_code]$$)}}" userInput="$$createThirdProductAttributeOption.option[store_labels][0][label]$$" stepKey="setThirdAttributeValue"/>
+            <actionGroup ref="saveProductForm" stepKey="saveThirdProduct"/>
+        </before>
+        <after>
+            <!--Delete products-->
+            <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
+            <deleteData createDataKey="createSecondProduct" stepKey="deleteSecondProduct"/>
+            <deleteData createDataKey="createThirdProduct" stepKey="deleteThirdProduct"/>
+            <!--Delete attribute-->
+            <deleteData createDataKey="createDropdownAttribute" stepKey="deleteDropdownAttribute"/>
+            <!--Delete category-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="NavigateToAndResetProductGridToDefaultView" stepKey="NavigateToAndResetProductGridToDefaultViewAfterTest"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductGridFilters"/>
+        <!--Sort by custom attribute DESC using grabbed value-->
+        <conditionalClick selector="{{AdminProductGridSection.columnHeader($$createDropdownAttribute.attribute[frontend_labels][0][label]$$)}}" dependentSelector="{{AdminProductGridSection.columnHeader($$createDropdownAttribute.attribute[frontend_labels][0][label]$$)}}" visible="true" stepKey="ascendSortByCustomAttribute"/>
+        <waitForPageLoad stepKey="waitForProductGridLoad"/>
+        <!--Check products sorting. Expected result => Blue-Green-Red -->
+        <see selector="{{AdminProductGridSection.productGridNameProduct($$createSecondProduct.name$$)}}" userInput="$$createSecondProduct.name$$" stepKey="seeSecondProductName"/>
+        <see selector="{{AdminProductGridSection.productGridNameProduct($$createFirstProduct.name$$)}}" userInput="$$createFirstProduct.name$$" stepKey="seeFirstProductName"/>
+        <see selector="{{AdminProductGridSection.productGridNameProduct($$createThirdProduct.name$$)}}" userInput="$$createThirdProduct.name$$" stepKey="seeThirdProductName"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest.xml
index a11646cc46875..de065d2d930cb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest.xml
@@ -20,12 +20,16 @@
             <group value="catalog"/>
         </annotations>
         <before>
+            <!-- Add downloadable domains -->
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <!--Create product-->
             <comment userInput="Create product" stepKey="commentCreateProduct"/>
             <createData entity="VirtualProduct" stepKey="createProduct"/>
         </before>
         <after>
+            <!-- Remove downloadable domains -->
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
             <!--Delete product-->
             <comment userInput="Delete product" stepKey="commentDeleteProduct"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml
index 41f27497a50eb..df50edd20410a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest.xml
@@ -144,6 +144,8 @@
 
         <!-- Save the second product -->
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
 
         <!-- Go to the admin grid and see the uploaded image -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex3"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
index 1cb01ac11cb8f..ad110ceee32d2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
@@ -64,6 +64,10 @@
         <!--Verify Category Title-->
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
 
+        <!-- Perform reindex and flush cache -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <!--Verify Category in store front page-->
         <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}" stepKey="seeDefaultProductPage"/>
         <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
index f317c66e5366a..10ff1151cd9b3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
@@ -25,6 +25,10 @@
                 <requiredEntity createDataKey="initialCategoryEntity"/>
             </createData>
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+
+            <!--TODO: REMOVE AFTER FIX MC-21717 -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush full_page" stepKey="flushCache"/>
         </before>
         <after>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
index 637ae790c16c8..82395e5d6e0eb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
@@ -94,6 +94,9 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
         <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice245InStock.urlKey}}" stepKey="seeUrlKey"/>
 
+        <!--Run re-index task -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <!--Verify customer see updated simple product link on category page -->
         <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
index 045b3f3420ff6..4817b3497c97e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
@@ -94,6 +94,9 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
         <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice32501InStock.urlKey}}" stepKey="seeUrlKey"/>
 
+        <!--Run re-index task -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <!--Verify customer see updated simple product link on category page -->
         <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
index 8ac56d09e5b42..9fa0e155a4fe7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
@@ -28,6 +28,9 @@
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
         </before>
         <after>
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteVirtualProduct">
+                <argument name="product" value="updateVirtualProductRegularPrice"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
             <actionGroup ref="logout" stepKey="logout"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index a2a4f65860254..bbde98f8fc043 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -28,6 +28,9 @@
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
         </before>
         <after>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
+                <argument name="sku" value="{{updateVirtualProductRegularPrice5OutOfStock.sku}}"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
             <actionGroup ref="logout" stepKey="logout"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
index ffbad0752b73c..15e5be210b73a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
@@ -28,6 +28,9 @@
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
         </before>
         <after>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
+                <argument name="sku" value="{{updateVirtualProductRegularPrice5OutOfStock.sku}}"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
             <actionGroup ref="logout" stepKey="logout"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
index aa3184994daff..8b4518007ea29 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
@@ -27,6 +27,9 @@
             </createData>
         </before>
         <after>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
+                <argument name="sku" value="{{updateVirtualProductRegularPrice99OutOfStock.sku}}"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
index 3101c1e460322..984c296845113 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -28,6 +28,9 @@
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
         </before>
         <after>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
+                <argument name="sku" value="{{updateVirtualProductSpecialPrice.sku}}"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
             <actionGroup ref="logout" stepKey="logout"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 58978c31b5b40..1c590563d4cfc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -28,6 +28,9 @@
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
         </before>
         <after>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
+                <argument name="sku" value="{{updateVirtualProductSpecialPriceOutOfStock.sku}}"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
             <actionGroup ref="logout" stepKey="logout"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
index d28e9ddbb1271..e0e8360850983 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -28,6 +28,9 @@
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
         </before>
         <after>
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteVirtualProduct">
+                <argument name="product" value="updateVirtualProductTierPriceInStock"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
             <actionGroup ref="logout" stepKey="logout"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
index 22dd2b0054db4..677cc4c65ce88 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
@@ -28,6 +28,9 @@
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
         </before>
         <after>
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteVirtualProduct">
+                <argument name="product" value="updateVirtualProductWithTierPriceInStock"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
             <actionGroup ref="logout" stepKey="logout"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 29c7536d21621..f0148f3d384c1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -28,6 +28,9 @@
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
         </before>
         <after>
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteVirtualProduct">
+                <argument name="product" value="updateVirtualTierPriceOutOfStock"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
             <actionGroup ref="logout" stepKey="logout"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
index a4c8b492d9d84..d8fa20c7cc469 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
@@ -19,10 +19,13 @@
             <group value="Catalog"/>
         </annotations>
         <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="deleteAllProductsUsingProductGrid" stepKey="deleteAllProducts"/>
             <createData entity="ApiProductWithDescription" stepKey="product"/>
         </before>
         <after>
             <deleteData createDataKey="product" stepKey="delete"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
         </after>
     </test>
     <test name="AdvanceCatalogSearchSimpleProductBySkuTest">
@@ -36,7 +39,7 @@
             <group value="Catalog"/>
         </annotations>
         <before>
-            <createData entity="ApiProductWithDescription" stepKey="product"/>
+            <createData entity="ApiProductWithDescriptionAndUnderscoredSku" stepKey="product"/>
         </before>
         <after>
             <deleteData createDataKey="product" stepKey="delete"/>
@@ -87,6 +90,9 @@
             <group value="Catalog"/>
         </annotations>
         <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="deleteAllProductsUsingProductGrid" stepKey="deleteAllProducts"/>
+
             <createData entity="ApiProductWithDescription" stepKey="product"/>
             <getData entity="GetProduct" stepKey="arg1">
                 <requiredEntity createDataKey="product"/>
@@ -100,6 +106,7 @@
         </before>
         <after>
             <deleteData createDataKey="product" stepKey="delete"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
         </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
index 84c3f81ef6dbf..07b802637b2e7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml
@@ -33,7 +33,7 @@
             <group value="Catalog"/>
         </annotations>
         <before>
-            <createData entity="ApiVirtualProductWithDescription" stepKey="product"/>
+            <createData entity="ApiVirtualProductWithDescriptionAndUnderscoredSku" stepKey="product"/>
         </before>
     </test>
     <test name="AdvanceCatalogSearchVirtualProductByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/DisplayRefreshCacheAfterChangingCategoryPageLayoutTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/DisplayRefreshCacheAfterChangingCategoryPageLayoutTest.xml
index 5a94dd4f04d24..02df8db5c2121 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/DisplayRefreshCacheAfterChangingCategoryPageLayoutTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/DisplayRefreshCacheAfterChangingCategoryPageLayoutTest.xml
@@ -11,6 +11,7 @@
     <test name="DisplayRefreshCacheAfterChangingCategoryPageLayoutTest">
         <annotations>
             <features value="Catalog"/>
+            <stories value="Category Layout Change"/>
             <title value="'Refresh cache' admin notification is displayed when changing category page layout"/>
             <description value="'Refresh cache' message is not displayed when changing category page layout"/>
             <severity value="MAJOR"/>
@@ -45,7 +46,8 @@
         <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
         <waitForPageLoad stepKey="waitSaveToApply"/>
         <!-- See if warning message displays -->
-        <comment userInput="See if warning message displays" stepKey="checkWarningMessagePresence"/>
-        <see selector="{{AdminMessagesSection.warningMessage}}" userInput="Please go to Cache Management and refresh cache types" stepKey="seeWarningMessage"/>
+        <actionGroup ref="AdminSystemMessagesWarningActionGroup" stepKey="seeWarningMessage">
+            <argument name="message" value="Please go to Cache Management and refresh cache types"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index 7c0de6da18caf..ad66214e902fe 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -17,6 +17,203 @@
             <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"/>
+            <group value="SearchEngineElasticsearch"/>
+        </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>
+
+        <!--Re-index-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
+        <!-- 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>
+    <test name="EndToEndB2CGuestUserMysqlTest">
+        <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 using the Mysql search engine"/>
+            <description value="User browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out using the Mysql search engine."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-20476"/>
+            <group value="SearchEngineMysql"/>
         </annotations>
         <before>
             <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml
index 461ebde29fcad..c8a7cdee66b53 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml
@@ -49,6 +49,10 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryWithProducts"/>
         <waitForPageLoad stepKey="waitForCategorySaved"/>
         <see userInput="You saved the category." stepKey="seeSuccessMessage"/>
+
+        <!--Run re-index task-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryStorefront"/>
         <waitForPageLoad stepKey="waitForCategoryStorefrontPage"/>
         <seeElement selector="{{StorefrontCategoryProductSection.ProductImageByName($$createSimpleProduct.name$$)}}" stepKey="seeCreatedProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchSimpleProductBySkuWithHyphenTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchSimpleProductBySkuWithHyphenTest.xml
new file mode 100644
index 0000000000000..3b1cd7ff02e6a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchSimpleProductBySkuWithHyphenTest.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="StorefrontAdvanceCatalogSearchSimpleProductBySkuWithHyphenTest" 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 simple product with product sku that contains hyphen"/>
+            <description value="Guest customer should be able to advance search simple product with product sku that contains hyphen"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-20361"/>
+            <group value="Catalog"/>
+            <group value="SearchEngineMysql"/>
+        </annotations>
+        <before>
+            <createData entity="ApiProductWithDescription" stepKey="product"/>
+        </before>
+        <after>
+            <deleteData createDataKey="product" stepKey="delete"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchVirtualProductBySkuWithHyphenTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchVirtualProductBySkuWithHyphenTest.xml
new file mode 100644
index 0000000000000..d6b3a060ffd3a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchVirtualProductBySkuWithHyphenTest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAdvanceCatalogSearchVirtualProductBySkuWithHyphenTest" 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 that contains hyphen"/>
+            <description value="Guest customer should be able to advance search virtual product with product sku that contains hyphen"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-20385"/>
+            <group value="Catalog"/>
+            <group value="SearchEngineMysql"/>
+        </annotations>
+        <before>
+            <createData entity="ApiVirtualProductWithDescription" stepKey="product"/>
+        </before>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml
index ac2605ff5f3e2..4eef6a2c06800 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml
@@ -186,6 +186,11 @@
         <waitForElementVisible selector="{{AdminCatalogStorefrontConfigSection.productsPerPageAllowedValues}}" stepKey="waitForSectionOpen"/>
         <seeInField selector="{{AdminCatalogStorefrontConfigSection.productsPerPageAllowedValues}}" userInput="12,24,36" stepKey="seeDefaultValueAllowedNumberProductsPerPage"/>
         <seeInField selector="{{AdminCatalogStorefrontConfigSection.productsPerPageDefaultValue}}" userInput="12" stepKey="seeDefaultValueProductPerPage"/>
+
+        <!-- Perform reindex and flush cache -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <!-- Open storefront on the category page -->
         <comment userInput="Open storefront on the category page" stepKey="commentOpenStorefront"/>
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="goToStorefrontCreatedCategoryPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontForthLevelCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontForthLevelCategoryTest.xml
new file mode 100644
index 0000000000000..bb46f8010eaa8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontForthLevelCategoryTest.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="StorefrontForthLevelCategoryTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Category"/>
+            <title value="Storefront forth level category test"/>
+            <description value="When the submenu was created in the third stage follow, the submenu works"/>
+            <severity value="MAJOR"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category1"/>
+            <createData entity="SubCategoryWithParent" stepKey="category2">
+                <requiredEntity createDataKey="category1"/>
+            </createData>
+            <createData entity="SubCategoryWithParent" stepKey="category3">
+                <requiredEntity createDataKey="category2"/>
+            </createData>
+            <createData entity="SubCategoryWithParent" stepKey="category4">
+                <requiredEntity createDataKey="category3"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="category4" stepKey="deleteCategory4"/>
+            <deleteData createDataKey="category3" stepKey="deleteCategory3"/>
+            <deleteData createDataKey="category2" stepKey="deleteCategory2"/>
+            <deleteData createDataKey="category1" stepKey="deleteCategory1"/>
+        </after>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
+        <moveMouseOver
+            selector="{{StorefrontHeaderSection.NavigationCategoryByName($$category1.name$$)}}"
+            stepKey="hoverCategoryLevelOne"/>
+        <moveMouseOver
+            selector="{{StorefrontHeaderSection.NavigationCategoryByName($$category2.name$$)}}"
+            stepKey="hoverCategoryLevelTwo"/>
+        <moveMouseOver
+            selector="{{StorefrontHeaderSection.NavigationCategoryByName($$category3.name$$)}}"
+            stepKey="hoverCategoryLevelThree"/>
+        <moveMouseOver
+            selector="{{StorefrontHeaderSection.NavigationCategoryByName($$category4.name$$)}}"
+            stepKey="hoverCategoryLevelFour"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
index 386633f0e9476..21f8e2e070e32 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml
@@ -41,6 +41,9 @@
         </actionGroup>
         <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
 
+        <!--Run re-index task-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <!--Check product in category listing-->
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="goToCategoryPage"/>
         <seeElement selector="{{StorefrontCategoryProductSection.ProductImageByNameAndSrc(SimpleProductNameWithDoubleQuote.name, ProductImage.fileName)}}" stepKey="seeCorrectImageCategoryPage"/>
@@ -88,6 +91,9 @@
             <deleteData createDataKey="createCategoryOne" stepKey="deleteCategory"/>
         </after>
 
+        <!--Run re-index task-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <!--Check product in category listing-->
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategoryOne.name$$)}}" stepKey="navigateToCategoryPage"/>
         <waitForPageLoad stepKey="waitforCategoryPageToLoad"/>
@@ -111,11 +117,10 @@
         <waitForPageLoad stepKey="waitforCategoryPageToLoad2"/>
 
         <!--Open product display page-->
-        <click selector="{{StorefrontCategoryProductSection.ProductTitleByNumber('1')}}" stepKey="goToProduct2DisplayPage"/>
-        <!--<click selector="{{StorefrontCategoryProductSection.ProductTitleByName(productWithHTMLEntityOne.name)}}" stepKey="clickProductToGoProductPage"/>-->
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName(productWithHTMLEntityTwo.name)}}" stepKey="clickProductToGoSecondProductPage"/>
         <waitForPageLoad stepKey="waitForProductDisplayPageLoad3"/>
 
-        <!--Veriy the breadcrumbs on Product Display page-->
+        <!--Verify 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"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
index 6184a220f047c..deb6700c56990 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
@@ -56,6 +56,7 @@
             </actionGroup>
 
             <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" arguments="full_page" stepKey="flushCache"/>
         </before>
         <after>
             <!-- Change "Category Products" and "Product Categories" indexers to "Update on Save" mode -->
@@ -115,7 +116,7 @@
 
         <!-- "One or more indexers are invalid. Make sure your Magento cron job is running." global warning message appears -->
         <click selector="{{AdminSystemMessagesSection.systemMessagesDropdown}}" stepKey="openMessageSection"/>
-        <see userInput="One or more indexers are invalid. Make sure your Magento cron job is running." selector="{{AdminMessagesSection.warningMessage}}" stepKey="seeWarningMessage"/>
+        <see userInput="One or more indexers are invalid. Make sure your Magento cron job is running." selector="{{AdminSystemMessagesSection.warning}}" stepKey="seeWarningMessage"/>
 
         <!-- Open categories K, L, M, N on Storefront in order to make sure that new assigments are not applied yet -->
         <!-- Category K contains only Products B & C -->
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/Tab/AdvancedTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/Tab/AdvancedTest.php
index 0352bc83cafb7..4d9345d0b3f22 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/Tab/AdvancedTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/Tab/AdvancedTest.php
@@ -5,66 +5,87 @@
  */
 namespace Magento\Catalog\Test\Unit\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
+use Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Advanced;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Config\Model\Config\Source\Yesno;
 use Magento\Eav\Block\Adminhtml\Attribute\PropertyLocker;
+use Magento\Eav\Helper\Data as EavHelper;
+use Magento\Eav\Model\Entity\Type as EntityType;
+use Magento\Framework\Data\Form;
+use Magento\Framework\Data\Form\Element\Fieldset;
+use Magento\Framework\Data\Form\Element\Text;
+use Magento\Framework\Data\FormFactory;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
+ * Test product attribute add/edit advanced form tab
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AdvancedTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Catalog\Block\Adminhtml\Product\Attribute\Grid
+     * @var Advanced
      */
     protected $block;
 
     /**
-     * @var \Magento\Framework\Data\FormFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var FormFactory|MockObject
      */
     protected $formFactory;
 
     /**
-     * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
+     * @var Registry|MockObject
      */
     protected $registry;
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var TimezoneInterface|MockObject
      */
     protected $localeDate;
 
     /**
-     * @var \Magento\Config\Model\Config\Source\Yesno|\PHPUnit_Framework_MockObject_MockObject
+     * @var Yesno|MockObject
      */
     protected $yesNo;
 
     /**
-     * @var \Magento\Eav\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var EavHelper|MockObject
      */
     protected $eavData;
 
     /**
-     * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
+     * @var Filesystem|MockObject
      */
     protected $filesystem;
 
     /**
-     * @var PropertyLocker|\PHPUnit_Framework_MockObject_MockObject
+     * @var PropertyLocker|MockObject
      */
     protected $propertyLocker;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->registry = $this->createMock(\Magento\Framework\Registry::class);
-        $this->formFactory = $this->createMock(\Magento\Framework\Data\FormFactory::class);
-        $this->yesNo = $this->createMock(\Magento\Config\Model\Config\Source\Yesno::class);
-        $this->localeDate = $this->createMock(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
-        $this->eavData = $this->createMock(\Magento\Eav\Helper\Data::class);
-        $this->filesystem = $this->createMock(\Magento\Framework\Filesystem::class);
+        $objectManager = new ObjectManager($this);
+        $this->registry = $this->createMock(Registry::class);
+        $this->formFactory = $this->createMock(FormFactory::class);
+        $this->yesNo = $this->createMock(Yesno::class);
+        $this->localeDate = $this->createMock(TimezoneInterface::class);
+        $this->eavData = $this->createMock(EavHelper::class);
+        $this->filesystem = $this->createMock(Filesystem::class);
         $this->propertyLocker = $this->createMock(PropertyLocker::class);
 
         $this->block = $objectManager->getObject(
-            \Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Advanced::class,
+            Advanced::class,
             [
                 'registry' => $this->registry,
                 'formFactory' => $this->formFactory,
@@ -77,17 +98,35 @@ protected function setUp()
         );
     }
 
+    /**
+     * Test the block's html output
+     */
     public function testToHtml()
     {
-        $fieldSet = $this->createMock(\Magento\Framework\Data\Form\Element\Fieldset::class);
-        $form = $this->createMock(\Magento\Framework\Data\Form::class);
+        $defaultValue = 'default_value';
+        $localizedDefaultValue = 'localized_default_value';
+        $frontendInput = 'datetime';
+        $dateFormat = 'mm/dd/yy';
+        $timeFormat = 'H:i:s:';
+        $timeZone = 'America/Chicago';
+
+        $fieldSet = $this->createMock(Fieldset::class);
+        $form = $this->createMock(Form::class);
         $attributeModel = $this->createPartialMock(
-            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
-            ['getDefaultValue', 'setDisabled', 'getId', 'getEntityType', 'getIsUserDefined', 'getAttributeCode']
+            Attribute::class,
+            [
+                'getDefaultValue',
+                'setDisabled',
+                'getId',
+                'getEntityType',
+                'getIsUserDefined',
+                'getAttributeCode',
+                'getFrontendInput'
+            ]
         );
-        $entityType = $this->createMock(\Magento\Eav\Model\Entity\Type::class);
-        $formElement = $this->createPartialMock(\Magento\Framework\Data\Form\Element\Text::class, ['setDisabled']);
-        $directoryReadInterface = $this->createMock(\Magento\Framework\Filesystem\Directory\ReadInterface::class);
+        $entityType = $this->createMock(EntityType::class);
+        $formElement = $this->createPartialMock(Text::class, ['setDisabled']);
+        $directoryReadInterface = $this->createMock(ReadInterface::class);
 
         $this->registry->expects($this->any())->method('registry')->with('entity_attribute')
             ->willReturn($attributeModel);
@@ -95,13 +134,28 @@ public function testToHtml()
         $form->expects($this->any())->method('addFieldset')->willReturn($fieldSet);
         $form->expects($this->any())->method('getElement')->willReturn($formElement);
         $fieldSet->expects($this->any())->method('addField')->willReturnSelf();
-        $attributeModel->expects($this->any())->method('getDefaultValue')->willReturn('default_value');
+        $attributeModel->expects($this->any())->method('getDefaultValue')->willReturn($defaultValue);
         $attributeModel->expects($this->any())->method('setDisabled')->willReturnSelf();
         $attributeModel->expects($this->any())->method('getId')->willReturn(1);
         $attributeModel->expects($this->any())->method('getEntityType')->willReturn($entityType);
         $attributeModel->expects($this->any())->method('getIsUserDefined')->willReturn(false);
         $attributeModel->expects($this->any())->method('getAttributeCode')->willReturn('attribute_code');
-        $this->localeDate->expects($this->any())->method('getDateFormat')->willReturn('mm/dd/yy');
+        $attributeModel->expects($this->any())->method('getFrontendInput')->willReturn($frontendInput);
+
+        $dateTimeMock = $this->createMock(\DateTime::class);
+        $dateTimeMock->expects($this->once())->method('setTimezone')->with(new \DateTimeZone($timeZone));
+        $dateTimeMock->expects($this->once())
+            ->method('format')
+            ->with(DateTime::DATETIME_PHP_FORMAT)
+            ->willReturn($localizedDefaultValue);
+        $this->localeDate->expects($this->any())->method('getDateFormat')->willReturn($dateFormat);
+        $this->localeDate->expects($this->any())->method('getTimeFormat')->willReturn($timeFormat);
+        $this->localeDate->expects($this->once())->method('getConfigTimezone')->willReturn($timeZone);
+        $this->localeDate->expects($this->once())
+            ->method('date')
+            ->with($defaultValue, null, false)
+            ->willReturn($dateTimeMock);
+
         $entityType->expects($this->any())->method('getEntityTypeCode')->willReturn('entity_type_code');
         $this->eavData->expects($this->any())->method('getFrontendClasses')->willReturn([]);
         $formElement->expects($this->exactly(2))->method('setDisabled')->willReturnSelf();
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
index 2008d0b9414c5..19c578e976cdd 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
@@ -85,7 +85,7 @@ protected function setUp()
         $this->backordersMock = $this->createMock(\Magento\CatalogInventory\Model\Source\Backorders::class);
         $this->stockMock = $this->createMock(\Magento\CatalogInventory\Model\Source\Stock::class);
         $this->coreRegistryMock = $this->createMock(\Magento\Framework\Registry::class);
-        $this->moduleManager = $this->createMock(\Magento\Framework\Module\ModuleManagerInterface::class);
+        $this->moduleManager = $this->createMock(\Magento\Framework\Module\Manager::class);
         $this->storeManagerMock = $this->getMockForAbstractClass(
             \Magento\Store\Model\StoreManagerInterface::class,
             [],
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/EditTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/EditTest.php
index cd8d57a51d609..7d4fa86cd6901 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/EditTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/EditTest.php
@@ -96,7 +96,9 @@ protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->categoryMock = $this->createPartialMock(\Magento\Catalog\Model\Category::class, [
+        $this->categoryMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Category::class,
+            [
                 'getPath',
                 'addData',
                 'getId',
@@ -104,9 +106,12 @@ protected function setUp()
                 'getResource',
                 'setStoreId',
                 'toArray'
-            ]);
+            ]
+        );
 
-        $this->contextMock = $this->createPartialMock(\Magento\Backend\App\Action\Context::class, [
+        $this->contextMock = $this->createPartialMock(
+            \Magento\Backend\App\Action\Context::class,
+            [
                 'getTitle',
                 'getRequest',
                 'getObjectManager',
@@ -115,7 +120,9 @@ protected function setUp()
                 'getMessageManager',
                 'getResultRedirectFactory',
                 'getSession'
-            ]);
+            ]
+        );
+
         $this->resultRedirectFactoryMock = $this->createPartialMock(
             \Magento\Backend\Model\View\Result\RedirectFactory::class,
             ['create']
@@ -285,44 +292,8 @@ public function dataProviderExecute()
      */
     private function mockInitCategoryCall()
     {
-        /**
-         * @var \Magento\Framework\Registry
-         * |\PHPUnit_Framework_MockObject_MockObject $registryMock
-         */
-        $registryMock = $this->createPartialMock(\Magento\Framework\Registry::class, ['register']);
-        /**
-         * @var \Magento\Cms\Model\Wysiwyg\Config
-         * |\PHPUnit_Framework_MockObject_MockObject $wysiwygConfigMock
-         */
-        $wysiwygConfigMock = $this->createPartialMock(\Magento\Cms\Model\Wysiwyg\Config::class, ['setStoreId']);
-        /**
-         * @var \Magento\Store\Model\StoreManagerInterface
-         * |\PHPUnit_Framework_MockObject_MockObject $storeManagerMock
-         */
-        $storeManagerMock = $this->getMockForAbstractClass(
-            \Magento\Store\Model\StoreManagerInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['getStore', 'getRootCategoryId']
-        );
-
         $this->objectManagerMock->expects($this->atLeastOnce())
             ->method('create')
             ->will($this->returnValue($this->categoryMock));
-
-        $this->objectManagerMock->expects($this->atLeastOnce())
-            ->method('get')
-            ->will(
-                $this->returnValueMap(
-                    [
-                        [\Magento\Framework\Registry::class, $registryMock],
-                        [\Magento\Cms\Model\Wysiwyg\Config::class, $wysiwygConfigMock],
-                        [\Magento\Store\Model\StoreManagerInterface::class, $storeManagerMock],
-                    ]
-                )
-            );
     }
 }
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 746d3340a6605..da58943bb3722 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
@@ -134,13 +134,10 @@ public function testExecuteWithGenericException()
             ->willReturn($categoryMock);
         $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, $wysiwygConfig]]);
         $categoryMock->expects($this->once())
             ->method('move')
-            ->willThrowException(new \Exception(
-                __('Some exception')
-            ));
+            ->willThrowException(new \Exception(__('Some exception')));
         $this->messageManager->expects($this->once())
             ->method('addErrorMessage')
             ->with(__('There was a category move error.'));
@@ -208,7 +205,6 @@ public function testExecuteWithLocalizedException()
             ->willReturn($categoryMock);
         $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, $wysiwygConfig]]);
         $this->messageManager->expects($this->once())
             ->method('addExceptionMessage');
@@ -236,9 +232,7 @@ public function testExecuteWithLocalizedException()
             ->willReturn(true);
         $categoryMock->expects($this->once())
             ->method('move')
-            ->willThrowException(new \Magento\Framework\Exception\LocalizedException(
-                __($exceptionMessage)
-            ));
+            ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__($exceptionMessage)));
         $this->resultJsonFactoryMock
             ->expects($this->once())
             ->method('create')
@@ -280,7 +274,6 @@ public function testSuccessfulCategorySave()
             ->willReturn($categoryMock);
         $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, $wysiwygConfig]]);
         $this->messageManager->expects($this->once())
             ->method('getMessages')
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 742148b1bf7f1..856f8a20b9daf 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
@@ -136,18 +136,22 @@ public function testExecute()
         $serializedOptions = '{"key":"value"}';
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->willReturnMap([
+            ->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')
-            ->willReturnMap([
+            ->willReturnMap(
+                [
                 [\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class, [], $this->attributeMock],
                 [\Magento\Eav\Model\Entity\Attribute\Set::class, [], $this->attributeSetMock]
-            ]);
+                ]
+            );
         $this->attributeMock->expects($this->once())
             ->method('loadByCode')
             ->willReturnSelf();
@@ -182,9 +186,9 @@ public function testExecute()
 
     /**
      * @dataProvider provideUniqueData
-     * @param array $options
-     * @param boolean $isError
-     * @throws \Magento\Framework\Exception\NotFoundException
+     * @param        array   $options
+     * @param        boolean $isError
+     * @throws       \Magento\Framework\Exception\NotFoundException
      */
     public function testUniqueValidation(array $options, $isError)
     {
@@ -192,13 +196,15 @@ public function testUniqueValidation(array $options, $isError)
         $countFunctionCalls = ($isError) ? 6 : 5;
         $this->requestMock->expects($this->exactly($countFunctionCalls))
             ->method('getParam')
-            ->willReturnMap([
+            ->willReturnMap(
+                [
                 ['frontend_label', null, null],
                 ['attribute_code', null, "test_attribute_code"],
                 ['new_attribute_set_name', null, 'test_attribute_set_name'],
                 ['message_key', null, Validate::DEFAULT_MESSAGE_KEY],
                 ['serialized_options', '[]', $serializedOptions],
-            ]);
+                ]
+            );
 
         $this->formDataSerializerMock
             ->expects($this->once())
@@ -323,22 +329,24 @@ public function provideUniqueData()
      * Check that empty admin scope labels will trigger error.
      *
      * @dataProvider provideEmptyOption
-     * @param array $options
-     * @throws \Magento\Framework\Exception\NotFoundException
+     * @param        array $options
+     * @throws       \Magento\Framework\Exception\NotFoundException
      */
     public function testEmptyOption(array $options, $result)
     {
         $serializedOptions = '{"key":"value"}';
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->willReturnMap([
+            ->willReturnMap(
+                [
                 ['frontend_label', null, null],
                 ['frontend_input', 'select', 'multipleselect'],
                 ['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())
@@ -439,6 +447,129 @@ public function provideEmptyOption()
         ];
     }
 
+    /**
+     * Check that admin scope labels which only contain spaces will trigger error.
+     *
+     * @dataProvider provideWhitespaceOption
+     * @param        array  $options
+     * @param        $result
+     * @throws       \Magento\Framework\Exception\NotFoundException
+     */
+    public function testWhitespaceOption(array $options, $result)
+    {
+        $serializedOptions = '{"key":"value"}';
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap(
+                [
+                              ['frontend_label', null, null],
+                              ['frontend_input', 'select', 'multipleselect'],
+                              ['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)
+            ->willReturn($options);
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->attributeMock);
+
+        $this->attributeMock->expects($this->once())
+            ->method('loadByCode')
+            ->willReturnSelf();
+
+        $this->attributeCodeValidatorMock->expects($this->once())
+            ->method('isValid')
+            ->with('test_attribute_code')
+            ->willReturn(true);
+
+        $this->resultJsonFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->resultJson);
+
+        $this->resultJson->expects($this->once())
+            ->method('setJsonData')
+            ->willReturnArgument(0);
+
+        $response = $this->getModel()->execute();
+        $responseObject = json_decode($response);
+        $this->assertEquals($responseObject, $result);
+    }
+
+    /**
+     * Dataprovider for testWhitespaceOption.
+     *
+     * @return array
+     */
+    public function provideWhitespaceOption()
+    {
+        return [
+            'whitespace admin scope options' => [
+                [
+                    'option' => [
+                        'value' => [
+                            "option_0" => [' '],
+                        ],
+                    ],
+                ],
+                (object) [
+                    'error' => true,
+                    'message' => 'The value of Admin scope can\'t be empty.',
+                ]
+            ],
+            'not empty admin scope options' => [
+                [
+                    'option' => [
+                        'value' => [
+                            "option_0" => ['asdads'],
+                        ],
+                    ],
+                ],
+                (object) [
+                    'error' => false,
+                ]
+            ],
+            'whitespace admin scope options and deleted' => [
+                [
+                    'option' => [
+                        'value' => [
+                            "option_0" => [' '],
+                        ],
+                        'delete' => [
+                            'option_0' => '1',
+                        ],
+                    ],
+                ],
+                (object) [
+                    'error' => false,
+                ],
+            ],
+            'whitespace 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
      */
@@ -449,13 +580,15 @@ public function testExecuteWithOptionsDataError()
             . "If the error persists, please try again later.";
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->willReturnMap([
+            ->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())
@@ -465,10 +598,12 @@ public function testExecuteWithOptionsDataError()
 
         $this->objectManagerMock
             ->method('create')
-            ->willReturnMap([
+            ->willReturnMap(
+                [
                 [\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class, [], $this->attributeMock],
                 [\Magento\Eav\Model\Entity\Attribute\Set::class, [], $this->attributeSetMock]
-            ]);
+                ]
+            );
 
         $this->attributeCodeValidatorMock
             ->method('isValid')
@@ -485,10 +620,14 @@ public function testExecuteWithOptionsDataError()
             ->willReturn($this->resultJson);
         $this->resultJson->expects($this->once())
             ->method('setJsonData')
-            ->with(json_encode([
-                'error' => true,
-                'message' => $message
-            ]))
+            ->with(
+                json_encode(
+                    [
+                    'error' => true,
+                    'message' => $message
+                    ]
+                )
+            )
             ->willReturnSelf();
 
         $this->getModel()->execute();
@@ -498,23 +637,25 @@ public function testExecuteWithOptionsDataError()
      * Test execute with an invalid attribute code
      *
      * @dataProvider provideInvalidAttributeCodes
-     * @param string $attributeCode
-     * @param $result
-     * @throws \Magento\Framework\Exception\NotFoundException
+     * @param        string $attributeCode
+     * @param        $result
+     * @throws       \Magento\Framework\Exception\NotFoundException
      */
     public function testExecuteWithInvalidAttributeCode($attributeCode, $result)
     {
         $serializedOptions = '{"key":"value"}';
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->willReturnMap([
+            ->willReturnMap(
+                [
                 ['frontend_label', null, null],
                 ['frontend_input', 'select', 'multipleselect'],
                 ['attribute_code', null, $attributeCode],
                 ['new_attribute_set_name', null, 'test_attribute_set_name'],
                 ['message_key', Validate::DEFAULT_MESSAGE_KEY, 'message'],
                 ['serialized_options', '[]', $serializedOptions],
-            ]);
+                ]
+            );
 
         $this->formDataSerializerMock
             ->expects($this->once())
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 c889c58e3df3a..2aea34244437d 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
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Initialization;
 
 use Magento\Catalog\Api\ProductRepositoryInterface as ProductRepository;
@@ -11,6 +12,8 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Option;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Locale\Format;
+use Magento\Framework\Locale\FormatInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\Model\StoreManagerInterface;
@@ -100,6 +103,11 @@ class HelperTest extends \PHPUnit\Framework\TestCase
      */
     private $dateTimeFilterMock;
 
+    /**
+     * @var FormatInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $localeFormatMock;
+
     /**
      * @inheritdoc
      */
@@ -152,6 +160,12 @@ protected function setUp()
             ->setMethods(['prepareProductAttributes'])
             ->disableOriginalConstructor()
             ->getMock();
+        $this->localeFormatMock = $this->getMockBuilder(Format::class)
+            ->setMethods(['getNumber'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->dateTimeFilterMock = $this->createMock(\Magento\Catalog\Model\Product\Filter\DateTime::class);
 
         $this->helper = $this->objectManager->getObject(
             Helper::class,
@@ -164,7 +178,9 @@ protected function setUp()
                 'productLinkFactory' => $this->productLinkFactoryMock,
                 'productRepository' => $this->productRepositoryMock,
                 'linkTypeProvider' => $this->linkTypeProviderMock,
-                'attributeFilter' => $this->attributeFilterMock
+                'attributeFilter' => $this->attributeFilterMock,
+                'localeFormat' => $this->localeFormatMock,
+                'dateTimeFilter' => $this->dateTimeFilterMock
             ]
         );
 
@@ -175,11 +191,6 @@ 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);
     }
 
     /**
@@ -207,12 +218,13 @@ public function testInitialize(
             ->willReturn($this->assembleLinkTypes($linkTypes));
 
         $optionsData = [
-            'option1' => ['is_delete' => true, 'name' => 'name1', 'price' => 'price1', 'option_id' => ''],
-            'option2' => ['is_delete' => false, 'name' => 'name1', 'price' => 'price1', 'option_id' => '13'],
-            'option3' => ['is_delete' => false, 'name' => 'name1', 'price' => 'price1', 'option_id' => '14']
+            'option1' => ['is_delete' => true, 'name' => 'name1', 'price' => '1', 'option_id' => ''],
+            'option2' => ['is_delete' => false, 'name' => 'name2', 'price' => '2', 'option_id' => '13'],
+            'option3' => ['is_delete' => false, 'name' => 'name3', 'price' => '3', 'option_id' => '14'],
         ];
         $specialFromDate = '2018-03-03 19:30:00';
         $productData = [
+            'name' => 'Simple Product',
             'stock_data' => ['stock_data'],
             'options' => $optionsData,
             'website_ids' => $websiteIds,
@@ -222,37 +234,30 @@ public function testInitialize(
             $productData = array_merge($productData, ['tier_price' => $tierPrice]);
         }
 
-        $this->dateTimeFilterMock->expects($this->once())
+        $this->dateTimeFilterMock
+            ->expects($this->once())
             ->method('filter')
-            ->with($specialFromDate)
-            ->willReturn($specialFromDate);
+            ->willReturnArgument(0);
 
-        $attributeNonDate = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $attributeDate = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $attributeNonDateBackEnd =
-            $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\Backend\DefaultBackend::class)
-                ->disableOriginalConstructor()
-                ->getMock();
-        $attributeDateBackEnd = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\Backend\Datetime::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $attributeNonDate->expects($this->any())->method('getBackend')->willReturn($attributeNonDateBackEnd);
-        $attributeDate->expects($this->any())->method('getBackend')->willReturn($attributeDateBackEnd);
-        $attributeNonDateBackEnd->expects($this->any())->method('getType')->willReturn('non-datetime');
-        $attributeDateBackEnd->expects($this->any())->method('getType')->willReturn('datetime');
+        $this->setProductAttributes(
+            [
+                [
+                    'code' => 'name',
+                    'backend_type' => 'varchar',
+                ],
+                [
+                    'code' => 'special_from_date',
+                    'backend_type' => 'datetime',
+                ]
+            ]
+        );
 
         $useDefaults = ['attributeCode1', 'attributeCode2'];
 
         $this->requestMock->expects($this->any())->method('getPost')->willReturnMap(
             [
                 ['product', [], $productData],
-                ['use_default', null, $useDefaults]
+                ['use_default', null, $useDefaults],
             ]
         );
         $this->linkResolverMock->expects($this->once())->method('getLinks')->willReturn($links);
@@ -261,8 +266,6 @@ public function testInitialize(
         $this->productMock->expects($this->once())->method('isLockedAttribute')->with('media')->willReturn(true);
         $this->productMock->expects($this->once())->method('unlockAttribute')->with('media');
         $this->productMock->expects($this->once())->method('lockAttribute')->with('media');
-        $this->productMock->expects($this->once())->method('getAttributes')
-            ->willReturn([$attributeNonDate, $attributeDate]);
         $this->productMock->expects($this->any())->method('getSku')->willReturn('sku');
         $this->productMock->expects($this->any())->method('getOptionsReadOnly')->willReturn(false);
 
@@ -276,30 +279,38 @@ public function testInitialize(
         $secondExpectedCustomOption->setData($optionsData['option3']);
         $this->customOptionFactoryMock->expects($this->any())
             ->method('create')
-            ->willReturnMap([
+            ->willReturnMap(
                 [
-                    ['data' => $optionsData['option2']],
-                    $firstExpectedCustomOption
-                ], [
-                    ['data' => $optionsData['option3']],
-                    $secondExpectedCustomOption
+                    [
+                        ['data' => $optionsData['option2']],
+                        $firstExpectedCustomOption,
+                    ],
+                    [
+                        ['data' => $optionsData['option3']],
+                        $secondExpectedCustomOption,
+                    ],
                 ]
-            ]);
+            );
         $website = $this->getMockBuilder(WebsiteInterface::class)->getMockForAbstractClass();
         $website->expects($this->any())->method('getId')->willReturn(1);
         $this->storeManagerMock->expects($this->once())->method('isSingleStoreMode')->willReturn($isSingleStore);
         $this->storeManagerMock->expects($this->any())->method('getWebsite')->willReturn($website);
+        $this->localeFormatMock->expects($this->any())
+            ->method('getNumber')
+            ->willReturnArgument(0);
 
         $this->assembleProductRepositoryMock($links);
 
         $this->productLinkFactoryMock->expects($this->any())
             ->method('create')
-            ->willReturnCallback(function () {
-                return $this->getMockBuilder(ProductLink::class)
-                    ->setMethods(null)
-                    ->disableOriginalConstructor()
-                    ->getMock();
-            });
+            ->willReturnCallback(
+                function () {
+                    return $this->getMockBuilder(ProductLink::class)
+                        ->setMethods(null)
+                        ->disableOriginalConstructor()
+                        ->getMock();
+                }
+            );
 
         $this->attributeFilterMock->expects($this->any())->method('prepareProductAttributes')->willReturnArgument(1);
 
@@ -327,7 +338,35 @@ public function testInitialize(
         }
 
         $this->assertEquals($expectedLinks, $resultLinks);
-        $this->assertEquals($specialFromDate, $productData['special_from_date']);
+        $this->assertEquals($specialFromDate, $this->productMock->getSpecialFromDate());
+    }
+
+    /**
+     * Mock product attributes
+     *
+     * @param array $attributes
+     */
+    private function setProductAttributes(array $attributes): void
+    {
+        $attributesModels = [];
+        foreach ($attributes as $attribute) {
+            $attributeModel = $this->createMock(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
+            $backendModel = $attribute['backend_model']
+                ?? $this->createMock(\Magento\Eav\Model\Entity\Attribute\Backend\DefaultBackend::class);
+            $attributeModel->expects($this->any())
+                ->method('getBackend')
+                ->willReturn($backendModel);
+            $attributeModel->expects($this->any())
+                ->method('getAttributeCode')
+                ->willReturn($attribute['code']);
+            $backendModel->expects($this->any())
+                ->method('getType')
+                ->willReturn($attribute['backend_type']);
+            $attributesModels[$attribute['code']] = $attributeModel;
+        }
+        $this->productMock->expects($this->once())
+            ->method('getAttributes')
+            ->willReturn($attributesModels);
     }
 
     /**
@@ -388,8 +427,8 @@ public function initializeDataProvider()
                             'price' => 1.00,
                             'position' => 1,
                             'record_id' => 1,
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
                 'linkTypes' => ['related', 'upsell', 'crosssell'],
                 'expected_links' => [
@@ -533,16 +572,16 @@ public function mergeProductOptionsDataProvider()
                             [
                                 'option_type_id' => '2',
                                 'key1' => 'val1',
-                                'default_key1' => 'val2'
-                            ]
-                        ]
-                    ]
+                                'default_key1' => 'val2',
+                            ],
+                        ],
+                    ],
                 ],
                 [
                     4 => [
                         'key1' => '1',
-                        'values' => [3 => ['key1' => 1]]
-                    ]
+                        'values' => [3 => ['key1' => 1]],
+                    ],
                 ],
                 [
                     [
@@ -553,11 +592,11 @@ public function mergeProductOptionsDataProvider()
                             [
                                 'option_type_id' => '2',
                                 'key1' => 'val1',
-                                'default_key1' => 'val2'
-                            ]
-                        ]
-                    ]
-                ]
+                                'default_key1' => 'val2',
+                            ],
+                        ],
+                    ],
+                ],
             ],
             'key2 is replaced, key1 is not (checkbox is not checked)' => [
                 [
@@ -573,17 +612,17 @@ public function mergeProductOptionsDataProvider()
                                 'key1' => 'val1',
                                 'key2' => 'val2',
                                 'default_key1' => 'val11',
-                                'default_key2' => 'val22'
-                            ]
-                        ]
-                    ]
+                                'default_key2' => 'val22',
+                            ],
+                        ],
+                    ],
                 ],
                 [
                     5 => [
                         'key1' => '0',
                         'title' => '1',
-                        'values' => [2 => ['key1' => 1]]
-                    ]
+                        'values' => [2 => ['key1' => 1]],
+                    ],
                 ],
                 [
                     [
@@ -599,11 +638,11 @@ public function mergeProductOptionsDataProvider()
                                 'key1' => 'val11',
                                 'key2' => 'val2',
                                 'default_key1' => 'val11',
-                                'default_key2' => 'val22'
-                            ]
-                        ]
-                    ]
-                ]
+                                'default_key2' => 'val22',
+                            ],
+                        ],
+                    ],
+                ],
             ],
             'key1 is replaced, key2 has no default value' => [
                 [
@@ -618,17 +657,17 @@ public function mergeProductOptionsDataProvider()
                                 'key1' => 'val1',
                                 'title' => 'val2',
                                 'default_key1' => 'val11',
-                                'default_title' => 'val22'
-                            ]
-                        ]
-                    ]
+                                'default_title' => 'val22',
+                            ],
+                        ],
+                    ],
                 ],
                 [
                     7 => [
                         'key1' => '1',
                         'key2' => '1',
-                        'values' => [2 => ['key1' => 0, 'title' => 1]]
-                    ]
+                        'values' => [2 => ['key1' => 0, 'title' => 1]],
+                    ],
                 ],
                 [
                     [
@@ -643,10 +682,10 @@ public function mergeProductOptionsDataProvider()
                                 'title' => 'val22',
                                 'default_key1' => 'val11',
                                 'default_title' => 'val22',
-                                'is_delete_store_title' => 1
-                            ]
-                        ]
-                    ]
+                                'is_delete_store_title' => 1,
+                            ],
+                        ],
+                    ],
                 ],
             ],
         ];
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php
index 359e43070ba72..df96eff852d4e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -110,14 +109,15 @@ protected function setUp()
             'resultFactory' => $resultFactory
         ];
         /** @var \Magento\Backend\App\Action\Context $context */
-        $context = $this->initContext($additionalParams, [[Action::class, $this->actionMock]]);
+        $context = $this->initContext($additionalParams);
 
         $this->action = new \Magento\Catalog\Controller\Adminhtml\Product\MassStatus(
             $context,
             $this->productBuilderMock,
             $this->priceProcessorMock,
             $this->filterMock,
-            $collectionFactoryMock
+            $collectionFactoryMock,
+            $this->actionMock
         );
     }
 
@@ -137,11 +137,13 @@ public function testMassStatusAction()
             ->willReturn([3]);
         $this->request->expects($this->exactly(3))
             ->method('getParam')
-            ->willReturnMap([
-                ['store', null, $storeId],
-                ['status', null, $status],
-                ['filters', [], $filters]
-            ]);
+            ->willReturnMap(
+                [
+                    ['store', null, $storeId],
+                    ['status', null, $status],
+                    ['filters', [], $filters]
+                ]
+            );
         $this->actionMock->expects($this->once())
             ->method('updateAttributes')
             ->with([3], ['status' => $status], 2);
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php
index 60c6f2f1bd821..b826f25d7c591 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Category/ViewTest.php
@@ -25,7 +25,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
     protected $response;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Catalog\Helper\Category|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $categoryHelper;
 
@@ -165,13 +165,17 @@ protected function setUp()
             ->method('create')
             ->will($this->returnValue($this->page));
 
-        $this->action = (new ObjectManager($this))->getObject(\Magento\Catalog\Controller\Category\View::class, [
-            'context' => $this->context,
-            'catalogDesign' => $this->catalogDesign,
-            'categoryRepository' => $this->categoryRepository,
-            'storeManager' => $this->storeManager,
-            'resultPageFactory' => $resultPageFactory
-        ]);
+        $this->action = (new ObjectManager($this))->getObject(
+            \Magento\Catalog\Controller\Category\View::class,
+            [
+                'context' => $this->context,
+                'catalogDesign' => $this->catalogDesign,
+                'categoryRepository' => $this->categoryRepository,
+                'storeManager' => $this->storeManager,
+                'resultPageFactory' => $resultPageFactory,
+                'categoryHelper' => $this->categoryHelper
+            ]
+        );
     }
 
     public function testApplyCustomLayoutUpdate()
@@ -179,19 +183,17 @@ public function testApplyCustomLayoutUpdate()
         $categoryId = 123;
         $pageLayout = 'page_layout';
 
-        $this->objectManager->expects($this->any())->method('get')->will($this->returnValueMap([
-            [\Magento\Catalog\Helper\Category::class, $this->categoryHelper],
-        ]));
-
-        $this->request->expects($this->any())->method('getParam')->will($this->returnValueMap([
-            [Action::PARAM_NAME_URL_ENCODED],
-            ['id', false, $categoryId],
-        ]));
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                [Action::PARAM_NAME_URL_ENCODED],
+                ['id', false, $categoryId]
+            ]
+        );
 
         $this->categoryRepository->expects($this->any())->method('get')->with($categoryId)
             ->will($this->returnValue($this->category));
 
-        $this->categoryHelper->expects($this->any())->method('canShow')->will($this->returnValue(true));
+        $this->categoryHelper->expects($this->once())->method('canShow')->with($this->category)->willReturn(true);
 
         $settings = $this->createPartialMock(
             \Magento\Framework\DataObject::class,
diff --git a/app/code/Magento/Catalog/Test/Unit/Helper/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Helper/ImageTest.php
index 2759371dc96e7..f37192538655e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Helper/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Helper/ImageTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Test\Unit\Helper;
 
 use Magento\Catalog\Helper\Image;
@@ -29,6 +30,11 @@ class ImageTest extends \PHPUnit\Framework\TestCase
      */
     protected $assetRepository;
 
+    /**
+     * @var \Magento\Framework\Config\View|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $configView;
+
     /**
      * @var \Magento\Framework\View\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -58,6 +64,10 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->configView = $this->getMockBuilder(\Magento\Framework\Config\View::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->viewConfig = $this->getMockBuilder(\Magento\Framework\View\ConfigInterface::class)
             ->getMockForAbstractClass();
 
@@ -151,23 +161,89 @@ public function initDataProvider()
         ];
     }
 
+    /**
+     * @param array $data - optional 'frame' key
+     * @param bool $whiteBorders view config
+     * @param bool $expectedKeepFrame
+     * @dataProvider initKeepFrameDataProvider
+     */
+    public function testInitKeepFrame($data, $whiteBorders, $expectedKeepFrame)
+    {
+        $imageId = 'test_image_id';
+        $attributes = [];
+
+        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->prepareAttributes($data, $imageId);
+
+        $this->configView->expects(isset($data['frame']) ? $this->never() : $this->once())
+            ->method('getVarValue')
+            ->with('Magento_Catalog', 'product_image_white_borders')
+            ->willReturn($whiteBorders);
+
+        $this->viewConfig->expects($this->once())
+            ->method('getViewConfig')
+            ->willReturn($this->configView);
+
+        $this->image->expects($this->once())
+            ->method('setKeepFrame')
+            ->with($expectedKeepFrame)
+            ->willReturnSelf();
+
+        $this->helper->init($productMock, $imageId, $attributes);
+    }
+
+    /**
+     * @return array
+     */
+    public function initKeepFrameDataProvider()
+    {
+        return [
+            // when frame defined explicitly, it wins
+            [
+                'mediaImage' => [
+                    'frame' => 1,
+                ],
+                'whiteBorders' => true,
+                'expected' => true,
+            ],
+            [
+                'mediaImage' => [
+                    'frame' => 0,
+                ],
+                'whiteBorders' => true,
+                'expected' => false,
+            ],
+            // when frame is not defined, var is used
+            [
+                'mediaImage' => [],
+                'whiteBorders' => true,
+                'expected' => true,
+            ],
+            [
+                'mediaImage' => [],
+                'whiteBorders' => false,
+                'expected' => false,
+            ],
+        ];
+    }
+
     /**
      * @param $data
      * @param $imageId
      */
     protected function prepareAttributes($data, $imageId)
     {
-        $configViewMock = $this->getMockBuilder(\Magento\Framework\Config\View::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $configViewMock->expects($this->once())
+        $this->configView->expects($this->once())
             ->method('getMediaAttributes')
             ->with('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE, $imageId)
             ->willReturn($data);
 
         $this->viewConfig->expects($this->once())
             ->method('getViewConfig')
-            ->willReturn($configViewMock);
+            ->willReturn($this->configView);
     }
 
     /**
@@ -220,32 +296,34 @@ protected function prepareWatermarkProperties($data)
     {
         $this->scopeConfig->expects($this->any())
             ->method('getValue')
-            ->willReturnMap([
+            ->willReturnMap(
                 [
-                    'design/watermark/' . $data['type'] . '_image',
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                    null,
-                    $data['watermark']
-                ],
-                [
-                    'design/watermark/' . $data['type'] . '_imageOpacity',
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                    null,
-                    $data['watermark_opacity']
-                ],
-                [
-                    'design/watermark/' . $data['type'] . '_position',
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                    null,
-                    $data['watermark_position']
-                ],
-                [
-                    'design/watermark/' . $data['type'] . '_size',
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                    null,
-                    $data['watermark_size']
-                ],
-            ]);
+                    [
+                        'design/watermark/' . $data['type'] . '_image',
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                        null,
+                        $data['watermark']
+                    ],
+                    [
+                        'design/watermark/' . $data['type'] . '_imageOpacity',
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                        null,
+                        $data['watermark_opacity']
+                    ],
+                    [
+                        'design/watermark/' . $data['type'] . '_position',
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                        null,
+                        $data['watermark_position']
+                    ],
+                    [
+                        'design/watermark/' . $data['type'] . '_size',
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                        null,
+                        $data['watermark_size']
+                    ],
+                ]
+            );
 
         $this->image->expects($this->any())
             ->method('setWatermarkFile')
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/CustomlayoutupdateTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/CustomlayoutupdateTest.php
deleted file mode 100644
index 01fad60609c29..0000000000000
--- a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/CustomlayoutupdateTest.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Catalog\Test\Unit\Model\Attribute\Backend;
-
-use Magento\Framework\DataObject;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-
-class CustomlayoutupdateTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var string
-     */
-    private $attributeName = 'private';
-
-    /**
-     * @var \Magento\Catalog\Model\Attribute\Backend\Customlayoutupdate
-     */
-    private $model;
-
-    /**
-     * @expectedException \Magento\Eav\Model\Entity\Attribute\Exception
-     */
-    public function testValidateException()
-    {
-        $object = new DataObject();
-        $object->setData($this->attributeName, 'exception');
-        $this->model->validate($object);
-    }
-
-    /**
-     * @param string
-     * @dataProvider validateProvider
-     */
-    public function testValidate($data)
-    {
-        $object = new DataObject();
-        $object->setData($this->attributeName, $data);
-
-        $this->assertTrue($this->model->validate($object));
-        $this->assertTrue($this->model->validate($object));
-    }
-
-    /**
-     * @return array
-     */
-    public function validateProvider()
-    {
-        return [[''], ['xml']];
-    }
-
-    protected function setUp()
-    {
-        $helper = new ObjectManager($this);
-        $this->model = $helper->getObject(
-            \Magento\Catalog\Model\Attribute\Backend\Customlayoutupdate::class,
-            [
-                'layoutUpdateValidatorFactory' => $this->getMockedLayoutUpdateValidatorFactory()
-            ]
-        );
-        $this->model->setAttribute($this->getMockedAttribute());
-    }
-
-    /**
-     * @return \Magento\Framework\View\Model\Layout\Update\ValidatorFactory
-     */
-    private function getMockedLayoutUpdateValidatorFactory()
-    {
-        $mockBuilder = $this->getMockBuilder(\Magento\Framework\View\Model\Layout\Update\ValidatorFactory::class);
-        $mockBuilder->disableOriginalConstructor();
-        $mockBuilder->setMethods(['create']);
-        $mock = $mockBuilder->getMock();
-
-        $mock->expects($this->any())
-            ->method('create')
-            ->will($this->returnValue($this->getMockedValidator()));
-
-        return $mock;
-    }
-
-    /**
-     * @return \Magento\Framework\View\Model\Layout\Update\Validator
-     */
-    private function getMockedValidator()
-    {
-        $mockBuilder = $this->getMockBuilder(\Magento\Framework\View\Model\Layout\Update\Validator::class);
-        $mockBuilder->disableOriginalConstructor();
-        $mock = $mockBuilder->getMock();
-
-        $mock->expects($this->any())
-            ->method('isValid')
-            ->will(
-                /**
-                 * @param string $xml
-                 * $return bool
-                 */
-                $this->returnCallback(
-                    function ($xml) {
-                        if ($xml == 'exception') {
-                            return false;
-                        } else {
-                            return true;
-                        }
-                    }
-                )
-            );
-
-        $mock->expects($this->any())
-            ->method('getMessages')
-            ->will($this->returnValue(['error']));
-
-        return $mock;
-    }
-
-    /**
-     * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
-     */
-    private function getMockedAttribute()
-    {
-        $mockBuilder = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class);
-        $mockBuilder->disableOriginalConstructor();
-        $mock = $mockBuilder->getMock();
-
-        $mock->expects($this->any())
-            ->method('getName')
-            ->will($this->returnValue($this->attributeName));
-
-        $mock->expects($this->any())
-            ->method('getIsRequired')
-            ->will($this->returnValue(false));
-
-        return $mock;
-    }
-}
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
index cce00c50d37af..fde793d5c5f89 100644
--- 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
@@ -108,6 +108,7 @@ public function testExecute(): void
         ];
         $linkField = 'entity_id';
         $productId = 10;
+        $originalProductId = 11;
 
         /** @var \PHPUnit_Framework_MockObject_MockObject $product */
         $product = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class)
@@ -124,7 +125,7 @@ public function testExecute(): void
             ->willReturnMap(
                 [
                     ['tier_price', $originalTierPrices],
-                    ['entity_id', $productId]
+                    ['entity_id', $originalProductId]
                 ]
             );
         $product->expects($this->atLeastOnce())->method('getStoreId')->willReturn(0);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/DataProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/DataProviderTest.php
index 8f3aa66e57c5e..4c3450d555f1d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/DataProviderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/DataProviderTest.php
@@ -17,6 +17,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\DataProvider\EavValidationRules;
 use Magento\Ui\DataProvider\Modifier\PoolInterface;
+use Magento\Framework\Stdlib\ArrayUtils;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -78,6 +79,14 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
      */
     private $modifierPool;
 
+    /**
+     * @var ArrayUtils|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $arrayUtils;
+
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $this->eavValidationRules = $this->getMockBuilder(EavValidationRules::class)
@@ -128,6 +137,10 @@ protected function setUp()
             ->getMock();
 
         $this->modifierPool = $this->getMockBuilder(PoolInterface::class)->getMockForAbstractClass();
+
+        $this->arrayUtils = $this->getMockBuilder(ArrayUtils::class)
+            ->setMethods(['flatten'])
+            ->disableOriginalConstructor()->getMock();
     }
 
     /**
@@ -157,7 +170,8 @@ private function getModel()
                 'eavConfig' => $this->eavConfig,
                 'request' => $this->request,
                 'categoryFactory' => $this->categoryFactory,
-                'pool' => $this->modifierPool
+                'pool' => $this->modifierPool,
+                'arrayUtils' => $this->arrayUtils
             ]
         );
 
@@ -206,10 +220,12 @@ public function testGetDataNoFileExists()
             ->getMock();
         $categoryMock->expects($this->exactly(2))
             ->method('getData')
-            ->willReturnMap([
-                ['', null, $categoryData],
-                ['image', null, $categoryData['image']],
-            ]);
+            ->willReturnMap(
+                [
+                    ['', null, $categoryData],
+                    ['image', null, $categoryData['image']],
+                ]
+            );
         $categoryMock->expects($this->any())
             ->method('getExistsStoreValueFlag')
             ->with('url_key')
@@ -280,10 +296,12 @@ public function testGetData()
             ->getMock();
         $categoryMock->expects($this->exactly(2))
             ->method('getData')
-            ->willReturnMap([
-                ['', null, $categoryData],
-                ['image', null, $categoryData['image']],
-            ]);
+            ->willReturnMap(
+                [
+                    ['', null, $categoryData],
+                    ['image', null, $categoryData['image']],
+                ]
+            );
         $categoryMock->expects($this->any())
             ->method('getExistsStoreValueFlag')
             ->with('url_key')
@@ -331,10 +349,12 @@ public function testGetData()
 
     public function testGetMetaWithoutParentInheritanceResolving()
     {
+        $this->arrayUtils->expects($this->atLeastOnce())->method('flatten')->willReturn([1,3,3]);
+
         $categoryMock = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->registry->expects($this->once())
+        $this->registry->expects($this->atLeastOnce())
             ->method('registry')
             ->with('category')
             ->willReturn($categoryMock);
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 71f5ca33d1303..6977a9ad1c7cc 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
@@ -191,6 +191,9 @@ public function testIsExist($fileName, $fileMediaPath)
         $this->assertTrue($this->model->isExist($fileName));
     }
 
+    /**
+     * @return array
+     */
     public function isExistProvider()
     {
         return [
@@ -213,6 +216,9 @@ public function testIsBeginsWithMediaDirectoryPath($fileName, $expected)
         $this->assertEquals($expected, $this->model->isBeginsWithMediaDirectoryPath($fileName));
     }
 
+    /**
+     * @return array
+     */
     public function isBeginsWithMediaDirectoryPathProvider()
     {
         return [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php
index f0e17c7938b27..09fbdf293ffc9 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php
@@ -95,11 +95,11 @@ public function testGetCollection()
             );
 
         $expectedResult = [
-            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],
+            0 => ['name' => 'Product Four', 'position' => 0, 'link_type' => 'crosssell'],
+            1 => ['name' => 'Product Five', 'position' => 0, 'link_type' => 'crosssell'],
+            2 => ['name' => 'Product Three', 'position' => 2, 'link_type' => 'crosssell'],
+            3 => ['name' => 'Product Two', 'position' => 2, 'link_type' => 'crosssell'],
+            4 => ['name' => 'Product One', 'position' => 10, 'link_type' => 'crosssell'],
         ];
 
         $actualResult = $this->model->getCollection($this->productMock, 'crosssell');
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/ProductTest.php
index 7a7c11e95d9b7..f7dde23e1510e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/ProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/ProductTest.php
@@ -84,15 +84,13 @@ public function testExecuteWithIndexerWorking()
     {
         $ids = [1, 2, 3];
 
-        $this->indexerMock->expects($this->once())->method('isWorking')->will($this->returnValue(true));
         $this->prepareIndexer();
 
         $rowMock = $this->createPartialMock(
             \Magento\Catalog\Model\Indexer\Category\Product\Action\Rows::class,
             ['execute']
         );
-        $rowMock->expects($this->at(0))->method('execute')->with($ids, true)->will($this->returnSelf());
-        $rowMock->expects($this->at(1))->method('execute')->with($ids, false)->will($this->returnSelf());
+        $rowMock->expects($this->at(0))->method('execute')->with($ids)->will($this->returnSelf());
 
         $this->rowsMock->expects($this->once())->method('create')->will($this->returnValue($rowMock));
 
@@ -103,14 +101,13 @@ public function testExecuteWithIndexerNotWorking()
     {
         $ids = [1, 2, 3];
 
-        $this->indexerMock->expects($this->once())->method('isWorking')->will($this->returnValue(false));
         $this->prepareIndexer();
 
         $rowMock = $this->createPartialMock(
             \Magento\Catalog\Model\Indexer\Category\Product\Action\Rows::class,
             ['execute']
         );
-        $rowMock->expects($this->once())->method('execute')->with($ids, false)->will($this->returnSelf());
+        $rowMock->expects($this->once())->method('execute')->with($ids)->will($this->returnSelf());
 
         $this->rowsMock->expects($this->once())->method('create')->will($this->returnValue($rowMock));
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/CategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/CategoryTest.php
index 74f748ef9bf00..4e6659f85f5df 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/CategoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/CategoryTest.php
@@ -84,15 +84,13 @@ public function testExecuteWithIndexerWorking()
     {
         $ids = [1, 2, 3];
 
-        $this->indexerMock->expects($this->once())->method('isWorking')->will($this->returnValue(true));
         $this->prepareIndexer();
 
         $rowMock = $this->createPartialMock(
             \Magento\Catalog\Model\Indexer\Product\Category\Action\Rows::class,
             ['execute']
         );
-        $rowMock->expects($this->at(0))->method('execute')->with($ids, true)->will($this->returnSelf());
-        $rowMock->expects($this->at(1))->method('execute')->with($ids, false)->will($this->returnSelf());
+        $rowMock->expects($this->at(0))->method('execute')->with($ids)->will($this->returnSelf());
 
         $this->rowsMock->expects($this->once())->method('create')->will($this->returnValue($rowMock));
 
@@ -103,14 +101,13 @@ public function testExecuteWithIndexerNotWorking()
     {
         $ids = [1, 2, 3];
 
-        $this->indexerMock->expects($this->once())->method('isWorking')->will($this->returnValue(false));
         $this->prepareIndexer();
 
         $rowMock = $this->createPartialMock(
             \Magento\Catalog\Model\Indexer\Product\Category\Action\Rows::class,
             ['execute']
         );
-        $rowMock->expects($this->once())->method('execute')->with($ids, false)->will($this->returnSelf());
+        $rowMock->expects($this->once())->method('execute')->with($ids)->will($this->returnSelf());
 
         $this->rowsMock->expects($this->once())->method('create')->will($this->returnValue($rowMock));
 
@@ -123,7 +120,7 @@ public function testExecuteWithIndexerNotWorking()
 
     protected function prepareIndexer()
     {
-        $this->indexerRegistryMock->expects($this->once())
+        $this->indexerRegistryMock->expects($this->any())
             ->method('get')
             ->with(\Magento\Catalog\Model\Indexer\Product\Category::INDEXER_ID)
             ->will($this->returnValue($this->indexerMock));
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 8ca23df31cdee..c59aa1988be55 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
@@ -178,6 +178,7 @@ public function validateFilterDataProvider()
             ['filter' => '0', 'result' => false],
             ['filter' => 0, 'result' => false],
             ['filter' => '100500INF', 'result' => false],
+            ['filter' => '-10\'[0]', 'result' => false],
         ];
     }
 
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 80b6db2a516bd..809fa0225278c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Test\Unit\Model\Product;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Copier;
 
@@ -46,6 +47,11 @@ class CopierTest extends \PHPUnit\Framework\TestCase
      */
     protected $metadata;
 
+    /**
+     * @var ScopeOverriddenValue|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeOverriddenValue;
+
     protected function setUp()
     {
         $this->copyConstructorMock = $this->createMock(\Magento\Catalog\Model\Product\CopyConstructorInterface::class);
@@ -59,6 +65,7 @@ protected function setUp()
         $this->optionRepositoryMock;
         $this->productMock = $this->createMock(Product::class);
         $this->productMock->expects($this->any())->method('getEntityId')->willReturn(1);
+        $this->scopeOverriddenValue = $this->createMock(ScopeOverriddenValue::class);
 
         $this->metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadata::class)
             ->disableOriginalConstructor()
@@ -67,15 +74,20 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $metadataPool->expects($this->any())->method('getMetadata')->willReturn($this->metadata);
+
         $this->_model = new Copier(
             $this->copyConstructorMock,
-            $this->productFactoryMock
+            $this->productFactoryMock,
+            $this->scopeOverriddenValue
         );
 
-        $this->setProperties($this->_model, [
-            'optionRepository' => $this->optionRepositoryMock,
-            'metadataPool' => $metadataPool,
-        ]);
+        $this->setProperties(
+            $this->_model,
+            [
+                'optionRepository' => $this->optionRepositoryMock,
+                'metadataPool' => $metadataPool,
+            ]
+        );
     }
 
     /**
@@ -103,10 +115,12 @@ public function testCopy()
         ];
         $this->productMock->expects($this->atLeastOnce())->method('getWebsiteIds');
         $this->productMock->expects($this->atLeastOnce())->method('getCategoryIds');
-        $this->productMock->expects($this->any())->method('getData')->willReturnMap([
-            ['', null, $productData],
-            ['linkField', null, '1'],
-        ]);
+        $this->productMock->expects($this->any())->method('getData')->willReturnMap(
+            [
+                ['', null, $productData],
+                ['linkField', null, '1'],
+            ]
+        );
 
         $entityMock = $this->getMockForAbstractClass(
             \Magento\Eav\Model\Entity\AbstractEntity::class,
@@ -191,9 +205,11 @@ public function testCopy()
 
         $this->metadata->expects($this->any())->method('getLinkField')->willReturn('linkField');
 
-        $duplicateMock->expects($this->any())->method('getData')->willReturnMap([
-            ['linkField', null, '2'],
-        ]);
+        $duplicateMock->expects($this->any())->method('getData')->willReturnMap(
+            [
+                ['linkField', null, '2'],
+            ]
+        );
         $this->optionRepositoryMock->expects($this->once())
             ->method('duplicate')
             ->with($this->productMock, $duplicateMock);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Filter/DateTimeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Filter/DateTimeTest.php
new file mode 100644
index 0000000000000..aefa0b1cf106d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Filter/DateTimeTest.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\Test\Unit\Model\Product\Filter;
+
+use Magento\Framework\Locale\Resolver;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Stdlib\DateTime\Timezone;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test datetime filter
+ */
+class DateTimeTest extends TestCase
+{
+    /**
+     * @var string
+     */
+    private $locale;
+    /**
+     * @var \Magento\Catalog\Model\Product\Filter\DateTime
+     */
+    private $model;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $objectManager = new ObjectManager($this);
+        $this->locale = Resolver::DEFAULT_LOCALE;
+        $localeResolver = $this->getMockForAbstractClass(ResolverInterface::class);
+        $localeResolver->expects($this->any())
+            ->method('getLocale')
+            ->willReturnCallback(
+                function () {
+                    return $this->locale;
+                }
+            );
+        $timezone = $objectManager->getObject(
+            Timezone::class,
+            ['localeResolver' => $localeResolver]
+        );
+        $stdlibDateTimeFilter = $objectManager->getObject(
+            \Magento\Framework\Stdlib\DateTime\Filter\DateTime::class,
+            ['localeDate' => $timezone]
+        );
+        $this->model = $objectManager->getObject(
+            \Magento\Catalog\Model\Product\Filter\DateTime::class,
+            [
+                'stdlibDateTimeFilter' => $stdlibDateTimeFilter
+            ]
+        );
+    }
+
+    /**
+     * Test filter with different dates formats and locales
+     *
+     * @dataProvider provideFilter
+     */
+    public function testFilter(string $date, string $expectedDate, string $locale = Resolver::DEFAULT_LOCALE)
+    {
+        $this->locale = $locale;
+        $this->assertEquals($expectedDate, $this->model->filter($date));
+    }
+
+    /**
+     * Provide date formats and locales
+     *
+     * @return array
+     */
+    public function provideFilter(): array
+    {
+        return [
+            ['1999-12-31', '1999-12-31 00:00:00', 'en_US'],
+            ['12-31-1999', '1999-12-31 00:00:00', 'en_US'],
+            ['12/31/1999', '1999-12-31 00:00:00', 'en_US'],
+            ['December 31, 1999', '1999-12-31 00:00:00', 'en_US'],
+            ['1999-12-31', '1999-12-31 00:00:00', 'fr_FR'],
+            ['31-12-1999', '1999-12-31 00:00:00', 'fr_FR'],
+            ['31/12/1999', '1999-12-31 00:00:00', 'fr_FR'],
+            ['31 Décembre 1999', '1999-12-31 00:00:00', 'fr_FR'],
+        ];
+    }
+}
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 1d12645019d1e..6d4e98b60ad18 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
@@ -7,6 +7,9 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Product\Gallery;
 
+/**
+ * Tests for \Magento\Catalog\Model\Product\Gallery\GalleryManagement.
+ */
 class GalleryManagementTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -39,11 +42,16 @@ class GalleryManagementTest extends \PHPUnit\Framework\TestCase
      */
     protected $attributeValueMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->productRepositoryMock = $this->createMock(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         $this->contentValidatorMock = $this->createMock(\Magento\Framework\Api\ImageContentValidatorInterface::class);
-        $this->productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, [
+        $this->productMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product::class,
+            [
                 'setStoreId',
                 'getData',
                 'getStoreId',
@@ -51,7 +59,8 @@ protected function setUp()
                 'getCustomAttribute',
                 'getMediaGalleryEntries',
                 'setMediaGalleryEntries',
-            ]);
+            ]
+        );
         $this->mediaGalleryEntryMock =
             $this->createMock(\Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface::class);
         $this->model = new \Magento\Catalog\Model\Product\Gallery\GalleryManagement(
@@ -151,6 +160,8 @@ public function testUpdateWithNonExistingImage()
         $existingEntryMock->expects($this->once())->method('getId')->willReturn(43);
         $this->productMock->expects($this->once())->method('getMediaGalleryEntries')
             ->willReturn([$existingEntryMock]);
+        $existingEntryMock->expects($this->once())->method('getTypes')->willReturn([]);
+        $entryMock->expects($this->once())->method('getTypes')->willReturn([]);
         $entryMock->expects($this->once())->method('getId')->willReturn($entryId);
         $this->model->update($productSku, $entryMock);
     }
@@ -172,12 +183,19 @@ public function testUpdateWithCannotSaveException()
         $existingEntryMock->expects($this->once())->method('getId')->willReturn($entryId);
         $this->productMock->expects($this->once())->method('getMediaGalleryEntries')
             ->willReturn([$existingEntryMock]);
+        $existingEntryMock->expects($this->once())->method('getTypes')->willReturn([]);
+        $entryMock->expects($this->once())->method('getTypes')->willReturn([]);
         $entryMock->expects($this->once())->method('getId')->willReturn($entryId);
         $this->productRepositoryMock->expects($this->once())->method('save')->with($this->productMock)
             ->willThrowException(new \Exception());
         $this->model->update($productSku, $entryMock);
     }
 
+    /**
+     * Check update gallery entry behavior.
+     *
+     * @return void
+     */
     public function testUpdate()
     {
         $productSku = 'testProduct';
@@ -203,14 +221,13 @@ public function testUpdate()
             ->willReturn([$existingEntryMock, $existingSecondEntryMock]);
 
         $entryMock->expects($this->exactly(2))->method('getId')->willReturn($entryId);
-        $entryMock->expects($this->once())->method('getFile')->willReturn("base64");
-        $entryMock->expects($this->once())->method('setId')->with(null);
-        $entryMock->expects($this->exactly(2))->method('getTypes')->willReturn(['image']);
+        $entryMock->expects($this->once())->method('getTypes')->willReturn(['image']);
 
         $this->productMock->expects($this->once())->method('setMediaGalleryEntries')
             ->with([$entryMock, $existingSecondEntryMock])
             ->willReturnSelf();
         $this->productRepositoryMock->expects($this->once())->method('save')->with($this->productMock);
+
         $this->assertTrue($this->model->update($productSku, $entryMock));
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Image/ParamsBuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Image/ParamsBuilderTest.php
new file mode 100644
index 0000000000000..22e3a88574e03
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Image/ParamsBuilderTest.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Unit\Model\Product\Image;
+
+use Magento\Catalog\Model\Product\Image;
+use Magento\Catalog\Model\Product\Image\ParamsBuilder;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Config\View;
+use Magento\Framework\View\ConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+
+class ParamsBuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $viewConfig;
+
+    /**
+     * @var ParamsBuilder
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
+        $this->viewConfig = $this->createMock(ConfigInterface::class);
+        $this->model = $objectManager->getObject(
+            ParamsBuilder::class,
+            [
+                'scopeConfig' => $this->scopeConfig,
+                'viewConfig' => $this->viewConfig,
+            ]
+        );
+    }
+
+    /**
+     * Test watermark location.
+     */
+    public function testWatermarkLocation()
+    {
+        $imageArguments = [
+            'type' => 'type',
+            'height' => 'image_height',
+            'width' => 'image_width',
+            'angle' => 'angle',
+            'background' => [1, 2, 3]
+        ];
+        $scopeId = 1;
+        $quality = 100;
+        $file = 'file';
+        $width = 'width';
+        $height = 'height';
+        $size = "{$width}x{$height}";
+        $opacity = 'opacity';
+        $position = 'position';
+
+        $viewMock = $this->createMock(View::class);
+        $viewMock->expects($this->once())
+            ->method('getVarValue')
+            ->with('Magento_Catalog', 'product_image_white_borders')
+            ->willReturn(true);
+
+        $this->viewConfig->expects($this->once())
+            ->method('getViewConfig')
+            ->with(['area' => Area::AREA_FRONTEND])
+            ->willReturn($viewMock);
+
+        $this->scopeConfig->expects($this->exactly(5))->method('getValue')->withConsecutive(
+            [
+                Image::XML_PATH_JPEG_QUALITY
+            ],
+            [
+                "design/watermark/{$imageArguments['type']}_image",
+                ScopeInterface::SCOPE_STORE,
+                $scopeId,
+            ],
+            [
+                "design/watermark/{$imageArguments['type']}_size",
+                ScopeInterface::SCOPE_STORE],
+            [
+                "design/watermark/{$imageArguments['type']}_imageOpacity",
+                ScopeInterface::SCOPE_STORE,
+                $scopeId
+            ],
+            [
+                "design/watermark/{$imageArguments['type']}_position",
+                ScopeInterface::SCOPE_STORE,
+                $scopeId
+            ]
+        )->willReturnOnConsecutiveCalls(
+            $quality,
+            $file,
+            $size,
+            $opacity,
+            $position
+        );
+
+        $actual = $this->model->build($imageArguments, $scopeId);
+        $expected = [
+            'image_type' => $imageArguments['type'],
+            'background' => $imageArguments['background'],
+            'angle' => $imageArguments['angle'],
+            'quality' => $quality,
+            'keep_aspect_ratio' => true,
+            'keep_frame' => true,
+            'keep_transparency' => true,
+            'constrain_only' => true,
+            'watermark_file' => $file,
+            'watermark_image_opacity' => $opacity,
+            'watermark_position' => $position,
+            'watermark_width' => $width,
+            'watermark_height' => $height,
+            'image_height' => $imageArguments['height'],
+            'image_width' => $imageArguments['width'],
+        ];
+
+        $this->assertEquals(
+            $expected,
+            $actual
+        );
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/Validation/ResultTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/Validation/ResultTest.php
new file mode 100644
index 0000000000000..7ed32d564ca19
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/Validation/ResultTest.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\Test\Unit\Model\Product\Price\Validation;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Catalog\Model\Product\Price\Validation\Result;
+use PHPUnit\Framework\TestCase;
+use Magento\Catalog\Api\Data\PriceUpdateResultInterface;
+use Magento\Catalog\Api\Data\PriceUpdateResultInterfaceFactory;
+
+class ResultTest extends TestCase
+{
+    /**
+     * @var Result
+     */
+    private $model;
+
+    /**
+     * @var PriceUpdateResultInterfaceFactory|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $priceUpdateResultFactory;
+
+    /**
+     * @var ObjectManagerHelper|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManager;
+
+    /**
+     * Setup environment for test
+     */
+    protected function setUp()
+    {
+        $this->priceUpdateResultFactory = $this->getMockBuilder(PriceUpdateResultInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->objectManager = new ObjectManagerHelper($this);
+        $this->model = $this->objectManager->getObject(
+            Result::class,
+            [
+                'priceUpdateResultFactory' => $this->priceUpdateResultFactory
+            ]
+        );
+
+        $this->model->addFailedItem(1, 'Invalid attribute color = 1', ['SKU' => 'ABC', 'storeId' => 1]);
+        $this->model->addFailedItem(2, 'Invalid attribute size = M', ['SKU' => 'DEF', 'storeId' => 1]);
+    }
+
+    /**
+     * Test getFailedRowIds() function
+     */
+    public function testGetFailedRowIds()
+    {
+        $this->assertEquals([1, 2], $this->model->getFailedRowIds());
+    }
+
+    /**
+     * Test getFailedItems() function
+     */
+    public function testGetFailedItems()
+    {
+        $priceUpdateResult1 = $this->createMock(PriceUpdateResultInterface::class);
+        $priceUpdateResult2 = $this->createMock(PriceUpdateResultInterface::class);
+
+        $this->priceUpdateResultFactory->expects($this->at(0))
+            ->method('create')
+            ->willReturn($priceUpdateResult1);
+        $this->priceUpdateResultFactory->expects($this->at(1))
+            ->method('create')
+            ->willReturn($priceUpdateResult2);
+
+        $priceUpdateResult1->expects($this->once())->method('setMessage')
+            ->with('Invalid attribute color = 1');
+        $priceUpdateResult1->expects($this->once())->method('setParameters')
+            ->with(['SKU' => 'ABC', 'storeId' => 1]);
+
+        $priceUpdateResult2->expects($this->once())->method('setMessage')
+            ->with('Invalid attribute size = M');
+        $priceUpdateResult2->expects($this->once())->method('setParameters')
+            ->with(['SKU' => 'DEF', 'storeId' => 1]);
+
+        $this->assertEquals([$priceUpdateResult1, $priceUpdateResult2], $this->model->getFailedItems());
+    }
+}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
index 99151d1c8dd39..cdbef1bec3872 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
@@ -165,9 +165,13 @@ public function testTierPrices($priceScope, $expectedWebsiteId)
         $this->websiteMock->expects($this->any())->method('getId')->will($this->returnValue($expectedWebsiteId));
         $this->tpFactory->expects($this->any())
             ->method('create')
-            ->will($this->returnCallback(function () {
-                return $this->objectManagerHelper->getObject(\Magento\Catalog\Model\Product\TierPrice::class);
-            }));
+            ->will(
+                $this->returnCallback(
+                    function () {
+                        return $this->objectManagerHelper->getObject(\Magento\Catalog\Model\Product\TierPrice::class);
+                    }
+                )
+            );
 
         // create sample TierPrice objects that would be coming from a REST call
         $tierPriceExtensionMock = $this->getMockBuilder(ProductTierPriceExtensionInterface::class)
@@ -198,9 +202,10 @@ public function testTierPrices($priceScope, $expectedWebsiteId)
         $tpArray = $this->product->getData($this::KEY_TIER_PRICE);
         $this->assertNotNull($tpArray);
         $this->assertTrue(is_array($tpArray));
-        $this->assertEquals(sizeof($tps), sizeof($tpArray));
+        $this->assertEquals(count($tps), count($tpArray));
 
-        for ($i = 0; $i < sizeof($tps); $i++) {
+        $count = count($tps);
+        for ($i = 0; $i < $count; $i++) {
             $tpData = $tpArray[$i];
             $this->assertEquals($expectedWebsiteId, $tpData['website_id'], 'Website Id does not match');
             $this->assertEquals($tps[$i]->getValue(), $tpData['price'], 'Price/Value does not match');
@@ -226,12 +231,13 @@ public function testTierPrices($priceScope, $expectedWebsiteId)
         $tpRests = $this->model->getTierPrices($this->product);
         $this->assertNotNull($tpRests);
         $this->assertTrue(is_array($tpRests));
-        $this->assertEquals(sizeof($tps), sizeof($tpRests));
+        $this->assertEquals(count($tps), count($tpRests));
         foreach ($tpRests as $tpRest) {
             $this->assertEquals(50, $tpRest->getExtensionAttributes()->getPercentageValue());
         }
 
-        for ($i = 0; $i < sizeof($tps); $i++) {
+        $count = count($tps);
+        for ($i = 0; $i < $count; $i++) {
             $this->assertEquals(
                 $tps[$i]->getValue(),
                 $tpRests[$i]->getValue(),
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
index 5eaf2422e95a9..ce234e17c41aa 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
@@ -41,7 +41,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $moduleManager;
 
@@ -221,7 +221,7 @@ protected function setUp()
         $this->categoryIndexerMock = $this->getMockForAbstractClass(\Magento\Framework\Indexer\IndexerInterface::class);
 
         $this->moduleManager = $this->createPartialMock(
-            \Magento\Framework\Module\ModuleManagerInterface::class,
+            \Magento\Framework\Module\Manager::class,
             ['isEnabled']
         );
         $this->extensionAttributes = $this->getMockBuilder(\Magento\Framework\Api\ExtensionAttributesInterface::class)
@@ -486,6 +486,9 @@ public function testGetStoreSingleSiteModelIds(
         $this->assertEquals($websiteIDs, $this->model->getStoreIds());
     }
 
+    /**
+     * @return array
+     */
     public function getSingleStoreIds()
     {
         return [
@@ -1074,6 +1077,12 @@ public function testGetProductLinks()
         $outputRelatedLink->setPosition(0);
         $expectedOutput = [$outputRelatedLink];
         $this->productLinkRepositoryMock->expects($this->once())->method('getList')->willReturn($expectedOutput);
+        $typeInstance = $this->getMockBuilder(\Magento\Catalog\Model\Product\Type\AbstractType::class)
+            ->setMethods(['getSku'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $typeInstance->method('getSku')->willReturn('model');
+        $this->productTypeInstanceMock->method('factory')->willReturn($typeInstance);
         $links = $this->model->getProductLinks();
         $this->assertEquals($links, $expectedOutput);
     }
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 6370a4a7a27e2..0316b2e374d2f 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
@@ -98,7 +98,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getStore', 'getId', 'getWebsiteId'])
             ->getMockForAbstractClass();
-        $moduleManager = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
+        $moduleManager = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
             ->disableOriginalConstructor()
             ->getMock();
         $catalogProductFlatState = $this->getMockBuilder(\Magento\Catalog\Model\Indexer\Product\Flat\State::class)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Link/Product/CollectionTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Link/Product/CollectionTest.php
index 596148b627506..a29e76c5c8ff1 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Link/Product/CollectionTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Link/Product/CollectionTest.php
@@ -7,6 +7,8 @@
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitation;
 use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -105,11 +107,11 @@ protected function setUp()
         $this->storeManagerMock
             ->expects($this->any())
             ->method('getStore')
-            ->will($this->returnCallback(
+            ->willReturnCallback(
                 function ($store) {
                     return is_object($store) ? $store : new \Magento\Framework\DataObject(['id' => 42]);
                 }
-            ));
+            );
         $this->catalogHelperMock = $this->createMock(\Magento\Catalog\Helper\Data::class);
         $this->stateMock = $this->createMock(\Magento\Catalog\Model\Indexer\Product\Flat\State::class);
         $this->scopeConfigInterfaceMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
@@ -125,6 +127,11 @@ function ($store) {
         $productLimitationFactoryMock->method('create')
             ->willReturn($this->createMock(ProductLimitation::class));
 
+        $metadataMock = $this->getMockForAbstractClass(EntityMetadataInterface::class);
+        $metadataMock->method('getLinkField')->willReturn('entity_id');
+        $metadataPoolMock = $this->getMockBuilder(MetadataPool::class)->disableOriginalConstructor()->getMock();
+        $metadataPoolMock->method('getMetadata')->willReturn($metadataMock);
+
         $this->collection = $this->objectManager->getObject(
             \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection::class,
             [
@@ -147,6 +154,7 @@ function ($store) {
                 'customerSession' => $this->sessionMock,
                 'dateTime' => $this->dateTimeMock,
                 'productLimitationFactory' => $productLimitationFactoryMock,
+                'metadataPool' => $metadataPoolMock
             ]
         );
     }
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 eb7b70c8a1718..6832d5b3399d7 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
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Model\Product\Media\ConfigInterface;
 use Magento\Catalog\Model\View\Asset\Image;
+use Magento\Framework\Encryption\Encryptor;
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Asset\ContextInterface;
@@ -103,9 +104,10 @@ public function testGetContext()
     /**
      * @param string $filePath
      * @param array $miscParams
+     * @param string $readableParams
      * @dataProvider getPathDataProvider
      */
-    public function testGetPath($filePath, $miscParams)
+    public function testGetPath($filePath, $miscParams, $readableParams)
     {
         $imageModel = $this->objectManager->getObject(
             Image::class,
@@ -118,11 +120,13 @@ public function testGetPath($filePath, $miscParams)
                 'miscParams' => $miscParams
             ]
         );
-        $miscParams['background'] = isset($miscParams['background']) ? implode(',', $miscParams['background']) : '';
         $absolutePath = '/var/www/html/magento2ce/pub/media/catalog/product';
-        $hashPath = md5(implode('_', $miscParams));
+        $hashPath = 'somehash';
         $this->context->method('getPath')->willReturn($absolutePath);
-        $this->encryptor->method('hash')->willReturn($hashPath);
+        $this->encryptor->expects(static::once())
+            ->method('hash')
+            ->with($readableParams, $this->anything())
+            ->willReturn($hashPath);
         static::assertEquals(
             $absolutePath . '/cache/'. $hashPath . $filePath,
             $imageModel->getPath()
@@ -132,9 +136,10 @@ public function testGetPath($filePath, $miscParams)
     /**
      * @param string $filePath
      * @param array $miscParams
+     * @param string $readableParams
      * @dataProvider getPathDataProvider
      */
-    public function testGetUrl($filePath, $miscParams)
+    public function testGetUrl($filePath, $miscParams, $readableParams)
     {
         $imageModel = $this->objectManager->getObject(
             Image::class,
@@ -147,11 +152,13 @@ public function testGetUrl($filePath, $miscParams)
                 'miscParams' => $miscParams
             ]
         );
-        $miscParams['background'] = isset($miscParams['background']) ? implode(',', $miscParams['background']) : '';
         $absolutePath = 'http://localhost/pub/media/catalog/product';
-        $hashPath = md5(implode('_', $miscParams));
+        $hashPath = 'somehash';
         $this->context->expects(static::once())->method('getBaseUrl')->willReturn($absolutePath);
-        $this->encryptor->expects(static::once())->method('hash')->willReturn($hashPath);
+        $this->encryptor->expects(static::once())
+            ->method('hash')
+            ->with($readableParams, $this->anything())
+            ->willReturn($hashPath);
         static::assertEquals(
             $absolutePath . '/cache/' . $hashPath . $filePath,
             $imageModel->getUrl()
@@ -166,7 +173,8 @@ public function getPathDataProvider()
         return [
             [
                 '/some_file.png',
-                [], //default value for miscParams
+                [], //default value for miscParams,
+                'h:empty_w:empty_q:empty_r:empty_nonproportional_noframe_notransparency_notconstrainonly_nobackground',
             ],
             [
                 '/some_file_2.png',
@@ -174,15 +182,32 @@ public function getPathDataProvider()
                     'image_type' => 'thumbnail',
                     'image_height' => 75,
                     'image_width' => 75,
-                    'keep_aspect_ratio' => 'proportional',
-                    'keep_frame' => 'frame',
-                    'keep_transparency' => 'transparency',
-                    'constrain_only' => 'doconstrainonly',
+                    'keep_aspect_ratio' => true,
+                    'keep_frame' => true,
+                    'keep_transparency' => true,
+                    'constrain_only' => true,
                     'background' => [233,1,0],
                     'angle' => null,
                     'quality' => 80,
                 ],
-            ]
+                'h:75_w:75_proportional_frame_transparency_doconstrainonly_rgb233,1,0_r:empty_q:80',
+            ],
+            [
+                '/some_file_3.png',
+                [
+                    'image_type' => 'thumbnail',
+                    'image_height' => 75,
+                    'image_width' => 75,
+                    'keep_aspect_ratio' => false,
+                    'keep_frame' => false,
+                    'keep_transparency' => false,
+                    'constrain_only' => false,
+                    'background' => [233,1,0],
+                    'angle' => 90,
+                    'quality' => 80,
+                ],
+                'h:75_w:75_nonproportional_noframe_notransparency_notconstrainonly_rgb233,1,0_r:90_q:80',
+            ],
         ];
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php
index 774edcfeb6b64..b3acaa4b8bbed 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/Component/ColumnFactoryTest.php
@@ -7,17 +7,19 @@
 
 namespace Magento\Catalog\Test\Unit\Ui\Component;
 
-use PHPUnit\Framework\TestCase;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Catalog\Ui\Component\ColumnFactory;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Listing\Columns\ColumnInterface;
 use Magento\Ui\Component\Filters\FilterModifier;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
- * ColumnFactory test.
+ * Test to Create columns factory on product grid page
  */
 class ColumnFactoryTest extends TestCase
 {
@@ -32,25 +34,30 @@ class ColumnFactoryTest extends TestCase
     private $objectManager;
 
     /**
-     * @var ProductAttributeInterface|\PHPUnit\Framework\MockObject\MockObject
+     * @var Attribute|MockObject
      */
     private $attribute;
 
     /**
-     * @var ContextInterface|\PHPUnit\Framework\MockObject\MockObject
+     * @var ContextInterface|MockObject
      */
     private $context;
 
     /**
-     * @var UiComponentFactory|\PHPUnit\Framework\MockObject\MockObject
+     * @var UiComponentFactory|MockObject
      */
     private $uiComponentFactory;
 
     /**
-     * @var ColumnInterface|\PHPUnit\Framework\MockObject\MockObject
+     * @var ColumnInterface|MockObject
      */
     private $column;
 
+    /**
+     * @var TimezoneInterface|MockObject
+     */
+    private $timezone;
+
     /**
      * @inheritdoc
      */
@@ -58,18 +65,30 @@ protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
 
-        $this->attribute = $this->getMockBuilder(ProductAttributeInterface::class)
-            ->setMethods(['usesSource'])
-            ->getMockForAbstractClass();
+        $this->attribute = $this->createPartialMock(
+            Attribute::class,
+            [
+                'getAttributeCode',
+                'getIsFilterableInGrid',
+                'getFrontendInput',
+                'getDefaultFrontendLabel',
+                'getIsVisibleInGrid',
+            ]
+        );
         $this->context = $this->createMock(ContextInterface::class);
         $this->uiComponentFactory = $this->createMock(UiComponentFactory::class);
         $this->column = $this->getMockForAbstractClass(ColumnInterface::class);
         $this->uiComponentFactory->method('create')
             ->willReturn($this->column);
+        $this->timezone = $this->createMock(TimezoneInterface::class);
 
-        $this->columnFactory = $this->objectManager->getObject(ColumnFactory::class, [
-            'componentFactory' => $this->uiComponentFactory
-        ]);
+        $this->columnFactory = $this->objectManager->getObject(
+            ColumnFactory::class,
+            [
+                'componentFactory' => $this->uiComponentFactory,
+                'timezone' => $this->timezone,
+            ]
+        );
     }
 
     /**
@@ -96,7 +115,6 @@ public function testCreatedObject(): void
      *
      * @param array $filterModifiers
      * @param null|string $filter
-     *
      * @return void
      * @dataProvider filterModifiersProvider
      */
@@ -111,6 +129,7 @@ public function testCreateWithNotFilterableInGridAttribute(array $filterModifier
                     'visible' => null,
                     'filter' => $filter,
                     'component' => 'Magento_Ui/js/grid/columns/column',
+                    '__disableTmpl' => ['label' => true]
                 ],
             ],
             'context' => $this->context,
@@ -132,7 +151,7 @@ public function testCreateWithNotFilterableInGridAttribute(array $filterModifier
     }
 
     /**
-     * Filter modifiers data provider.
+     * Filter modifiers data provider
      *
      * @return array
      */
@@ -153,4 +172,102 @@ public function filterModifiersProvider(): array
             ],
         ];
     }
+
+    /**
+     * Test to create date column
+     *
+     * @param string $frontendInput
+     * @param bool $showsTime
+     * @param string $expectedDateFormat
+     * @param string $expectedTimezone
+     * @dataProvider createDateColumnDataProvider
+     */
+    public function testCreateDateColumn(
+        string $frontendInput,
+        bool $showsTime,
+        string $expectedDateFormat,
+        string $expectedTimezone
+    ) {
+        $attributeCode = 'attribute_code';
+        $dateFormat = 'date_format';
+        $dateTimeFormat = 'datetime_format';
+        $defaultTimezone = 'default_timezone';
+        $configTimezone = 'config_timezone';
+        $label = 'Date label';
+
+        $expectedConfig = [
+            'data' => [
+                'config' => [
+                    'label' => __($label),
+                    'dataType' => 'date',
+                    'add_field' => true,
+                    'visible' => true,
+                    'filter' => 'dateRange',
+                    'component' => 'Magento_Ui/js/grid/columns/date',
+                    'timezone' => $expectedTimezone,
+                    'dateFormat' => $expectedDateFormat,
+                    '__disableTmpl' => ['label' => true],
+                    'options' => [
+                        'showsTime' => $showsTime
+                    ]
+                ],
+            ],
+            'context' => $this->context,
+        ];
+
+        $this->attribute->method('getAttributeCode')
+            ->willReturn($attributeCode);
+        $this->attribute->method('getDefaultFrontendLabel')
+            ->willReturn($label);
+        $this->attribute->method('getIsFilterableInGrid')
+            ->willReturn(true);
+        $this->attribute->method('getIsVisibleInGrid')
+            ->willReturn(true);
+        $this->attribute->method('getFrontendInput')
+            ->willReturn($frontendInput);
+
+        $this->timezone->method('getDateFormat')
+            ->with(\IntlDateFormatter::MEDIUM)
+            ->willReturn($dateFormat);
+        $this->timezone->method('getDateTimeFormat')
+            ->with(\IntlDateFormatter::MEDIUM)
+            ->willReturn($dateTimeFormat);
+        $this->timezone->method('getDefaultTimezone')
+            ->willReturn($defaultTimezone);
+        $this->timezone->method('getConfigTimezone')
+            ->willReturn($configTimezone);
+
+        $this->uiComponentFactory->expects($this->once())
+            ->method('create')
+            ->with($attributeCode, 'column', $expectedConfig)
+            ->willReturn($this->column);
+
+        $this->assertEquals(
+            $this->column,
+            $this->columnFactory->create($this->attribute, $this->context)
+        );
+    }
+
+    /**
+     * Data provider to create date column test
+     *
+     * @return array
+     */
+    public function createDateColumnDataProvider(): array
+    {
+        return [
+            [
+                'frontendInput' => 'date',
+                'showsTime' => false,
+                'dateFormat' => 'date_format',
+                'expectedTimezone' => 'default_timezone',
+            ],
+            [
+                'frontendInput' => 'datetime',
+                'showsTime' => true,
+                'expectedDateFormat' => 'datetime_format',
+                'expectedTimezone' => 'config_timezone',
+            ],
+        ];
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/Component/FilterFactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/Component/FilterFactoryTest.php
new file mode 100644
index 0000000000000..1e72b7ba35864
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/Component/FilterFactoryTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Ui\Component;
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Ui\Component\FilterFactory;
+use Magento\Eav\Model\Entity\Attribute\Source\SourceInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class FilterFactoryTest extends TestCase
+{
+    /**
+     * Stub attribute
+     */
+    private const STUB_ATTRIBUTE = [
+        'attribute_code' => 'color',
+        'default_frontend_label' => 'Color',
+        'uses_source' => 'Color',
+        'source_model' => 'getSourceModel value',
+        'frontend_input' => 'select',
+        'all_options' => [
+            [
+                'value' => 1,
+                'label' => 'Black',
+            ],
+            [
+                'value' => 2,
+                'label' => 'White',
+            ]
+        ]
+    ];
+
+    /**
+     * @var FilterFactory
+     */
+    private $filterFactory;
+
+    /**
+     * @var UiComponentFactory|MockObject
+     */
+    private $componentFactoryMock;
+
+    /**
+     * Setup environment for test
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->componentFactoryMock = $this->createMock(UiComponentFactory::class);
+
+        $this->filterFactory = $objectManager->getObject(
+            FilterFactory::class,
+            [
+                'componentFactory' => $this->componentFactoryMock
+            ]
+        );
+    }
+
+    /**
+     * Test create() with use source attribute
+     */
+    public function testCreateWithUseSourceAttribute()
+    {
+        $contextMock = $this->createMock(ContextInterface::class);
+        $attributeMock = $this->getMockBuilder(ProductAttributeInterface::class)
+            ->setMethods(['usesSource', 'getSource'])
+            ->getMockForAbstractClass();
+        $attributeMock->method('getAttributeCode')->willReturn(self::STUB_ATTRIBUTE['attribute_code']);
+        $attributeMock->method('getDefaultFrontendLabel')
+            ->willReturn(self::STUB_ATTRIBUTE['default_frontend_label']);
+        $attributeMock->method('usesSource')->willReturn(self::STUB_ATTRIBUTE['uses_source']);
+        $attributeMock->method('getSourceModel')->willReturn(self::STUB_ATTRIBUTE['source_model']);
+        $attributeMock->method('getFrontendInput')->willReturn(self::STUB_ATTRIBUTE['frontend_input']);
+        $sourceMock = $this->createMock(SourceInterface::class);
+        $attributeMock->method('getSource')->willReturn($sourceMock);
+        $sourceMock->method('getAllOptions')->willReturn(self::STUB_ATTRIBUTE['all_options']);
+        $this->componentFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(self::STUB_ATTRIBUTE['attribute_code'], 'filterSelect', [
+                'data' => [
+                    'config' => [
+                        'options' => self::STUB_ATTRIBUTE['all_options'],
+                        'caption' => (string)__('Select...'),
+                        'dataScope' => self::STUB_ATTRIBUTE['attribute_code'],
+                        'label' => self::STUB_ATTRIBUTE['default_frontend_label'],
+                    ]
+                ],
+                'context' => $contextMock
+            ]);
+
+        $this->filterFactory->create($attributeMock, $contextMock);
+    }
+}
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
index dcd50d4739d70..c704d9f89581d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/Component/Product/MassActionTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/Component/Product/MassActionTest.php
@@ -12,6 +12,9 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
+/**
+ * MassAction test
+ */
 class MassActionTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -103,7 +106,8 @@ public function getPrepareDataProvider() : array
                 [
                     'type' => 'first_action',
                     'label' => 'First Action',
-                    'url' => '/module/controller/firstAction'
+                    'url' => '/module/controller/firstAction',
+                    '__disableTmpl' => true
                 ],
             ],
             [
@@ -122,7 +126,8 @@ public function getPrepareDataProvider() : array
                             'label' => 'Second Sub Action 2',
                             'url' => '/module/controller/secondSubAction2'
                         ],
-                    ]
+                    ],
+                    '__disableTmpl' => true
                 ],
             ],
             [
@@ -141,7 +146,8 @@ public function getPrepareDataProvider() : array
                             'label' => 'Second Sub Action 2',
                             'url' => '/module/controller/disable'
                         ],
-                    ]
+                    ],
+                    '__disableTmpl' => true
                 ],
             ],
             [
@@ -160,7 +166,8 @@ public function getPrepareDataProvider() : array
                             'label' => 'Second Sub Action 2',
                             'url' => '/module/controller/disable'
                         ],
-                    ]
+                    ],
+                    '__disableTmpl' => true
                 ],
                 false,
                 false
@@ -170,7 +177,8 @@ public function getPrepareDataProvider() : array
                 [
                     'type' => 'delete',
                     'label' => 'First Action',
-                    'url' => '/module/controller/delete'
+                    'url' => '/module/controller/delete',
+                    '__disableTmpl' => true
                 ],
             ],
             [
@@ -178,7 +186,8 @@ public function getPrepareDataProvider() : array
                 [
                     'type' => 'delete',
                     'label' => 'First Action',
-                    'url' => '/module/controller/delete'
+                    'url' => '/module/controller/delete',
+                    '__disableTmpl' => true
                 ],
                 false,
                 false
@@ -188,7 +197,8 @@ public function getPrepareDataProvider() : array
                 [
                     'type' => 'delete',
                     'label' => 'First Action',
-                    'url' => '/module/controller/attributes'
+                    'url' => '/module/controller/attributes',
+                    '__disableTmpl' => true
                 ],
             ],
             [
@@ -196,7 +206,8 @@ public function getPrepareDataProvider() : array
                 [
                     'type' => 'delete',
                     'label' => 'First Action',
-                    'url' => '/module/controller/attributes'
+                    'url' => '/module/controller/attributes',
+                    '__disableTmpl' => true
                 ],
                 false,
                 false
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AdvancedPricingTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AdvancedPricingTest.php
index e9f9349100f15..e455ad47ee626 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AdvancedPricingTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AdvancedPricingTest.php
@@ -11,7 +11,7 @@
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
-use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
+use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Directory\Helper\Data as DirectoryHelper;
 use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
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 932b09f7df9cb..bceafee0f82a4 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
@@ -10,7 +10,6 @@
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Categories;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
-use Magento\Framework\App\CacheInterface;
 use Magento\Framework\DB\Helper as DbHelper;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Model\Store;
@@ -161,7 +160,14 @@ public function testModifyMetaLocked($locked)
             ->willReturnArgument(2);
 
         $modifyMeta = $this->createModel()->modifyMeta($meta);
-        $this->assertEquals($locked, $modifyMeta['arguments']['data']['config']['disabled']);
+        $this->assertEquals(
+            $locked,
+            $modifyMeta['children']['category_ids']['arguments']['data']['config']['disabled']
+        );
+        $this->assertEquals(
+            $locked,
+            $modifyMeta['children']['create_category_button']['arguments']['data']['config']['disabled']
+        );
     }
 
     /**
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 88075b13f1430..91e22407acc43 100644
--- 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
@@ -38,9 +38,10 @@
 use Magento\Framework\Stdlib\ArrayManager;
 use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory as EavAttributeFactory;
 use Magento\Framework\Event\ManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
- * Class EavTest
+ * Class to test Data provider for eav attributes on product page
  *
  * @method Eav getModel
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -49,142 +50,142 @@
 class EavTest extends AbstractModifierTest
 {
     /**
-     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var Config|MockObject
      */
     private $eavConfigMock;
 
     /**
-     * @var EavValidationRules|\PHPUnit_Framework_MockObject_MockObject
+     * @var EavValidationRules|MockObject
      */
     private $eavValidationRulesMock;
 
     /**
-     * @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RequestInterface|MockObject
      */
     private $requestMock;
 
     /**
-     * @var GroupCollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var GroupCollectionFactory|MockObject
      */
     private $groupCollectionFactoryMock;
 
     /**
-     * @var GroupCollection|\PHPUnit_Framework_MockObject_MockObject
+     * @var GroupCollection|MockObject
      */
     private $groupCollectionMock;
 
     /**
-     * @var Group|\PHPUnit_Framework_MockObject_MockObject
+     * @var Group|MockObject
      */
     private $groupMock;
 
     /**
-     * @var EavAttribute|\PHPUnit_Framework_MockObject_MockObject
+     * @var EavAttribute|MockObject
      */
     private $attributeMock;
 
     /**
-     * @var EntityType|\PHPUnit_Framework_MockObject_MockObject
+     * @var EntityType|MockObject
      */
     private $entityTypeMock;
 
     /**
-     * @var AttributeCollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var AttributeCollectionFactory|MockObject
      */
     private $attributeCollectionFactoryMock;
 
     /**
-     * @var AttributeCollection|\PHPUnit_Framework_MockObject_MockObject
+     * @var AttributeCollection|MockObject
      */
     private $attributeCollectionMock;
 
     /**
-     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StoreManagerInterface|MockObject
      */
     private $storeManagerMock;
 
     /**
-     * @var FormElementMapper|\PHPUnit_Framework_MockObject_MockObject
+     * @var FormElementMapper|MockObject
      */
     private $formElementMapperMock;
 
     /**
-     * @var MetaPropertiesMapper|\PHPUnit_Framework_MockObject_MockObject
+     * @var MetaPropertiesMapper|MockObject
      */
     private $metaPropertiesMapperMock;
 
     /**
-     * @var SearchCriteriaBuilder|\PHPUnit_Framework_MockObject_MockObject
+     * @var SearchCriteriaBuilder|MockObject
      */
     private $searchCriteriaBuilderMock;
 
     /**
-     * @var ProductAttributeGroupRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ProductAttributeGroupRepositoryInterface|MockObject
      */
     private $attributeGroupRepositoryMock;
 
     /**
-     * @var SearchCriteria|\PHPUnit_Framework_MockObject_MockObject
+     * @var SearchCriteria|MockObject
      */
     private $searchCriteriaMock;
 
     /**
-     * @var SortOrderBuilder|\PHPUnit_Framework_MockObject_MockObject
+     * @var SortOrderBuilder|MockObject
      */
     private $sortOrderBuilderMock;
 
     /**
-     * @var ProductAttributeRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ProductAttributeRepositoryInterface|MockObject
      */
     private $attributeRepositoryMock;
 
     /**
-     * @var AttributeGroupInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var AttributeGroupInterface|MockObject
      */
     private $attributeGroupMock;
 
     /**
-     * @var SearchResultsInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var SearchResultsInterface|MockObject
      */
     private $searchResultsMock;
 
     /**
-     * @var Attribute|\PHPUnit_Framework_MockObject_MockObject
+     * @var Attribute|MockObject
      */
     private $eavAttributeMock;
 
     /**
-     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StoreInterface|MockObject
      */
     protected $storeMock;
 
     /**
-     * @var Currency|\PHPUnit_Framework_MockObject_MockObject
+     * @var Currency|MockObject
      */
     protected $currencyMock;
 
     /**
-     * @var CurrencyLocale|\PHPUnit_Framework_MockObject_MockObject
+     * @var CurrencyLocale|MockObject
      */
     protected $currencyLocaleMock;
 
     /**
-     * @var ProductAttributeInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ProductAttributeInterface|MockObject
      */
     protected $productAttributeMock;
 
     /**
-     * @var ArrayManager|\PHPUnit_Framework_MockObject_MockObject
+     * @var ArrayManager|MockObject
      */
     protected $arrayManagerMock;
 
     /**
-     * @var EavAttributeFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var EavAttributeFactory|MockObject
      */
     protected $eavAttributeFactoryMock;
 
     /**
-     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ManagerInterface|MockObject
      */
     protected $eventManagerMock;
 
@@ -457,8 +458,10 @@ public function testModifyData()
      * @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
+     * @param string|null $frontendInput
+     * @param array $expectedCustomize
+     * @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(
@@ -466,7 +469,9 @@ public function testSetupAttributeMetaDefaultAttribute(
         bool $productRequired,
         $attrValue,
         array $expected,
-        $locked = false
+        bool $locked = false,
+        string $frontendInput = null,
+        array $expectedCustomize = []
     ) : void {
         $configPath = 'arguments/data/config';
         $groupCode = 'product-details';
@@ -492,6 +497,7 @@ public function testSetupAttributeMetaDefaultAttribute(
         $this->productAttributeMock->method('getDefaultValue')->willReturn('required_value');
         $this->productAttributeMock->method('getAttributeCode')->willReturn('code');
         $this->productAttributeMock->method('getValue')->willReturn('value');
+        $this->productAttributeMock->method('getFrontendInput')->willReturn($frontendInput);
 
         $attributeMock = $this->getMockBuilder(AttributeInterface::class)
             ->setMethods(['getValue'])
@@ -527,14 +533,16 @@ function ($value) use ($attributeOptionsExpected) {
                     }
                 )
             )
-            ->willReturn($expected);
+            ->willReturn($expected + $expectedCustomize);
 
         $this->arrayManagerMock->method('get')->willReturn([]);
         $this->arrayManagerMock->method('exists')->willReturn(true);
 
+        $actual = $this->eav->setupAttributeMeta($this->productAttributeMock, $groupCode, $sortOrder);
+
         $this->assertEquals(
-            $expected,
-            $this->eav->setupAttributeMeta($this->productAttributeMock, $groupCode, $sortOrder)
+            $expected + $expectedCustomize,
+            $actual
         );
     }
 
@@ -562,6 +570,7 @@ public function setupAttributeMetaDataProvider()
                     'scopeLabel' => '',
                     'globalScope' => false,
                     'sortOrder' => 0,
+                    '__disableTmpl' => ['label' => true, 'code' => true]
                 ],
             ],
             'default_null_prod_not_new_locked_and_required' => [
@@ -581,6 +590,7 @@ public function setupAttributeMetaDataProvider()
                     'scopeLabel' => '',
                     'globalScope' => false,
                     'sortOrder' => 0,
+                    '__disableTmpl' => ['label' => true, 'code' => true]
                 ],
                 'locked' => true,
             ],
@@ -601,6 +611,7 @@ public function setupAttributeMetaDataProvider()
                     'scopeLabel' => '',
                     'globalScope' => false,
                     'sortOrder' => 0,
+                    '__disableTmpl' => ['label' => true, 'code' => true]
                 ],
             ],
             'default_null_prod_new_and_not_required' => [
@@ -620,6 +631,7 @@ public function setupAttributeMetaDataProvider()
                     'scopeLabel' => '',
                     'globalScope' => false,
                     'sortOrder' => 0,
+                    '__disableTmpl' => ['label' => true, 'code' => true]
                 ],
             ],
             'default_null_prod_new_locked_and_not_required' => [
@@ -639,6 +651,7 @@ public function setupAttributeMetaDataProvider()
                     'scopeLabel' => '',
                     'globalScope' => false,
                     'sortOrder' => 0,
+                    '__disableTmpl' => ['label' => true, 'code' => true]
                 ],
                 'locked' => true,
             ],
@@ -659,8 +672,32 @@ public function setupAttributeMetaDataProvider()
                     'scopeLabel' => '',
                     'globalScope' => false,
                     'sortOrder' => 0,
+                    '__disableTmpl' => ['label' => true, 'code' => true]
                 ],
-            ]
+            ],
+            'datetime_null_prod_not_new_and_required' => [
+                'productId' => 1,
+                'productRequired' => true,
+                'attrValue' => 'val',
+                'expected' => [
+                    'dataType' => 'datetime',
+                    'formElement' => 'datetime',
+                    'visible' => null,
+                    'required' => true,
+                    'notice' => null,
+                    'default' => null,
+                    'label' => new Phrase(null),
+                    'code' => 'code',
+                    'source' => 'product-details',
+                    'scopeLabel' => '',
+                    'globalScope' => false,
+                    'sortOrder' => 0,
+                    '__disableTmpl' => ['label' => true, 'code' => true]
+                ],
+                'locked' => false,
+                'frontendInput' => 'datetime',
+                'expectedCustomize' => ['arguments' => ['data' => ['config' => ['options' => ['showsTime' => 1]]]]],
+            ],
         ];
     }
 }
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 a9d717db7b7f9..9d0e7fc57ffce 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
@@ -33,7 +33,7 @@ protected function setUp()
         parent::setUp();
 
         $this->attributeRepositoryMock = $this->getMockBuilder(AttributeRepositoryInterface::class)
-        ->getMockForAbstractClass();
+            ->getMockForAbstractClass();
 
         $arrayManager = $this->objectManager->getObject(ArrayManager::class);
 
@@ -52,10 +52,13 @@ protected function setUp()
      */
     protected function createModel()
     {
-        return $this->objectManager->getObject(General::class, [
+        return $this->objectManager->getObject(
+            General::class,
+            [
             'locator' => $this->locatorMock,
             'arrayManager' => $this->arrayManagerMock,
-        ]);
+            ]
+        );
     }
 
     public function testModifyMeta()
@@ -63,8 +66,10 @@ public function testModifyMeta()
         $this->arrayManagerMock->expects($this->any())
             ->method('merge')
             ->willReturnArgument(2);
-        $this->assertNotEmpty($this->getModel()->modifyMeta([
-            'first_panel_code' => [
+        $this->assertNotEmpty(
+            $this->getModel()->modifyMeta(
+                [
+                'first_panel_code' => [
                 'arguments' => [
                     'data' => [
                         'config' => [
@@ -72,15 +77,17 @@ public function testModifyMeta()
                         ]
                     ],
                 ]
-            ]
-        ]));
+                ]
+                ]
+            )
+        );
     }
 
     /**
-     * @param array $data
-     * @param int $defaultStatusValue
-     * @param array $expectedResult
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @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)
@@ -100,6 +107,97 @@ public function testModifyDataNewProduct(array $data, int $defaultStatusValue, a
         $this->assertSame($expectedResult, $this->generalModifier->modifyData($data));
     }
 
+    /**
+     * Verify the product attribute status set owhen editing existing product
+     *
+     * @param        array  $data
+     * @param        string $modelId
+     * @param        int    $defaultStatus
+     * @param        int    $statusAttributeValue
+     * @param        array  $expectedResult
+     * @throws       \Magento\Framework\Exception\NoSuchEntityException
+     * @dataProvider modifyDataOfExistingProductDataProvider
+     */
+    public function testModifyDataOfExistingProduct(
+        array $data,
+        string $modelId,
+        int $defaultStatus,
+        int $statusAttributeValue,
+        array $expectedResult
+    ) {
+        $attributeMock = $this->getMockForAbstractClass(AttributeInterface::class);
+        $attributeMock->expects($this->any())
+            ->method('getDefaultValue')
+            ->willReturn($defaultStatus);
+        $this->attributeRepositoryMock->expects($this->any())
+            ->method('get')
+            ->with(
+                ProductAttributeInterface::ENTITY_TYPE_CODE,
+                ProductAttributeInterface::CODE_STATUS
+            )
+            ->willReturn($attributeMock);
+        $this->productMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($modelId);
+        $this->productMock->expects($this->any())
+            ->method('getStatus')
+            ->willReturn($statusAttributeValue);
+        $this->assertSame($expectedResult, current($this->generalModifier->modifyData($data)));
+    }
+
+    /**
+     * @return array
+     */
+    public function modifyDataOfExistingProductDataProvider(): array
+    {
+        return [
+            'With enable status value' => [
+                'data' => [],
+                'modelId' => '1',
+                'defaultStatus' => 1,
+                'statusAttributeValue' => 1,
+                'expectedResult' => [
+                        General::DATA_SOURCE_DEFAULT => [
+                            ProductAttributeInterface::CODE_STATUS => 1,
+                        ],
+                ],
+            ],
+            'Without disable status value' => [
+                'data' => [],
+                'modelId' => '1',
+                'defaultStatus' => 1,
+                'statusAttributeValue' => 2,
+                'expectedResult' => [
+                        General::DATA_SOURCE_DEFAULT => [
+                            ProductAttributeInterface::CODE_STATUS => 2,
+                        ],
+                ],
+            ],
+            'With enable status value with empty modelId' => [
+                'data' => [],
+                'modelId' => '',
+                'defaultStatus' => 1,
+                'statusAttributeValue' => 1,
+                'expectedResult' => [
+                    General::DATA_SOURCE_DEFAULT => [
+                        ProductAttributeInterface::CODE_STATUS => 1,
+                    ],
+                ],
+            ],
+            'Without disable status value with empty modelId' => [
+                'data' => [],
+                'modelId' => '',
+                'defaultStatus' => 2,
+                'statusAttributeValue' => 2,
+                'expectedResult' => [
+                    General::DATA_SOURCE_DEFAULT => [
+                        ProductAttributeInterface::CODE_STATUS => 2,
+                    ],
+                ],
+            ],
+        ];
+    }
+
     /**
      * @return array
      */
diff --git a/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/Checker/AddToCompareAvailabilityTest.php b/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/Checker/AddToCompareAvailabilityTest.php
new file mode 100644
index 0000000000000..55bfbe8b4ec71
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/Checker/AddToCompareAvailabilityTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\ViewModel\Product\Checker;
+
+use Magento\Catalog\ViewModel\Product\Checker\AddToCompareAvailability;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
+
+/**
+ * Unit test for Magento\Catalog\ViewModel\Product\Checker\AddToCompareAvailability.
+ */
+class AddToCompareAvailabilityTest extends \PHPUnit\Framework\TestCase
+{
+
+    /**
+     * @var AddToCompareAvailability
+     */
+    private $viewModel;
+
+    /**
+     * @var StockConfigurationInterface|MockObject
+     */
+    protected $stockConfigurationMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+
+        $objectManager = new ObjectManager($this);
+
+        $this->stockConfigurationMock =
+            $this->getMockBuilder(StockConfigurationInterface::class)
+            ->getMock();
+
+        $this->viewModel = $objectManager->getObject(
+            AddToCompareAvailability::class,
+            [
+                'stockConfiguration' => $this->stockConfigurationMock
+            ]
+        );
+    }
+
+    /**
+     * Test IsAvailableForCompare() with data provider
+     *
+     * @param bool $status
+     * @param bool $isSalable
+     * @param array $isInStock
+     * @param bool $isShowOutOfStock
+     * @param bool $expectedBool
+     * @return void
+     * @dataProvider isAvailableForCompareDataProvider
+     */
+    public function testIsAvailableForCompare($status, $isSalable, $isInStock, $isShowOutOfStock, $expectedBool): void
+    {
+        $productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $productMock->expects($this->once())
+            ->method('getStatus')
+            ->willReturn($status);
+
+        $productMock->expects($this->any())
+            ->method('isSalable')
+            ->willReturn($isSalable);
+
+        $productMock->expects($this->any())
+            ->method('getQuantityAndStockStatus')
+            ->willReturn($isInStock);
+
+        $this->stockConfigurationMock->expects($this->any())
+            ->method('isShowOutOfStock')
+            ->willReturn($isShowOutOfStock);
+
+        $this->assertEquals($expectedBool, $this->viewModel->isAvailableForCompare($productMock));
+    }
+
+    /**
+     * Data provider for isAvailableForCompare()
+     *
+     * @return array
+     */
+    public function isAvailableForCompareDataProvider(): array
+    {
+        return [
+            [Status::STATUS_ENABLED, true, ['is_in_stock' => true], false, true],
+            [Status::STATUS_ENABLED, true, ['is_in_stock' => false], true, true],
+            [Status::STATUS_ENABLED, true, [], false, true],
+            [Status::STATUS_ENABLED, false, [], false, false],
+            [Status::STATUS_DISABLED, true, ['is_in_stock' => true], false, false]
+        ];
+    }
+}
diff --git a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
index 9a6a22fcb0985..b902e741c006c 100644
--- a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
+++ b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
@@ -5,10 +5,17 @@
  */
 namespace Magento\Catalog\Ui\Component;
 
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Filters\FilterModifier;
+use Magento\Ui\Component\Listing\Columns\ColumnInterface;
 
 /**
- * Column Factory
+ * Create columns factory on product grid page
  *
  * @api
  * @since 100.0.2
@@ -16,7 +23,7 @@
 class ColumnFactory
 {
     /**
-     * @var \Magento\Framework\View\Element\UiComponentFactory
+     * @var UiComponentFactory
      */
     protected $componentFactory;
 
@@ -40,25 +47,36 @@ class ColumnFactory
         'select' => 'select',
         'multiselect' => 'multiselect',
         'date' => 'date',
+        'datetime' => 'date',
     ];
 
     /**
-     * @param \Magento\Framework\View\Element\UiComponentFactory $componentFactory
+     * @var TimezoneInterface
      */
-    public function __construct(\Magento\Framework\View\Element\UiComponentFactory $componentFactory)
-    {
+    private $timezone;
+
+    /**
+     * @param UiComponentFactory $componentFactory
+     * @param TimezoneInterface|null $timezone
+     */
+    public function __construct(
+        UiComponentFactory $componentFactory,
+        TimezoneInterface $timezone = null
+    ) {
         $this->componentFactory = $componentFactory;
+        $this->timezone = $timezone
+            ?? ObjectManager::getInstance()->get(TimezoneInterface::class);
     }
 
     /**
      * Create Factory
      *
-     * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
-     * @param \Magento\Framework\View\Element\UiComponent\ContextInterface $context
+     * @param ProductAttributeInterface $attribute
+     * @param ContextInterface $context
      * @param array $config
      *
-     * @return \Magento\Ui\Component\Listing\Columns\ColumnInterface
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return ColumnInterface
+     * @throws LocalizedException
      */
     public function create($attribute, $context, array $config = [])
     {
@@ -74,6 +92,7 @@ public function create($attribute, $context, array $config = [])
                 'filter' => ($attribute->getIsFilterableInGrid() || array_key_exists($columnName, $filterModifiers))
                     ? $this->getFilterType($attribute->getFrontendInput())
                     : null,
+                '__disableTmpl' => ['label' => true],
             ],
             $config
         );
@@ -84,19 +103,46 @@ public function create($attribute, $context, array $config = [])
                 $optionData['__disableTmpl'] = true;
             }
         }
-        
+
         $config['component'] = $this->getJsComponent($config['dataType']);
-        
+
+        if ($config['dataType'] === 'date') {
+            $config += $this->getDateConfig($attribute);
+        }
+
         $arguments = [
             'data' => [
                 'config' => $config,
             ],
             'context' => $context,
         ];
-        
+
         return $this->componentFactory->create($columnName, 'column', $arguments);
     }
 
+    /**
+     * Get config for Date columns
+     *
+     * @param ProductAttributeInterface $attribute
+     * @return array
+     */
+    private function getDateConfig(ProductAttributeInterface $attribute): array
+    {
+        $isDatetime = $attribute->getFrontendInput() === 'datetime';
+        $dateFormat = $isDatetime
+            ? $this->timezone->getDateTimeFormat(\IntlDateFormatter::MEDIUM)
+            : $this->timezone->getDateFormat(\IntlDateFormatter::MEDIUM);
+        $timezone = $isDatetime
+            ? $this->timezone->getConfigTimezone()
+            : $this->timezone->getDefaultTimezone();
+
+        return [
+            'timezone' => $timezone,
+            'dateFormat' => $dateFormat,
+            'options' => ['showsTime' => $isDatetime],
+        ];
+    }
+
     /**
      * Get Js Component
      *
@@ -112,7 +158,7 @@ protected function getJsComponent($dataType)
     /**
      * Get Data Type
      *
-     * @param \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
+     * @param ProductAttributeInterface $attribute
      *
      * @return string
      */
@@ -129,8 +175,9 @@ protected function getDataType($attribute)
      */
     protected function getFilterType($frontendInput)
     {
-        $filtersMap = ['date' => 'dateRange'];
+        $filtersMap = ['date' => 'dateRange', 'datetime' => 'dateRange'];
         $result = array_replace_recursive($this->dataTypeMap, $filtersMap);
+
         return $result[$frontendInput] ?? $result['default'];
     }
 }
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
index 8ea6d8b9e5a06..1e056d9f8d517 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns.php
@@ -6,13 +6,15 @@
 namespace Magento\Catalog\Ui\Component\Listing;
 
 /**
+ * Column IU component
+ *
  * @api
  * @since 100.0.2
  */
 class Columns extends \Magento\Ui\Component\Listing\Columns
 {
     /**
-     * Default columns max order
+     * Default columns max order value
      */
     const DEFAULT_COLUMNS_MAX_ORDER = 100;
 
@@ -30,6 +32,7 @@ class Columns extends \Magento\Ui\Component\Listing\Columns
         'boolean' => 'select',
         'multiselect' => 'select',
         'date' => 'dateRange',
+        'datetime' => 'datetimeRange',
     ];
 
     /**
@@ -52,7 +55,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function prepare()
     {
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/ProductActions.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/ProductActions.php
index 0c4efa87c1a32..596b0f4118599 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/ProductActions.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/ProductActions.php
@@ -60,6 +60,7 @@ public function prepareDataSource(array $dataSource)
                     ),
                     'label' => __('Edit'),
                     'hidden' => false,
+                    '__disableTmpl' => true
                 ];
             }
         }
diff --git a/app/code/Magento/Catalog/Ui/Component/Product/MassAction.php b/app/code/Magento/Catalog/Ui/Component/Product/MassAction.php
index 894e2b701b5ac..f770f6b9c497f 100644
--- a/app/code/Magento/Catalog/Ui/Component/Product/MassAction.php
+++ b/app/code/Magento/Catalog/Ui/Component/Product/MassAction.php
@@ -12,6 +12,9 @@
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Ui\Component\AbstractComponent;
 
+/**
+ * Class MassAction
+ */
 class MassAction extends AbstractComponent
 {
     const NAME = 'massaction';
@@ -40,7 +43,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function prepare() : void
     {
@@ -49,7 +52,8 @@ public function prepare() : void
         foreach ($this->getChildComponents() as $actionComponent) {
             $actionType = $actionComponent->getConfiguration()['type'];
             if ($this->isActionAllowed($actionType)) {
-                $config['actions'][] = $actionComponent->getConfiguration();
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
+                $config['actions'][] = array_merge($actionComponent->getConfiguration(), ['__disableTmpl' => true]);
             }
         }
         $origConfig = $this->getConfiguration();
@@ -64,7 +68,7 @@ public function prepare() : void
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getComponentName() : string
     {
diff --git a/app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php b/app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php
index be73940237db4..932fe4ef33d83 100644
--- a/app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php
+++ b/app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php
@@ -10,6 +10,9 @@
 
 use Magento\Framework\UrlInterface;
 
+/**
+ * Returns configuration for product Url Input type
+ */
 class Product implements \Magento\Ui\Model\UrlInput\ConfigInterface
 {
     /**
@@ -27,7 +30,7 @@ public function __construct(UrlInterface $urlBuilder)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfig(): array
     {
@@ -46,6 +49,7 @@ public function getConfig(): array
             'template' => 'ui/grid/filters/elements/ui-select',
             'searchUrl' => $this->urlBuilder->getUrl('catalog/product/search'),
             'filterPlaceholder' => __('Product Name or SKU'),
+            'filterRateLimitMethod' => 'notifyWhenChangesStop',
             'isDisplayEmptyPlaceholder' => true,
             'emptyOptionsHtml' => __('Start typing to find products'),
             'missingValuePlaceholder' => __('Product with ID: %s doesn\'t exist'),
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 9ad75b5fda923..f19f5abd0b423 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
@@ -14,7 +14,7 @@
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
-use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
+use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Ui\Component\Container;
 use Magento\Ui\Component\Form\Element\DataType\Number;
 use Magento\Ui\Component\Form\Element\DataType\Price;
@@ -149,6 +149,7 @@ public function modifyMeta(array $meta)
 
         $this->specialPriceDataToInline();
         $this->customizeTierPrice();
+        $this->customizePrice();
 
         if (isset($this->meta['advanced-pricing'])) {
             $this->addAdvancedPriceLink();
@@ -197,6 +198,29 @@ protected function preparePriceFields($fieldCode)
         return $this;
     }
 
+    /**
+     * Customize price field.
+     *
+     * @return $this
+     */
+    private function customizePrice(): AdvancedPricing
+    {
+        $pathFrom = $this->arrayManager->findPath('price', $this->meta, null, 'children');
+
+        if ($pathFrom) {
+            $this->meta = $this->arrayManager->merge(
+                $this->arrayManager->slicePath($pathFrom, 0, -2) . '/arguments/data/config',
+                $this->meta,
+                [
+                    'label' => false,
+                    'required' => false,
+                ]
+            );
+        }
+
+        return $this;
+    }
+
     /**
      * Customize tier price field
      *
@@ -573,12 +597,11 @@ private function specialPriceDataToInline()
                 $this->arrayManager->slicePath($pathFrom, 0, -2) . '/arguments/data/config',
                 $this->meta,
                 [
-                    'label' => __('Special Price From'),
+                    'label' => false,
+                    'required' => false,
                     'additionalClasses' => 'admin__control-grouped-date',
                     'breakLine' => false,
                     'component' => 'Magento_Ui/js/form/components/group',
-                    'scopeLabel' =>
-                        $this->arrayManager->get($pathFrom . '/arguments/data/config/scopeLabel', $this->meta),
                 ]
             );
             $this->meta = $this->arrayManager->merge(
@@ -586,8 +609,9 @@ private function specialPriceDataToInline()
                 $this->meta,
                 [
                     'label' => __('Special Price From'),
-                    'scopeLabel' => null,
-                    'additionalClasses' => 'admin__field-date'
+                    'scopeLabel' =>
+                        $this->arrayManager->get($pathFrom . '/arguments/data/config/scopeLabel', $this->meta),
+                    'additionalClasses' => 'admin__field-date',
                 ]
             );
             $this->meta = $this->arrayManager->merge(
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 0733d21bf47d7..53c9595b59e76 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
@@ -78,11 +78,20 @@ public function getOptions()
                 \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection::SORT_ORDER_ASC
             );
 
-        return $collection->getData();
+        $collectionData = $collection->getData() ?? [];
+
+        array_walk(
+            $collectionData,
+            function (&$attribute) {
+                $attribute['__disableTmpl'] = true;
+            }
+        );
+
+        return $collectionData;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyMeta(array $meta)
@@ -116,17 +125,20 @@ public function modifyMeta(array $meta)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyData(array $data)
     {
-        return array_replace_recursive($data, [
-            $this->locator->getProduct()->getId() => [
-                self::DATA_SOURCE_DEFAULT => [
-                    'attribute_set_id' => $this->locator->getProduct()->getAttributeSetId()
-                ],
+        return array_replace_recursive(
+            $data,
+            [
+                $this->locator->getProduct()->getId() => [
+                    self::DATA_SOURCE_DEFAULT => [
+                        'attribute_set_id' => $this->locator->getProduct()->getAttributeSetId()
+                    ],
+                ]
             ]
-        ]);
+        );
     }
 }
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 5f1907344ce83..cd1f8e8e3379b 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
@@ -23,7 +23,6 @@
  * Data provider for categories field of product page
  *
  * @api
- *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 101.0.0
  */
@@ -120,7 +119,7 @@ public function __construct(
      * @return CacheInterface
      * @deprecated 101.0.3
      */
-    private function getCacheManager()
+    private function getCacheManager(): CacheInterface
     {
         if (!$this->cacheManager) {
             $this->cacheManager = ObjectManager::getInstance()
@@ -148,9 +147,9 @@ public function modifyMeta(array $meta)
      *
      * @return bool
      */
-    private function isAllowed()
+    private function isAllowed(): bool
     {
-        return $this->authorization->isAllowed('Magento_Catalog::categories');
+        return (bool) $this->authorization->isAllowed('Magento_Catalog::categories');
     }
 
     /**
@@ -234,6 +233,7 @@ protected function customizeCategoriesField(array $meta)
         $fieldCode = 'category_ids';
         $elementPath = $this->arrayManager->findPath($fieldCode, $meta, null, 'children');
         $containerPath = $this->arrayManager->findPath(static::CONTAINER_PREFIX . $fieldCode, $meta, null, 'children');
+        $fieldIsDisabled = $this->locator->getProduct()->isLockedAttribute($fieldCode);
 
         if (!$elementPath) {
             return $meta;
@@ -243,13 +243,13 @@ protected function customizeCategoriesField(array $meta)
             'arguments' => [
                 'data' => [
                     'config' => [
-                        'label' => __('Categories'),
+                        'label' => false,
+                        'required' => false,
                         'dataScope' => '',
                         'breakLine' => false,
                         'formElement' => 'container',
                         'componentType' => 'container',
                         'component' => 'Magento_Ui/js/form/components/group',
-                        'scopeLabel' => __('[GLOBAL]'),
                         'disabled' => $this->locator->getProduct()->isLockedAttribute($fieldCode),
                     ],
                 ],
@@ -266,6 +266,7 @@ protected function customizeCategoriesField(array $meta)
                                 'chipsEnabled' => true,
                                 'disableLabel' => true,
                                 'levelsVisibility' => '1',
+                                'disabled' => $fieldIsDisabled,
                                 'elementTmpl' => 'ui/grid/filters/elements/ui-select',
                                 'options' => $this->getCategoriesTree(),
                                 'listens' => [
@@ -291,6 +292,7 @@ protected function customizeCategoriesField(array $meta)
                             'formElement' => 'container',
                             'additionalClasses' => 'admin__field-small',
                             'componentType' => 'container',
+                            'disabled' => $fieldIsDisabled,
                             'component' => 'Magento_Ui/js/form/components/button',
                             'template' => 'ui/form/components/button/container',
                             'actions' => [
@@ -320,11 +322,7 @@ protected function customizeCategoriesField(array $meta)
                 ]
             ];
         }
-        $meta = $this->arrayManager->merge(
-            $containerPath,
-            $meta,
-            $value
-        );
+        $meta = $this->arrayManager->merge($containerPath, $meta, $value);
 
         return $meta;
     }
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 4039ff862f6fe..25e816f79639a 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -18,6 +18,7 @@
 use Magento\Eav\Api\Data\AttributeGroupInterface;
 use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\Source\SpecificSourceInterface;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory as GroupCollectionFactory;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SortOrderBuilder;
@@ -39,7 +40,7 @@
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory as AttributeCollectionFactory;
 
 /**
- * Class Eav
+ * Data provider for eav attributes on product page
  *
  * @api
  *
@@ -685,13 +686,20 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
                 'scopeLabel' => $this->getScopeLabel($attribute),
                 'globalScope' => $this->isScopeGlobal($attribute),
                 'sortOrder' => $sortOrder * self::SORT_ORDER_MULTIPLIER,
+                '__disableTmpl' => ['label' => true, 'code' => true]
             ]
         );
+        $product = $this->locator->getProduct();
 
         // TODO: Refactor to $attribute->getOptions() when MAGETWO-48289 is done
         $attributeModel = $this->getAttributeModel($attribute);
         if ($attributeModel->usesSource()) {
-            $options = $attributeModel->getSource()->getAllOptions(true, true);
+            $source = $attributeModel->getSource();
+            if ($source instanceof SpecificSourceInterface) {
+                $options = $source->getOptionsFor($product);
+            } else {
+                $options = $source->getAllOptions(true, true);
+            }
             foreach ($options as &$option) {
                 $option['__disableTmpl'] = true;
             }
@@ -718,7 +726,6 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
             $meta = $this->arrayManager->merge($configPath, $meta, ['componentType' => Field::NAME]);
         }
 
-        $product = $this->locator->getProduct();
         if (in_array($attributeCode, $this->attributesToDisable)
             || $product->isLockedAttribute($attributeCode)) {
             $meta = $this->arrayManager->merge($configPath, $meta, ['disabled' => true]);
@@ -726,7 +733,7 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
 
         // TODO: getAttributeModel() should not be used when MAGETWO-48284 is complete
         $childData = $this->arrayManager->get($configPath, $meta, []);
-        if (($rules = $this->catalogEavValidationRules->build($this->getAttributeModel($attribute), $childData))) {
+        if ($rules = $this->catalogEavValidationRules->build($this->getAttributeModel($attribute), $childData)) {
             $meta = $this->arrayManager->merge($configPath, $meta, ['validation' => $rules]);
         }
 
@@ -746,6 +753,9 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
                 // Gallery attribute is being handled by "Images And Videos" section
                 $meta = [];
                 break;
+            case 'datetime':
+                $meta = $this->customizeDatetimeAttribute($meta);
+                break;
         }
 
         //Checking access to design config.
@@ -851,6 +861,7 @@ public function setupAttributeContainerMeta(ProductAttributeInterface $attribute
                 'breakLine' => false,
                 'label' => $attribute->getDefaultFrontendLabel(),
                 'required' => $attribute->getIsRequired(),
+                '__disableTmpl' => ['label' => true]
             ]
         );
 
@@ -859,7 +870,9 @@ public function setupAttributeContainerMeta(ProductAttributeInterface $attribute
                 'arguments/data/config',
                 $containerMeta,
                 [
-                    'component' => 'Magento_Ui/js/form/components/group'
+                    'component' => 'Magento_Ui/js/form/components/group',
+                    'label' => false,
+                    'required' => false,
                 ]
             );
         }
@@ -948,6 +961,19 @@ private function customizeWysiwyg(ProductAttributeInterface $attribute, array $m
         return $meta;
     }
 
+    /**
+     * Customize datetime attribute
+     *
+     * @param array $meta
+     * @return array
+     */
+    private function customizeDatetimeAttribute(array $meta): array
+    {
+        $meta['arguments']['data']['config']['options']['showsTime'] = 1;
+
+        return $meta;
+    }
+
     /**
      * Retrieve form element
      *
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 91c74a2da5048..ebc0425be0188 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
@@ -21,13 +21,13 @@
 class General extends AbstractModifier
 {
     /**
-     * @var LocatorInterface
+     * @var   LocatorInterface
      * @since 101.0.0
      */
     protected $locator;
 
     /**
-     * @var ArrayManager
+     * @var   ArrayManager
      * @since 101.0.0
      */
     protected $arrayManager;
@@ -43,8 +43,8 @@ class General extends AbstractModifier
     private $attributeRepository;
 
     /**
-     * @param LocatorInterface $locator
-     * @param ArrayManager $arrayManager
+     * @param LocatorInterface                  $locator
+     * @param ArrayManager                      $arrayManager
      * @param AttributeRepositoryInterface|null $attributeRepository
      */
     public function __construct(
@@ -61,10 +61,10 @@ public function __construct(
     /**
      * Customize number fields for advanced price and weight fields.
      *
-     * @param array $data
+     * @param  array $data
      * @return array
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 101.0.0
+     * @since  101.0.0
      */
     public function modifyData(array $data)
     {
@@ -72,7 +72,10 @@ public function modifyData(array $data)
         $data = $this->customizeAdvancedPriceFormat($data);
         $modelId = $this->locator->getProduct()->getId();
 
-        if (!isset($data[$modelId][static::DATA_SOURCE_DEFAULT][ProductAttributeInterface::CODE_STATUS])) {
+        $productStatus = $this->locator->getProduct()->getStatus();
+        if (!empty($productStatus) && !empty($modelId)) {
+            $data[$modelId][static::DATA_SOURCE_DEFAULT][ProductAttributeInterface::CODE_STATUS] = $productStatus;
+        } elseif (!isset($data[$modelId][static::DATA_SOURCE_DEFAULT][ProductAttributeInterface::CODE_STATUS])) {
             $attributeStatus = $this->attributeRepository->get(
                 ProductAttributeInterface::ENTITY_TYPE_CODE,
                 ProductAttributeInterface::CODE_STATUS
@@ -87,9 +90,9 @@ public function modifyData(array $data)
     /**
      * Customizing weight fields
      *
-     * @param array $data
+     * @param  array $data
      * @return array
-     * @since 101.0.0
+     * @since  101.0.0
      */
     protected function customizeWeightFormat(array $data)
     {
@@ -112,9 +115,9 @@ protected function customizeWeightFormat(array $data)
     /**
      * Customizing number fields for advanced price
      *
-     * @param array $data
+     * @param  array $data
      * @return array
-     * @since 101.0.0
+     * @since  101.0.0
      */
     protected function customizeAdvancedPriceFormat(array $data)
     {
@@ -136,9 +139,9 @@ protected function customizeAdvancedPriceFormat(array $data)
     /**
      * Customize product form fields.
      *
-     * @param array $meta
+     * @param  array $meta
      * @return array
-     * @since 101.0.0
+     * @since  101.0.0
      */
     public function modifyMeta(array $meta)
     {
@@ -154,9 +157,9 @@ public function modifyMeta(array $meta)
     /**
      * Disable collapsible and set empty label
      *
-     * @param array $meta
+     * @param  array $meta
      * @return array
-     * @since 101.0.0
+     * @since  101.0.0
      */
     protected function prepareFirstPanel(array $meta)
     {
@@ -177,9 +180,9 @@ protected function prepareFirstPanel(array $meta)
     /**
      * Customize Status field
      *
-     * @param array $meta
+     * @param  array $meta
      * @return array
-     * @since 101.0.0
+     * @since  101.0.0
      */
     protected function customizeStatusField(array $meta)
     {
@@ -203,9 +206,9 @@ protected function customizeStatusField(array $meta)
     /**
      * Customize Weight filed
      *
-     * @param array $meta
+     * @param  array $meta
      * @return array
-     * @since 101.0.0
+     * @since  101.0.0
      */
     protected function customizeWeightField(array $meta)
     {
@@ -221,6 +224,7 @@ protected function customizeWeightField(array $meta)
                         'validate-zero-or-greater' => true
                     ],
                     'additionalClasses' => 'admin__field-small',
+                    'sortOrder' => 0,
                     'addafter' => $this->locator->getStore()->getConfig('general/locale/weight_unit'),
                     'imports' => $disabled ? [] : [
                         'disabled' => '!${$.provider}:' . self::DATA_SCOPE_PRODUCT
@@ -239,6 +243,8 @@ protected function customizeWeightField(array $meta)
                 $containerPath . static::META_CONFIG_PATH,
                 $meta,
                 [
+                    'label' => false,
+                    'required' => false,
                     'component' => 'Magento_Ui/js/form/components/group',
                 ]
             );
@@ -266,6 +272,7 @@ protected function customizeWeightField(array $meta)
                         ],
                     ],
                     'value' => (int)$this->locator->getProduct()->getTypeInstance()->hasWeight(),
+                    'sortOrder' => 10,
                     'disabled' => $disabled,
                 ]
             );
@@ -277,9 +284,9 @@ protected function customizeWeightField(array $meta)
     /**
      * Customize "Set Product as New" date fields
      *
-     * @param array $meta
+     * @param  array $meta
      * @return array
-     * @since 101.0.0
+     * @since  101.0.0
      */
     protected function customizeNewDateRangeField(array $meta)
     {
@@ -314,7 +321,8 @@ protected function customizeNewDateRangeField(array $meta)
                 $fromContainerPath . self::META_CONFIG_PATH,
                 $meta,
                 [
-                    'label' => __('Set Product as New From'),
+                    'label' => false,
+                    'required' => false,
                     'additionalClasses' => 'admin__control-grouped-date',
                     'breakLine' => false,
                     'component' => 'Magento_Ui/js/form/components/group',
@@ -335,9 +343,9 @@ protected function customizeNewDateRangeField(array $meta)
     /**
      * Add links for fields depends of product name
      *
-     * @param array $meta
+     * @param  array $meta
      * @return array
-     * @since 101.0.0
+     * @since  101.0.0
      */
     protected function customizeNameListeners(array $meta)
     {
@@ -409,9 +417,9 @@ private function getLocaleCurrency()
     /**
      * Format price according to the locale of the currency
      *
-     * @param mixed $value
+     * @param  mixed $value
      * @return string
-     * @since 101.0.0
+     * @since  101.0.0
      */
     protected function formatPrice($value)
     {
@@ -429,9 +437,9 @@ protected function formatPrice($value)
     /**
      * Format number according to the locale of the currency and precision of input
      *
-     * @param mixed $value
+     * @param  mixed $value
      * @return string
-     * @since 101.0.0
+     * @since  101.0.0
      */
     protected function formatNumber($value)
     {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdate.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdate.php
new file mode 100644
index 0000000000000..453be0c1a1582
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdate.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\Ui\DataProvider\Product\Form\Modifier;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Ui\DataProvider\Modifier\ModifierInterface;
+
+/**
+ * Additional logic on how to display the layout update field.
+ */
+class LayoutUpdate implements ModifierInterface
+{
+    /**
+     * @var LocatorInterface
+     */
+    private $locator;
+
+    /**
+     * @param LocatorInterface $locator
+     */
+    public function __construct(LocatorInterface $locator)
+    {
+        $this->locator = $locator;
+    }
+
+    /**
+     * Extract custom layout value.
+     *
+     * @param ProductInterface|Product $product
+     * @return mixed
+     */
+    private function extractLayoutUpdate(ProductInterface $product)
+    {
+        if ($product instanceof Product && !$product->hasData(Product::CUSTOM_ATTRIBUTES)) {
+            return $product->getData('custom_layout_update');
+        }
+
+        $attr = $product->getCustomAttribute('custom_layout_update');
+
+        return $attr ? $attr->getValue() : null;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 101.1.0
+     */
+    public function modifyData(array $data)
+    {
+        $product = $this->locator->getProduct();
+        if ($this->extractLayoutUpdate($product)) {
+            $data[$product->getId()][AbstractModifier::DATA_SOURCE_DEFAULT]['custom_layout_update_file']
+                = \Magento\Catalog\Model\Product\Attribute\Backend\LayoutUpdate::VALUE_USE_UPDATE_XML;
+        }
+
+        return $data;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function modifyMeta(array $meta)
+    {
+        return $meta;
+    }
+}
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdate.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdate.php
index b2f453e8d8ccb..3b01106619640 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdate.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdate.php
@@ -37,7 +37,8 @@ public function __construct(ArrayManager $arrayManager)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     public function modifyMeta(array $meta)
@@ -47,7 +48,8 @@ public function modifyMeta(array $meta)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     public function modifyData(array $data)
@@ -96,7 +98,8 @@ protected function customizeDateRangeField(array $meta)
             $fromContainerPath . self::META_CONFIG_PATH,
             $meta,
             [
-                'label' => __('Schedule Update From'),
+                'label' => false,
+                'required' => false,
                 'additionalClasses' => 'admin__control-grouped-date',
                 'breakLine' => false,
                 'component' => 'Magento_Ui/js/form/components/group',
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 a529580e29239..9c5fffc5db9b9 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
@@ -115,7 +115,7 @@ private function getUpdatedTierPriceStructure(array $priceMeta)
                             'dataType' => Price::NAME,
                             'component' => 'Magento_Ui/js/form/components/group',
                             'label' => __('Price'),
-                            'enableLabel' => true,
+                            'showLabel' => false,
                             'dataScope' => '',
                             'additionalClasses' => 'control-grouped',
                             'sortOrder' => isset($priceMeta['arguments']['data']['config']['sortOrder'])
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 4fcb87ab1396e..d8f76c40e8fad 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
@@ -98,8 +98,6 @@ public function __construct(
     }
 
     /**
-     * In order to allow to use image generation using Services, we need to emulate area code and store code
-     *
      * @inheritdoc
      */
     public function collect(ProductInterface $product, ProductRenderInterface $productRender)
@@ -107,6 +105,7 @@ public function collect(ProductInterface $product, ProductRenderInterface $produ
         $images = [];
         /** @var ThemeInterface $currentTheme */
         $currentTheme = $this->design->getDesignTheme();
+        $this->design->setDesignTheme($currentTheme);
 
         foreach ($this->imageCodes as $imageCode) {
             /** @var ImageInterface $image */
@@ -135,7 +134,6 @@ public function collect(ProductInterface $product, ProductRenderInterface $produ
             $images[] = $image;
         }
 
-        $this->design->setDesignTheme($currentTheme);
         $productRender->setImages($images);
     }
 
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Modifier/Attributes.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Modifier/Attributes.php
new file mode 100644
index 0000000000000..01aaa6f8e0629
--- /dev/null
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Modifier/Attributes.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\Ui\DataProvider\Product\Modifier;
+
+use Magento\Framework\Escaper;
+use Magento\Ui\DataProvider\Modifier\ModifierInterface;
+
+/**
+ * Modify product listing attributes
+ */
+class Attributes implements ModifierInterface
+{
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @var array
+     */
+    private $escapeAttributes;
+
+    /**
+     * @param Escaper $escaper
+     * @param array $escapeAttributes
+     */
+    public function __construct(
+        Escaper $escaper,
+        array $escapeAttributes = []
+    ) {
+        $this->escaper = $escaper;
+        $this->escapeAttributes = $escapeAttributes;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function modifyData(array $data)
+    {
+        if (!empty($data) && !empty($this->escapeAttributes)) {
+            foreach ($data['items'] as &$item) {
+                foreach ($this->escapeAttributes as $escapeAttribute) {
+                    if (isset($item[$escapeAttribute])) {
+                        $item[$escapeAttribute] = $this->escaper->escapeHtml($item[$escapeAttribute]);
+                    }
+                }
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function modifyMeta(array $meta)
+    {
+        return $meta;
+    }
+}
diff --git a/app/code/Magento/Catalog/ViewModel/Product/Checker/AddToCompareAvailability.php b/app/code/Magento/Catalog/ViewModel/Product/Checker/AddToCompareAvailability.php
index 27829155af292..00bac7e61b5b4 100644
--- a/app/code/Magento/Catalog/ViewModel/Product/Checker/AddToCompareAvailability.php
+++ b/app/code/Magento/Catalog/ViewModel/Product/Checker/AddToCompareAvailability.php
@@ -10,6 +10,7 @@
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 
 /**
  * Check is available add to compare.
@@ -37,7 +38,11 @@ public function __construct(StockConfigurationInterface $stockConfiguration)
      */
     public function isAvailableForCompare(ProductInterface $product): bool
     {
-        return $this->isInStock($product) || $this->stockConfiguration->isShowOutOfStock();
+        if ((int)$product->getStatus() !== Status::STATUS_DISABLED) {
+            return $this->isInStock($product) || $this->stockConfiguration->isShowOutOfStock();
+        }
+
+        return false;
     }
 
     /**
@@ -53,6 +58,6 @@ private function isInStock(ProductInterface $product): bool
             return $product->isSalable();
         }
 
-        return isset($quantityAndStockStatus['is_in_stock']) && $quantityAndStockStatus['is_in_stock'];
+        return $quantityAndStockStatus['is_in_stock'] ?? false;
     }
 }
diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
index c04cfb2dce00a..4f905cd85f3d1 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/di.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -158,6 +158,10 @@
                     <item name="class" xsi:type="string">Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\TierPrice</item>
                     <item name="sortOrder" xsi:type="number">150</item>
                 </item>
+                <item name="custom_layout_update" xsi:type="array">
+                    <item name="class" xsi:type="string">Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\LayoutUpdate</item>
+                    <item name="sortOrder" xsi:type="number">160</item>
+                </item>
             </argument>
         </arguments>
     </virtualType>
@@ -166,7 +170,24 @@
             <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"/>
+    <virtualType name="Magento\Catalog\Ui\DataProvider\Product\Listing\Modifier\Pool" type="Magento\Ui\DataProvider\Modifier\Pool">
+        <arguments>
+            <argument name="modifiers" xsi:type="array">
+                <item name="attributes" xsi:type="array">
+                    <item name="class" xsi:type="string">Magento\Catalog\Ui\DataProvider\Product\Modifier\Attributes</item>
+                    <item name="sortOrder" xsi:type="number">10</item>
+                </item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Catalog\Ui\DataProvider\Product\Modifier\Attributes">
+        <arguments>
+            <argument name="escapeAttributes" xsi:type="array">
+                <item name="name" xsi:type="string">name</item>
+                <item name="sku" xsi:type="string">sku</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\CustomOptions">
         <arguments>
             <argument name="scopeName" xsi:type="string">product_form.product_form</argument>
@@ -232,4 +253,21 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype">
+        <arguments>
+            <argument name="optionsArray" xsi:type="array">
+                <item name="450" xsi:type="array">
+                    <item name="value" xsi:type="string">datetime</item>
+                    <item name="label" xsi:type="string" translate="true">Date and Time</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Ui\DataProvider\Mapper\FormElement">
+        <arguments>
+            <argument name="mappings" xsi:type="array">
+                <item name="datetime" xsi:type="string">date</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml
index b83ed8591047a..c80363038ac60 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/system.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml
@@ -65,7 +65,7 @@
                 </field>
                 <field id="grid_per_page" translate="label comment" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Products per Page on Grid Default Value</label>
-                    <comment>Must be in the allowed values list</comment>
+                    <comment>Must be in the allowed values list.</comment>
                     <validate>validate-per-page-value</validate>
                 </field>
                 <field id="list_per_page_values" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -75,7 +75,7 @@
                 </field>
                 <field id="list_per_page" translate="label comment" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Products per Page on List Default Value</label>
-                    <comment>Must be in the allowed values list</comment>
+                    <comment>Must be in the allowed values list.</comment>
                     <validate>validate-per-page-value</validate>
                 </field>
                 <field id="flat_catalog_category" translate="label" type="select" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
@@ -90,12 +90,12 @@
                 </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>
+                    <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">
                     <label>Allow All Products per Page</label>
-                    <comment>Whether to show "All" option in the "Show X Per Page" dropdown</comment>
+                    <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="remember_pagination" translate="label comment" type="select" sortOrder="7" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
diff --git a/app/code/Magento/Catalog/etc/config.xml b/app/code/Magento/Catalog/etc/config.xml
index 20511f4ff2295..8506d2ae03032 100644
--- a/app/code/Magento/Catalog/etc/config.xml
+++ b/app/code/Magento/Catalog/etc/config.xml
@@ -78,5 +78,12 @@
                 <thumbnail_position>stretch</thumbnail_position>
             </watermark>
         </design>
+        <general>
+            <validator_data>
+                <input_types>
+                    <datetime>datetime</datetime>
+                </input_types>
+            </validator_data>
+        </general>
     </default>
 </config>
diff --git a/app/code/Magento/Catalog/etc/db_schema.xml b/app/code/Magento/Catalog/etc/db_schema.xml
index 3d17db7a66666..d5b318f671726 100644
--- a/app/code/Magento/Catalog/etc/db_schema.xml
+++ b/app/code/Magento/Catalog/etc/db_schema.xml
@@ -1238,7 +1238,7 @@
             <column name="website_id"/>
         </constraint>
     </table>
-    <table name="catalog_product_index_price_cfg_opt_agr_tmp" resource="default" engine="memory"
+    <table name="catalog_product_index_price_cfg_opt_agr_tmp" resource="default" engine="innodb"
            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"/>
@@ -1279,7 +1279,7 @@
             <column name="website_id"/>
         </constraint>
     </table>
-    <table name="catalog_product_index_price_cfg_opt_tmp" resource="default" engine="memory"
+    <table name="catalog_product_index_price_cfg_opt_tmp" resource="default" engine="innodb"
            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"/>
@@ -1327,7 +1327,7 @@
             <column name="website_id"/>
         </constraint>
     </table>
-    <table name="catalog_product_index_price_final_tmp" resource="default" engine="memory"
+    <table name="catalog_product_index_price_final_tmp" resource="default" engine="innodb"
            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"/>
@@ -1375,7 +1375,7 @@
             <column name="website_id"/>
         </constraint>
     </table>
-    <table name="catalog_product_index_price_opt_tmp" resource="default" engine="memory"
+    <table name="catalog_product_index_price_opt_tmp" resource="default" engine="innodb"
            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"/>
@@ -1418,7 +1418,7 @@
             <column name="option_id"/>
         </constraint>
     </table>
-    <table name="catalog_product_index_price_opt_agr_tmp" resource="default" engine="memory"
+    <table name="catalog_product_index_price_opt_agr_tmp" resource="default" engine="innodb"
            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"/>
@@ -1470,7 +1470,7 @@
             <column name="value"/>
         </index>
     </table>
-    <table name="catalog_product_index_eav_tmp" resource="default" engine="memory"
+    <table name="catalog_product_index_eav_tmp" resource="default" engine="innodb"
            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"/>
@@ -1489,13 +1489,13 @@
             <column name="value"/>
             <column name="source_id"/>
         </constraint>
-        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_TMP_ATTRIBUTE_ID" indexType="hash">
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_TMP_ATTRIBUTE_ID" indexType="btree">
             <column name="attribute_id"/>
         </index>
-        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_TMP_STORE_ID" indexType="hash">
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_TMP_STORE_ID" indexType="btree">
             <column name="store_id"/>
         </index>
-        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_TMP_VALUE" indexType="hash">
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_TMP_VALUE" indexType="btree">
             <column name="value"/>
         </index>
     </table>
@@ -1528,7 +1528,7 @@
             <column name="value"/>
         </index>
     </table>
-    <table name="catalog_product_index_eav_decimal_tmp" resource="default" engine="memory"
+    <table name="catalog_product_index_eav_decimal_tmp" resource="default" engine="innodb"
            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"/>
@@ -1547,13 +1547,13 @@
             <column name="value"/>
             <column name="source_id"/>
         </constraint>
-        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_ATTRIBUTE_ID" indexType="hash">
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_ATTRIBUTE_ID" indexType="btree">
             <column name="attribute_id"/>
         </index>
-        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_STORE_ID" indexType="hash">
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_STORE_ID" indexType="btree">
             <column name="store_id"/>
         </index>
-        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_VALUE" indexType="hash">
+        <index referenceId="CATALOG_PRODUCT_INDEX_EAV_DECIMAL_TMP_VALUE" indexType="btree">
             <column name="value"/>
         </index>
     </table>
@@ -1592,7 +1592,7 @@
             <column name="min_price"/>
         </index>
     </table>
-    <table name="catalog_product_index_price_tmp" resource="default" engine="memory"
+    <table name="catalog_product_index_price_tmp" resource="default" engine="innodb"
            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"/>
@@ -1617,17 +1617,17 @@
             <column name="customer_group_id"/>
             <column name="website_id"/>
         </constraint>
-        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_TMP_CUSTOMER_GROUP_ID" indexType="hash">
+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_TMP_CUSTOMER_GROUP_ID" indexType="btree">
             <column name="customer_group_id"/>
         </index>
-        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_TMP_WEBSITE_ID" indexType="hash">
+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_TMP_WEBSITE_ID" indexType="btree">
             <column name="website_id"/>
         </index>
-        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_TMP_MIN_PRICE" indexType="hash">
+        <index referenceId="CATALOG_PRODUCT_INDEX_PRICE_TMP_MIN_PRICE" indexType="btree">
             <column name="min_price"/>
         </index>
     </table>
-    <table name="catalog_category_product_index_tmp" resource="default" engine="memory"
+    <table name="catalog_category_product_index_tmp" resource="default" engine="innodb"
            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"/>
@@ -1646,7 +1646,7 @@
             <column name="product_id"/>
             <column name="store_id"/>
         </constraint>
-        <index referenceId="CAT_CTGR_PRD_IDX_TMP_PRD_ID_CTGR_ID_STORE_ID" indexType="hash">
+        <index referenceId="CAT_CTGR_PRD_IDX_TMP_PRD_ID_CTGR_ID_STORE_ID" indexType="btree">
             <column name="product_id"/>
             <column name="category_id"/>
             <column name="store_id"/>
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index 570fa6e7f9ef7..af7b9af2d8b7e 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -73,6 +73,7 @@
     <preference for="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface" type="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactory" />
     <preference for="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface" type="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite" />
     <preference for="Magento\Catalog\Api\Data\MassActionInterface" type="\Magento\Catalog\Model\MassAction" />
+    <preference for="Magento\Catalog\Model\ProductLink\Data\ListCriteriaInterface" type="Magento\Catalog\Model\ProductLink\Data\ListCriteria" />
     <type name="Magento\Customer\Model\ResourceModel\Visitor">
         <plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
     </type>
@@ -402,6 +403,9 @@
                 <item name="upsell" xsi:type="object">Magento\Catalog\Model\ProductLink\CollectionProvider\Upsell</item>
                 <item name="related" xsi:type="object">Magento\Catalog\Model\ProductLink\CollectionProvider\Related</item>
             </argument>
+            <argument name="mapProviders" xsi:type="array">
+                <item name="linked" xsi:type="object">Magento\Catalog\Model\ProductLink\CollectionProvider\LinkedMapProvider</item>
+            </argument>
         </arguments>
     </type>
     <type name="Magento\Catalog\Model\ProductLink\Converter\ConverterPool">
@@ -411,6 +415,28 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Product\Option">
+        <arguments>
+            <argument name="optionGroups" xsi:type="array">
+                <item name="date" xsi:type="string">Magento\Catalog\Model\Product\Option\Type\Date</item>
+                <item name="file" xsi:type="string">Magento\Catalog\Model\Product\Option\Type\File</item>
+                <item name="select" xsi:type="string">Magento\Catalog\Model\Product\Option\Type\Select</item>
+                <item name="text" xsi:type="string">Magento\Catalog\Model\Product\Option\Type\Text</item>
+            </argument>
+            <argument name="optionTypesToGroups" xsi:type="array">
+                <item name="field" xsi:type="const">Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_TEXT</item>
+                <item name="area" xsi:type="const">Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_TEXT</item>
+                <item name="file" xsi:type="const">Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_FILE</item>
+                <item name="drop_down" xsi:type="const">Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_SELECT</item>
+                <item name="radio" xsi:type="const">Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_SELECT</item>
+                <item name="checkbox" xsi:type="const">Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_SELECT</item>
+                <item name="multiple" xsi:type="const">Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_SELECT</item>
+                <item name="date" xsi:type="const">Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_DATE</item>
+                <item name="date_time" xsi:type="const">Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_DATE</item>
+                <item name="time" xsi:type="const">Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_DATE</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Catalog\Model\Product\Option\Validator\Pool">
         <arguments>
             <argument name="validators" xsi:type="array">
@@ -867,7 +893,7 @@
             <argument name="hydrators" xsi:type="array">
                 <item name="Magento\Catalog\Api\Data\CategoryInterface" xsi:type="string">Magento\Framework\EntityManager\AbstractModelHydrator</item>
                 <item name="Magento\Catalog\Api\Data\CategoryTreeInterface" xsi:type="string">Magento\Framework\EntityManager\AbstractModelHydrator</item>
-                <item name="Magento\Catalog\Api\Data\ProductInterface" xsi:type="string">Magento\Framework\EntityManager\AbstractModelHydrator</item>
+                <item name="Magento\Catalog\Api\Data\ProductInterface" xsi:type="string">Magento\Catalog\Model\Product\Hydrator</item>
             </argument>
         </arguments>
     </type>
@@ -1176,4 +1202,124 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\ProductLink\Repository">
+        <arguments>
+            <argument name="entityCollectionProvider" xsi:type="object">Magento\Catalog\Model\ProductLink\CollectionProvider\Proxy</argument>
+            <argument name="linkInitializer" xsi:type="object">Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\ProductLink\ProductLinkQuery">
+        <arguments>
+            <argument name="collectionProvider" xsi:type="object">Magento\Catalog\Model\ProductLink\CollectionProvider\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager">
+        <arguments>
+            <argument name="themeFactory" xsi:type="object">Magento\Framework\View\Design\Theme\FlyweightFactory\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager">
+        <arguments>
+            <argument name="themeFactory" xsi:type="object">Magento\Framework\View\Design\Theme\FlyweightFactory\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Category\Attribute\Backend\LayoutUpdate">
+        <arguments>
+            <argument name="manager" xsi:type="object">Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Category\Attribute\Source\LayoutUpdate">
+        <arguments>
+            <argument name="manager" xsi:type="object">Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Product\Attribute\Backend\LayoutUpdate">
+        <arguments>
+            <argument name="manager" xsi:type="object">Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Product\Attribute\Source\LayoutUpdate">
+        <arguments>
+            <argument name="manager" xsi:type="object">Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Eav\Model\Config">
+        <arguments>
+            <argument name="attributesForPreload" xsi:type="array">
+                <item name="catalog_product" xsi:type="array">
+                    <item name="category_ids" xsi:type="string">catalog_product</item>
+                    <item name="country_of_manufacture" xsi:type="string">catalog_product</item>
+                    <item name="created_at" xsi:type="string">catalog_product</item>
+                    <item name="custom_design" xsi:type="string">catalog_product</item>
+                    <item name="custom_design_from" xsi:type="string">catalog_product</item>
+                    <item name="custom_design_to" xsi:type="string">catalog_product</item>
+                    <item name="custom_layout" xsi:type="string">catalog_product</item>
+                    <item name="custom_layout_update" xsi:type="string">catalog_product</item>
+                    <item name="description" xsi:type="string">catalog_product</item>
+                    <item name="gallery" xsi:type="string">catalog_product</item>
+                    <item name="has_options" xsi:type="string">catalog_product</item>
+                    <item name="image" xsi:type="string">catalog_product</item>
+                    <item name="image_label" xsi:type="string">catalog_product</item>
+                    <item name="media_gallery" xsi:type="string">catalog_product</item>
+                    <item name="meta_description" xsi:type="string">catalog_product</item>
+                    <item name="meta_keyword" xsi:type="string">catalog_product</item>
+                    <item name="meta_title" xsi:type="string">catalog_product</item>
+                    <item name="minimal_price" xsi:type="string">catalog_product</item>
+                    <item name="name" xsi:type="string">catalog_product</item>
+                    <item name="news_from_date" xsi:type="string">catalog_product</item>
+                    <item name="news_to_date" xsi:type="string">catalog_product</item>
+                    <item name="old_id" xsi:type="string">catalog_product</item>
+                    <item name="options_container" xsi:type="string">catalog_product</item>
+                    <item name="page_layout" xsi:type="string">catalog_product</item>
+                    <item name="price" xsi:type="string">catalog_product</item>
+                    <item name="quantity_and_stock_status" xsi:type="string">catalog_product</item>
+                    <item name="required_options" xsi:type="string">catalog_product</item>
+                    <item name="short_description" xsi:type="string">catalog_product</item>
+                    <item name="sku" xsi:type="string">catalog_product</item>
+                    <item name="small_image" xsi:type="string">catalog_product</item>
+                    <item name="small_image_label" xsi:type="string">catalog_product</item>
+                    <item name="special_from_date" xsi:type="string">catalog_product</item>
+                    <item name="special_price" xsi:type="string">catalog_product</item>
+                    <item name="special_to_date" xsi:type="string">catalog_product</item>
+                    <item name="status" xsi:type="string">catalog_product</item>
+                    <item name="thumbnail" xsi:type="string">catalog_product</item>
+                    <item name="thumbnail_label" xsi:type="string">catalog_product</item>
+                    <item name="tier_price" xsi:type="string">catalog_product</item>
+                    <item name="updated_at" xsi:type="string">catalog_product</item>
+                    <item name="visibility" xsi:type="string">catalog_product</item>
+                    <item name="weight" xsi:type="string">catalog_product</item>
+                </item>
+                <item name="catalog_category" xsi:type="array">
+                    <item name="all_children" xsi:type="string">catalog_category</item>
+                    <item name="available_sort_by" xsi:type="string">catalog_category</item>
+                    <item name="children" xsi:type="string">catalog_category</item>
+                    <item name="children_count" xsi:type="string">catalog_category</item>
+                    <item name="custom_apply_to_products" xsi:type="string">catalog_category</item>
+                    <item name="custom_design" xsi:type="string">catalog_category</item>
+                    <item name="custom_design_from" xsi:type="string">catalog_category</item>
+                    <item name="custom_design_to" xsi:type="string">catalog_category</item>
+                    <item name="custom_layout_update" xsi:type="string">catalog_category</item>
+                    <item name="custom_use_parent_settings" xsi:type="string">catalog_category</item>
+                    <item name="default_sort_by" xsi:type="string">catalog_category</item>
+                    <item name="description" xsi:type="string">catalog_category</item>
+                    <item name="display_mode" xsi:type="string">catalog_category</item>
+                    <item name="filter_price_range" xsi:type="string">catalog_category</item>
+                    <item name="image" xsi:type="string">catalog_category</item>
+                    <item name="include_in_menu" xsi:type="string">catalog_category</item>
+                    <item name="is_active" xsi:type="string">catalog_category</item>
+                    <item name="is_anchor" xsi:type="string">catalog_category</item>
+                    <item name="landing_page" xsi:type="string">catalog_category</item>
+                    <item name="level" xsi:type="string">catalog_category</item>
+                    <item name="meta_description" xsi:type="string">catalog_category</item>
+                    <item name="meta_keywords" xsi:type="string">catalog_category</item>
+                    <item name="meta_title" xsi:type="string">catalog_category</item>
+                    <item name="name" xsi:type="string">catalog_category</item>
+                    <item name="page_layout" xsi:type="string">catalog_category</item>
+                    <item name="path" xsi:type="string">catalog_category</item>
+                    <item name="path_in_store" xsi:type="string">catalog_category</item>
+                    <item name="position" xsi:type="string">catalog_category</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/etc/events.xml b/app/code/Magento/Catalog/etc/events.xml
index f4345ce719a19..24186146c56f0 100644
--- a/app/code/Magento/Catalog/etc/events.xml
+++ b/app/code/Magento/Catalog/etc/events.xml
@@ -64,4 +64,7 @@
     <event name="catalog_product_save_commit_after">
         <observer name="magento_image_resize" instance="Magento\Catalog\Observer\ImageResizeAfterProductSave" />
     </event>
+    <event name="catalog_category_prepare_save">
+        <observer name="additional_authorization" instance="Magento\Catalog\Observer\CategoryDesignAuthorization" />
+    </event>
 </config>
diff --git a/app/code/Magento/Catalog/etc/webapi_rest/di.xml b/app/code/Magento/Catalog/etc/webapi_rest/di.xml
index 44cdd473bf74e..bfbc05b12079d 100644
--- a/app/code/Magento/Catalog/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Catalog/etc/webapi_rest/di.xml
@@ -22,4 +22,10 @@
     <type name="Magento\Catalog\Api\ProductCustomOptionRepositoryInterface">
         <plugin name="updateProductCustomOptionsAttributes" type="Magento\Catalog\Plugin\Model\Product\Option\UpdateProductCustomOptionsAttributes"/>
     </type>
+    <type name="Magento\Catalog\Api\ProductRepositoryInterface">
+        <plugin name="product_authorization" type="Magento\Catalog\Plugin\ProductAuthorization" />
+    </type>
+    <type name="Magento\Catalog\Api\CategoryRepositoryInterface">
+        <plugin name="category_authorization" type="Magento\Catalog\Plugin\CategoryAuthorization" />
+    </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 44cdd473bf74e..bfbc05b12079d 100644
--- a/app/code/Magento/Catalog/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Catalog/etc/webapi_soap/di.xml
@@ -22,4 +22,10 @@
     <type name="Magento\Catalog\Api\ProductCustomOptionRepositoryInterface">
         <plugin name="updateProductCustomOptionsAttributes" type="Magento\Catalog\Plugin\Model\Product\Option\UpdateProductCustomOptionsAttributes"/>
     </type>
+    <type name="Magento\Catalog\Api\ProductRepositoryInterface">
+        <plugin name="product_authorization" type="Magento\Catalog\Plugin\ProductAuthorization" />
+    </type>
+    <type name="Magento\Catalog\Api\CategoryRepositoryInterface">
+        <plugin name="category_authorization" type="Magento\Catalog\Plugin\CategoryAuthorization" />
+    </type>
 </config>
diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv
index 9b7f8a2b07730..555871ef32c26 100644
--- a/app/code/Magento/Catalog/i18n/en_US.csv
+++ b/app/code/Magento/Catalog/i18n/en_US.csv
@@ -814,4 +814,5 @@ Details,Details
 "A total of %1 record(s) haven't been deleted. Please see server logs for more details.","A total of %1 record(s) haven't been deleted. Please see server logs for more details."
 "Are you sure you want to delete this category?","Are you sure you want to delete this category?"
 "Attribute Set Information","Attribute Set Information"
+"Failed to retrieve product links for ""%1""","Failed to retrieve product links for ""%1"""
 
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 6b63a20134df1..d6340330df8ea 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
@@ -507,8 +507,13 @@
                             })(jQuery);
                             this.closeModal();
                         }
-                    }]
-
+                    }],
+                    keyEventHandlers: {
+                        enterKey: function (event) {
+                            this.buttons[1].click();
+                            event.preventDefault();
+                        }
+                    }
                 }).trigger('openModal');
 
             }
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 f020eddc35dbd..64384ac391a8d 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
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+use Magento\Catalog\Helper\Data;
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
@@ -63,7 +64,12 @@ function bindAttributeInputType()
 {
     checkOptionsPanelVisibility();
     switchDefaultValueField();
-    if($('frontend_input') && ($('frontend_input').value=='boolean' || $('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;
         }
@@ -75,8 +81,7 @@ function bindAttributeInputType()
                 if($('backend_type').options[i].value=='int') $('backend_type').selectedIndex = i;
             }
         }
-    }
-    else {
+    } else {
         if($('is_filterable')){
             $('is_filterable').selectedIndex=0;
             $('is_filterable').disabled = true;
@@ -172,6 +177,7 @@ function switchDefaultValueField()
             break;
 
         case 'date':
+        case 'datetime':
             defaultValueDateVisibility = true;
             break;
 
@@ -202,21 +208,22 @@ function switchDefaultValueField()
             setRowVisibility('frontend_class', false);
         break;
 
-        <?php foreach ($this->helper(Magento\Catalog\Helper\Data::class)->getAttributeHiddenFields() as $type => $fields) :?>
+        <?php // phpcs:ignore Magento2.Templates.ThisInTemplate ?>
+        <?php foreach ($this->helper(Data::class)->getAttributeHiddenFields() as $type => $fields): ?>
             case '<?= $block->escapeJs($type) ?>':
                 var isFrontTabHidden = false;
-                <?php foreach ($fields as $one) :?>
-                    <?php if ($one == '_front_fieldset') :?>
+                <?php foreach ($fields as $one): ?>
+                    <?php if ($one == '_front_fieldset'): ?>
                         getFrontTab().hide();
                         isFrontTabHidden = true;
-                    <?php elseif ($one == '_default_value') :?>
+                    <?php elseif ($one == '_default_value'): ?>
                         defaultValueTextVisibility =
                         defaultValueTextareaVisibility =
                         defaultValueDateVisibility =
                         defaultValueYesnoVisibility = false;
-                    <?php elseif ($one == '_scope') :?>
+                    <?php elseif ($one == '_scope'): ?>
                         scopeVisibility = false;
-                    <?php else :?>
+                    <?php else: ?>
                         setRowVisibility('<?= $block->escapeJs($one) ?>', false);
                     <?php endif; ?>
                 <?php endforeach; ?>
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 8adffb752187b..68a7a3a69cfd3 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
@@ -7,7 +7,7 @@
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_optionId = (int)$_option->getId(); ?>
-<div class="admin__field field<?= $_option->getIsRequire() ? ' required _required' : '' ?>">
+<div class="admin__field field<?= $_option->getIsRequire() ? ' required' : '' ?>">
     <label class="label admin__field-label">
         <?= $block->escapeHtml($_option->getTitle()) ?>
         <?= /* @noEscape */ $block->getFormattedPrice() ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
index 2218ce5d29671..243fdb6e603a0 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
@@ -6,7 +6,7 @@
 ?>
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
 <?php $_option = $block->getOption(); ?>
-<div class="admin__field field<?= $_option->getIsRequire() ? ' required _required' : '' ?>">
+<div class="admin__field field<?= $_option->getIsRequire() ? ' _required' : '' ?>">
     <label class="label admin__field-label">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
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 992093c4a6658..f2afef1215017 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
@@ -489,6 +489,15 @@
                 </imports>
             </settings>
         </field>
+        <field name="custom_layout_update_file" component="Magento_Catalog/js/components/use-parent-settings/select" sortOrder="205" formElement="select">
+            <settings>
+                <dataType>string</dataType>
+                <label translate="true">Custom Layout Update</label>
+                <imports>
+                    <link name="serviceDisabled">${ $.parentName }.custom_use_parent_settings:checked || $.data.serviceDisabled</link>
+                </imports>
+            </settings>
+        </field>
         <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">
@@ -528,10 +537,7 @@
                 <item name="type" xsi:type="string">group</item>
                 <item name="config" xsi:type="array">
                     <item name="additionalClasses" xsi:type="string">admin__control-grouped-date</item>
-                    <item name="label" xsi:type="string" translate="true">Schedule Update From</item>
-                    <item name="required" xsi:type="boolean">false</item>
                     <item name="breakLine" xsi:type="boolean">false</item>
-                    <item name="scopeLabel" xsi:type="string">[STORE VIEW]</item>
                 </item>
             </argument>
             <field name="custom_design_from" sortOrder="230" formElement="date">
@@ -541,6 +547,7 @@
                     </additionalClasses>
                     <dataType>string</dataType>
                     <label translate="true">Schedule Update From</label>
+                    <scopeLabel>[STORE VIEW]</scopeLabel>
                 </settings>
             </field>
             <field name="custom_design_to" sortOrder="240" formElement="date">
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 6c5d37a92ea4a..3a6621137ed5a 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
@@ -101,6 +101,7 @@
                         <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="datetime" xsi:type="string">datetime</item>
                         <item name="boolean" xsi:type="string">boolean</item>
                         <item name="multiselect" xsi:type="string">multiselect</item>
                         <item name="select" xsi:type="string">select</item>
@@ -287,6 +288,7 @@
                         <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="datetime" xsi:type="string">datetime</item>
                         <item name="boolean" xsi:type="string">boolean</item>
                         <item name="multiselect" xsi:type="string">multiselect</item>
                         <item name="select" xsi:type="string">select</item>
@@ -376,6 +378,29 @@
                 <dataScope>default_value_date</dataScope>
             </settings>
         </field>
+        <field name="default_value_datetime" component="Magento_Catalog/js/components/visible-on-option/date" sortOrder="35" formElement="date">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="valuesForOptions" xsi:type="array">
+                        <item name="datetime" xsi:type="string">datetime</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <dataType>text</dataType>
+                <label translate="true">Default Value</label>
+                <dataScope>default_value_datetime</dataScope>
+            </settings>
+            <formElements>
+                <date>
+                    <settings>
+                        <options>
+                            <option name="showsTime" xsi:type="boolean">true</option>
+                        </options>
+                    </settings>
+                </date>
+            </formElements>
+        </field>
         <field name="is_unique" component="Magento_Catalog/js/components/visible-on-option/yesno" sortOrder="40" formElement="checkbox">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
@@ -412,6 +437,7 @@
                         <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="datetime" xsi:type="string">date</item>
                         <item name="boolean" xsi:type="string">boolean</item>
                         <item name="multiselect" xsi:type="string">multiselect</item>
                         <item name="select" xsi:type="string">select</item>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/components/new-attribute-form.js b/app/code/Magento/Catalog/view/adminhtml/web/js/components/new-attribute-form.js
index 6702b94b119de..a879b85bab257 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/components/new-attribute-form.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/components/new-attribute-form.js
@@ -42,41 +42,47 @@ define([
 
             var self = this;
 
-            prompt({
-                content: this.newSetPromptMessage,
-                actions: {
+            this.validate();
 
-                    /**
-                     * @param {String} val
-                     * @this {actions}
-                     */
-                    confirm: function (val) {
-                        var rules = ['required-entry', 'validate-no-html-tags'],
-                            editForm = self,
-                            newAttributeSetName = val,
-                            i,
-                            params = {};
+            if (!this.additionalInvalid && !this.source.get('params.invalid')) {
+                prompt({
+                    content: this.newSetPromptMessage,
+                    actions: {
 
-                        if (!newAttributeSetName) {
-                            return;
-                        }
-
-                        for (i = 0; i < rules.length; i++) {
-                            if (!$.validator.methods[rules[i]](newAttributeSetName)) {
-                                alert({
-                                    content: $.validator.messages[rules[i]]
-                                });
+                        /**
+                         * @param {String} val
+                         * @this {actions}
+                         */
+                        confirm: function (val) {
+                            var rules = ['required-entry', 'validate-no-html-tags'],
+                                editForm = self,
+                                newAttributeSetName = val,
+                                i,
+                                params = {};
 
+                            if (!newAttributeSetName) {
                                 return;
                             }
-                        }
 
-                        params['new_attribute_set_name'] = newAttributeSetName;
-                        editForm.setAdditionalData(params);
-                        editForm.save();
+                            for (i = 0; i < rules.length; i++) {
+                                if (!$.validator.methods[rules[i]](newAttributeSetName)) {
+                                    alert({
+                                        content: $.validator.messages[rules[i]]
+                                    });
+
+                                    return;
+                                }
+                            }
+
+                            params['new_attribute_set_name'] = newAttributeSetName;
+                            editForm.setAdditionalData(params);
+                            editForm.save();
+                        }
                     }
-                }
-            });
+                });
+            } else {
+                this.focusInvalid();
+            }
         }
     });
 });
diff --git a/app/code/Magento/Catalog/view/base/requirejs-config.js b/app/code/Magento/Catalog/view/base/requirejs-config.js
new file mode 100644
index 0000000000000..2fc0bbcb8c00d
--- /dev/null
+++ b/app/code/Magento/Catalog/view/base/requirejs-config.js
@@ -0,0 +1,16 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    map: {
+        '*': {
+            priceBox:             'Magento_Catalog/js/price-box',
+            priceOptionDate:      'Magento_Catalog/js/price-option-date',
+            priceOptionFile:      'Magento_Catalog/js/price-option-file',
+            priceOptions:         'Magento_Catalog/js/price-options',
+            priceUtils:           'Magento_Catalog/js/price-utils'
+        }
+    }
+};
diff --git a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
index dbc064665d3fe..78d2883d7401a 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
@@ -53,7 +53,7 @@ if ($option) : ?>
         }
         ?>
 
-        <div class="field choice admin__field admin__field-option <?= /* @noEscape */ $option->getIsRequire() ? 'required': '' ?>">
+        <div class="field choice admin__field admin__field-option">
             <input type="<?= $block->escapeHtmlAttr($optionType) ?>"
                    class="<?= $optionType === Option::OPTION_TYPE_RADIO
                        ? 'radio admin__control-radio'
diff --git a/app/code/Magento/Catalog/view/frontend/requirejs-config.js b/app/code/Magento/Catalog/view/frontend/requirejs-config.js
index 55df18afeb024..3674d54340544 100644
--- a/app/code/Magento/Catalog/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Catalog/view/frontend/requirejs-config.js
@@ -11,11 +11,6 @@ var config = {
             upsellProducts:         'Magento_Catalog/js/upsell-products',
             productListToolbarForm: 'Magento_Catalog/js/product/list/toolbar',
             catalogGallery:         'Magento_Catalog/js/gallery',
-            priceBox:               'Magento_Catalog/js/price-box',
-            priceOptionDate:        'Magento_Catalog/js/price-option-date',
-            priceOptionFile:        'Magento_Catalog/js/price-option-file',
-            priceOptions:           'Magento_Catalog/js/price-options',
-            priceUtils:             'Magento_Catalog/js/price-utils',
             catalogAddToCart:       'Magento_Catalog/js/catalog-add-to-cart'
         }
     },
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 55772388d44bf..0bea3ca03dee8 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
@@ -130,6 +130,8 @@
                                             default :?>
                                                 <?php if (is_string($block->getProductAttributeValue($item, $attribute))) :?>
                                                     <?= /* @noEscape */ $helper->productAttribute($item, $block->getProductAttributeValue($item, $attribute), $attribute->getAttributeCode()) ?>
+                                                <?php else : ?>
+                                                    <?=  $block->escapeHtml($helper->productAttribute($item, $block->getProductAttributeValue($item, $attribute), $attribute->getAttributeCode())) ?>
                                                 <?php endif; ?>
                                                 <?php break;
                                         } ?>
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 8c32302cf7c29..554caf6026001 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -13,14 +13,16 @@ use Magento\Framework\App\Action\Action;
  * Product list template
  *
  * @var $block \Magento\Catalog\Block\Product\ListProduct
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <?php
 $_productCollection = $block->getLoadedProductCollection();
+/** @var \Magento\Catalog\Helper\Output $_helper */
 $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
 ?>
 <?php if (!$_productCollection->count()) :?>
-    <div class="message info empty"><div><?= $block->escapeHtml(__('We can\'t find products matching the selection.')) ?></div></div>
+    <div class="message info empty"><div><?= $escaper->escapeHtml(__('We can\'t find products matching the selection.')) ?></div></div>
 <?php else :?>
     <?= $block->getToolbarHtml() ?>
     <?= $block->getAdditionalHtml() ?>
@@ -55,7 +57,7 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                     }
                     ?>
                     <?php // Product Image ?>
-                    <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                    <a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
                        class="product photo product-item-photo"
                        tabindex="-1">
                         <?= $productImage->toHtml() ?>
@@ -66,7 +68,7 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                         ?>
                         <strong class="product name product-item-name">
                             <a class="product-item-link"
-                               href="<?= $block->escapeUrl($_product->getProductUrl()) ?>">
+                               href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>">
                                 <?= /* @noEscape */ $_helper->productAttribute($_product, $_product->getName(), 'name') ?>
                             </a>
                         </strong>
@@ -77,13 +79,13 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                         <?php endif; ?>
 
                         <div class="product-item-inner">
-                            <div class="product actions product-item-actions"<?= strpos($pos, $viewMode . '-actions') ? $block->escapeHtmlAttr($position) : '' ?>>
-                                <div class="actions-primary"<?= strpos($pos, $viewMode . '-primary') ? $block->escapeHtmlAttr($position) : '' ?>>
+                            <div class="product actions product-item-actions"<?= strpos($pos, $viewMode . '-actions') ? $escaper->escapeHtmlAttr($position) : '' ?>>
+                                <div class="actions-primary"<?= strpos($pos, $viewMode . '-primary') ? $escaper->escapeHtmlAttr($position) : '' ?>>
                                     <?php if ($_product->isSaleable()) :?>
                                         <?php $postParams = $block->getAddToCartPostParams($_product); ?>
                                         <form data-role="tocart-form"
-                                              data-product-sku="<?= $block->escapeHtml($_product->getSku()) ?>"
-                                              action="<?= $block->escapeUrl($postParams['action']) ?>"
+                                              data-product-sku="<?= $escaper->escapeHtml($_product->getSku()) ?>"
+                                              action="<?= $escaper->escapeUrl($postParams['action']) ?>"
                                               method="post">
                                             <input type="hidden"
                                                    name="product"
@@ -92,20 +94,20 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                                                    value="<?= /* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
                                             <?= $block->getBlockHtml('formkey') ?>
                                             <button type="submit"
-                                                    title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"
+                                                    title="<?= $escaper->escapeHtmlAttr(__('Add to Cart')) ?>"
                                                     class="action tocart primary">
-                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                <span><?= $escaper->escapeHtml(__('Add to Cart')) ?></span>
                                             </button>
                                         </form>
                                     <?php else :?>
                                         <?php if ($_product->isAvailable()) :?>
-                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                            <div class="stock available"><span><?= $escaper->escapeHtml(__('In stock')) ?></span></div>
                                         <?php else :?>
-                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                            <div class="stock unavailable"><span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></div>
                                         <?php endif; ?>
                                     <?php endif; ?>
                                 </div>
-                                <div data-role="add-to-links" class="actions-secondary"<?= strpos($pos, $viewMode . '-secondary') ? $block->escapeHtmlAttr($position) : '' ?>>
+                                <div data-role="add-to-links" class="actions-secondary"<?= strpos($pos, $viewMode . '-secondary') ? $escaper->escapeHtmlAttr($position) : '' ?>>
                                     <?php if ($addToBlock = $block->getChildBlock('addto')) :?>
                                         <?= $addToBlock->setProduct($_product)->getChildHtml() ?>
                                     <?php endif; ?>
@@ -114,9 +116,9 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                             <?php if ($showDescription) :?>
                                 <div class="product description product-item-description">
                                     <?= /* @noEscape */ $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
-                                    <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                                    <a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
                                        title="<?= /* @noEscape */ $_productNameStripped ?>"
-                                       class="action more"><?= $block->escapeHtml(__('Learn More')) ?></a>
+                                       class="action more"><?= $escaper->escapeHtml(__('Learn More')) ?></a>
                                 </div>
                             <?php endif; ?>
                         </div>
@@ -132,7 +134,7 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
         {
             "[data-role=tocart-form], .form.map.checkout": {
                 "catalogAddToCart": {
-                    "product_sku": "<?= $block->escapeJs($_product->getSku()) ?>"
+                    "product_sku": "<?= $escaper->escapeJs($_product->getSku()) ?>"
                 }
             }
         }
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 926e7c78a7df0..fc4d85044a8d6 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
@@ -6,6 +6,8 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 // phpcs:disable Generic.WhiteSpace.ScopeIndent.Incorrect
+// phpcs:disable Generic.Files.LineLength
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundHelper
 
 /* @var $block \Magento\Catalog\Block\Product\AbstractProduct */
 ?>
@@ -23,6 +25,7 @@ switch ($type = $block->getType()) {
             $items = $block->getAllItems();
             $limit = $block->getPositionLimit();
             $shuffle = (int) $block->isShuffled();
+            $isWeightedRandom = (int) $block->getRotation()->isWeightedRandom($block->getProductListType());
             $canItemsAddToCart = $block->canItemsAddToCart();
 
             $showAddTo = true;
@@ -43,6 +46,7 @@ switch ($type = $block->getType()) {
             $items = $block->getItems();
             $limit = 0;
             $shuffle = 0;
+            $isWeightedRandom = 0;
             $canItemsAddToCart = $block->canItemsAddToCart();
 
             $showAddTo = true;
@@ -62,6 +66,7 @@ switch ($type = $block->getType()) {
             $items = $block->getAllItems();
             $limit = $block->getPositionLimit();
             $shuffle = (int) $block->isShuffled();
+            $isWeightedRandom = (int) $block->getRotation()->isWeightedRandom($block->getProductListType());
 
             $showAddTo = false;
             $showCart = false;
@@ -82,6 +87,7 @@ switch ($type = $block->getType()) {
             $items = $block->getItemCollection()->getItems();
             $limit = $block->getItemLimit('upsell');
             $shuffle = 0;
+            $isWeightedRandom = 0;
 
             $showAddTo = false;
             $showCart = false;
@@ -152,22 +158,22 @@ switch ($type = $block->getType()) {
 }
 ?>
 
-<?php if ($exist) :?>
+<?php if ($exist):?>
 
-<?php if ($type == 'related' || $type == 'upsell') :?>
-<?php if ($type == 'related') :?>
-<div class="block <?= $block->escapeHtmlAttr($class) ?>" data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}' data-limit="<?= $block->escapeHtmlAttr($limit) ?>" data-shuffle="<?= /* @noEscape */ $shuffle ?>">
-    <?php else :?>
-    <div class="block <?= $block->escapeHtmlAttr($class) ?>" data-mage-init='{"upsellProducts":{}}' data-limit="<?= $block->escapeHtmlAttr($limit) ?>" data-shuffle="<?= /* @noEscape */ $shuffle ?>">
+<?php if ($type == 'related' || $type == 'upsell'):?>
+<?php if ($type == 'related'):?>
+<div class="block <?= $block->escapeHtmlAttr($class) ?>" data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}' data-limit="<?= $block->escapeHtmlAttr($limit) ?>" data-shuffle="<?= /* @noEscape */ $shuffle ?>" data-shuffle-weighted="<?= /* @noEscape */ $isWeightedRandom ?>">
+    <?php else:?>
+    <div class="block <?= $block->escapeHtmlAttr($class) ?>" data-mage-init='{"upsellProducts":{}}' data-limit="<?= $block->escapeHtmlAttr($limit) ?>" data-shuffle="<?= /* @noEscape */ $shuffle ?>" data-shuffle-weighted="<?= /* @noEscape */ $isWeightedRandom ?>">
         <?php endif; ?>
-        <?php else :?>
+        <?php else:?>
         <div class="block <?= $block->escapeHtmlAttr($class) ?>">
             <?php endif; ?>
             <div class="block-title title">
                 <strong id="block-<?= $block->escapeHtmlAttr($class) ?>-heading" role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
             </div>
             <div class="block-content content" aria-labelledby="block-<?= $block->escapeHtmlAttr($class) ?>-heading">
-                <?php if ($type == 'related' && $canItemsAddToCart) :?>
+                <?php if ($type == 'related' && $canItemsAddToCart):?>
                     <div class="block-actions">
                         <?= $block->escapeHtml(__('Check items to add to the cart or')) ?>
                         <button type="button" class="action select" data-role="select-all"><span><?= $block->escapeHtml(__('select all')) ?></span></button>
@@ -175,16 +181,16 @@ switch ($type = $block->getType()) {
                 <?php endif; ?>
                 <div class="products wrapper grid products-grid products-<?= $block->escapeHtmlAttr($type) ?>">
                     <ol class="products list items product-items">
-                        <?php foreach ($items as $_item) :?>
+                        <?php foreach ($items as $_item):?>
                             <?php $available = ''; ?>
-                            <?php if (!$_item->isComposite() && $_item->isSaleable() && $type == 'related') :?>
-                                <?php if (!$_item->getRequiredOptions()) :?>
+                            <?php if (!$_item->isComposite() && $_item->isSaleable() && $type == 'related'):?>
+                                <?php if (!$_item->getRequiredOptions()):?>
                                     <?php $available = 'related-available'; ?>
                                 <?php endif; ?>
                             <?php endif; ?>
-                            <?php if ($type == 'related' || $type == 'upsell') :?>
-                                <li class="item product product-item" style="display: none;">
-                            <?php else :?>
+                            <?php if ($type == 'related' || $type == 'upsell'):?>
+                                <li class="item product product-item" style="display: none;"  data-shuffle-group="<?= $block->escapeHtmlAttr($_item->getPriority()) ?>" >
+                            <?php else:?>
                                 <li class="item product product-item">
                             <?php endif; ?>
                             <div class="product-item-info <?= /* @noEscape */ $available ?>">
@@ -199,12 +205,12 @@ switch ($type = $block->getType()) {
 
                                     <?= /* @noEscape */ $block->getProductPrice($_item) ?>
 
-                                    <?php if ($templateType) :?>
+                                    <?php if ($templateType):?>
                                         <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                                     <?php endif; ?>
 
-                                    <?php if ($canItemsAddToCart && !$_item->isComposite() && $_item->isSaleable() && $type == 'related') :?>
-                                        <?php if (!$_item->getRequiredOptions()) :?>
+                                    <?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<?= $block->escapeHtmlAttr($_item->getId()) ?>" name="related_products[]" value="<?= $block->escapeHtmlAttr($_item->getId()) ?>" />
                                                 <label class="label" for="related-checkbox<?= $block->escapeHtmlAttr($_item->getId()) ?>"><span><?= $block->escapeHtml(__('Add to Cart')) ?></span></label>
@@ -212,16 +218,16 @@ switch ($type = $block->getType()) {
                                         <?php endif; ?>
                                     <?php endif; ?>
 
-                                    <?php if ($showAddTo || $showCart) :?>
+                                    <?php if ($showAddTo || $showCart):?>
                                         <div class="product actions product-item-actions">
-                                            <?php if ($showCart) :?>
+                                            <?php if ($showCart):?>
                                                 <div class="actions-primary">
-                                                    <?php if ($_item->isSaleable()) :?>
-                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)) :?>
+                                                    <?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 else:?>
                                                             <?php $postDataHelper = $this->helper(Magento\Framework\Data\Helper\PostHelper::class);
                                                             $postData = $postDataHelper->getPostData($block->escapeUrl($block->getAddToCartUrl($_item)), ['product' => $_item->getEntityId()])
                                                             ?>
@@ -231,19 +237,19 @@ switch ($type = $block->getType()) {
                                                                 <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                                             </button>
                                                         <?php endif; ?>
-                                                    <?php else :?>
-                                                        <?php if ($_item->getIsSalable()) :?>
+                                                    <?php else:?>
+                                                        <?php if ($_item->getIsSalable()):?>
                                                             <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-                                                        <?php else :?>
+                                                        <?php else:?>
                                                             <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
                                                         <?php endif; ?>
                                                     <?php endif; ?>
                                                 </div>
                                             <?php endif; ?>
 
-                                            <?php if ($showAddTo) :?>
+                                            <?php if ($showAddTo):?>
                                                 <div class="secondary-addto-links actions-secondary" data-role="add-to-links">
-                                                    <?php if ($addToBlock = $block->getChildBlock('addto')) :?>
+                                                    <?php if ($addToBlock = $block->getChildBlock('addto')):?>
                                                         <?= $addToBlock->setProduct($_item)->getChildHtml() ?>
                                                     <?php endif; ?>
                                                 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
index b776fd4f7e193..6cebd51284f48 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
@@ -16,7 +16,6 @@
  */
 ?>
 <?php
-$start = microtime(true);
 $_productCollection = $block->getLoadedProductCollection();
 $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
 ?>
@@ -98,4 +97,3 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
     </div>
     <?= $block->getToolbarHtml() ?>
 <?php endif; ?>
-<?= $time_taken = microtime(true) - $start ?>
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 c6d351b2a9571..25257f4bcea8a 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
@@ -22,7 +22,7 @@
         <input type="hidden" name="product" value="<?= (int)$_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="<?= $block->escapeHtmlAttr($block->getRequest()->getParam('id')) ?>" />
+        <input type="hidden" name="item"  value="<?= (int)$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/opengraph/general.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml
index eb2bde647f9b1..4bfdbb7bc24bc 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,13 +9,16 @@
 
 <meta property="og:type" content="product" />
 <meta property="og:title"
-      content="<?= /* @noEscape */ $block->stripTags($block->getProduct()->getName()) ?>" />
+      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="<?= /* @noEscape */ $block->stripTags($block->getProduct()->getShortDescription()) ?>" />
+      content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getShortDescription())) ?>" />
 <meta property="og:url" content="<?= $block->escapeUrl($block->getProduct()->getProductUrl()) ?>" />
-<?php if ($priceAmount = $block->getProduct()->getPriceInfo()->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE)->getAmount()) :?>
+<?php if ($priceAmount = $block->getProduct()
+          ->getPriceInfo()
+          ->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE)
+          ->getAmount()):?>
     <meta property="product:price:amount" content="<?= $block->escapeHtmlAttr($priceAmount) ?>"/>
     <?= $block->getChildHtml('meta.currency') ?>
 <?php endif;?>
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/gallery.js b/app/code/Magento/Catalog/view/frontend/web/js/gallery.js
index f6be6fd58ca25..2b3349c25c917 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/gallery.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/gallery.js
@@ -3,18 +3,10 @@
  * See COPYING.txt for license details.
  */
 
-(function (factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'jquery-ui-modules/widget'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+define([
+    'jquery',
+    'jquery-ui-modules/widget'
+], function ($) {
     'use strict';
 
     $.widget('mage.gallery', {
@@ -49,4 +41,4 @@
     });
 
     return $.mage.gallery;
-}));
+});
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/related-products.js b/app/code/Magento/Catalog/view/frontend/web/js/related-products.js
index 822dd5b9a7b13..bc54fdeac5c28 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/related-products.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/related-products.js
@@ -26,12 +26,16 @@ define([
          * @private
          */
         _create: function () {
-            $(this.options.selectAllLink).on('click', $.proxy(this._selectAllRelated, this));
-            $(this.options.relatedCheckbox).on('click', $.proxy(this._addRelatedToProduct, this));
+            $(this.options.selectAllLink, this.element).on('click', $.proxy(this._selectAllRelated, this));
+            $(this.options.relatedCheckbox, this.element).on('click', $.proxy(this._addRelatedToProduct, this));
+
+            if (this.element.data('shuffle')) {
+                this._shuffle(this.element.find(this.options.elementsSelector));
+            }
             this._showRelatedProducts(
                 this.element.find(this.options.elementsSelector),
                 this.element.data('limit'),
-                this.element.data('shuffle')
+                this.element.data('shuffle-weighted')
             );
         },
 
@@ -69,24 +73,66 @@ define([
             );
         },
 
+        /* jscs:disable */
+        /* eslint-disable */
         /**
          * Show related products according to limit. Shuffle if needed.
          * @param {*} elements
          * @param {*} limit
-         * @param {*} shuffle
+         * @param weightedRandom
          * @private
          */
-        _showRelatedProducts: function (elements, limit, shuffle) {
-            var index;
-
-            if (shuffle) {
-                this._shuffle(elements);
-            }
+        _showRelatedProducts: function (elements, limit, weightedRandom) {
+            var index, weights = [], random = [], weight = 2, shown = 0, $element, currentGroup, prevGroup;
 
             if (limit === 0) {
                 limit = elements.length;
             }
 
+            if (weightedRandom && limit > 0 && limit < elements.length) {
+                for (index = 0; index < limit; index++) {
+                    $element = $(elements[index]);
+                    if ($element.data('shuffle-group') !== '') {
+                        break;
+                    }
+                    $element.show();
+                    shown++;
+                }
+                limit -= shown;
+                for (index = elements.length - 1; index >= 0; index--) {
+                    $element = $(elements[index]);
+                    currentGroup = $element.data('shuffle-group');
+                    if (currentGroup !== '') {
+                        weights.push([index, Math.log(weight)]);
+                        if (typeof prevGroup !== 'undefined' && prevGroup !== currentGroup) {
+                            weight += 2;
+                        }
+                        prevGroup = currentGroup;
+                    }
+                }
+
+                if (weights.length === 0) {
+                    return;
+                }
+
+                for (index = 0; index < weights.length; index++) {
+                    random.push([weights[index][0], Math.pow(Math.random(), 1 / weights[index][1])]);
+                }
+
+                random.sort(function(a, b) {
+                    a = a[1];
+                    b = b[1];
+                    return a < b ? 1 : (a > b ? -1 : 0);
+                });
+                index = 0;
+                while (limit) {
+                    $(elements[random[index][0]]).show();
+                    limit--;
+                    index++
+                }
+                return;
+            }
+
             for (index = 0; index < limit; index++) {
                 $(elements[index]).show();
             }
@@ -96,12 +142,19 @@ define([
         /* eslint-disable */
         /**
          * Shuffle an array
-         * @param {Array} o
+         * @param {Array} elements
          * @returns {*}
          */
-        _shuffle: function shuffle(o) { //v1.0
-            for (var j, x, i = o.length; i; j = Math.floor(Math.random() * i), x = o[--i], o[i] = o[j], o[j] = x);
-            return o;
+        _shuffle: function shuffle(elements) {
+            var parent, child, lastSibling;
+            if (elements.length) {
+                parent = $(elements[0]).parent();
+            }
+            while (elements.length) {
+                child = elements.splice(Math.floor(Math.random() *  elements.length), 1)[0];
+                lastSibling = parent.find('[data-shuffle-group="' + $(child).data('shuffle-group') + '"]').last();
+                lastSibling.after(child);
+            }
         }
 
         /* jscs:disable */
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/upsell-products.js b/app/code/Magento/Catalog/view/frontend/web/js/upsell-products.js
index da2526d5679c8..867011d3d1646 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/upsell-products.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/upsell-products.js
@@ -19,33 +19,78 @@ define([
          * @private
          */
         _create: function () {
+            if (this.element.data('shuffle')) {
+                this._shuffle(this.element.find(this.options.elementsSelector));
+            }
             this._showUpsellProducts(
                 this.element.find(this.options.elementsSelector),
                 this.element.data('limit'),
-                this.element.data('shuffle')
+                this.element.data('shuffle-weighted')
             );
         },
 
+        /* jscs:disable */
+        /* eslint-disable */
         /**
          * Show upsell products according to limit. Shuffle if needed.
          * @param {*} elements
          * @param {Number} limit
-         * @param {Boolean} shuffle
+         * @param {Boolean} weightedRandom
          * @private
          */
-        _showUpsellProducts: function (elements, limit, shuffle) {
-            var index;
-
-            if (shuffle) {
-                this._shuffle(elements);
-            }
+        _showUpsellProducts: function (elements, limit, weightedRandom) {
+            var index, weights = [], random = [], weight = 2, shown = 0, $element, currentGroup, prevGroup;
 
             if (limit === 0) {
                 limit = elements.length;
             }
 
+            if (weightedRandom && limit > 0 && limit < elements.length) {
+                for (index = 0; index < limit; index++) {
+                    $element = $(elements[index]);
+                    if ($element.data('shuffle-group') !== '') {
+                        break;
+                    }
+                    $element.show();
+                    shown++;
+                }
+                limit -= shown;
+                for (index = elements.length - 1; index >= 0; index--) {
+                    $element = $(elements[index]);
+                    currentGroup = $element.data('shuffle-group');
+                    if (currentGroup !== '') {
+                        weights.push([index, Math.log(weight)]);
+                        if (typeof prevGroup !== 'undefined' && prevGroup !== currentGroup) {
+                            weight += 2;
+                        }
+                        prevGroup = currentGroup;
+                    }
+                }
+
+                if (weights.length === 0) {
+                    return;
+                }
+
+                for (index = 0; index < weights.length; index++) {
+                    random.push([weights[index][0], Math.pow(Math.random(), 1 / weights[index][1])]);
+                }
+
+                random.sort(function(a, b) {
+                    a = a[1];
+                    b = b[1];
+                    return a < b ? 1 : (a > b ? -1 : 0);
+                });
+                index = 0;
+                while (limit) {
+                    $(elements[random[index][0]]).show();
+                    limit--;
+                    index++
+                }
+                return;
+            }
+
             for (index = 0; index < limit; index++) {
-                $(this.element).find(elements[index]).show();
+                $(elements[index]).show();
             }
         },
 
@@ -53,12 +98,19 @@ define([
         /* eslint-disable */
         /**
          * Shuffle an array
-         * @param o
+         * @param elements
          * @returns {*}
          */
-        _shuffle: function shuffle(o){ //v1.0
-            for (var j, x, i = o.length; i; j = Math.floor(Math.random() * i), x = o[--i], o[i] = o[j], o[j] = x);
-            return o;
+        _shuffle: function shuffle(elements){ //v1.0
+            var parent, child, lastSibling;
+            if (elements.length) {
+                parent = $(elements[0]).parent();
+            }
+            while (elements.length) {
+                child = elements.splice(Math.floor(Math.random() *  elements.length), 1)[0];
+                lastSibling = parent.find('[data-shuffle-group="' + $(child).data('shuffle-group') + '"]').last();
+                lastSibling.after(child);
+            }
         }
 
         /* jscs:disable */
diff --git a/app/code/Magento/Catalog/view/frontend/web/product/view/validation.js b/app/code/Magento/Catalog/view/frontend/web/product/view/validation.js
index ab1753e7b9ed3..3205e58297b6c 100644
--- a/app/code/Magento/Catalog/view/frontend/web/product/view/validation.js
+++ b/app/code/Magento/Catalog/view/frontend/web/product/view/validation.js
@@ -3,19 +3,11 @@
  * See COPYING.txt for license details.
  */
 
-(function (factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'jquery-ui-modules/widget',
-            'mage/validation/validation'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+define([
+    'jquery',
+    'jquery-ui-modules/widget',
+    'mage/validation/validation'
+], function ($) {
     'use strict';
 
     $.widget('mage.validation', $.mage.validation, {
@@ -97,4 +89,4 @@
     });
 
     return $.mage.validation;
-}));
+});
diff --git a/app/code/Magento/CatalogCmsGraphQl/Model/Resolver/Category/Block.php b/app/code/Magento/CatalogCmsGraphQl/Model/Resolver/Category/Block.php
new file mode 100644
index 0000000000000..110d03cac7735
--- /dev/null
+++ b/app/code/Magento/CatalogCmsGraphQl/Model/Resolver/Category/Block.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogCmsGraphQl\Model\Resolver\Category;
+
+use Magento\Catalog\Model\Category;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\CmsGraphQl\Model\Resolver\DataProvider\Block as BlockProvider;
+
+/**
+ * Resolver category cms content
+ */
+class Block implements ResolverInterface
+{
+    /**
+     * @var BlockProvider
+     */
+    private $blockProvider;
+
+    /**
+     * @param BlockProvider $blockProvider
+     */
+    public function __construct(BlockProvider $blockProvider)
+    {
+        $this->blockProvider = $blockProvider;
+    }
+
+    /**
+     * @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'];
+        $blockId = $category->getLandingPage();
+
+        if (empty($blockId)) {
+            return null;
+        }
+
+        try {
+            $block = $this->blockProvider->getData($blockId);
+        } catch (NoSuchEntityException $e) {
+            return null;
+        }
+
+        return $block;
+    }
+}
diff --git a/app/code/Magento/CatalogCmsGraphQl/README.md b/app/code/Magento/CatalogCmsGraphQl/README.md
new file mode 100644
index 0000000000000..f3b36e515ac6e
--- /dev/null
+++ b/app/code/Magento/CatalogCmsGraphQl/README.md
@@ -0,0 +1,3 @@
+# CatalogCmsGraphQl
+
+**CatalogCmsGraphQl** provides type and resolver information for GraphQL attributes that have dependencies on the Catalog and Cms modules.
\ No newline at end of file
diff --git a/app/code/Magento/CatalogCmsGraphQl/composer.json b/app/code/Magento/CatalogCmsGraphQl/composer.json
new file mode 100644
index 0000000000000..a9d6ee4d9f2f1
--- /dev/null
+++ b/app/code/Magento/CatalogCmsGraphQl/composer.json
@@ -0,0 +1,28 @@
+{
+    "name": "magento/module-catalog-cms-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-cms-graph-ql": "*"
+    },
+    "suggest": {
+        "magento/module-graph-ql": "*",
+        "magento/module-cms": "*",
+        "magento/module-catalog-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\CatalogCmsGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogCmsGraphQl/etc/graphql/di.xml b/app/code/Magento/CatalogCmsGraphQl/etc/graphql/di.xml
new file mode 100644
index 0000000000000..cc8d8f9845c51
--- /dev/null
+++ b/app/code/Magento/CatalogCmsGraphQl/etc/graphql/di.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:ObjectManager/etc/config.xsd">
+    <type name="Magento\CatalogGraphQl\Model\AttributesJoiner">
+        <arguments>
+            <argument name="fieldToAttributeMap" xsi:type="array">
+                <item name="cms_block" xsi:type="array">
+                    <item name="landing_page" xsi:type="string">landing_page</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/CatalogCmsGraphQl/etc/module.xml b/app/code/Magento/CatalogCmsGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..40cc556bbf713
--- /dev/null
+++ b/app/code/Magento/CatalogCmsGraphQl/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_CatalogCmsGraphQl" >
+        <sequence>
+            <module name="Magento_CmsGraphQl"/>
+            <module name="Magento_CatalogGraphQl"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/CatalogCmsGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogCmsGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..0fc5f69a009a4
--- /dev/null
+++ b/app/code/Magento/CatalogCmsGraphQl/etc/schema.graphqls
@@ -0,0 +1,6 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+interface CategoryInterface {
+    cms_block: CmsBlock @doc(description: "Category CMS Block.") @resolver(class: "Magento\\CatalogCmsGraphQl\\Model\\Resolver\\Category\\Block")
+}
\ No newline at end of file
diff --git a/app/code/Magento/CatalogCmsGraphQl/registration.php b/app/code/Magento/CatalogCmsGraphQl/registration.php
new file mode 100644
index 0000000000000..c2b95cd9a4c5d
--- /dev/null
+++ b/app/code/Magento/CatalogCmsGraphQl/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_CatalogCmsGraphQl', __DIR__);
diff --git a/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/AttributeOptionProvider.php b/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/AttributeOptionProvider.php
index 7781473128754..320e0adc29b9f 100644
--- a/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/AttributeOptionProvider.php
+++ b/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/AttributeOptionProvider.php
@@ -41,10 +41,11 @@ public function __construct(ResourceConnection $resourceConnection)
      * Get option data. Return list of attributes with option data
      *
      * @param array $optionIds
+     * @param array $attributeCodes
      * @return array
      * @throws \Zend_Db_Statement_Exception
      */
-    public function getOptions(array $optionIds): array
+    public function getOptions(array $optionIds, array $attributeCodes = []): array
     {
         if (!$optionIds) {
             return [];
@@ -60,20 +61,28 @@ public function getOptions(array $optionIds): array
                     'attribute_label' => 'a.frontend_label',
                 ]
             )
-            ->joinInner(
+            ->joinLeft(
                 ['options' => $this->resourceConnection->getTableName('eav_attribute_option')],
                 'a.attribute_id = options.attribute_id',
                 []
             )
-            ->joinInner(
+            ->joinLeft(
                 ['option_value' => $this->resourceConnection->getTableName('eav_attribute_option_value')],
                 'options.option_id = option_value.option_id',
                 [
                     'option_label' => 'option_value.value',
                     'option_id' => 'option_value.option_id',
                 ]
-            )
-            ->where('option_value.option_id IN (?)', $optionIds);
+            );
+
+        $select->where('option_value.option_id IN (?)', $optionIds);
+
+        if (!empty($attributeCodes)) {
+            $select->orWhere(
+                'a.attribute_code in (?) AND a.frontend_input = \'boolean\'',
+                $attributeCodes
+            );
+        }
 
         return $this->formatResult($select);
     }
diff --git a/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Attribute.php b/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Attribute.php
index b70c9f6165fc6..0ec65c88024f2 100644
--- a/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Attribute.php
+++ b/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Attribute.php
@@ -139,7 +139,9 @@ private function isBucketEmpty(?BucketInterface $bucket): bool
     private function getAttributeOptions(AggregationInterface $aggregation): array
     {
         $attributeOptionIds = [];
+        $attributes = [];
         foreach ($this->getAttributeBuckets($aggregation) as $bucket) {
+            $attributes[] = \preg_replace('~_bucket$~', '', $bucket->getName());
             $attributeOptionIds[] = \array_map(
                 function (AggregationValueInterface $value) {
                     return $value->getValue();
@@ -152,6 +154,6 @@ function (AggregationValueInterface $value) {
             return [];
         }
 
-        return $this->attributeOptionProvider->getOptions(\array_merge(...$attributeOptionIds));
+        return $this->attributeOptionProvider->getOptions(\array_merge(...$attributeOptionIds), $attributes);
     }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php b/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
index d57154c429920..b3a9672a47010 100644
--- a/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
+++ b/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
@@ -20,6 +20,24 @@ class AttributesJoiner
      */
     private $queryFields = [];
 
+    /**
+     * Field to attribute mapping
+     *
+     * For fields that are not named the same as their attribute, or require extra attributes to resolve
+     * e.g. ['field' => ['attr1', 'attr2'], 'other_field' => ['other_attr']]
+     *
+     * @var array
+     */
+    private $fieldToAttributeMap = [];
+
+    /**
+     * @param array $fieldToAttributeMap
+     */
+    public function __construct(array $fieldToAttributeMap = [])
+    {
+        $this->fieldToAttributeMap = $fieldToAttributeMap;
+    }
+
     /**
      * Join fields attached to field node to collection's select.
      *
@@ -30,9 +48,7 @@ class AttributesJoiner
     public function join(FieldNode $fieldNode, AbstractCollection $collection) : void
     {
         foreach ($this->getQueryFields($fieldNode) as $field) {
-            if (!$collection->isAttributeAdded($field)) {
-                $collection->addAttributeToSelect($field);
-            }
+            $this->addFieldToCollection($collection, $field);
         }
     }
 
@@ -42,7 +58,7 @@ public function join(FieldNode $fieldNode, AbstractCollection $collection) : voi
      * @param FieldNode $fieldNode
      * @return string[]
      */
-    public function getQueryFields(FieldNode $fieldNode)
+    public function getQueryFields(FieldNode $fieldNode): array
     {
         if (!isset($this->queryFields[$fieldNode->name->value])) {
             $this->queryFields[$fieldNode->name->value] = [];
@@ -58,4 +74,29 @@ public function getQueryFields(FieldNode $fieldNode)
 
         return $this->queryFields[$fieldNode->name->value];
     }
+
+    /**
+     * Add field to collection select
+     *
+     * Add a query field to the collection, using mapped attribute names if they are set
+     *
+     * @param AbstractCollection $collection
+     * @param string $field
+     */
+    private function addFieldToCollection(AbstractCollection $collection, string $field)
+    {
+        $attribute = isset($this->fieldToAttributeMap[$field]) ? $this->fieldToAttributeMap[$field] : $field;
+
+        if (is_array($attribute)) {
+            foreach ($attribute as $attributeName) {
+                if (!$collection->isAttributeAdded($attributeName)) {
+                    $collection->addAttributeToSelect($attributeName);
+                }
+            }
+        } else {
+            if (!$collection->isAttributeAdded($attribute)) {
+                $collection->addAttributeToSelect($attribute);
+            }
+        }
+    }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/CategoryFilter.php b/app/code/Magento/CatalogGraphQl/Model/Category/CategoryFilter.php
new file mode 100644
index 0000000000000..2c03550404ae0
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/CategoryFilter.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\Category;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\InputException;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Search\Model\Query;
+
+/**
+ * Category filter allows to filter collection using 'id, url_key, name' from search criteria.
+ */
+class CategoryFilter
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Filter for filtering the requested categories id's based on url_key, ids, name in the result.
+     *
+     * @param array $args
+     * @param Collection $categoryCollection
+     * @param StoreInterface $store
+     * @throws InputException
+     */
+    public function applyFilters(array $args, Collection $categoryCollection, StoreInterface $store)
+    {
+        $categoryCollection->addAttributeToFilter(CategoryInterface::KEY_IS_ACTIVE, ['eq' => 1]);
+        foreach ($args['filters'] as $field => $cond) {
+            foreach ($cond as $condType => $value) {
+                if ($field === 'ids') {
+                    $categoryCollection->addIdFilter($value);
+                } else {
+                    $this->addAttributeFilter($categoryCollection, $field, $condType, $value, $store);
+                }
+            }
+        }
+    }
+
+    /**
+     * Add filter to category collection
+     *
+     * @param Collection $categoryCollection
+     * @param string $field
+     * @param string $condType
+     * @param string|array $value
+     * @param StoreInterface $store
+     * @throws InputException
+     */
+    private function addAttributeFilter($categoryCollection, $field, $condType, $value, $store)
+    {
+        if ($condType === 'match') {
+            $this->addMatchFilter($categoryCollection, $field, $value, $store);
+            return;
+        }
+        $categoryCollection->addAttributeToFilter($field, [$condType => $value]);
+    }
+
+    /**
+     * Add match filter to collection
+     *
+     * @param Collection $categoryCollection
+     * @param string $field
+     * @param string $value
+     * @param StoreInterface $store
+     * @throws InputException
+     */
+    private function addMatchFilter($categoryCollection, $field, $value, $store)
+    {
+        $minQueryLength = $this->scopeConfig->getValue(
+            Query::XML_PATH_MIN_QUERY_LENGTH,
+            ScopeInterface::SCOPE_STORE,
+            $store
+        );
+        $searchValue = str_replace('%', '', $value);
+        $matchLength = strlen($searchValue);
+        if ($matchLength < $minQueryLength) {
+            throw new InputException(__('Invalid match filter'));
+        }
+
+        $categoryCollection->addAttributeToFilter($field, ['like' => "%{$searchValue}%"]);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Config/CategoryAttributeReader.php b/app/code/Magento/CatalogGraphQl/Model/Config/CategoryAttributeReader.php
index 0ca72d9ff9519..cd11c3c68f794 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Config/CategoryAttributeReader.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Config/CategoryAttributeReader.php
@@ -51,16 +51,24 @@ class CategoryAttributeReader implements ReaderInterface
      */
     private $collectionFactory;
 
+    /**
+     * @var array
+     */
+    private $categoryAttributeResolvers;
+
     /**
      * @param Type $typeLocator
      * @param CollectionFactory $collectionFactory
+     * @param array $categoryAttributeResolvers
      */
     public function __construct(
         Type $typeLocator,
-        CollectionFactory $collectionFactory
+        CollectionFactory $collectionFactory,
+        array $categoryAttributeResolvers = []
     ) {
         $this->typeLocator = $typeLocator;
         $this->collectionFactory = $collectionFactory;
+        $this->categoryAttributeResolvers = $categoryAttributeResolvers;
     }
 
     /**
@@ -93,6 +101,9 @@ public function read($scope = null) : array
             $data['fields'][$attributeCode]['name'] = $attributeCode;
             $data['fields'][$attributeCode]['type'] = $locatedType;
             $data['fields'][$attributeCode]['arguments'] = [];
+            if (isset($this->categoryAttributeResolvers[$attributeCode])) {
+                $data['fields'][$attributeCode]['resolver'] = $this->categoryAttributeResolvers[$attributeCode];
+            }
         }
 
         $config['CategoryInterface'] = $data;
diff --git a/app/code/Magento/CatalogGraphQl/Model/Product/Option/DateType.php b/app/code/Magento/CatalogGraphQl/Model/Product/Option/DateType.php
index e1106a3f696e4..cd582ffda9244 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Product/Option/DateType.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Product/Option/DateType.php
@@ -10,9 +10,12 @@
 use Magento\Catalog\Model\Product\Option\Type\Date as ProductDateOptionType;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 
 /**
- * @inheritdoc
+ * CatalogGraphQl product option date type
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class DateType extends ProductDateOptionType
 {
@@ -43,6 +46,13 @@ private function formatValues($values)
         if (isset($values[$this->getOption()->getId()])) {
             $value = $values[$this->getOption()->getId()];
             $dateTime = \DateTime::createFromFormat(DateTime::DATETIME_PHP_FORMAT, $value);
+
+            if ($dateTime === false) {
+                throw new GraphQlInputException(
+                    __('Invalid format provided. Please use \'Y-m-d H:i:s\' format.')
+                );
+            }
+
             $values[$this->getOption()->getId()] = [
                 'date' => $value,
                 'year' => $dateTime->format('Y'),
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CanonicalUrl.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CanonicalUrl.php
new file mode 100644
index 0000000000000..3cce413ff93f3
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/CanonicalUrl.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\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\Store\Api\Data\StoreInterface;
+use Magento\Catalog\Helper\Category as CategoryHelper;
+
+/**
+ * Resolve data for category canonical URL
+ */
+class CanonicalUrl implements ResolverInterface
+{
+    /** @var CategoryHelper */
+    private $categoryHelper;
+
+    /**
+     * CanonicalUrl constructor.
+     * @param CategoryHelper $categoryHelper
+     */
+    public function __construct(CategoryHelper $categoryHelper)
+    {
+        $this->categoryHelper = $categoryHelper;
+    }
+
+    /**
+     * @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'];
+        /** @var StoreInterface $store */
+        $store = $context->getExtensionAttributes()->getStore();
+        if ($this->categoryHelper->canUseCanonicalTag($store)) {
+            $baseUrl = $category->getUrlInstance()->getBaseUrl();
+            return str_replace($baseUrl, '', $category->getUrl());
+        }
+        return null;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Image.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Image.php
new file mode 100644
index 0000000000000..a06a8252d5a5e
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Image.php
@@ -0,0 +1,65 @@
+<?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\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Framework\Filesystem\DirectoryList;
+
+/**
+ * Resolve category image to a fully qualified URL
+ */
+class Image implements ResolverInterface
+{
+    /** @var DirectoryList  */
+    private $directoryList;
+
+    /**
+     * @param DirectoryList $directoryList
+     */
+    public function __construct(DirectoryList $directoryList)
+    {
+        $this->directoryList = $directoryList;
+    }
+
+    /**
+     * @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 \Magento\Catalog\Model\Category $category */
+        $category = $value['model'];
+        $imagePath = $category->getImage();
+        if (empty($imagePath)) {
+            return null;
+        }
+        /** @var StoreInterface $store */
+        $store = $context->getExtensionAttributes()->getStore();
+        $baseUrl = $store->getBaseUrl('media');
+
+        $mediaPath = $this->directoryList->getUrlPath('media');
+        $pos = strpos($imagePath, $mediaPath);
+        if ($pos !== false) {
+            $imagePath = substr($imagePath, $pos + strlen($mediaPath), strlen($baseUrl));
+        }
+        $imageUrl = rtrim($baseUrl, '/') . '/' . ltrim($imagePath, '/');
+
+        return $imageUrl;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryList.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryList.php
new file mode 100644
index 0000000000000..6b8949d612829
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryList.php
@@ -0,0 +1,114 @@
+<?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\Exception\InputException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CategoryTree;
+use Magento\CatalogGraphQl\Model\Category\CategoryFilter;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+
+/**
+ * Category List resolver, used for GraphQL category data request processing.
+ */
+class CategoryList implements ResolverInterface
+{
+    /**
+     * @var CategoryTree
+     */
+    private $categoryTree;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var CategoryFilter
+     */
+    private $categoryFilter;
+
+    /**
+     * @var ExtractDataFromCategoryTree
+     */
+    private $extractDataFromCategoryTree;
+
+    /**
+     * @param CategoryTree $categoryTree
+     * @param ExtractDataFromCategoryTree $extractDataFromCategoryTree
+     * @param CategoryFilter $categoryFilter
+     * @param CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        CategoryTree $categoryTree,
+        ExtractDataFromCategoryTree $extractDataFromCategoryTree,
+        CategoryFilter $categoryFilter,
+        CollectionFactory $collectionFactory
+    ) {
+        $this->categoryTree = $categoryTree;
+        $this->extractDataFromCategoryTree = $extractDataFromCategoryTree;
+        $this->categoryFilter = $categoryFilter;
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (isset($value[$field->getName()])) {
+            return $value[$field->getName()];
+        }
+        $store = $context->getExtensionAttributes()->getStore();
+
+        $rootCategoryIds = [];
+        if (!isset($args['filters'])) {
+            $rootCategoryIds[] = (int)$store->getRootCategoryId();
+        } else {
+            $categoryCollection = $this->collectionFactory->create();
+            try {
+                $this->categoryFilter->applyFilters($args, $categoryCollection, $store);
+            } catch (InputException $e) {
+                return [];
+            }
+
+            foreach ($categoryCollection as $category) {
+                $rootCategoryIds[] = (int)$category->getId();
+            }
+        }
+
+        $result = $this->fetchCategories($rootCategoryIds, $info);
+        return $result;
+    }
+
+    /**
+     * Fetch category tree data
+     *
+     * @param array $categoryIds
+     * @param ResolveInfo $info
+     * @return array
+     * @throws GraphQlNoSuchEntityException
+     */
+    private function fetchCategories(array $categoryIds, ResolveInfo $info)
+    {
+        $fetchedCategories = [];
+        foreach ($categoryIds as $categoryId) {
+            $categoryTree = $this->categoryTree->getTree($info, $categoryId);
+            if (empty($categoryTree)) {
+                continue;
+            }
+            $fetchedCategories[] = current($this->extractDataFromCategoryTree->execute($categoryTree));
+        }
+
+        return $fetchedCategories;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/DataProvider/Filters.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/DataProvider/Filters.php
index 786d4f1ab867c..f6d8edf1fe9b5 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/DataProvider/Filters.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/DataProvider/Filters.php
@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
 use Magento\CatalogGraphQl\Model\Resolver\Layer\FiltersProvider;
+use Magento\Catalog\Model\Layer\Filter\Item;
 
 /**
  * Layered navigation filters data provider.
@@ -20,6 +21,11 @@ class Filters
      */
     private $filtersProvider;
 
+    /**
+     * @var array
+     */
+    private $mappings;
+
     /**
      * Filters constructor.
      * @param FiltersProvider $filtersProvider
@@ -28,26 +34,31 @@ public function __construct(
         FiltersProvider $filtersProvider
     ) {
         $this->filtersProvider = $filtersProvider;
+        $this->mappings = [
+            'Category' => 'category'
+        ];
     }
 
     /**
      * Get layered navigation filters data
      *
      * @param string $layerType
+     * @param array|null $attributesToFilter
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function getData(string $layerType) : array
+    public function getData(string $layerType, array $attributesToFilter = null) : array
     {
         $filtersData = [];
         /** @var AbstractFilter $filter */
         foreach ($this->filtersProvider->getFilters($layerType) as $filter) {
-            if ($filter->getItemsCount()) {
+            if ($this->isNeedToAddFilter($filter, $attributesToFilter)) {
                 $filterGroup = [
                     'name' => (string)$filter->getName(),
                     'filter_items_count' => $filter->getItemsCount(),
                     'request_var' => $filter->getRequestVar(),
                 ];
-                /** @var \Magento\Catalog\Model\Layer\Filter\Item $filterItem */
+                /** @var Item $filterItem */
                 foreach ($filter->getItems() as $filterItem) {
                     $filterGroup['filter_items'][] = [
                         'label' => (string)$filterItem->getLabel(),
@@ -60,4 +71,32 @@ public function getData(string $layerType) : array
         }
         return $filtersData;
     }
+
+    /**
+     * Check for adding filter to the list
+     *
+     * @param AbstractFilter $filter
+     * @param array $attributesToFilter
+     * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function isNeedToAddFilter(AbstractFilter $filter, array $attributesToFilter): bool
+    {
+        if ($attributesToFilter === null) {
+            $result = (bool)$filter->getItemsCount();
+        } else {
+            if ($filter->hasAttributeModel()) {
+                $filterAttribute = $filter->getAttributeModel();
+                $result = in_array($filterAttribute->getAttributeCode(), $attributesToFilter);
+            } else {
+                $name = (string)$filter->getName();
+                if (array_key_exists($name, $this->mappings)) {
+                    $result = in_array($this->mappings[$name], $attributesToFilter);
+                } else {
+                    $result = true;
+                }
+            }
+        }
+        return $result;
+    }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/LayerFilters.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/LayerFilters.php
index 0ec7e12e42d55..78ac45a1ad001 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/LayerFilters.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/LayerFilters.php
@@ -44,6 +44,29 @@ public function resolve(
             return null;
         }
 
-        return $this->filtersDataProvider->getData($value['layer_type']);
+        $attributes = $this->prepareAttributesResults($value);
+        return $this->filtersDataProvider->getData($value['layer_type'], $attributes);
+    }
+
+    /**
+     * Get attributes available to filtering from the search result
+     *
+     * @param array $value
+     * @return array|null
+     */
+    private function prepareAttributesResults(array $value): ?array
+    {
+        $attributes = [];
+        if (!empty($value['search_result'])) {
+            $buckets = $value['search_result']->getSearchAggregation()->getBuckets();
+            foreach ($buckets as $bucket) {
+                if (!empty($bucket->getValues())) {
+                    $attributes[] = str_replace('_bucket', '', $bucket->getName());
+                }
+            }
+        } else {
+            $attributes = null;
+        }
+        return $attributes;
     }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php
index 86137990cc57d..889735a5f4d88 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php
@@ -14,6 +14,7 @@
 use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * @inheritdoc
@@ -63,10 +64,13 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $this->productDataProvider->addEavAttributes($fields);
 
         $result = function () use ($value) {
-            $data = $this->productDataProvider->getProductBySku($value['sku']);
+            $data = $value['product'] ?? $this->productDataProvider->getProductBySku($value['sku']);
             if (empty($data)) {
                 return null;
             }
+            if (!isset($data['model'])) {
+                throw new LocalizedException(__('"model" value should be specified'));
+            }
             $productModel = $data['model'];
             /** @var \Magento\Catalog\Model\Product $productModel */
             $data = $productModel->getData();
@@ -79,10 +83,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
                     }
                 }
             }
-
             return array_replace($value, $data);
         };
-
         return $this->valueFactory->create($result);
     }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/BatchProductLinks.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/BatchProductLinks.php
new file mode 100644
index 0000000000000..14732ecf37c63
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/BatchProductLinks.php
@@ -0,0 +1,81 @@
+<?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\ProductLink\Data\ListCriteria;
+use Magento\Catalog\Model\ProductLink\ProductLinkQuery;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Query\Resolver\BatchServiceContractResolverInterface;
+use Magento\Framework\GraphQl\Query\Resolver\ResolveRequestInterface;
+use Magento\Catalog\Api\Data\ProductLinkInterface;
+
+/**
+ * Format the product links information to conform to GraphQL schema representation
+ */
+class BatchProductLinks implements BatchServiceContractResolverInterface
+{
+    /**
+     * @var string[]
+     */
+    private static $linkTypes = ['related', 'upsell', 'crosssell'];
+
+    /**
+     * @inheritDoc
+     */
+    public function getServiceContract(): array
+    {
+        return [ProductLinkQuery::class, 'search'];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function convertToServiceArgument(ResolveRequestInterface $request)
+    {
+        $value = $request->getValue();
+        if (empty($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $value['model'];
+
+        return new ListCriteria((string)$product->getId(), self::$linkTypes, $product);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function convertFromServiceResult($result, ResolveRequestInterface $request)
+    {
+        /** @var \Magento\Catalog\Model\ProductLink\Data\ListResultInterface $result */
+        if ($result->getError()) {
+            //If model isn't there previous method would've thrown an exception.
+            /** @var \Magento\Catalog\Model\Product $product */
+            $product = $request->getValue()['model'];
+            throw new LocalizedException(
+                __('Failed to retrieve product links for "%1"', $product->getSku()),
+                $result->getError()
+            );
+        }
+
+        return array_filter(
+            array_map(
+                function (ProductLinkInterface $link) {
+                    return [
+                        'sku' => $link->getSku(),
+                        'link_type' => $link->getLinkType(),
+                        'linked_product_sku' => $link->getLinkedProductSku(),
+                        'linked_product_type' => $link->getLinkedProductType(),
+                        'position' => $link->getPosition()
+                    ];
+                },
+                $result->getResult()
+            )
+        );
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CanonicalUrl.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CanonicalUrl.php
index 9047eaee4b568..0f764d1daa5e7 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CanonicalUrl.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CanonicalUrl.php
@@ -12,12 +12,25 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Helper\Product as ProductHelper;
+use Magento\Store\Api\Data\StoreInterface;
 
 /**
  * Resolve data for product canonical URL
  */
 class CanonicalUrl implements ResolverInterface
 {
+    /** @var ProductHelper */
+    private $productHelper;
+
+    /**
+     * @param Product $productHelper
+     */
+    public function __construct(ProductHelper $productHelper)
+    {
+        $this->productHelper = $productHelper;
+    }
+
     /**
      * @inheritdoc
      */
@@ -32,10 +45,14 @@ public function resolve(
             throw new LocalizedException(__('"model" value should be specified'));
         }
 
-        /* @var $product Product */
+        /* @var Product $product */
         $product = $value['model'];
-        $url = $product->getUrlModel()->getUrl($product, ['_ignore_category' => true]);
-        
-        return $url;
+        /** @var StoreInterface $store */
+        $store = $context->getExtensionAttributes()->getStore();
+        if ($this->productHelper->canUseCanonicalTag($store)) {
+            $product->getUrlModel()->getUrl($product, ['_ignore_category' => true]);
+            return $product->getRequestPath();
+        }
+        return null;
     }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGallery/Label.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGallery/Label.php
deleted file mode 100644
index 4ec76fe59ca88..0000000000000
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGallery/Label.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\CatalogGraphQl\Model\Resolver\Product\MediaGallery;
-
-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\Api\Data\StoreInterface;
-
-/**
- * Return media label
- */
-class Label implements ResolverInterface
-{
-    /**
-     * @var ProductResourceModel
-     */
-    private $productResource;
-
-    /**
-     * @param ProductResourceModel $productResource
-     */
-    public function __construct(
-        ProductResourceModel $productResource
-    ) {
-        $this->productResource = $productResource;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function resolve(
-        Field $field,
-        $context,
-        ResolveInfo $info,
-        array $value = null,
-        array $args = null
-    ) {
-
-        if (isset($value['label'])) {
-            return $value['label'];
-        }
-
-        if (!isset($value['model'])) {
-            throw new LocalizedException(__('"model" value should be specified'));
-        }
-
-        /** @var Product $product */
-        $product = $value['model'];
-        $productId = (int)$product->getEntityId();
-        /** @var StoreInterface $store */
-        $store = $context->getExtensionAttributes()->getStore();
-        $storeId = (int)$store->getId();
-        if (!isset($value['image_type'])) {
-            return $this->getAttributeValue($productId, 'name', $storeId);
-        }
-        $imageType = $value['image_type'];
-        $imageLabel = $this->getAttributeValue($productId, $imageType . '_label', $storeId);
-        if ($imageLabel == null) {
-            $imageLabel = $this->getAttributeValue($productId, 'name', $storeId);
-        }
-
-        return $imageLabel;
-    }
-
-    /**
-     * Get attribute value
-     *
-     * @param int $productId
-     * @param string $attributeCode
-     * @param int $storeId
-     * @return null|string Null if attribute value is not exists
-     */
-    private function getAttributeValue(int $productId, string $attributeCode, int $storeId): ?string
-    {
-        $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/MediaGallery/Url.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGallery/Url.php
index eaab159cddae6..359d295095667 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGallery/Url.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGallery/Url.php
@@ -24,11 +24,17 @@ class Url implements ResolverInterface
      * @var ImageFactory
      */
     private $productImageFactory;
+
     /**
      * @var PlaceholderProvider
      */
     private $placeholderProvider;
 
+    /**
+     * @var string[]
+     */
+    private $placeholderCache = [];
+
     /**
      * @param ImageFactory $productImageFactory
      * @param PlaceholderProvider $placeholderProvider
@@ -64,12 +70,8 @@ public function resolve(
         if (isset($value['image_type'])) {
             $imagePath = $product->getData($value['image_type']);
             return $this->getImageUrl($value['image_type'], $imagePath);
-        }
-        if (isset($value['file'])) {
-            $image = $this->productImageFactory->create();
-            $image->setDestinationSubdir('image')->setBaseFile($value['file']);
-            $imageUrl = $image->getUrl();
-            return $imageUrl;
+        } elseif (isset($value['file'])) {
+            return $this->getImageUrl('image', $value['file']);
         }
         return [];
     }
@@ -84,12 +86,16 @@ public function resolve(
      */
     private function getImageUrl(string $imageType, ?string $imagePath): string
     {
+        if (empty($imagePath) && !empty($this->placeholderCache[$imageType])) {
+            return $this->placeholderCache[$imageType];
+        }
         $image = $this->productImageFactory->create();
         $image->setDestinationSubdir($imageType)
             ->setBaseFile($imagePath);
 
         if ($image->isBaseFilePlaceholder()) {
-            return $this->placeholderProvider->getPlaceholder($imageType);
+            $this->placeholderCache[$imageType] = $this->placeholderProvider->getPlaceholder($imageType);
+            return $this->placeholderCache[$imageType];
         }
 
         return $image->getUrl();
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage.php
index d1566162472b0..7c08f91c922bd 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductImage.php
@@ -18,6 +18,25 @@
  */
 class ProductImage implements ResolverInterface
 {
+    /** @var array */
+    private static $catalogImageLabelTypes = [
+        'image' => 'image_label',
+        'small_image' => 'small_image_label',
+        'thumbnail' => 'thumbnail_label'
+    ];
+
+    /** @var array */
+    private $imageTypeLabels;
+
+    /**
+     * @param array $imageTypeLabels
+     */
+    public function __construct(
+        array $imageTypeLabels = []
+    ) {
+        $this->imageTypeLabels =  array_replace(self::$catalogImageLabelTypes, $imageTypeLabels);
+    }
+
     /**
      * @inheritdoc
      */
@@ -34,11 +53,16 @@ public function resolve(
 
         /** @var Product $product */
         $product = $value['model'];
-        $imageType = $field->getName();
+        $label =  $value['name'] ?? null;
+        if (isset($this->imageTypeLabels[$info->fieldName])
+            && !empty($value[$this->imageTypeLabels[$info->fieldName]])) {
+            $label = $value[$this->imageTypeLabels[$info->fieldName]];
+        }
 
         return [
             'model' => $product,
-            'image_type' => $imageType,
+            'image_type' => $field->getName(),
+            'label' => $label
         ];
     }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
index 3525ccbb6a2d1..b38a2c9bb04d9 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
@@ -48,24 +48,57 @@ public function __construct(
     public function execute(\Iterator $iterator): array
     {
         $tree = [];
+        /** @var CategoryInterface $rootCategory */
+        $rootCategory = $iterator->current();
         while ($iterator->valid()) {
-            /** @var CategoryInterface $category */
-            $category = $iterator->current();
+            /** @var CategoryInterface $currentCategory */
+            $currentCategory = $iterator->current();
             $iterator->next();
-            $pathElements = explode("/", $category->getPath());
-            if (empty($tree)) {
-                $this->startCategoryFetchLevel = count($pathElements) - 1;
+            if ($this->areParentsActive($currentCategory, $rootCategory, (array)$iterator)) {
+                $pathElements = explode("/", $currentCategory->getPath());
+                if (empty($tree)) {
+                    $this->startCategoryFetchLevel = count($pathElements) - 1;
+                }
+                $this->iteratingCategory = $currentCategory;
+                $currentLevelTree = $this->explodePathToArray($pathElements, $this->startCategoryFetchLevel);
+                if (empty($tree)) {
+                    $tree = $currentLevelTree;
+                }
+                $tree = $this->mergeCategoriesTrees($currentLevelTree, $tree);
             }
-            $this->iteratingCategory = $category;
-            $currentLevelTree = $this->explodePathToArray($pathElements, $this->startCategoryFetchLevel);
-            if (empty($tree)) {
-                $tree = $currentLevelTree;
-            }
-            $tree = $this->mergeCategoriesTrees($currentLevelTree, $tree);
         }
         return $tree;
     }
 
+    /**
+     * Test that all parents of the current category are active.
+     *
+     * Assumes that $categoriesArray are key-pair values and key is the ID of the category and
+     * all categories in this list are queried as active.
+     *
+     * @param CategoryInterface $currentCategory
+     * @param CategoryInterface $rootCategory
+     * @param array $categoriesArray
+     * @return bool
+     */
+    private function areParentsActive(
+        CategoryInterface $currentCategory,
+        CategoryInterface $rootCategory,
+        array $categoriesArray
+    ): bool {
+        if ($currentCategory === $rootCategory) {
+            return true;
+        } elseif (array_key_exists($currentCategory->getParentId(), $categoriesArray)) {
+            return $this->areParentsActive(
+                $categoriesArray[$currentCategory->getParentId()],
+                $rootCategory,
+                $categoriesArray
+            );
+        } else {
+            return false;
+        }
+    }
+
     /**
      * Merge together complex categories trees
      *
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
index 2ad05fbfa1e08..fef224b12acfc 100644
--- 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
@@ -51,6 +51,27 @@ public function process(
     /**
      * Add attribute to collection select
      *
+     * Add attributes to the collection where graphql fields names don't match attributes names, or if attributes exist
+     * on a nested level and they need to be loaded.
+     *
+     * Format of the attribute can be string or array while array can have different formats.
+     * Example: [
+     *          'price_range' =>
+     *               [
+     *                   'price' => 'price',
+     *                   'price_type' => 'price_type',
+     *               ],
+     *           'thumbnail' => //complex array where more than one attribute is needed to compute a value
+     *               [
+     *                   'label' =>
+     *                       [
+     *                           'attribute' => 'thumbnail_label', // the actual attribute
+     *                           'fallback_attribute' => 'name', //used as default value in case attribute value is null
+     *                       ],
+     *                   'url' => 'thumbnail',
+     *               ]
+     *          ]
+     *
      * @param Collection $collection
      * @param string $attribute
      */
@@ -59,9 +80,7 @@ private function addAttribute(Collection $collection, string $attribute): void
         if (isset($this->fieldToAttributeMap[$attribute])) {
             $attributeMap = $this->fieldToAttributeMap[$attribute];
             if (is_array($attributeMap)) {
-                foreach ($attributeMap as $attributeName) {
-                    $collection->addAttributeToSelect($attributeName);
-                }
+                $this->addAttributeAsArray($collection, $attributeMap);
             } else {
                 $collection->addAttributeToSelect($attributeMap);
             }
@@ -70,4 +89,39 @@ private function addAttribute(Collection $collection, string $attribute): void
             $collection->addAttributeToSelect($attribute);
         }
     }
+
+    /**
+     * Add an array defined attribute to the collection
+     *
+     * @param Collection $collection
+     * @param array $attributeMap
+     * @return void
+     */
+    private function addAttributeAsArray(Collection $collection, array $attributeMap): void
+    {
+        foreach ($attributeMap as $attribute) {
+            if (is_array($attribute)) {
+                $this->addAttributeComplexArrayToCollection($collection, $attribute);
+            } else {
+                $collection->addAttributeToSelect($attribute);
+            }
+        }
+    }
+
+    /**
+     * Add a complex array defined attribute to the collection
+     *
+     * @param Collection $collection
+     * @param array $attribute
+     * @return void
+     */
+    private function addAttributeComplexArrayToCollection(Collection $collection, array $attribute): void
+    {
+        if (isset($attribute['attribute'])) {
+            $collection->addAttributeToSelect($attribute['attribute']);
+        }
+        if (isset($attribute['fallback_attribute'])) {
+            $collection->addAttributeToSelect($attribute['fallback_attribute']);
+        }
+    }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/FieldSelection.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/FieldSelection.php
index 3912bab05ebbe..ffa0a3e6848e1 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/FieldSelection.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/FieldSelection.php
@@ -50,19 +50,19 @@ private function getProductFields(ResolveInfo $info): array
     {
         $fieldNames = [];
         foreach ($info->fieldNodes as $node) {
-            if ($node->name->value !== 'products') {
+            if ($node->name->value !== 'products' && $node->name->value !== 'variants') {
                 continue;
             }
             foreach ($node->selectionSet->selections as $selection) {
-                if ($selection->name->value !== 'items') {
+                if ($selection->name->value !== 'items' && $selection->name->value !== 'product') {
                     continue;
                 }
                 $fieldNames[] = $this->collectProductFieldNames($selection, $fieldNames);
             }
         }
-
-        $fieldNames = array_merge(...$fieldNames);
-
+        if (!empty($fieldNames)) {
+            $fieldNames = array_merge(...$fieldNames);
+        }
         return $fieldNames;
     }
 
diff --git a/app/code/Magento/CatalogGraphQl/Plugin/DesignLoader.php b/app/code/Magento/CatalogGraphQl/Plugin/DesignLoader.php
new file mode 100644
index 0000000000000..cfb99ce270c21
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Plugin/DesignLoader.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\Plugin;
+
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\View\DesignLoader as ViewDesignLoader;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Catalog\Block\Product\ImageFactory;
+
+/**
+ * Load necessary design files for GraphQL
+ */
+class DesignLoader
+{
+    /**
+     * @var DesignLoader
+     */
+    private $designLoader;
+
+    /**
+     * @var ManagerInterface
+     */
+    private $messageManager;
+
+    /**
+     * @param ViewDesignLoader $designLoader
+     * @param ManagerInterface $messageManager
+     */
+    public function __construct(
+        ViewDesignLoader $designLoader,
+        ManagerInterface $messageManager
+    ) {
+        $this->designLoader = $designLoader;
+        $this->messageManager = $messageManager;
+    }
+
+    /**
+     * Before create load the design files
+     *
+     * @param ImageFactory $subject
+     * @param Product $product
+     * @param string $imageId
+     * @param array|null $attributes
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeCreate(
+        ImageFactory $subject,
+        Product $product,
+        string $imageId,
+        array $attributes = null
+    ) {
+        try {
+            $this->designLoader->load();
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            if ($e->getPrevious() instanceof \Magento\Framework\Config\Dom\ValidationException) {
+                /** @var MessageInterface $message */
+                $message = $this->messageManager
+                    ->createMessage(MessageInterface::TYPE_ERROR)
+                    ->setText($e->getMessage());
+                $this->messageManager->addUniqueMessages([$message]);
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
index ad1b450f5215c..066a7b38d8967 100644
--- a/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
@@ -134,6 +134,45 @@
                 <item name="price_range" xsi:type="array">
                     <item name="price" xsi:type="string">price</item>
                 </item>
+                <item name="thumbnail" xsi:type="array">
+                    <item name="label" xsi:type="array">
+                        <item name="attribute" xsi:type="string">thumbnail_label</item>
+                        <item name="fallback_attribute" xsi:type="string">name</item>
+                    </item>
+                    <item name="url" xsi:type="string">thumbnail</item>
+                </item>
+                <item name="small_image" xsi:type="array">
+                    <item name="label" xsi:type="array">
+                        <item name="attribute" xsi:type="string">small_image_label</item>
+                        <item name="fallback_attribute" xsi:type="string">name</item>
+                    </item>
+                    <item name="url" xsi:type="string">small_image</item>
+                </item>
+                <item name="image" xsi:type="array">
+                    <item name="label" xsi:type="array">
+                        <item name="attribute" xsi:type="string">image_label</item>
+                        <item name="fallback_attribute" xsi:type="string">name</item>
+                    </item>
+                    <item name="url" xsi:type="string">image</item>
+                </item>
+                <item name="media_gallery" xsi:type="array">
+                    <item name="label" xsi:type="array">
+                        <item name="attribute" xsi:type="string">image_label</item>
+                        <item name="fallback_attribute" xsi:type="string">name</item>
+                    </item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+
+    <type name="Magento\Catalog\Block\Product\ImageFactory">
+        <plugin name="designLoader" type="Magento\CatalogGraphQl\Plugin\DesignLoader" />
+    </type>
+
+    <type name="Magento\CatalogGraphQl\Model\Config\CategoryAttributeReader">
+        <arguments>
+            <argument name="categoryAttributeResolvers" xsi:type="array">
+                <item name="image" xsi:type="string">Magento\CatalogGraphQl\Model\Resolver\Category\Image</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index 6f2532635ca2c..f70a32a1b549e 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -11,9 +11,12 @@ type Query {
     ): 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.") @cache(cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Identity")
     category (
-        id: Int @doc(description: "Id of the category.")
+     id: Int @doc(description: "Id of the category.")
     ): CategoryTree
-    @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree") @doc(description: "The category query searches for categories that match the criteria specified in the search and filter attributes.") @cache(cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoryTreeIdentity")
+    @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree") @doc(description: "The category query searches for categories that match the criteria specified in the search and filter attributes.") @deprecated(reason: "Use 'categoryList' query instead of 'category' query") @cache(cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoryTreeIdentity")
+    categoryList(
+    filters: CategoryFilterInput @doc(description: "Identifies which Category filter inputs to search for and return.")
+    ): [CategoryTree] @doc(description: "Returns an array of categories based on the specified filters.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryList") @cache(cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoriesIdentity")
 }
 
 type Price @doc(description: "Price is deprecated, replaced by ProductPrice. The Price object defines the price of a product as well as any tax-related adjustments.") {
@@ -99,14 +102,14 @@ interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\
     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")
+    product_links: [ProductLinksInterface] @doc(description: "An array of ProductLinks objects.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\BatchProductLinks")
     media_gallery_entries: [MediaGalleryEntry] @deprecated(reason: "Use product's `media_gallery` instead") @doc(description: "An array of MediaGalleryEntry objects.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\MediaGalleryEntries")
     price: ProductPrices @deprecated(reason: "Use price_range for product price information.") @doc(description: "A ProductPrices object, indicating the price of an item.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Price")
     price_range: PriceRange! @doc(description: "A PriceRange object, indicating the range of prices for the product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\PriceRange")
     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") @cache(cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoriesIdentity")
-    canonical_url: String @doc(description: "Canonical URL.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CanonicalUrl")
+    canonical_url: String @doc(description: "Relative canonical URL. This value is returned only if the system setting 'Use Canonical Link Meta Tag For Products' is enabled") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CanonicalUrl")
     media_gallery: [MediaGalleryInterface] @doc(description: "An array of Media Gallery objects.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\MediaGallery")
 }
 
@@ -195,7 +198,7 @@ type CustomizableFileValue @doc(description: "CustomizableFileValue defines the
 
 interface MediaGalleryInterface @doc(description: "Contains basic information about a product image or video.") @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\MediaGalleryTypeResolver") {
     url: String @doc(description: "The URL of the product image or video.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\MediaGallery\\Url")
-    label: String @doc(description: "The label of the product image or video.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\MediaGallery\\Label")
+    label: String @doc(description: "The label of the product image or video.")
 }
 
 type ProductImage implements MediaGalleryInterface @doc(description: "Product image information. Contains the image URL and label.") {
@@ -220,6 +223,7 @@ interface CategoryInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model
     path_in_store: String @doc(description: "Category path in store.")
     url_key: String @doc(description: "The url key assigned to the category.")
     url_path: String @doc(description: "The url path assigned to the category.")
+    canonical_url: String @doc(description: "Relative canonical URL. This value is returned only if the system setting 'Use Canonical Link Meta Tag For Categories' is enabled") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CanonicalUrl")
     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.")
@@ -294,6 +298,13 @@ input ProductAttributeFilterInput @doc(description: "ProductAttributeFilterInput
     category_id: FilterEqualTypeInput @doc(description: "Filter product by category id")
 }
 
+input CategoryFilterInput  @doc(description: "CategoryFilterInput 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.")
+{
+    ids: FilterEqualTypeInput @doc(description: "Filter by category ID that uniquely identifies the category.")
+    url_key: FilterEqualTypeInput @doc(description: "Filter by the part of the URL that identifies the category")
+    name: FilterMatchTypeInput @doc(description: "Filter by the display name of the category.")
+}
+
 input ProductFilterInput @doc(description: "ProductFilterInput is deprecated, use @ProductAttributeFilterInput instead. ProductFilterInput defines the filters to be used in the search. A filter contains at least one attribute, a comparison operator, and the value that is being searched for.") {
     name: FilterTypeInput @doc(description: "The product name. Customers use this name to identify the product.")
     sku: FilterTypeInput @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer.")
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 1ae993ed99060..7ebc397cbe650 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -302,6 +302,9 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         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',
         'invalidNewToDateValue' => 'Make sure new_to_date is later than or the same as new_from_date',
+        // Can't add new translated strings in patch release
+        'invalidLayoutUpdate' => 'Invalid format.',
+        'insufficientPermissions' => 'Invalid format.',
     ];
     //@codingStandardsIgnoreEnd
 
@@ -1195,7 +1198,7 @@ protected function _initTypeModels()
             // phpcs:disable Magento2.Performance.ForeachArrayMerge.ForeachArrayMerge
             $this->_fieldsMap = array_merge($this->_fieldsMap, $model->getCustomFieldsMapping());
             $this->_specialAttributes = array_merge($this->_specialAttributes, $model->getParticularAttributes());
-            // phpcs:enable 
+            // phpcs:enable
         }
         $this->_initErrorTemplates();
         // remove doubles
@@ -1511,7 +1514,7 @@ public function getImagesFromRow(array $rowData)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      * @throws LocalizedException
-     * phpcs:disable Generic.Metrics.NestingLevel
+     * phpcs:disable Generic.Metrics.NestingLevel.TooHigh
      */
     protected function _saveProducts()
     {
@@ -1566,6 +1569,13 @@ protected function _saveProducts()
                     continue;
                 }
 
+                $storeId = !empty($rowData[self::COL_STORE])
+                    ? $this->getStoreIdByCode($rowData[self::COL_STORE])
+                    : Store::DEFAULT_STORE_ID;
+                $rowExistingImages = $existingImages[$storeId][$rowSku] ?? [];
+                $rowStoreMediaGalleryValues = $rowExistingImages;
+                $rowExistingImages += $existingImages[Store::DEFAULT_STORE_ID][$rowSku] ?? [];
+
                 if (self::SCOPE_STORE == $rowScope) {
                     // set necessary data from SCOPE_DEFAULT row
                     $rowData[self::COL_TYPE] = $this->skuProcessor->getNewSku($rowSku)['type_id'];
@@ -1669,19 +1679,16 @@ protected function _saveProducts()
 
                 // 5. Media gallery phase
                 list($rowImages, $rowLabels) = $this->getImagesFromRow($rowData);
-                $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;
+                    //Mark image as uploaded if it exists
+                    if (array_key_exists($image, $rowExistingImages)) {
                         $uploadedImages[$image] = $image;
                     }
-
-                    if (empty($rowImages)) {
+                    //Add image to hide to images list if it does not exist
+                    if (empty($rowImages[self::COL_MEDIA_IMAGE])
+                        || !in_array($image, $rowImages[self::COL_MEDIA_IMAGE])
+                    ) {
                         $rowImages[self::COL_MEDIA_IMAGE][] = $image;
                     }
                 }
@@ -1722,24 +1729,29 @@ protected function _saveProducts()
                             continue;
                         }
 
-                        if (isset($existingImages[$rowSku][$uploadedFile])) {
-                            $currentFileData = $existingImages[$rowSku][$uploadedFile];
+                        if (isset($rowExistingImages[$uploadedFile])) {
+                            $currentFileData = $rowExistingImages[$uploadedFile];
+                            $currentFileData['store_id'] = $storeId;
+                            $storeMediaGalleryValueExists = isset($rowStoreMediaGalleryValues[$uploadedFile]);
+                            if (array_key_exists($uploadedFile, $imageHiddenStates)
+                                && $currentFileData['disabled'] != $imageHiddenStates[$uploadedFile]
+                            ) {
+                                $imagesForChangeVisibility[] = [
+                                    'disabled' => $imageHiddenStates[$uploadedFile],
+                                    'imageData' => $currentFileData,
+                                    'exists' => $storeMediaGalleryValueExists
+                                ];
+                                $storeMediaGalleryValueExists = true;
+                            }
+
                             if (isset($rowLabels[$column][$columnImageKey])
                                 && $rowLabels[$column][$columnImageKey] !=
                                 $currentFileData['label']
                             ) {
                                 $labelsForUpdate[] = [
                                     'label' => $rowLabels[$column][$columnImageKey],
-                                    'imageData' => $currentFileData
-                                ];
-                            }
-
-                            if (array_key_exists($uploadedFile, $imageHiddenStates)
-                                && $currentFileData['disabled'] != $imageHiddenStates[$uploadedFile]
-                            ) {
-                                $imagesForChangeVisibility[] = [
-                                    'disabled' => $imageHiddenStates[$uploadedFile],
-                                    'imageData' => $currentFileData
+                                    'imageData' => $currentFileData,
+                                    'exists' => $storeMediaGalleryValueExists
                                 ];
                             }
                         } else {
@@ -2032,9 +2044,9 @@ protected function _saveProductTierPrices(array $tierPriceData)
     protected function _getUploader()
     {
         if ($this->_fileUploader === null) {
-            $this->_fileUploader = $this->_uploaderFactory->create();
+            $fileUploader = $this->_uploaderFactory->create();
 
-            $this->_fileUploader->init();
+            $fileUploader->init();
 
             $dirConfig = DirectoryList::getDefaultConfig();
             $dirAddon = $dirConfig[DirectoryList::MEDIA][DirectoryList::PATH];
@@ -2045,7 +2057,7 @@ protected function _getUploader()
                 $tmpPath = $dirAddon . '/' . $this->_mediaDirectory->getRelativePath('import');
             }
 
-            if (!$this->_fileUploader->setTmpDir($tmpPath)) {
+            if (!$fileUploader->setTmpDir($tmpPath)) {
                 throw new LocalizedException(
                     __('File directory \'%1\' is not readable.', $tmpPath)
                 );
@@ -2054,11 +2066,13 @@ protected function _getUploader()
             $destinationPath = $dirAddon . '/' . $this->_mediaDirectory->getRelativePath($destinationDir);
 
             $this->_mediaDirectory->create($destinationPath);
-            if (!$this->_fileUploader->setDestDir($destinationPath)) {
+            if (!$fileUploader->setDestDir($destinationPath)) {
                 throw new LocalizedException(
                     __('File directory \'%1\' is not writable.', $destinationPath)
                 );
             }
+
+            $this->_fileUploader = $fileUploader;
         }
         return $this->_fileUploader;
     }
@@ -3057,6 +3071,8 @@ private function getValidationErrorLevel($sku): string
      * @param int $nextLinkId
      * @param array $positionAttrId
      * @return void
+     * @throws LocalizedException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function processLinkBunches(
         array $bunch,
@@ -3067,6 +3083,7 @@ private function processLinkBunches(
         $productIds = [];
         $linkRows = [];
         $positionRows = [];
+        $linksToDelete = [];
 
         $bunch = array_filter($bunch, [$this, 'isRowAllowedToImport'], ARRAY_FILTER_USE_BOTH);
         foreach ($bunch as $rowData) {
@@ -3083,10 +3100,15 @@ function ($linkName) use ($rowData) {
             );
             foreach ($linkNameToId as $linkName => $linkId) {
                 $linkSkus = explode($this->getMultipleValueSeparator(), $rowData[$linkName . 'sku']);
+                //process empty value
+                if (!empty($linkSkus[0]) && $linkSkus[0] === $this->getEmptyAttributeValueConstant()) {
+                    $linksToDelete[$linkId][] = $productId;
+                    continue;
+                }
+
                 $linkPositions = !empty($rowData[$linkName . 'position'])
                     ? explode($this->getMultipleValueSeparator(), $rowData[$linkName . 'position'])
                     : [];
-
                 $linkSkus = array_filter(
                     $linkSkus,
                     function ($linkedSku) use ($sku) {
@@ -3095,6 +3117,7 @@ function ($linkedSku) use ($sku) {
                             && strcasecmp($linkedSku, $sku) !== 0;
                     }
                 );
+
                 foreach ($linkSkus as $linkedKey => $linkedSku) {
                     $linkedId = $this->getProductLinkedId($linkedSku);
                     if ($linkedId == null) {
@@ -3126,9 +3149,34 @@ function ($linkedSku) use ($sku) {
                 }
             }
         }
+        $this->deleteProductsLinks($resource, $linksToDelete);
         $this->saveLinksData($resource, $productIds, $linkRows, $positionRows);
     }
 
+    /**
+     * Delete links
+     *
+     * @param Link $resource
+     * @param array $linksToDelete
+     * @return void
+     * @throws LocalizedException
+     */
+    private function deleteProductsLinks(Link $resource, array $linksToDelete)
+    {
+        if (!empty($linksToDelete) && Import::BEHAVIOR_APPEND === $this->getBehavior()) {
+            foreach ($linksToDelete as $linkTypeId => $productIds) {
+                if (!empty($productIds)) {
+                    $whereLinkId = $this->_connection->quoteInto('link_type_id', $linkTypeId);
+                    $whereProductId =  $this->_connection->quoteInto('product_id IN (?)', array_unique($productIds));
+                    $this->_connection->delete(
+                        $resource->getMainTable(),
+                        $whereLinkId . ' AND ' . $whereProductId
+                    );
+                }
+            }
+        }
+    }
+
     /**
      * Fetches Product Links
      *
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
index 00e6da0ebe077..bd8523a4e396e 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
@@ -12,7 +12,6 @@
 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.
@@ -179,13 +178,15 @@ private function updateMediaGalleryField(array $data, $field)
         $insertData = [];
         foreach ($data as $datum) {
             $imageData = $datum['imageData'];
+            $exists = $datum['exists'] ?? true;
 
-            if ($imageData[$field] === null) {
+            if (!$exists) {
                 $insertData[] = [
                     $field => $datum[$field],
                     $this->getProductEntityLinkField() => $imageData[$this->getProductEntityLinkField()],
                     'value_id' => $imageData['value_id'],
-                    'store_id' => Store::DEFAULT_STORE_ID,
+                    'store_id' => $imageData['store_id'],
+                    'position' => $imageData['position'],
                 ];
             } else {
                 $this->connection->update(
@@ -196,7 +197,7 @@ private function updateMediaGalleryField(array $data, $field)
                     [
                         $this->getProductEntityLinkField() . ' = ?' => $imageData[$this->getProductEntityLinkField()],
                         'value_id = ?' => $imageData['value_id'],
-                        'store_id = ?' => Store::DEFAULT_STORE_ID,
+                        'store_id = ?' => $imageData['store_id'],
                     ]
                 );
             }
@@ -240,14 +241,15 @@ public function getExistingImages(array $bunch)
         )->joinLeft(
             ['mgv' => $this->mediaGalleryValueTableName],
             sprintf(
-                '(mg.value_id = mgv.value_id AND mgv.%s = mgvte.%s AND mgv.store_id = %d)',
+                '(mgv.%s = mgvte.%s AND mg.value_id = mgv.value_id)',
                 $this->getProductEntityLinkField(),
-                $this->getProductEntityLinkField(),
-                Store::DEFAULT_STORE_ID
+                $this->getProductEntityLinkField()
             ),
             [
+                'store_id' => 'mgv.store_id',
                 'label' => 'mgv.label',
                 'disabled' => 'mgv.disabled',
+                'position' => 'mgv.position',
             ]
         )->joinInner(
             ['pe' => $this->productEntityTableName],
@@ -259,7 +261,9 @@ public function getExistingImages(array $bunch)
         );
 
         foreach ($this->connection->fetchAll($select) as $image) {
-            $result[$image['sku']][$image['value']] = $image;
+            $storeId = $image['store_id'];
+            unset($image['store_id']);
+            $result[$storeId][$image['sku']][$image['value']] = $image;
         }
 
         return $result;
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index 4d8088a235402..4c716421b7ae6 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -1695,7 +1695,7 @@ protected function _parseRequiredData(array $rowData)
             $this->_rowIsMain = false;
         }
 
-        return [$this->_rowProductId, $this->_rowStoreId, $this->_rowType, $this->_rowIsMain];
+        return true;
     }
 
     /**
@@ -2086,7 +2086,9 @@ protected function _parseCustomOptions($rowData)
                     }
                 }
             }
-            $options[$name][$k]['_custom_option_store'] = $rowData[Product::COL_STORE_VIEW_CODE];
+            if (isset($rowData[Product::COL_STORE_VIEW_CODE])) {
+                $options[$name][$k][self::COLUMN_STORE] = $rowData[Product::COL_STORE_VIEW_CODE];
+            }
             $k++;
         }
         $rowData['custom_options'] = $options;
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/LayoutUpdate.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/LayoutUpdate.php
new file mode 100644
index 0000000000000..99919628518c6
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/LayoutUpdate.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CatalogImportExport\Model\Import\Product\Validator;
+
+use Magento\Framework\Config\ValidationStateInterface;
+use Magento\Framework\View\Model\Layout\Update\ValidatorFactory;
+
+/**
+ * Validates layout and custom layout update fields
+ */
+class LayoutUpdate extends AbstractImportValidator
+{
+    private const ERROR_INVALID_LAYOUT_UPDATE = 'invalidLayoutUpdate';
+
+    /**
+     * @var ValidatorFactory
+     */
+    private $layoutValidatorFactory;
+    
+    /**
+     * @var ValidationStateInterface
+     */
+    private $validationState;
+
+    /**
+     * @param ValidatorFactory $layoutValidatorFactory
+     * @param ValidationStateInterface $validationState
+     */
+    public function __construct(
+        ValidatorFactory $layoutValidatorFactory,
+        ValidationStateInterface $validationState
+    ) {
+        $this->layoutValidatorFactory = $layoutValidatorFactory;
+        $this->validationState = $validationState;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isValid($value): bool
+    {
+        if (!empty($value['custom_layout_update']) && !$this->validateXml($value['custom_layout_update'])) {
+            $this->_addMessages(
+                [
+                    $this->context->retrieveMessageTemplate(self::ERROR_INVALID_LAYOUT_UPDATE)
+                ]
+            );
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Validate XML layout update
+     *
+     * @param string $xml
+     * @return bool
+     */
+    private function validateXml(string $xml): bool
+    {
+        /** @var $layoutXmlValidator \Magento\Framework\View\Model\Layout\Update\Validator */
+        $layoutXmlValidator = $this->layoutValidatorFactory->create(
+            [
+                'validationState' => $this->validationState,
+            ]
+        );
+
+        try {
+            if (!$layoutXmlValidator->isValid($xml)) {
+                return false;
+            }
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/LayoutUpdatePermissions.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/LayoutUpdatePermissions.php
new file mode 100644
index 0000000000000..50d38cedfb754
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/LayoutUpdatePermissions.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CatalogImportExport\Model\Import\Product\Validator;
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\AuthorizationInterface;
+use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator;
+
+/**
+ * Validator to assert that the current user is allowed to make design updates if a layout is provided in the import
+ */
+class LayoutUpdatePermissions extends AbstractImportValidator
+{
+    private const ERROR_INSUFFICIENT_PERMISSIONS = 'insufficientPermissions';
+
+    /**
+     * @var UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * @var AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * @var array
+     */
+    private $allowedUserTypes = [
+        UserContextInterface::USER_TYPE_ADMIN,
+        UserContextInterface::USER_TYPE_INTEGRATION
+    ];
+
+    /**
+     * @param UserContextInterface $userContext
+     * @param AuthorizationInterface $authorization
+     */
+    public function __construct(
+        UserContextInterface $userContext,
+        AuthorizationInterface $authorization
+    ) {
+        $this->userContext = $userContext;
+        $this->authorization = $authorization;
+    }
+
+    /**
+     * Validate that the current user is allowed to make design updates
+     *
+     * @param array $data
+     * @return boolean
+     */
+    public function isValid($data): bool
+    {
+        if (empty($data['custom_layout_update'])) {
+            return true;
+        }
+
+        $userType = $this->userContext->getUserType();
+        $isValid = in_array($userType, $this->allowedUserTypes)
+            && $this->authorization->isAllowed('Magento_Catalog::edit_product_design');
+
+        if (!$isValid) {
+            $this->_addMessages(
+                [
+                    $this->context->retrieveMessageTemplate(self::ERROR_INSUFFICIENT_PERMISSIONS),
+                ]
+            );
+        }
+
+        return $isValid;
+    }
+}
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
index 4ce1c0e39d6de..487ffaffa95e9 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
@@ -7,6 +7,8 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\ValidatorException;
+use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\DriverPool;
 
 /**
@@ -34,13 +36,6 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      */
     protected $_tmpDir = '';
 
-    /**
-     * Download directory for url-based resources.
-     *
-     * @var string
-     */
-    private $downloadDir;
-
     /**
      * Destination directory.
      *
@@ -111,13 +106,18 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      */
     private $random;
 
+    /**
+     * @var Filesystem
+     */
+    private $fileSystem;
+
     /**
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDb
      * @param \Magento\MediaStorage\Helper\File\Storage $coreFileStorage
      * @param \Magento\Framework\Image\AdapterFactory $imageFactory
      * @param \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator
-     * @param \Magento\Framework\Filesystem $filesystem
-     * @param \Magento\Framework\Filesystem\File\ReadFactory $readFactory
+     * @param Filesystem $filesystem
+     * @param Filesystem\File\ReadFactory $readFactory
      * @param string|null $filePath
      * @param \Magento\Framework\Math\Random|null $random
      * @throws \Magento\Framework\Exception\FileSystemException
@@ -128,8 +128,8 @@ public function __construct(
         \Magento\MediaStorage\Helper\File\Storage $coreFileStorage,
         \Magento\Framework\Image\AdapterFactory $imageFactory,
         \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator,
-        \Magento\Framework\Filesystem $filesystem,
-        \Magento\Framework\Filesystem\File\ReadFactory $readFactory,
+        Filesystem $filesystem,
+        Filesystem\File\ReadFactory $readFactory,
         $filePath = null,
         \Magento\Framework\Math\Random $random = null
     ) {
@@ -137,13 +137,13 @@ public function __construct(
         $this->_coreFileStorageDb = $coreFileStorageDb;
         $this->_coreFileStorage = $coreFileStorage;
         $this->_validator = $validator;
+        $this->fileSystem = $filesystem;
         $this->_directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $this->_readFactory = $readFactory;
         if ($filePath !== null) {
             $this->_setUploadFile($filePath);
         }
         $this->random = $random ?: ObjectManager::getInstance()->get(\Magento\Framework\Math\Random::class);
-        $this->downloadDir = DirectoryList::getDefaultConfig()[DirectoryList::TMP][DirectoryList::PATH];
     }
 
     /**
@@ -179,8 +179,7 @@ public function move($fileName, $renameFileOff = false)
             $driver = ($matches[0] === $this->httpScheme) ? DriverPool::HTTP : DriverPool::HTTPS;
             $tmpFilePath = $this->downloadFileFromUrl($url, $driver);
         } else {
-            $tmpDir = $this->getTmpDir() ? ($this->getTmpDir() . '/') : '';
-            $tmpFilePath = $this->_directory->getRelativePath($tmpDir . $fileName);
+            $tmpFilePath = $this->_directory->getRelativePath($this->getTempFilePath($fileName));
         }
 
         $this->_setUploadFile($tmpFilePath);
@@ -217,8 +216,13 @@ private function downloadFileFromUrl($url, $driver)
         $tmpFileName = str_replace(".$fileExtension", '', $fileName);
         $tmpFileName .= '_' . $this->random->getRandomString(16);
         $tmpFileName .= $fileExtension ? ".$fileExtension" : '';
-        $tmpFilePath = $this->_directory->getRelativePath($this->downloadDir . '/' . $tmpFileName);
+        $tmpFilePath = $this->_directory->getRelativePath($this->getTempFilePath($tmpFileName));
 
+        if (!$this->_directory->isWritable($this->getTmpDir())) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Import images directory must be writable in order to process remote images.')
+            );
+        }
         $this->_directory->writeFile(
             $tmpFilePath,
             $this->_readFactory->create($url, $driver)->readAll()
@@ -236,7 +240,20 @@ private function downloadFileFromUrl($url, $driver)
      */
     protected function _setUploadFile($filePath)
     {
-        if (!$this->_directory->isReadable($filePath)) {
+        try {
+            $fullPath = $this->_directory->getAbsolutePath($filePath);
+            if ($this->getTmpDir()) {
+                $tmpDir = $this->fileSystem->getDirectoryReadByPath(
+                    $this->_directory->getAbsolutePath($this->getTmpDir())
+                );
+            } else {
+                $tmpDir = $this->_directory;
+            }
+            $readable = $tmpDir->isReadable($fullPath);
+        } catch (ValidatorException $exception) {
+            $readable = false;
+        }
+        if (!$readable) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('File \'%1\' was not found or has read restriction.', $filePath)
             );
@@ -381,6 +398,19 @@ protected function _moveFile($tmpPath, $destPath)
         }
     }
 
+    /**
+     * Append temp path to filename
+     *
+     * @param string $filename
+     * @return string
+     */
+    private function getTempFilePath(string $filename): string
+    {
+        return $this->getTmpDir()
+            ? rtrim($this->getTmpDir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $filename
+            : $filename;
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
index f792b0be2eb6b..c56bc667e2494 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml
@@ -26,7 +26,7 @@
         <waitForPageLoad stepKey="waitForUserInput"/>
         <scrollTo selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="scrollToContinue"/>
         <click selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="clickContinueButton"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Message is added to queue, wait to get your file soon" stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="Message is added to queue, wait to get your file soon" stepKey="seeSuccessMessage"/>
     </actionGroup>
 
     <!-- Export products without filtering -->
@@ -41,7 +41,7 @@
         <wait stepKey="waitForScroll" time="5"/>
         <click selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="clickContinueButton"/>
         <wait stepKey="waitForClick" time="5"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Message is added to queue, wait to get your file soon" stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="Message is added to queue, wait to get your file soon. Make sure your cron job is running to export the file" stepKey="seeSuccessMessage"/>
     </actionGroup>
 
     <!-- Download first file in the grid -->
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
index 88f6e6c9f9039..f0ec7dbd0706b 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
@@ -19,6 +19,9 @@
             <group value="configurable_product"/>
         </annotations>
         <before>
+            <!-- Add downloadable domains -->
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
+
             <!-- Create sample data:
                  1. Create simple products -->
             <createData entity="ApiCategory" stepKey="createCategory"/>
@@ -128,6 +131,9 @@
             <actionGroup ref="deleteAllExportedFiles" stepKey="clearExportedFilesList"/>
     </before>
         <after>
+            <!-- Remove downloadable domains -->
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
+
             <!-- Delete created data -->
             <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFisrtSimpleProduct"/>
             <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
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 9f63decac5ff7..f8b14a471fd9c 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
@@ -776,6 +776,77 @@ public function testValidateAmbiguousData(
         $this->assertEquals($errors, $resultErrors);
     }
 
+    /**
+     * Test for row without store view code field
+     * @param array $rowData
+     * @param array $responseData
+     *
+     * @covers \Magento\CatalogImportExport\Model\Import\Product\Option::_parseCustomOptions
+     * @dataProvider validateRowStoreViewCodeFieldDataProvider
+     */
+    public function testValidateRowDataForStoreViewCodeField($rowData, $responseData)
+    {
+        $reflection = new \ReflectionClass(\Magento\CatalogImportExport\Model\Import\Product\Option::class);
+        $reflectionMethod = $reflection->getMethod('_parseCustomOptions');
+        $reflectionMethod->setAccessible(true);
+        $result = $reflectionMethod->invoke($this->model, $rowData);
+        $this->assertEquals($responseData, $result);
+    }
+
+    /**
+     * Data provider for test of method _parseCustomOptions
+     *
+     * @return array
+     */
+    public function validateRowStoreViewCodeFieldDataProvider()
+    {
+        return [
+            'with_store_view_code' => [
+                '$rowData' => [
+                    'store_view_code' => '',
+                    'custom_options' =>
+                        'name=Test Field Title,type=field,required=1;sku=1-text,price=0,price_type=fixed'
+                ],
+                '$responseData' => [
+                    'store_view_code' => '',
+                    'custom_options' => [
+                        'Test Field Title' => [
+                            [
+                                'name' => 'Test Field Title',
+                                'type' => 'field',
+                                'required' => '1',
+                                'sku' => '1-text',
+                                'price' => '0',
+                                'price_type' => 'fixed',
+                                '_custom_option_store' => ''
+                            ]
+                        ]
+                    ]
+                ],
+            ],
+            'without_store_view_code' => [
+                '$rowData' => [
+                    'custom_options' =>
+                        'name=Test Field Title,type=field,required=1;sku=1-text,price=0,price_type=fixed'
+                ],
+                '$responseData' => [
+                    'custom_options' => [
+                        'Test Field Title' => [
+                            [
+                                'name' => 'Test Field Title',
+                                'type' => 'field',
+                                'required' => '1',
+                                'sku' => '1-text',
+                                'price' => '0',
+                                'price_type' => 'fixed'
+                            ]
+                        ]
+                    ]
+                ],
+            ]
+        ];
+    }
+
     /**
      * Data provider of row data and errors
      *
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/LayoutUpdatePermissionsTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/LayoutUpdatePermissionsTest.php
new file mode 100644
index 0000000000000..e018fc0cf5ccf
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/LayoutUpdatePermissionsTest.php
@@ -0,0 +1,101 @@
+<?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\Authorization\Model\UserContextInterface;
+use Magento\CatalogImportExport\Model\Import\Product\Validator\LayoutUpdatePermissions;
+use Magento\Framework\AuthorizationInterface;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Test validation for layout update permissions
+ */
+class LayoutUpdatePermissionsTest extends TestCase
+{
+    /**
+     * @var LayoutUpdatePermissions|MockObject
+     */
+    private $validator;
+
+    /**
+     * @var UserContextInterface|MockObject
+     */
+    private $userContext;
+
+    /**
+     * @var AuthorizationInterface|MockObject
+     */
+    private $authorization;
+
+    /**
+     * @var Product
+     */
+    private $context;
+
+    protected function setUp()
+    {
+        $this->userContext = $this->createMock(UserContextInterface::class);
+        $this->authorization = $this->createMock(AuthorizationInterface::class);
+        $this->context = $this->createMock(Product::class);
+        $this->context
+            ->method('retrieveMessageTemplate')
+            ->with('insufficientPermissions')
+            ->willReturn('oh no');
+        $this->validator = new LayoutUpdatePermissions(
+            $this->userContext,
+            $this->authorization
+        );
+        $this->validator->init($this->context);
+    }
+
+    /**
+     * @param $value
+     * @param $userContext
+     * @param $isAllowed
+     * @param $isValid
+     * @dataProvider configurationsProvider
+     */
+    public function testValidationConfiguration($value, $userContext, $isAllowed, $isValid)
+    {
+        $this->userContext
+            ->method('getUserType')
+            ->willReturn($userContext);
+
+        $this->authorization
+            ->method('isAllowed')
+            ->with('Magento_Catalog::edit_product_design')
+            ->willReturn($isAllowed);
+
+        $result = $this->validator->isValid(['custom_layout_update' => $value]);
+        $messages = $this->validator->getMessages();
+
+        self::assertSame($isValid, $result);
+
+        if ($isValid) {
+            self::assertSame([], $messages);
+        } else {
+            self::assertSame(['oh no'], $messages);
+        }
+    }
+
+    public function configurationsProvider()
+    {
+        return [
+            ['', null, null, true],
+            [null, null, null, true],
+            ['foo', UserContextInterface::USER_TYPE_ADMIN, true, true],
+            ['foo', UserContextInterface::USER_TYPE_INTEGRATION, true, true],
+            ['foo', UserContextInterface::USER_TYPE_ADMIN, false, false],
+            ['foo', UserContextInterface::USER_TYPE_INTEGRATION, false, false],
+            ['foo', 'something', null, false],
+        ];
+    }
+}
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/LayoutUpdateTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/LayoutUpdateTest.php
new file mode 100644
index 0000000000000..d1e8b879f6a08
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/LayoutUpdateTest.php
@@ -0,0 +1,97 @@
+<?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\LayoutUpdate;
+use Magento\Framework\Config\ValidationStateInterface;
+use Magento\Framework\View\Model\Layout\Update\Validator;
+use Magento\Framework\View\Model\Layout\Update\ValidatorFactory;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Test validation for layout update
+ */
+class LayoutUpdateTest extends TestCase
+{
+    /**
+     * @var LayoutUpdate|MockObject
+     */
+    private $validator;
+
+    /**
+     * @var Validator|MockObject
+     */
+    private $layoutValidator;
+
+    protected function setUp()
+    {
+        $validatorFactory = $this->createMock(ValidatorFactory::class);
+        $validationState = $this->createMock(ValidationStateInterface::class);
+        $this->layoutValidator = $this->createMock(Validator::class);
+        $validatorFactory->method('create')
+            ->with(['validationState' => $validationState])
+            ->willReturn($this->layoutValidator);
+
+        $this->validator = new LayoutUpdate(
+            $validatorFactory,
+            $validationState
+        );
+    }
+
+    public function testValidationIsSkippedWithDataNotPresent()
+    {
+        $this->layoutValidator
+            ->expects($this->never())
+            ->method('isValid');
+
+        $result = $this->validator->isValid([]);
+        self::assertTrue($result);
+    }
+
+    public function testValidationFailsProperly()
+    {
+        $this->layoutValidator
+            ->method('isValid')
+            ->with('foo')
+            ->willReturn(false);
+
+        $contextMock = $this->createMock(Product::class);
+        $contextMock
+            ->method('retrieveMessageTemplate')
+            ->with('invalidLayoutUpdate')
+            ->willReturn('oh no');
+        $this->validator->init($contextMock);
+
+        $result = $this->validator->isValid(['custom_layout_update' => 'foo']);
+        $messages = $this->validator->getMessages();
+        self::assertFalse($result);
+        self::assertSame(['oh no'], $messages);
+    }
+
+    public function testInvalidDataException()
+    {
+        $this->layoutValidator
+            ->method('isValid')
+            ->willThrowException(new \Exception('foo'));
+
+        $contextMock = $this->createMock(Product::class);
+        $contextMock
+            ->method('retrieveMessageTemplate')
+            ->with('invalidLayoutUpdate')
+            ->willReturn('oh no');
+        $this->validator->init($contextMock);
+
+        $result = $this->validator->isValid(['custom_layout_update' => 'foo']);
+        $messages = $this->validator->getMessages();
+        self::assertFalse($result);
+        self::assertSame(['oh no'], $messages);
+    }
+}
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 f85d33edb5d8c..40041fe90db96 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
@@ -284,9 +284,11 @@ protected function setUp()
                 ->getMock();
         $this->storeResolver =
             $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product\StoreResolver::class)
-                ->setMethods([
-                    'getStoreCodeToId',
-                ])
+                ->setMethods(
+                    [
+                        'getStoreCodeToId',
+                    ]
+                )
                 ->disableOriginalConstructor()
                 ->getMock();
         $this->skuProcessor =
@@ -410,7 +412,7 @@ protected function _objectConstructor()
         $this->_filesystem->expects($this->once())
             ->method('getDirectoryWrite')
             ->with(DirectoryList::ROOT)
-            ->will($this->returnValue(self::MEDIA_DIRECTORY));
+            ->willReturn($this->_mediaDirectory);
 
         $this->validator->expects($this->any())->method('init');
         return $this;
@@ -596,9 +598,13 @@ public function testGetMultipleValueSeparatorDefault()
     public function testGetMultipleValueSeparatorFromParameters()
     {
         $expectedSeparator = 'value';
-        $this->setPropertyValue($this->importProduct, '_parameters', [
-            \Magento\ImportExport\Model\Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR => $expectedSeparator,
-        ]);
+        $this->setPropertyValue(
+            $this->importProduct,
+            '_parameters',
+            [
+                \Magento\ImportExport\Model\Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR => $expectedSeparator,
+            ]
+        );
 
         $this->assertEquals(
             $expectedSeparator,
@@ -618,9 +624,13 @@ public function testGetEmptyAttributeValueConstantDefault()
     public function testGetEmptyAttributeValueConstantFromParameters()
     {
         $expectedSeparator = '__EMPTY__VALUE__TEST__';
-        $this->setPropertyValue($this->importProduct, '_parameters', [
-            \Magento\ImportExport\Model\Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT => $expectedSeparator,
-        ]);
+        $this->setPropertyValue(
+            $this->importProduct,
+            '_parameters',
+            [
+                \Magento\ImportExport\Model\Import::FIELD_EMPTY_ATTRIBUTE_VALUE_CONSTANT => $expectedSeparator,
+            ]
+        );
 
         $this->assertEquals(
             $expectedSeparator,
@@ -632,9 +642,12 @@ public function testDeleteProductsForReplacement()
     {
         $importProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
-            ->setMethods([
-                'setParameters', '_deleteProducts'
-            ])
+            ->setMethods(
+                [
+                    'setParameters',
+                    '_deleteProducts'
+                ]
+            )
             ->getMock();
 
         $importProduct->expects($this->once())->method('setParameters')->with(
@@ -764,9 +777,13 @@ public function testGetProductWebsites()
             'key 3' => 'val',
         ];
         $expectedResult = array_keys($productValue);
-        $this->setPropertyValue($this->importProduct, 'websitesCache', [
-            $productSku => $productValue
-        ]);
+        $this->setPropertyValue(
+            $this->importProduct,
+            'websitesCache',
+            [
+                $productSku => $productValue
+            ]
+        );
 
         $actualResult = $this->importProduct->getProductWebsites($productSku);
 
@@ -785,9 +802,13 @@ public function testGetProductCategories()
             'key 3' => 'val',
         ];
         $expectedResult = array_keys($productValue);
-        $this->setPropertyValue($this->importProduct, 'categoriesCache', [
-            $productSku => $productValue
-        ]);
+        $this->setPropertyValue(
+            $this->importProduct,
+            'categoriesCache',
+            [
+                $productSku => $productValue
+            ]
+        );
 
         $actualResult = $this->importProduct->getProductCategories($productSku);
 
@@ -1112,9 +1133,13 @@ public function testValidateRowSetAttributeSetCodeIntoRowData()
             ->disableOriginalConstructor()
             ->getMock();
         $productType->expects($this->once())->method('isRowValid')->with($expectedRowData);
-        $this->setPropertyValue($importProduct, '_productTypeModels', [
-            $newSku['type_id'] => $productType
-        ]);
+        $this->setPropertyValue(
+            $importProduct,
+            '_productTypeModels',
+            [
+                $newSku['type_id'] => $productType
+            ]
+        );
 
         //suppress option validation
         $this->_rewriteGetOptionEntityInImportProduct($importProduct);
@@ -1229,6 +1254,56 @@ public function testParseAttributesWithWrappedValuesWillReturnsLowercasedAttribu
         $this->assertArrayNotHasKey('PARAM2', $attributes);
     }
 
+    /**
+     * @param bool $isRead
+     * @param bool $isWrite
+     * @param string $message
+     * @dataProvider fillUploaderObjectDataProvider
+     */
+    public function testFillUploaderObject($isRead, $isWrite, $message)
+    {
+        $fileUploaderMock = $this
+            ->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Uploader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $fileUploaderMock
+            ->method('setTmpDir')
+            ->with('pub/media/import')
+            ->willReturn($isRead);
+
+        $fileUploaderMock
+            ->method('setDestDir')
+            ->with('pub/media/catalog/product')
+            ->willReturn($isWrite);
+
+        $this->_mediaDirectory
+            ->method('getRelativePath')
+            ->willReturnMap(
+                [
+                    ['import', 'import'],
+                    ['catalog/product', 'catalog/product'],
+                ]
+            );
+
+        $this->_mediaDirectory
+            ->method('create')
+            ->with('pub/media/catalog/product');
+
+        $this->_uploaderFactory
+            ->expects($this->once())
+            ->method('create')
+            ->willReturn($fileUploaderMock);
+
+        try {
+            $this->importProduct->getUploader();
+            $this->assertNotNull($this->getPropertyValue($this->importProduct, '_fileUploader'));
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            $this->assertNull($this->getPropertyValue($this->importProduct, '_fileUploader'));
+            $this->assertEquals($message, $e->getMessage());
+        }
+    }
+
     /**
      * Test that errors occurred during importing images are logged.
      *
@@ -1275,6 +1350,20 @@ function ($name) use ($throwException, $exception) {
         );
     }
 
+    /**
+     * Data provider for testFillUploaderObject.
+     *
+     * @return array
+     */
+    public function fillUploaderObjectDataProvider()
+    {
+        return [
+            [false, true, 'File directory \'pub/media/import\' is not readable.'],
+            [true, false, 'File directory \'pub/media/catalog/product\' is not writable.'],
+            [true, true, ''],
+        ];
+    }
+
     /**
      * Data provider for testUploadMediaFiles.
      *
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 2c6aa6535c10e..f10cf0364c545 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php
@@ -128,6 +128,7 @@ public function testMoveFileUrl($fileUrl, $expectedHost, $expectedFileName, $che
     {
         $tmpDir = 'var/tmp';
         $destDir = 'var/dest/dir';
+        $this->uploader->method('getTmpDir')->willReturn($tmpDir);
 
         // Expected invocation to validate file extension
         $this->uploader->expects($this->exactly($checkAllowedExtension))->method('checkAllowedExtension')
@@ -159,9 +160,11 @@ public function testMoveFileUrl($fileUrl, $expectedHost, $expectedFileName, $che
         $this->directoryMock->expects($this->any())->method('writeFile')
             ->will($this->returnValue($expectedFileName));
 
-        // Expected invocations to move the temp file to the destination directory
-        $this->directoryMock->expects($this->once())->method('isWritable')
-            ->with($destDir)
+        // Expected invocations save the downloaded file to temp file
+        // and move the temp file to the destination directory
+        $this->directoryMock->expects($this->exactly(2))
+            ->method('isWritable')
+            ->withConsecutive([$destDir], [$tmpDir])
             ->willReturn(true);
         $this->directoryMock->expects($this->once())->method('getAbsolutePath')
             ->with($destDir)
@@ -172,9 +175,6 @@ public function testMoveFileUrl($fileUrl, $expectedHost, $expectedFileName, $che
             ->with($destDir . '/' . $expectedFileName)
             ->willReturn(['name' => $expectedFileName, 'path' => 'absPath']);
 
-        // Do not use configured temp directory
-        $this->uploader->expects($this->never())->method('getTmpDir');
-
         $this->uploader->setDestDir($destDir);
         $result = $this->uploader->move($fileUrl);
 
diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
index 6af2bbaf45e3c..25d9c1bde0d68 100644
--- a/app/code/Magento/CatalogImportExport/composer.json
+++ b/app/code/Magento/CatalogImportExport/composer.json
@@ -16,7 +16,8 @@
         "magento/module-import-export": "*",
         "magento/module-media-storage": "*",
         "magento/module-store": "*",
-        "magento/module-tax": "*"
+        "magento/module-tax": "*",
+        "magento/module-authorization": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/CatalogImportExport/etc/di.xml b/app/code/Magento/CatalogImportExport/etc/di.xml
index 6906272b11d68..4e2fe390e0b17 100644
--- a/app/code/Magento/CatalogImportExport/etc/di.xml
+++ b/app/code/Magento/CatalogImportExport/etc/di.xml
@@ -25,7 +25,14 @@
                 <item name="website" xsi:type="object">Magento\CatalogImportExport\Model\Import\Product\Validator\Website</item>
                 <item name="weight" xsi:type="object">Magento\CatalogImportExport\Model\Import\Product\Validator\Weight</item>
                 <item name="quantity" xsi:type="object">Magento\CatalogImportExport\Model\Import\Product\Validator\Quantity</item>
+                <item name="layout_update" xsi:type="object">Magento\CatalogImportExport\Model\Import\Product\Validator\LayoutUpdate</item>
+                <item name="layout_update_permissions" xsi:type="object">Magento\CatalogImportExport\Model\Import\Product\Validator\LayoutUpdatePermissions</item>
             </argument>
         </arguments>
     </type>
+    <type name="Magento\CatalogImportExport\Model\Import\Product\Validator\LayoutUpdate">
+        <arguments>
+            <argument name="validationState" xsi:type="object">Magento\Framework\Config\ValidationState\Required</argument>
+        </arguments>
+    </type>
 </config>
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 6c4f6a0f46a59..ffcb758dcbd66 100644
--- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
+++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
@@ -37,7 +37,7 @@ protected function _getGroupRenderer()
                 '',
                 ['data' => ['is_render_to_js_template' => true]]
             );
-            $this->_groupRenderer->setClass('customer_group_select');
+            $this->_groupRenderer->setClass('customer_group_select admin__control-select');
         }
         return $this->_groupRenderer;
     }
@@ -57,7 +57,7 @@ protected function _prepareToRender()
             'min_sale_qty',
             [
                 'label' => __('Minimum Qty'),
-                'class' => 'required-entry validate-number validate-greater-than-zero'
+                'class' => 'required-entry validate-number validate-greater-than-zero admin__control-text'
             ]
         );
         $this->_addAfter = false;
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 3670b93b8cb48..c5644060c689f 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
@@ -230,6 +230,8 @@ protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = f
     {
         $connection = $this->getConnection();
         $qtyExpr = $connection->getCheckSql('cisi.qty > 0', 'cisi.qty', 0);
+        $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+        $linkField = $metadata->getLinkField();
 
         $select = $connection->select()->from(
             ['e' => $this->getTable('catalog_product_entity')],
@@ -243,6 +245,12 @@ protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = f
             ['cisi' => $this->getTable('cataloginventory_stock_item')],
             'cisi.stock_id = cis.stock_id AND cisi.product_id = e.entity_id',
             []
+        )->joinInner(
+            ['mcpei' => $this->getTable('catalog_product_entity_int')],
+            'e.' . $linkField . ' = mcpei.' . $linkField
+            . ' AND mcpei.attribute_id = ' . $this->_getAttribute('status')->getId()
+            . ' AND mcpei.value = ' . ProductStatus::STATUS_ENABLED,
+            []
         )->columns(
             ['qty' => $qtyExpr]
         )->where(
diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Schema/ChangeTmpTablesEngine.php b/app/code/Magento/CatalogInventory/Setup/Patch/Schema/ChangeTmpTablesEngine.php
deleted file mode 100644
index 7f43cd279d4e3..0000000000000
--- a/app/code/Magento/CatalogInventory/Setup/Patch/Schema/ChangeTmpTablesEngine.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\CatalogInventory\Setup\Patch\Schema;
-
-use Magento\Framework\Setup\Patch\SchemaPatchInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * Change engine for temporary tables to InnoDB.
- */
-class ChangeTmpTablesEngine implements SchemaPatchInterface
-{
-    /**
-     * @var SchemaSetupInterface
-     */
-    private $schemaSetup;
-
-    /**
-     * @param SchemaSetupInterface $schemaSetup
-     */
-    public function __construct(SchemaSetupInterface $schemaSetup)
-    {
-        $this->schemaSetup = $schemaSetup;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function apply()
-    {
-        $this->schemaSetup->startSetup();
-
-        $tableName = $this->schemaSetup->getTable('cataloginventory_stock_status_tmp');
-        if ($this->schemaSetup->getConnection()->isTableExists($tableName)) {
-            $this->schemaSetup->getConnection()->changeTableEngine($tableName, 'InnoDB');
-        }
-
-        $this->schemaSetup->endSetup();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public static function getDependencies()
-    {
-        return [];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getAliases()
-    {
-        return [];
-    }
-}
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/AdminAssertDisabledQtyActionGroup.xml b/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/AdminAssertDisabledQtyActionGroup.xml
deleted file mode 100644
index 27c4a93577a07..0000000000000
--- a/app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/AdminAssertDisabledQtyActionGroup.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.
-  */
--->
-
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminAssertDisabledQtyActionGroup">
-        <annotations>
-            <description>Goes to the 'Quantity' field and assert disabled attribute.</description>
-        </annotations>
-
-        <seeElement selector="{{AdminProductFormSection.productQuantity}}" stepKey="assertProductQty"/>
-        <assertElementContainsAttribute selector="{{AdminProductFormSection.productQuantity}}" attribute="disabled" expectedValue="true" stepKey="checkIfQtyIsDisabled" />
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Section/AdminProductFormSection.xml
index f4b79b17b3fc3..945613ee753d6 100644
--- a/app/code/Magento/CatalogInventory/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Section/AdminProductFormSection.xml
@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductFormSection">
-        <element name="advancedInventoryLink" type="button" selector="button[data-index='advanced_inventory_button']" timeout="30"/>
+        <element name="advancedInventoryLink" type="button" selector="button[data-index='advanced_inventory_button'].action-additional" timeout="30"/>
+        <element name="advancedInventoryButton" type="button" selector="button[data-index='advanced_inventory_button'].action-basic" timeout="30"/>
     </section>
 </sections>
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 789befcfec8b7..aafde14a28584 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
@@ -3,8 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
-
 namespace Magento\CatalogInventory\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter;
@@ -177,7 +175,7 @@ public function modifyMeta(array $meta)
     }
 
     /**
-     * Prepare Meta
+     * Modify UI Quantity and Stock status attribute meta.
      *
      * @return void
      */
@@ -187,10 +185,6 @@ private function prepareMeta()
         $pathField = $this->arrayManager->findPath($fieldCode, $this->meta, null, 'children');
 
         if ($pathField) {
-            $labelField = $this->arrayManager->get(
-                $this->arrayManager->slicePath($pathField, 0, -2) . '/arguments/data/config/label',
-                $this->meta
-            );
             $fieldsetPath = $this->arrayManager->slicePath($pathField, 0, -4);
 
             $this->meta = $this->arrayManager->merge(
@@ -218,10 +212,9 @@ private function prepareMeta()
                 'formElement' => 'container',
                 'componentType' => 'container',
                 'component' => "Magento_Ui/js/form/components/group",
-                'label' => $labelField,
+                'label' => false,
                 'breakLine' => false,
                 'dataScope' => $fieldCode,
-                'scopeLabel' => '[GLOBAL]',
                 'source' => 'product_details',
                 'sortOrder' => (int) $this->arrayManager->get(
                     $this->arrayManager->slicePath($pathField, 0, -2) . '/arguments/data/config/sortOrder',
@@ -229,9 +222,51 @@ private function prepareMeta()
                 ) - 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',
+                'visible' => '1',
+                'require' => '0',
+                'additionalClasses' => 'admin__field-small',
+                'label' => __('Quantity'),
+                'scopeLabel' => '[GLOBAL]',
+                'dataScope' => 'qty',
+                'validation' => [
+                    'validate-number' => true,
+                    'less-than-equals-to' => StockDataFilter::MAX_QTY_VALUE,
+                ],
+                'imports' => [
+                    'handleChanges' => '${$.provider}:data.product.stock_data.is_qty_decimal',
+                ],
+                'sortOrder' => 10,
+            ];
+            $advancedInventoryButton['arguments']['data']['config'] = [
+                'displayAsLink' => true,
+                'formElement' => 'container',
+                'componentType' => 'container',
+                'component' => 'Magento_Ui/js/form/components/button',
+                'template' => 'ui/form/components/button/container',
+                'actions' => [
+                    [
+                        'targetName' => 'product_form.product_form.advanced_inventory_modal',
+                        'actionName' => 'toggleModal',
+                    ],
+                ],
+                'imports' => [
+                    'childError' => 'product_form.product_form.advanced_inventory_modal.stock_data:error',
+                ],
+                'title' => __('Advanced Inventory'),
+                'provider' => false,
+                'additionalForGroup' => true,
+                'source' => 'product_details',
+                'sortOrder' => 20,
+            ];
             $container['children'] = [
-                'qty' => $this->getQtyMetaStructure(),
-                'advanced_inventory_button' => $this->getAdvancedInventoryButtonMetaStructure(),
+                'qty' => $qty,
+                'advanced_inventory_button' => $advancedInventoryButton,
             ];
 
             $this->meta = $this->arrayManager->merge(
@@ -241,74 +276,4 @@ private function prepareMeta()
             );
         }
     }
-
-    /**
-     * Get Qty meta structure
-     *
-     * @return array
-     */
-    private function getQtyMetaStructure()
-    {
-        return  [
-            'arguments' => [
-                'data' => [
-                    'config' => [
-                        'component' => 'Magento_CatalogInventory/js/components/qty-validator-changer',
-                        'group' => 'quantity_and_stock_status_qty',
-                        'dataType' => 'number',
-                        'formElement' => 'input',
-                        'componentType' => 'field',
-                        'visible' => '1',
-                        'require' => '0',
-                        'additionalClasses' => 'admin__field-small',
-                        'label' => __('Quantity'),
-                        'scopeLabel' => '[GLOBAL]',
-                        'dataScope' => 'qty',
-                        'validation' => [
-                            'validate-number' => true,
-                            'less-than-equals-to' => StockDataFilter::MAX_QTY_VALUE,
-                        ],
-                        'imports' => [
-                            'handleChanges' => '${$.provider}:data.product.stock_data.is_qty_decimal',
-                        ],
-                        'sortOrder' => 10,
-                        'disabled' => $this->locator->getProduct()->isLockedAttribute('quantity_and_stock_status'),
-                    ]
-                ]
-            ]
-        ];
-    }
-
-    /**
-     * Get advances inventory button meta structure
-     *
-     * @return array
-     */
-    private function getAdvancedInventoryButtonMetaStructure()
-    {
-        return  [
-            'arguments' => [
-                'data' => [
-                    'config' => [
-                        'displayAsLink' => true,
-                        'formElement' => 'container',
-                        'componentType' => 'container',
-                        'component' => 'Magento_Ui/js/form/components/button',
-                        'template' => 'ui/form/components/button/container',
-                        'actions' => [
-                            [
-                                'targetName' => 'product_form.product_form.advanced_inventory_modal',
-                                'actionName' => 'toggleModal',
-                            ],
-                        ],
-                        'title' => __('Advanced Inventory'),
-                        'provider' => false,
-                        'additionalForGroup' => true,
-                        'source' => 'product_details',
-                        'sortOrder' => 20,
-                    ]
-                ]
-            ]
-        ];
-    }
 }
diff --git a/app/code/Magento/CatalogInventory/etc/db_schema.xml b/app/code/Magento/CatalogInventory/etc/db_schema.xml
index d903d09dd1f85..b5c4a96f24a94 100644
--- a/app/code/Magento/CatalogInventory/etc/db_schema.xml
+++ b/app/code/Magento/CatalogInventory/etc/db_schema.xml
@@ -142,7 +142,7 @@
             <column name="website_id"/>
         </index>
     </table>
-    <table name="cataloginventory_stock_status_tmp" resource="default" engine="memory"
+    <table name="cataloginventory_stock_status_tmp" resource="default" engine="innodb"
            comment="Cataloginventory Stock Status Indexer Tmp">
         <column xsi:type="int" name="product_id" padding="10" unsigned="true" nullable="false" identity="false"
                 comment="Product ID"/>
@@ -159,10 +159,10 @@
             <column name="website_id"/>
             <column name="stock_id"/>
         </constraint>
-        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_TMP_STOCK_ID" indexType="hash">
+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_TMP_STOCK_ID" indexType="btree">
             <column name="stock_id"/>
         </index>
-        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_TMP_WEBSITE_ID" indexType="hash">
+        <index referenceId="CATALOGINVENTORY_STOCK_STATUS_TMP_WEBSITE_ID" indexType="btree">
             <column name="website_id"/>
         </index>
     </table>
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 b813aa5d356cb..c77c77a5183d0 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
@@ -35,9 +35,7 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="formElement" xsi:type="string">container</item>
-                        <item name="label" xsi:type="string" translate="true">Manage Stock</item>
                         <item name="dataScope" xsi:type="string">stock_data</item>
-                        <item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
                     </item>
                 </argument>
                 <field name="manage_stock" formElement="select">
@@ -74,12 +72,8 @@
                             <link name="linkedValue">${$.provider}:data.product.stock_data.manage_stock</link>
                         </links>
                         <exports>
-                            <link name="disabled">${$.parentName}.manage_stock:disabled</link>
                             <link name="checked">${$.parentName}.manage_stock:disabled</link>
                         </exports>
-                        <imports>
-                            <link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
-                        </imports>
                     </settings>
                     <formElements>
                         <checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -105,7 +99,6 @@
                     <dataScope>quantity_and_stock_status.qty</dataScope>
                     <links>
                         <link name="value">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:value</link>
-                        <link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
                     </links>
                     <imports>
                         <link name="handleChanges">${$.provider}:data.product.stock_data.is_qty_decimal</link>
@@ -117,9 +110,7 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="formElement" xsi:type="string">container</item>
-                        <item name="label" xsi:type="string" translate="true">Out-of-Stock Threshold</item>
                         <item name="dataScope" xsi:type="string">stock_data</item>
-                        <item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
                         <item name="imports" xsi:type="array">
                             <item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.manage_stock</item>
                         </item>
@@ -154,12 +145,8 @@
                             <link name="linkedValue">${$.provider}:data.product.stock_data.min_qty</link>
                         </links>
                         <exports>
-                            <link name="disabled">${$.parentName}.min_qty:disabled</link>
                             <link name="checked">${$.parentName}.min_qty:disabled</link>
                         </exports>
-                        <imports>
-                            <link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
-                        </imports>
                     </settings>
                     <formElements>
                         <checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -220,13 +207,6 @@
                             <class name="admin__field-no-label">true</class>
                         </additionalClasses>
                         <dataScope>use_config_min_sale_qty</dataScope>
-                        <exports>
-                            <link name="disabled">${$.parentName}.min_sale_qty:disabled</link>
-                            <link name="checked">${$.parentName}.min_sale_qty:disabled</link>
-                        </exports>
-                        <imports>
-                            <link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
-                        </imports>
                     </settings>
                     <formElements>
                         <checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -290,9 +270,7 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="formElement" xsi:type="string">container</item>
-                        <item name="label" xsi:type="string" translate="true">Maximum Qty Allowed in Shopping Cart</item>
                         <item name="dataScope" xsi:type="string">stock_data</item>
-                        <item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
                     </item>
                 </argument>
                 <field name="max_sale_qty" formElement="input">
@@ -325,12 +303,8 @@
                             <link name="linkedValue">${$.provider}:data.product.stock_data.max_sale_qty</link>
                         </links>
                         <exports>
-                            <link name="disabled">${$.parentName}.max_sale_qty:disabled</link>
                             <link name="checked">${$.parentName}.max_sale_qty:disabled</link>
                         </exports>
-                        <imports>
-                            <link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
-                        </imports>
                     </settings>
                     <formElements>
                         <checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -358,7 +332,6 @@
                     <dataScope>stock_data.is_qty_decimal</dataScope>
                     <imports>
                         <link name="visible">${$.provider}:data.product.stock_data.manage_stock</link>
-                        <link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
                     </imports>
                 </settings>
                 <formElements>
@@ -381,7 +354,6 @@
                     <dataScope>stock_data.is_decimal_divided</dataScope>
                     <imports>
                         <link name="visible">${$.provider}:data.product.stock_data.manage_stock</link>
-                        <link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
                     </imports>
                 </settings>
                 <formElements>
@@ -396,9 +368,7 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="formElement" xsi:type="string">container</item>
-                        <item name="label" xsi:type="string" translate="true">Backorders</item>
                         <item name="dataScope" xsi:type="string">stock_data</item>
-                        <item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
                         <item name="imports" xsi:type="array">
                             <item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.manage_stock</item>
                         </item>
@@ -441,12 +411,8 @@
                             <link name="linkedValue">${$.provider}:data.product.stock_data.backorders</link>
                         </links>
                         <exports>
-                            <link name="disabled">${$.parentName}.backorders:disabled</link>
                             <link name="checked">${$.parentName}.backorders:disabled</link>
                         </exports>
-                        <imports>
-                            <link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
-                        </imports>
                     </settings>
                     <formElements>
                         <checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -465,9 +431,7 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="formElement" xsi:type="string">container</item>
-                        <item name="label" xsi:type="string" translate="true">Notify for Quantity Below</item>
                         <item name="dataScope" xsi:type="string">stock_data</item>
-                        <item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
                         <item name="imports" xsi:type="array">
                             <item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.manage_stock</item>
                         </item>
@@ -502,12 +466,8 @@
                             <link name="linkedValue">${$.provider}:data.product.stock_data.notify_stock_qty</link>
                         </links>
                         <exports>
-                            <link name="disabled">${$.parentName}.notify_stock_qty:disabled</link>
                             <link name="checked">${$.parentName}.notify_stock_qty:disabled</link>
                         </exports>
-                        <imports>
-                            <link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
-                        </imports>
                     </settings>
                     <formElements>
                         <checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -526,9 +486,7 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="formElement" xsi:type="string">container</item>
-                        <item name="label" xsi:type="string" translate="true">Enable Qty Increments</item>
                         <item name="dataScope" xsi:type="string">stock_data</item>
-                        <item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
                     </item>
                 </argument>
                 <field name="enable_qty_increments" formElement="select">
@@ -565,12 +523,8 @@
                             <link name="linkedValue">${$.provider}:data.product.stock_data.enable_qty_increments</link>
                         </links>
                         <exports>
-                            <link name="disabled">${$.parentName}.enable_qty_increments:disabled</link>
                             <link name="checked">${$.parentName}.enable_qty_increments:disabled</link>
                         </exports>
-                        <imports>
-                            <link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
-                        </imports>
                     </settings>
                     <formElements>
                         <checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -589,9 +543,7 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="formElement" xsi:type="string">container</item>
-                        <item name="label" xsi:type="string" translate="true">Qty Increments</item>
                         <item name="dataScope" xsi:type="string">stock_data</item>
-                        <item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
                         <item name="imports" xsi:type="array">
                             <item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.enable_qty_increments</item>
                         </item>
@@ -630,12 +582,8 @@
                             <link name="linkedValue">${$.provider}:data.product.stock_data.qty_increments</link>
                         </links>
                         <exports>
-                            <link name="disabled">${$.parentName}.qty_increments:disabled</link>
                             <link name="checked">${$.parentName}.qty_increments:disabled</link>
                         </exports>
-                        <imports>
-                            <link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
-                        </imports>
                     </settings>
                     <formElements>
                         <checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -654,9 +602,7 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="formElement" xsi:type="string">container</item>
-                        <item name="label" xsi:type="string" translate="true">Stock Status</item>
                         <item name="dataScope" xsi:type="string">quantity_and_stock_status</item>
-                        <item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
                         <item name="imports" xsi:type="array">
                             <item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.manage_stock</item>
                         </item>
@@ -672,9 +618,6 @@
                         <scopeLabel>[GLOBAL]</scopeLabel>
                         <label translate="true">Stock Status</label>
                         <dataScope>is_in_stock</dataScope>
-                        <imports>
-                            <link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
-                        </imports>
                     </settings>
                     <formElements>
                         <select>
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
index e12eabba76401..1fc53c78985fb 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
@@ -242,7 +242,22 @@ public function __construct(
      */
     public function reindexById($id)
     {
-        $this->reindexByIds([$id]);
+        try {
+            $this->cleanProductIndex([$id]);
+
+            $products = $this->productLoader->getProducts([$id]);
+            $activeRules = $this->getActiveRules();
+            foreach ($products as $product) {
+                $this->applyRules($activeRules, $product);
+            }
+
+            $this->reindexRuleGroupWebsite->execute();
+        } catch (\Exception $e) {
+            $this->critical($e);
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Catalog rule indexing failed. See details in exception log.')
+            );
+        }
     }
 
     /**
@@ -275,11 +290,18 @@ protected function doReindexByIds($ids)
     {
         $this->cleanProductIndex($ids);
 
-        $products = $this->productLoader->getProducts($ids);
-        $activeRules = $this->getActiveRules();
-        foreach ($products as $product) {
-            $this->applyRules($activeRules, $product);
+        /** @var Rule[] $activeRules */
+        $activeRules = $this->getActiveRules()->getItems();
+        foreach ($activeRules as $rule) {
+            $rule->setProductsFilter($ids);
+            $this->reindexRuleProduct->execute($rule, $this->batchCount);
         }
+
+        foreach ($ids as $productId) {
+            $this->cleanProductPriceIndex([$productId]);
+            $this->reindexRuleProductPrice->execute($this->batchCount, $productId);
+        }
+
         $this->reindexRuleGroupWebsite->execute();
     }
 
@@ -365,17 +387,13 @@ protected function cleanByIds($productIds)
      * Assign product to rule
      *
      * @param Rule $rule
-     * @param Product $product
+     * @param int $productEntityId
+     * @param array $websiteIds
      * @return void
      */
-    private function assignProductToRule(Rule $rule, Product $product): void
+    private function assignProductToRule(Rule $rule, int $productEntityId, array $websiteIds): void
     {
-        if (!$rule->validate($product)) {
-            return;
-        }
-
         $ruleId = (int) $rule->getId();
-        $productEntityId = (int) $product->getId();
         $ruleProductTable = $this->getTable('catalogrule_product');
         $this->connection->delete(
             $ruleProductTable,
@@ -385,7 +403,6 @@ private function assignProductToRule(Rule $rule, Product $product): void
             ]
         );
 
-        $websiteIds = array_intersect($product->getWebsiteIds(), $rule->getWebsiteIds());
         $customerGroupIds = $rule->getCustomerGroupIds();
         $fromTime = strtotime($rule->getFromDate());
         $toTime = strtotime($rule->getToDate());
@@ -429,12 +446,17 @@ private function assignProductToRule(Rule $rule, Product $product): void
      * @param Product $product
      * @return $this
      * @throws \Exception
+     * @deprecated
+     * @see ReindexRuleProduct::execute
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function applyRule(Rule $rule, $product)
     {
-        $this->assignProductToRule($rule, $product);
-        $this->reindexRuleProductPrice->execute($this->batchCount, $product);
+        if ($rule->validate($product)) {
+            $websiteIds = array_intersect($product->getWebsiteIds(), $rule->getWebsiteIds());
+            $this->assignProductToRule($rule, $product->getId(), $websiteIds);
+        }
+        $this->reindexRuleProductPrice->execute($this->batchCount, $product->getId());
         $this->reindexRuleGroupWebsite->execute();
 
         return $this;
@@ -450,11 +472,16 @@ protected function applyRule(Rule $rule, $product)
     private function applyRules(RuleCollection $ruleCollection, Product $product): void
     {
         foreach ($ruleCollection as $rule) {
-            $this->assignProductToRule($rule, $product);
+            if (!$rule->validate($product)) {
+                continue;
+            }
+
+            $websiteIds = array_intersect($product->getWebsiteIds(), $rule->getWebsiteIds());
+            $this->assignProductToRule($rule, $product->getId(), $websiteIds);
         }
 
         $this->cleanProductPriceIndex([$product->getId()]);
-        $this->reindexRuleProductPrice->execute($this->batchCount, $product);
+        $this->reindexRuleProductPrice->execute($this->batchCount, $product->getId());
     }
 
     /**
@@ -507,7 +534,7 @@ protected function updateRuleProductData(Rule $rule)
      */
     protected function applyAllRules(Product $product = null)
     {
-        $this->reindexRuleProductPrice->execute($this->batchCount, $product);
+        $this->reindexRuleProductPrice->execute($this->batchCount, $product->getId());
         $this->reindexRuleGroupWebsite->execute();
         return $this;
     }
@@ -562,7 +589,7 @@ protected function calcRuleProductPrice($ruleData, $productData = null)
      */
     protected function getRuleProductsStmt($websiteId, Product $product = null)
     {
-        return $this->ruleProductsSelectBuilder->build($websiteId, $product);
+        return $this->ruleProductsSelectBuilder->build((int) $websiteId, (int) $product->getId());
     }
 
     /**
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProductPrice.php b/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProductPrice.php
index 11ba87730bec1..51869f1accbb3 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProductPrice.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProductPrice.php
@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogRule\Model\Indexer;
 
-use Magento\Catalog\Model\Product;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -65,19 +64,19 @@ public function __construct(
      * Reindex product prices.
      *
      * @param int $batchCount
-     * @param Product|null $product
+     * @param int|null $productId
      * @param bool $useAdditionalTable
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function execute($batchCount, Product $product = null, $useAdditionalTable = false)
+    public function execute(int $batchCount, ?int $productId = null, bool $useAdditionalTable = false)
     {
         /**
          * Update products rules prices per each website separately
          * because for each website date in website's timezone should be used
          */
         foreach ($this->storeManager->getWebsites() as $website) {
-            $productsStmt = $this->ruleProductsSelectBuilder->build($website->getId(), $product, $useAdditionalTable);
+            $productsStmt = $this->ruleProductsSelectBuilder->build($website->getId(), $productId, $useAdditionalTable);
             $dayPrices = [];
             $stopFlags = [];
             $prevKey = null;
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductsSelectBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductsSelectBuilder.php
index 6989a33535ad8..e15bf6b3b1faa 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/RuleProductsSelectBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/RuleProductsSelectBuilder.php
@@ -74,15 +74,12 @@ public function __construct(
      * Build select for indexer according passed parameters.
      *
      * @param int $websiteId
-     * @param \Magento\Catalog\Model\Product|null $product
+     * @param int|null $productId
      * @param bool $useAdditionalTable
      * @return \Zend_Db_Statement_Interface
      */
-    public function build(
-        $websiteId,
-        \Magento\Catalog\Model\Product $product = null,
-        $useAdditionalTable = false
-    ) {
+    public function build(int $websiteId, ?int $productId = null, bool $useAdditionalTable = false)
+    {
         $connection = $this->resource->getConnection();
         $indexTable = $this->resource->getTableName('catalogrule_product');
         if ($useAdditionalTable) {
@@ -107,8 +104,8 @@ public function build(
             ['rp.website_id', 'rp.customer_group_id', 'rp.product_id', 'rp.sort_order', 'rp.rule_id']
         );
 
-        if ($product && $product->getEntityId()) {
-            $select->where('rp.product_id=?', $product->getEntityId());
+        if ($productId) {
+            $select->where('rp.product_id=?', $productId);
         }
 
         /**
@@ -159,9 +156,11 @@ public function build(
             sprintf($joinCondition, $tableAlias, $storeId),
             []
         );
-        $select->columns([
-            'default_price' => $connection->getIfNullSql($tableAlias . '.value', 'pp_default.value'),
-        ]);
+        $select->columns(
+            [
+                'default_price' => $connection->getIfNullSql($tableAlias . '.value', 'pp_default.value'),
+            ]
+        );
 
         return $connection->query($select);
     }
diff --git a/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php b/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
index 7cbbc547571ab..ec63d70d55abf 100644
--- a/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
+++ b/app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php
@@ -85,7 +85,8 @@ public function getValue()
     {
         if (null === $this->value) {
             if ($this->product->hasData(self::PRICE_CODE)) {
-                $this->value = (float)$this->product->getData(self::PRICE_CODE) ?: false;
+                $value = $this->product->getData(self::PRICE_CODE);
+                $this->value = $value ? (float)$value : false;
             } else {
                 $this->value = $this->ruleResource->getRulePrice(
                     $this->dateTime->scopeDate($this->storeManager->getStore()->getId()),
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateNewCatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateNewCatalogPriceRuleActionGroup.xml
index 00dcb68089b73..209095e0b0195 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateNewCatalogPriceRuleActionGroup.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCreateNewCatalogPriceRuleActionGroup.xml
@@ -21,7 +21,6 @@
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <fillField stepKey="fillName" selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{catalogRule.name}}"/>
         <fillField stepKey="fillDescription" selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{catalogRule.description}}"/>
-        <selectOption selector="{{AdminNewCatalogPriceRule.status}}" userInput="{{catalogRule.is_active}}" stepKey="selectStatus"/>
         <selectOption stepKey="selectWebSite" selector="{{AdminNewCatalogPriceRule.websites}}" userInput="{{catalogRule.website_ids[0]}}"/>
         <selectOption selector="{{AdminNewCatalogPriceRule.customerGroups}}" userInput="{{customerGroup}}" stepKey="selectCustomerGroup"/>
         <scrollTo selector="{{AdminNewCatalogPriceRule.actionsTab}}" stepKey="scrollToActionTab"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogPriceRuleFormActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogPriceRuleFormActionGroup.xml
index 77fe0f50653c7..0a4b6366d11a8 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogPriceRuleFormActionGroup.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AssertCatalogPriceRuleFormActionGroup.xml
@@ -13,7 +13,7 @@
             <description>Validates that the provided Catalog Rule, Status, Websites and Customer Group details are present and correct on a Admin Catalog Price Rule creation/edit page.</description>
         </annotations>
         <arguments>
-            <argument name="catalogRule" defaultValue="inactiveCatalogRule"/>
+            <argument name="catalogRule" defaultValue="inactiveCatalogRule" />
             <argument name="status"  type="string" defaultValue=""/>
             <argument name="websites" type="string"/>
             <argument name="customerGroup" type="string"/>
@@ -21,7 +21,6 @@
 
         <seeInField stepKey="fillName" selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{catalogRule.name}}"/>
         <seeInField stepKey="fillDescription" selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{catalogRule.description}}"/>
-        <seeOptionIsSelected selector="{{AdminNewCatalogPriceRule.status}}" userInput="{{status}}" stepKey="selectStatus"/>
         <see stepKey="seeWebSite" selector="{{AdminNewCatalogPriceRule.websites}}" userInput="{{websites}}"/>
         <seeOptionIsSelected selector="{{AdminNewCatalogPriceRule.customerGroups}}" userInput="{{customerGroup}}" stepKey="selectCustomerGroup"/>
         <scrollTo selector="{{AdminNewCatalogPriceRule.actionsTab}}" stepKey="scrollToActionTab"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
index 39f509c68c6e4..50b4165a3f34b 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
@@ -25,6 +25,7 @@
         <!-- 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}}"/>
+        <click stepKey="selectActive" selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}"/>
         <selectOption stepKey="selectSite" selector="{{AdminNewCatalogPriceRule.websites}}" userInput="{{catalogRule.website_ids[0]}}"/>
         <click stepKey="clickFromCalender" selector="{{AdminNewCatalogPriceRule.fromDateButton}}"/>
         <click stepKey="clickFromToday" selector="{{AdminNewCatalogPriceRule.todayDate}}"/>
@@ -47,16 +48,35 @@
         <arguments>
             <argument name="catalogRule" defaultValue="_defaultCatalogRule"/>
         </arguments>
-
         <click stepKey="addNewRule" selector="{{AdminGridMainControls.add}}"/>
-        <fillField selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{catalogRule.name}}"  stepKey="fillName"/>
-        <fillField selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{catalogRule.description}}" stepKey="fillDescription"/>
-        <selectOption selector="{{AdminNewCatalogPriceRule.websites}}" parameterArray="{{catalogRule.website_ids}}" stepKey="selectSite"/>
+        <fillField selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{catalogRule.name}}"  stepKey="fillName" />
+        <click stepKey="selectActive" selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}"/>
+        <fillField selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{catalogRule.description}}" stepKey="fillDescription" />
+        <selectOption selector="{{AdminNewCatalogPriceRule.websites}}" parameterArray="{{catalogRule.website_ids}}" stepKey="selectSite" />
         <click stepKey="openActionDropdown" selector="{{AdminNewCatalogPriceRule.actionsTab}}"/>
         <fillField stepKey="fillDiscountValue" selector="{{AdminNewCatalogPriceRuleActions.discountAmount}}" userInput="{{catalogRule.discount_amount}}"/>
         <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{AdminNewCatalogPriceRule.save}}" stepKey="clickSave"/>
         <waitForPageLoad stepKey="waitForApplied"/>
     </actionGroup>
+
+    <actionGroup name="AdminCreateCatalogPriceRuleWithConditionActionGroup" extends="createCatalogPriceRule">
+        <arguments>
+            <argument name="catalogRuleType" type="entity" defaultValue="PriceRuleWithCondition"/>
+        </arguments>
+        <waitForPageLoad stepKey="waitForPageLoad" after="addNewRule"/>
+        <click selector="{{AdminNewCatalogPriceRule.conditionsTab}}" stepKey="expandConditions" before="openActionDropdown"/>
+        <scrollTo selector="{{AdminNewCatalogPriceRule.conditionsTab}}" stepKey="scrollToConditionsTab" after="expandConditions"/>
+        <waitForElementVisible selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="waitForNewRule" after="scrollToConditionsTab"/>
+        <click selector="{{PriceRuleConditionsSection.createNewRule}}" stepKey="clickNewRule" after="waitForNewRule"/>
+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.conditionsDropdown}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="selectProductAttribute" after="clickNewRule"/>
+        <waitForPageLoad stepKey="waitForAttributeLoad" after="selectProductAttribute"/>
+        <!--Assert that attribute contains today date without time-->
+        <comment userInput="Assert that attribute contains today date without time" stepKey="assertDate" after="waitForAttributeLoad"/>
+        <generateDate date="now" format="Y-m-d" stepKey="today" after="assertDate"/>
+        <grabTextFrom selector="{{PriceRuleConditionsSection.firstProductAttributeSelected}}"  stepKey="grabTextFromSelectedAttribute" after="today"/>
+        <assertEquals expected="$today" actual="$grabTextFromSelectedAttribute" stepKey="assertTodayDate" after="grabTextFromSelectedAttribute"/>
+    </actionGroup>
     <actionGroup name="AdminCreateMultipleWebsiteCatalogPriceRule" extends="createCatalogPriceRule">
         <remove keyForRemoval="selectSite"/>
         <selectOption selector="{{AdminNewCatalogPriceRule.websites}}" parameterArray="['FirstWebsite', 'SecondWebsite']" stepKey="selectWebsite"/>
@@ -188,4 +208,48 @@
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" after="clickToConfirm" stepKey="waitForSuccessMessage"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the rule." after="waitForSuccessMessage" stepKey="verifyRuleIsDeleted"/>
     </actionGroup>
+
+    <actionGroup name="AdminFillCatalogRuleConditionActionGroup">
+        <annotations>
+            <description>Clicks on the Conditions tab. Fills in the provided condition for Catalog Price Rule.</description>
+        </annotations>
+        <arguments>
+            <argument name="condition" type="string" defaultValue="{{CatalogRuleProductConditions.categoryIds}}"/>
+            <argument name="conditionOperator" type="string" defaultValue="is"/>
+            <argument name="conditionValue" type="string" defaultValue="2"/>
+        </arguments>
+
+        <conditionalClick selector="{{AdminNewCatalogPriceRule.conditionsTab}}" dependentSelector="{{AdminNewCatalogPriceRuleConditions.newCondition}}" visible="false" stepKey="openConditionsTab"/>
+        <waitForElementVisible selector="{{AdminNewCatalogPriceRuleConditions.newCondition}}" stepKey="waitForAddConditionButton"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.newCondition}}" stepKey="addNewCondition"/>
+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.conditionSelect('1')}}" userInput="{{condition}}" stepKey="selectTypeCondition"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.condition('is')}}" stepKey="clickOnOperator"/>
+        <selectOption selector="{{AdminNewCatalogPriceRuleConditions.activeOperatorSelect}}" userInput="{{conditionOperator}}" stepKey="selectCondition"/>
+        <!-- In case we are choosing already selected value - select is not closed automatically -->
+        <conditionalClick selector="{{AdminNewCatalogPriceRuleConditions.condition('...')}}" dependentSelector="{{AdminNewCatalogPriceRuleConditions.activeOperatorSelect}}" visible="true" stepKey="closeSelect"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.condition('...')}}" stepKey="clickToChooseOption3"/>
+        <waitForElementVisible selector="{{AdminNewCatalogPriceRuleConditions.activeValueInput}}" stepKey="waitForValueInput"/>
+        <fillField selector="{{AdminNewCatalogPriceRuleConditions.activeValueInput}}" userInput="{{conditionValue}}" stepKey="fillConditionValue"/>
+        <click selector="{{AdminNewCatalogPriceRuleConditions.activeConditionApplyButton}}" stepKey="clickApply"/>
+        <waitForElementNotVisible selector="{{AdminNewCatalogPriceRuleConditions.activeConditionApplyButton}}" stepKey="waitForApplyButtonInvisibility"/>
+    </actionGroup>
+
+    <actionGroup name="newCatalogPriceRuleWithInvalidData">
+        <annotations>
+            <description>Goes to the Catalog Price Rule grid. Clicks on Add. Fills in the provided Catalog Rule details with invalid data.</description>
+        </annotations>
+        <arguments>
+            <argument name="catalogRule" defaultValue="catalogRuleWithInvalid"/>
+        </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}}"/>
+        <fillField stepKey="fillPriority" selector="{{AdminNewCatalogPriceRule.priority}}" userInput="{{catalogRule.priority}}"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{AdminNewCatalogPriceRule.save}}" stepKey="clickSave"/>
+        <waitForPageLoad stepKey="waitForApplied"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml b/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
index 75a7484324576..2920a895f607d 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
@@ -173,4 +173,19 @@
         <data key="defaultRuleLabelAllStoreViews">Free Shipping in conditions</data>
         <data key="defaultStoreView">Free Shipping in conditions</data>
     </entity>
+
+    <entity name="catalogRuleWithInvalid" 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>
+        <data key="priority">ten</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleProductConditionData.xml b/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleProductConditionData.xml
new file mode 100644
index 0000000000000..510ea25c3f566
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleProductConditionData.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="CatalogRuleProductConditions">
+        <data key="categoryIds">Magento\CatalogRule\Model\Rule\Condition\Product|category_ids</data>
+    </entity>
+</entities>
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
index 0d89c7970b852..5b6b610508fef 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Metadata/catalog-rule-meta.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Metadata/catalog-rule-meta.xml
@@ -9,8 +9,9 @@
 
 <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">
+    <operation name="createCatalogRule" dataType="catalogRule" type="create" auth="adminFormKey"
+               url="/catalog_rule/promo_catalog/save/back/edit" method="POST"
+               returnRegex="~\/id\/(?'id'\d+)\/~" returnIndex="id" successRegex="/messages-message-success/">
         <contentType>application/x-www-form-urlencoded</contentType>
         <field key="name">string</field>
         <field key="description">string</field>
@@ -24,4 +25,7 @@
         <field key="simple_action">string</field>
         <field key="discount_amount">string</field>
     </operation>
+    <operation name="DeleteCatalogRule" dataType="catalogRule" type="delete" auth="adminFormKey"
+               url="/catalog_rule/promo_catalog/delete/id/{return}" method="POST" successRegex="/messages-message-success/">
+    </operation>
 </operations>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Page/AdminNewCatalogPriceRulePage.xml b/app/code/Magento/CatalogRule/Test/Mftf/Page/AdminNewCatalogPriceRulePage.xml
index fded4f5e5f322..71372481490e8 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Page/AdminNewCatalogPriceRulePage.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Page/AdminNewCatalogPriceRulePage.xml
@@ -10,5 +10,6 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="AdminNewCatalogPriceRulePage" url="catalog_rule/promo_catalog/new/" module="Magento_CatalogRule" area="admin">
         <section name="AdminNewCatalogPriceRule"/>
+        <section name="AdminNewCatalogPriceRuleConditions"/>
     </page>
 </pages>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml b/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml
index ba0493d8e995b..7d375da6dfb65 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Section/AdminNewCatalogPriceRuleSection.xml
@@ -20,8 +20,12 @@
         <element name="ruleNameNew" type="input" selector="[name='staging[name]']"/>
         <element name="description" type="textarea" selector="[name='description']"/>
         <element name="status" type="select" selector="[name='is_active']"/>
+        <element name="isActive" type="select" selector="input[name='is_active']+label"/>
 
         <element name="websites" type="select" selector="[name='website_ids']"/>
+        <element name="active" type="checkbox" selector="//div[contains(@class, 'admin__actions-switch')]/input[@name='is_active']/../label"/>
+        <element name="activeIsEnabled" type="checkbox" selector="(//div[contains(@class, 'admin__actions-switch')])[1]/input[@value='1']"/>
+        <element name="activePosition" type="checkbox" selector="fieldset[class='admin__fieldset'] div[class*='_required']:nth-of-type(4)"/>
         <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"/>
@@ -33,6 +37,8 @@
         <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']"/>
+
+        <element name="fieldError" type="text" selector="//input[@name='{{fieldName}}']/following-sibling::label[@class='admin__field-error']" parameterized="true"/>
     </section>
 
     <section name="AdminNewCatalogPriceRuleActions">
@@ -42,8 +48,9 @@
     </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="newCondition" type="button" selector=".rule-param.rule-param-new-child" timeout="30"/>
+        <element name="conditionsDropdown" type="select" selector="select[data-form-part='catalog_rule_form'][data-ui-id='newchild-0-select-rule-conditions-1-new-child']"/>
+        <element name="conditionSelect" type="select" selector="select#conditions__{{var}}__new_child" parameterized="true" timeout="30"/>
         <element name="targetEllipsis" type="button" selector="//li[{{var}}]//a[@class='label'][text() = '...']" parameterized="true"/>
         <element name="targetEllipsisValue" type="button" selector="//ul[@id='conditions__{{var}}__children']//a[contains(text(), '{{var1}}')]" parameterized="true" timeout="30"/>
         <element name="ellipsisValue" type="button" selector="//ul[@id='conditions__{{var}}__children']//a[contains(text(), '...')]" parameterized="true" timeout="30"/>
@@ -51,6 +58,10 @@
         <element name="targetSelect" type="select" selector="//ul[@id='conditions__{{var}}__children']//select" parameterized="true" timeout="30"/>
         <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"/>
+        <element name="condition" type="text" selector="//span[@class='rule-param']/a[text()='{{condition}}']" parameterized="true"/>
+        <element name="activeOperatorSelect" type="select" selector=".rule-param-edit select[name*='[operator]']"/>
+        <element name="activeValueInput" type="input" selector=".rule-param-edit [name*='[value]']"/>
+        <element name="activeConditionApplyButton" type="button" selector=".rule-param-edit .rule-param-apply" timeout="30"/>
     </section>
 
     <section name="AdminCatalogPriceRuleGrid">
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
index 741da96179b8c..ca534ec7f5375 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
@@ -52,6 +52,7 @@
         <waitForPageLoad stepKey="waitForIndividualRulePage"/>
         <fillField selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{_defaultCatalogRule.name}}" stepKey="fillName"/>
         <fillField selector="{{AdminNewCatalogPriceRule.description}}" userInput="{{_defaultCatalogRule.description}}" stepKey="fillDescription"/>
+        <click stepKey="selectActive" selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}"/>
         <selectOption selector="{{AdminNewCatalogPriceRule.websites}}" userInput="{{_defaultCatalogRule.website_ids[0]}}" stepKey="selectSite"/>
         <click selector="{{AdminNewCatalogPriceRule.fromDateButton}}" stepKey="clickFromCalender"/>
         <click selector="{{AdminNewCatalogPriceRule.todayDate}}" stepKey="clickFromToday"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml
index befe0b0ce7f98..ee61af180d350 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml
@@ -25,6 +25,10 @@
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
 
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
             <!-- log in and create the price rule -->
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI"/>
@@ -150,6 +154,7 @@
             <createData entity="ApiSimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
+
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
@@ -172,6 +177,10 @@
         <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccess"/>
 
+        <!-- Perform reindex and flush cache -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <!-- 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"/>
@@ -187,4 +196,27 @@
         <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$$createProduct.name$$" stepKey="seeProduct2"/>
         <see selector="{{StorefrontCategoryProductSection.ProductInfoByNumber('1')}}" userInput="$123.00" stepKey="seeDiscountedPrice2"/>
     </test>
+
+    <test name="AdminCreateCatalogPriceRuleWithInvalidDataTest">
+        <annotations>
+            <features value="CatalogRule"/>
+            <stories value="Create Catalog Price Rule"/>
+            <title value="Admin can not create catalog price rule with the invalid data"/>
+            <description value="Admin can not create catalog price rule with the invalid data"/>
+            <severity value="MAJOR"/>
+            <group value="CatalogRule"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <actionGroup ref="newCatalogPriceRuleWithInvalidData" stepKey="createNewPriceRule">
+            <argument name="catalogRule" value="catalogRuleWithInvalid"/>
+        </actionGroup>
+
+        <see selector="{{AdminNewCatalogPriceRule.fieldError('sort_order')}}" userInput="Please enter a valid number in this field." stepKey="seeSortOrderError"/>
+    </test>
 </tests>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateInactiveCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateInactiveCatalogPriceRuleTest.xml
index 5223b18df4e4a..83dff1ecdcab5 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateInactiveCatalogPriceRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateInactiveCatalogPriceRuleTest.xml
@@ -58,6 +58,7 @@
             <argument name="websites" value="Main Website"/>
             <argument name="customerGroup" value="General"/>
         </actionGroup>
+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}"  stepKey="verifyInactiveRule"/>
 
         <!-- Search Catalog Rule in Grid -->
         <actionGroup ref="AdminSearchCatalogRuleInGridActionGroup" stepKey="searchCreatedCatalogRule">
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest.xml
index 06392764290ac..d80759531ecae 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest.xml
@@ -18,7 +18,7 @@
             <group value="CatalogRule"/>
             <group value="mtf_migrated"/>
         </annotations>
-        
+
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer1"/>
             <createData entity="_defaultCategory" stepKey="createCategory1"/>
@@ -59,7 +59,7 @@
         <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
 
         <!-- Assert that the Success message is present after the delete -->
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the rule." stepKey="seeDeletedRuleMessage1"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the rule." stepKey="seeDeletedRuleMessage1"/>
 
         <!-- Reindex -->
         <magentoCLI command="cache:flush" stepKey="flushCache1"/>
@@ -154,6 +154,10 @@
                 <requiredEntity createDataKey="createConfigChildProduct2"/>
             </createData>
 
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
 
             <amOnPage url="{{AdminNewCatalogPriceRulePage.url}}" stepKey="openNewCatalogPriceRulePage"/>
@@ -188,7 +192,7 @@
             <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
         </actionGroup>
         <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the rule." stepKey="seeDeletedRuleMessage1"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the rule." stepKey="seeDeletedRuleMessage1"/>
 
         <!-- Reindex -->
         <magentoCLI command="cache:flush" stepKey="flushCache1"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
index d3546d06492be..16fbca2697702 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
@@ -19,14 +19,14 @@
             <group value="CatalogRule"/>
         </annotations>
         <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!-- Create a category -->
             <createData entity="ApiCategory" stepKey="createCategory"/>
-
             <!-- Create a simple product -->
             <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-
+            <!-- Login to Admin page -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <!-- Create a configurable product -->
             <actionGroup ref="createConfigurableProduct" stepKey="createConfigurableProduct">
                 <argument name="product" value="_defaultProduct"/>
@@ -34,9 +34,16 @@
             </actionGroup>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteConfigurableProduct">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsGridFilters"/>
+            <amOnPage url="{{AdminCatalogPriceRuleGridPage.url}}" stepKey="goToCatalogRuleGridPage"/>
+            <waitForPageLoad stepKey="waitForCatalogRuleGridPageLoaded"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearCatalogRuleGridFilters"/>
+            <actionGroup ref="logout" stepKey="amOnLogoutPage"/>
         </after>
 
         <!-- Create a catalog price rule -->
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
index b7a231df5045d..b9d601238ac73 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
@@ -16,6 +16,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-148"/>
             <group value="CatalogRule"/>
+            <skip>
+                <issueId value="MC-22577"/>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="login"/>
@@ -148,7 +151,7 @@
             <argument name="attribute" value="{{productAttributeDropdownTwoOptions.attribute_code}}"/>
         </actionGroup>
         <actionGroup ref="SaveAttributeSet" stepKey="saveAttributeSet"/>
-        
+
         <!-- First Simple Product: choose green as attribute value -->
         <actionGroup ref="filterAndSelectProduct" stepKey="openFirstSimpleProduct">
             <argument name="productSku" value="$$createFirstProduct.sku$$"/>
@@ -195,6 +198,7 @@
              Websites: Main Website
              Customer Groups: NOT LOGGED IN  -->
         <fillField userInput="{{SimpleCatalogPriceRule.name}}" selector="{{AdminCartPriceRulesFormSection.ruleName}}" stepKey="fillRuleName"/>
+        <click stepKey="selectActive" selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}"/>
         <selectOption userInput="{{SimpleCatalogPriceRule.websites}}" selector="{{AdminCartPriceRulesFormSection.websites}}" stepKey="selectWebsite"/>
         <selectOption userInput="{{SimpleCatalogPriceRule.customerGroups}}" selector="{{AdminCartPriceRulesFormSection.customerGroups}}" stepKey="selectCustomerGroups"/>
 
@@ -228,6 +232,7 @@
         <!-- Run cron twice -->
         <magentoCLI command="cron:run" stepKey="runCron1"/>
         <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
 
         <!-- Go to Frontend and open the simple product -->
         <amOnPage url="{{StorefrontProductPage.url($$createFirstProduct.sku$$)}}" stepKey="amOnSimpleProductPage"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
index 5b7e722c92a02..a251ee1e235d0 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
@@ -77,63 +77,27 @@
         <actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
-        
+
         <!-- Navigate to category on store front -->
         <amOnPage url="{{StorefrontProductPage.url($createCategory.name$)}}" stepKey="goToCategoryPage"/>
-        
-        <!-- Check product 1 name on store front category page -->
-        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1Name">
-            <argument name="productInfo" value="$createProduct1.name$"/>
-            <argument name="productNumber" value="3"/>
-        </actionGroup>
 
         <!-- Check product 1 price on store front category page -->
-        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1Price">
-            <argument name="productInfo" value="$51.10"/>
-            <argument name="productNumber" value="3"/>
-        </actionGroup>
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByName($createProduct1.name$)}}" userInput="$51.10" stepKey="storefrontProduct1Price"/>
 
         <!-- Check product 1 regular price on store front category page -->
-        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1RegularPrice">
-            <argument name="productInfo" value="$56.78"/>
-            <argument name="productNumber" value="3"/>
-        </actionGroup>
-
-        <!-- Check product 2 name on store front category page -->
-        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct2Name">
-            <argument name="productInfo" value="$createProduct2.name$"/>
-            <argument name="productNumber" value="2"/>
-        </actionGroup>
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByName($createProduct1.name$)}}" userInput="$56.78" stepKey="storefrontProduct1RegularPrice"/>
 
         <!-- Check product 2 price on store front category page -->
-        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct2Price">
-            <argument name="productInfo" value="$51.10"/>
-            <argument name="productNumber" value="2"/>
-        </actionGroup>
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByName($createProduct2.name$)}}" userInput="$51.10" stepKey="storefrontProduct2Price"/>
 
-        <!-- Check product 2 price on store front category page -->
-        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct2RegularPrice">
-            <argument name="productInfo" value="$56.78"/>
-            <argument name="productNumber" value="2"/>
-        </actionGroup>
-
-        <!-- Check product 3 name on store front category page -->
-        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct3Name">
-            <argument name="productInfo" value="$createProduct3.name$"/>
-            <argument name="productNumber" value="1"/>
-        </actionGroup>
+        <!-- Check product 2 regular price on store front category page -->
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByName($createProduct2.name$)}}" userInput="$56.78" stepKey="storefrontProduct2RegularPrice"/>
 
         <!-- Check product 3 price on store front category page -->
-        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct3Price">
-            <argument name="productInfo" value="$51.10"/>
-            <argument name="productNumber" value="1"/>
-        </actionGroup>
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByName($createProduct3.name$)}}" userInput="$51.10" stepKey="storefrontProduct3Price"/>
 
         <!-- Check product 3 regular price on store front category page -->
-        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct3RegularPrice">
-            <argument name="productInfo" value="$56.78"/>
-            <argument name="productNumber" value="1"/>
-        </actionGroup>
+        <see selector="{{StorefrontCategoryProductSection.ProductInfoByName($createProduct3.name$)}}" userInput="$56.78" stepKey="storefrontProduct3RegularPrice"/>
 
         <!-- Navigate to product 1 on store front -->
         <amOnPage url="{{StorefrontProductPage.url($createProduct1.name$)}}" stepKey="goToProductPage1"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
index b486654fe9acf..08e59c6316411 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
@@ -26,9 +26,14 @@
             </createData>
             <actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI"/>
             <actionGroup stepKey="selectLoggedInCustomers" ref="selectNotLoggedInCustomerGroup"/>
-            <selectOption selector="{{AdminNewCatalogPriceRule.status}}" userInput="Inactive" stepKey="setInactive"/>
+            <scrollToTopOfPage stepKey="scrollToTop"/>
+            <click stepKey="setInactive" selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}"/>
             <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
             <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="seeSuccess"/>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
deleted file mode 100644
index 78668366bccdc..0000000000000
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-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)
- */
-class IndexBuilderTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\CatalogRule\Model\Indexer\IndexBuilder
-     */
-    protected $indexBuilder;
-
-    /**
-     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $resource;
-
-    /**
-     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $storeManager;
-
-    /**
-     * @var \Magento\CatalogRule\Model\ResourceModel\Rule\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $ruleCollectionFactory;
-
-    /**
-     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $logger;
-
-    /**
-     * @var \Magento\Framework\Pricing\PriceCurrencyInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $priceCurrency;
-
-    /**
-     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $eavConfig;
-
-    /**
-     * @var \Magento\Framework\Stdlib\DateTime|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $dateFormat;
-
-    /**
-     * @var \Magento\Framework\Stdlib\DateTime\DateTime|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $dateTime;
-
-    /**
-     * @var \Magento\Catalog\Model\ProductFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $productFactory;
-
-    /**
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $connection;
-
-    /**
-     * @var \Magento\Framework\EntityManager\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $metadataPool;
-
-    /**
-     * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $select;
-
-    /**
-     * @var \Zend_Db_Statement_Interface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $db;
-
-    /**
-     * @var \Magento\Store\Model\Website|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $website;
-
-    /**
-     * @var \Magento\Rule\Model\Condition\Combine|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $combine;
-
-    /**
-     * @var \Magento\CatalogRule\Model\Rule|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $rules;
-
-    /**
-     * @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $product;
-
-    /**
-     * @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $attribute;
-
-    /**
-     * @var \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $backend;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $reindexRuleProductPrice;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $reindexRuleGroupWebsite;
-
-    /**
-     * @var ProductLoader|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $productLoader;
-
-    /**
-     * Set up test
-     *
-     * @return void
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    protected function setUp()
-    {
-        $this->resource = $this->createPartialMock(
-            \Magento\Framework\App\ResourceConnection::class,
-            ['getConnection', 'getTableName']
-        );
-        $this->ruleCollectionFactory = $this->createPartialMock(
-            \Magento\CatalogRule\Model\ResourceModel\Rule\CollectionFactory::class,
-            ['create']
-        );
-        $this->backend = $this->createMock(\Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend::class);
-        $this->select = $this->createMock(\Magento\Framework\DB\Select::class);
-        $this->metadataPool = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
-        $metadata = $this->createMock(\Magento\Framework\EntityManager\EntityMetadata::class);
-        $this->metadataPool->expects($this->any())->method('getMetadata')->willReturn($metadata);
-        $this->connection = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
-        $this->db = $this->createMock(\Zend_Db_Statement_Interface::class);
-        $this->website = $this->createMock(\Magento\Store\Model\Website::class);
-        $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-        $this->combine = $this->createMock(\Magento\Rule\Model\Condition\Combine::class);
-        $this->rules = $this->createMock(\Magento\CatalogRule\Model\Rule::class);
-        $this->logger = $this->createMock(\Psr\Log\LoggerInterface::class);
-        $this->attribute = $this->createMock(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class);
-        $this->priceCurrency = $this->createMock(\Magento\Framework\Pricing\PriceCurrencyInterface::class);
-        $this->dateFormat = $this->createMock(\Magento\Framework\Stdlib\DateTime::class);
-        $this->dateTime = $this->createMock(\Magento\Framework\Stdlib\DateTime\DateTime::class);
-        $this->eavConfig = $this->createPartialMock(\Magento\Eav\Model\Config::class, ['getAttribute']);
-        $this->product = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $this->productFactory = $this->createPartialMock(\Magento\Catalog\Model\ProductFactory::class, ['create']);
-        $this->connection->expects($this->any())->method('select')->will($this->returnValue($this->select));
-        $this->connection->expects($this->any())->method('query')->will($this->returnValue($this->db));
-        $this->select->expects($this->any())->method('distinct')->will($this->returnSelf());
-        $this->select->expects($this->any())->method('where')->will($this->returnSelf());
-        $this->select->expects($this->any())->method('from')->will($this->returnSelf());
-        $this->select->expects($this->any())->method('order')->will($this->returnSelf());
-        $this->resource->expects($this->any())->method('getConnection')->will($this->returnValue($this->connection));
-        $this->resource->expects($this->any())->method('getTableName')->will($this->returnArgument(0));
-        $this->storeManager->expects($this->any())->method('getWebsites')->will($this->returnValue([$this->website]));
-        $this->storeManager->expects($this->any())->method('getWebsite')->will($this->returnValue($this->website));
-        $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]));
-
-        $ruleCollection = $this->createMock(\Magento\CatalogRule\Model\ResourceModel\Rule\Collection::class);
-        $this->ruleCollectionFactory->expects($this->once())
-            ->method('create')
-            ->willReturn($ruleCollection);
-        $ruleCollection->expects($this->once())
-            ->method('addFieldToFilter')
-            ->willReturnSelf();
-        $ruleIterator = new \ArrayIterator([$this->rules]);
-        $ruleCollection->method('getIterator')
-            ->willReturn($ruleIterator);
-
-        $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 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->createMock(
-            \Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice::class
-        );
-        $this->reindexRuleGroupWebsite = $this->createMock(
-            \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite::class
-        );
-        $this->setProperties(
-            $this->indexBuilder,
-            [
-                'metadataPool' => $this->metadataPool,
-                'reindexRuleProductPrice' => $this->reindexRuleProductPrice,
-                'reindexRuleGroupWebsite' => $this->reindexRuleGroupWebsite,
-            ]
-        );
-    }
-
-    /**
-     * Test UpdateCatalogRuleGroupWebsiteData
-     *
-     * @covers \Magento\CatalogRule\Model\Indexer\IndexBuilder::updateCatalogRuleGroupWebsiteData
-     * @return void
-     */
-    public function testUpdateCatalogRuleGroupWebsiteData()
-    {
-        $priceAttrMock = $this->createPartialMock(\Magento\Catalog\Model\Entity\Attribute::class, ['getBackend']);
-        $backendModelMock = $this->createPartialMock(
-            \Magento\Catalog\Model\Product\Attribute\Backend\Tierprice::class,
-            ['getResource']
-        );
-        $resourceMock = $this->createPartialMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Tierprice::class,
-            ['getMainTable']
-        );
-        $resourceMock->expects($this->any())
-            ->method('getMainTable')
-            ->will($this->returnValue('catalog_product_entity_tier_price'));
-        $backendModelMock->expects($this->any())
-            ->method('getResource')
-            ->will($this->returnValue($resourceMock));
-        $priceAttrMock->expects($this->any())
-            ->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);
-
-        $this->indexBuilder->reindexByIds([1]);
-    }
-
-    /**
-     * @param $object
-     * @param array $properties
-     */
-    private function setProperties($object, $properties = [])
-    {
-        $reflectionClass = new \ReflectionClass(get_class($object));
-        foreach ($properties as $key => $value) {
-            if ($reflectionClass->hasProperty($key)) {
-                $reflectionProperty = $reflectionClass->getProperty($key);
-                $reflectionProperty->setAccessible(true);
-                $reflectionProperty->setValue($object, $value);
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductPriceTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductPriceTest.php
index 5f63283df6760..d0f266d574945 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductPriceTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductPriceTest.php
@@ -71,6 +71,7 @@ public function testExecute()
         $websiteId = 234;
         $defaultGroupId = 11;
         $defaultStoreId = 22;
+        $productId = 55;
 
         $websiteMock = $this->createMock(WebsiteInterface::class);
         $websiteMock->expects($this->once())
@@ -93,11 +94,10 @@ public function testExecute()
             ->with($defaultGroupId)
             ->willReturn($groupMock);
 
-        $productMock = $this->createMock(Product::class);
         $statementMock = $this->createMock(\Zend_Db_Statement_Interface::class);
         $this->ruleProductsSelectBuilderMock->expects($this->once())
             ->method('build')
-            ->with($websiteId, $productMock, true)
+            ->with($websiteId, $productId, true)
             ->willReturn($statementMock);
 
         $ruleData = [
@@ -126,6 +126,6 @@ public function testExecute()
         $this->pricesPersistorMock->expects($this->once())
             ->method('execute');
 
-        $this->assertTrue($this->model->execute(1, $productMock, true));
+        $this->assertTrue($this->model->execute(1, $productId, true));
     }
 }
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php
deleted file mode 100644
index e43fe41dc2127..0000000000000
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-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;
-use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
-use Magento\Framework\EntityManager\EntityMetadataInterface;
-use Magento\Store\Api\Data\WebsiteInterface;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class RuleProductsSelectBuilderTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder
-     */
-    private $model;
-
-    /**
-     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $storeManagerMock;
-
-    /**
-     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $resourceMock;
-
-    /**
-     * @var ActiveTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $activeTableSwitcherMock;
-
-    /**
-     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $eavConfigMock;
-
-    /**
-     * @var \Magento\Framework\EntityManager\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $metadataPoolMock;
-
-    /**
-     * @var IndexerTableSwapperInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $tableSwapperMock;
-
-    protected function setUp()
-    {
-        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-            ->getMockForAbstractClass();
-        $this->resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->activeTableSwitcherMock = $this->getMockBuilder(ActiveTableSwitcher::class)
-                ->disableOriginalConstructor()
-                ->getMock();
-        $this->eavConfigMock = $this->getMockBuilder(\Magento\Eav\Model\Config::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $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->tableSwapperMock
-        );
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testBuild()
-    {
-        $websiteId = 55;
-        $ruleTable = 'catalogrule_product';
-        $rplTable = 'catalogrule_product_replica';
-        $prTable = 'catalog_product_entity';
-        $wsTable = 'catalog_product_website';
-        $productMock = $this->getMockBuilder(Product::class)->disableOriginalConstructor()->getMock();
-        $productMock->expects($this->exactly(2))->method('getEntityId')->willReturn(500);
-
-        $connectionMock = $this->getMockBuilder(AdapterInterface::class)->disableOriginalConstructor()->getMock();
-        $this->resourceMock->expects($this->at(0))->method('getConnection')->willReturn($connectionMock);
-
-        $this->tableSwapperMock->expects($this->once())
-            ->method('getWorkingTableName')
-            ->with($ruleTable)
-            ->willReturn($rplTable);
-
-        $this->resourceMock->expects($this->at(1))->method('getTableName')->with($ruleTable)->willReturn($ruleTable);
-        $this->resourceMock->expects($this->at(2))->method('getTableName')->with($rplTable)->willReturn($rplTable);
-        $this->resourceMock->expects($this->at(3))->method('getTableName')->with($prTable)->willReturn($prTable);
-        $this->resourceMock->expects($this->at(4))->method('getTableName')->with($wsTable)->willReturn($wsTable);
-
-        $selectMock = $this->getMockBuilder(Select::class)->disableOriginalConstructor()->getMock();
-        $connectionMock->expects($this->once())->method('select')->willReturn($selectMock);
-        $selectMock->expects($this->at(0))->method('from')->with(['rp' => $rplTable])->willReturnSelf();
-        $selectMock->expects($this->at(1))
-            ->method('order')
-            ->with(['rp.website_id', 'rp.customer_group_id', 'rp.product_id', 'rp.sort_order', 'rp.rule_id'])
-            ->willReturnSelf();
-        $selectMock->expects($this->at(2))->method('where')->with('rp.product_id=?', 500)->willReturnSelf();
-
-        $attributeMock = $this->getMockBuilder(AbstractAttribute::class)->disableOriginalConstructor()->getMock();
-        $this->eavConfigMock->expects($this->once())
-            ->method('getAttribute')
-            ->with(Product::ENTITY, 'price')
-            ->willReturn($attributeMock);
-        $backendMock = $this->getMockBuilder(AbstractBackend::class)->disableOriginalConstructor()->getMock();
-        $backendMock->expects($this->once())->method('getTable')->willReturn('price_table');
-        $attributeMock->expects($this->once())->method('getBackend')->willReturn($backendMock);
-        $attributeMock->expects($this->once())->method('getId')->willReturn(200);
-
-        $metadataMock = $this->getMockBuilder(EntityMetadataInterface::class)->disableOriginalConstructor()->getMock();
-        $this->metadataPoolMock->expects($this->once())
-            ->method('getMetadata')
-            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
-            ->willReturn($metadataMock);
-        $metadataMock->expects($this->once())->method('getLinkField')->willReturn('link_field');
-
-        $selectMock->expects($this->at(3))
-            ->method('join')
-            ->with(['e' => $prTable], 'e.entity_id = rp.product_id', [])
-            ->willReturnSelf();
-        $selectMock->expects($this->at(4))
-            ->method('join')
-            ->with(
-                ['pp_default' => 'price_table'],
-                'pp_default.link_field=e.link_field AND (pp_default.attribute_id=200) and pp_default.store_id=0',
-                []
-            )->willReturnSelf();
-        $websiteMock = $this->getMockBuilder(WebsiteInterface::class)
-            ->setMethods(['getDefaultGroup'])
-            ->getMockForAbstractClass();
-        $this->storeManagerMock->expects($this->once())
-            ->method('getWebsite')
-            ->with($websiteId)
-            ->willReturn($websiteMock);
-
-        $groupMock = $this->getMockBuilder(\Magento\Store\Model\Group::class)
-            ->setMethods(['getDefaultStoreId'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $websiteMock->expects($this->once())->method('getDefaultGroup')->willReturn($groupMock);
-        $groupMock->expects($this->once())->method('getDefaultStoreId')->willReturn(700);
-
-        $selectMock->expects($this->at(5))
-            ->method('joinInner')
-            ->with(
-                ['product_website' => $wsTable],
-                'product_website.product_id=rp.product_id '
-                . 'AND product_website.website_id = rp.website_id '
-                . 'AND product_website.website_id='
-                . $websiteId,
-                []
-            )->willReturnSelf();
-        $selectMock->expects($this->at(6))
-            ->method('joinLeft')
-            ->with(
-                ['pp' . $websiteId => 'price_table'],
-                'pp55.link_field=e.link_field AND (pp55.attribute_id=200) and pp55.store_id=700',
-                []
-            )->willReturnSelf();
-
-        $connectionMock->expects($this->once())
-            ->method('getIfNullSql')
-            ->with('pp55.value', 'pp_default.value')
-            ->willReturn('IF NULL SQL');
-        $selectMock->expects($this->at(7))
-            ->method('columns')
-            ->with(['default_price' => 'IF NULL SQL'])
-            ->willReturnSelf();
-        $statementMock = $this->getMockBuilder(\Zend_Db_Statement_Interface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $connectionMock->expects($this->once())->method('query')->with($selectMock)->willReturn($statementMock);
-
-        $this->assertEquals($statementMock, $this->model->build($websiteId, $productMock, true));
-    }
-}
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Pricing/Price/CatalogRulePriceTest.php b/app/code/Magento/CatalogRule/Test/Unit/Pricing/Price/CatalogRulePriceTest.php
index 7514d2bc4b5c5..54cd9e411df5c 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Pricing/Price/CatalogRulePriceTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Pricing/Price/CatalogRulePriceTest.php
@@ -176,4 +176,17 @@ public function testGetAmountNoBaseAmount()
         $result = $this->object->getValue();
         $this->assertFalse($result);
     }
+
+    public function testGetValueWithNullAmount()
+    {
+        $catalogRulePrice = null;
+        $convertedPrice = 0.0;
+
+        $this->saleableItemMock->expects($this->once())->method('hasData')
+                ->with('catalog_rule_price')->willReturn(true);
+        $this->saleableItemMock->expects($this->once())->method('getData')
+                    ->with('catalog_rule_price')->willReturn($catalogRulePrice);
+
+        $this->assertEquals($convertedPrice, $this->object->getValue());
+    }
 }
diff --git a/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml b/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml
index c114f6b1d77cd..59e3c4668e8a4 100644
--- a/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml
+++ b/app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml
@@ -95,33 +95,30 @@
                 <dataScope>description</dataScope>
             </settings>
         </field>
-        <field name="is_active" formElement="select">
+        <field name="is_active" formElement="checkbox">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="source" xsi:type="string">catalog_rule</item>
+                    <item name="default" xsi:type="number">0</item>
                 </item>
             </argument>
             <settings>
-                <dataType>number</dataType>
-                <label translate="true">Status</label>
-                <visible>true</visible>
-                <dataScope>is_active</dataScope>
+                <validation>
+                    <rule name="required-entry" xsi:type="boolean">true</rule>
+                </validation>
+                <dataType>boolean</dataType>
+                <label translate="true">Active</label>
             </settings>
             <formElements>
-                <select>
+                <checkbox>
                     <settings>
-                        <options>
-                            <option name="0" xsi:type="array">
-                                <item name="value" xsi:type="number">1</item>
-                                <item name="label" xsi:type="string" translate="true">Active</item>
-                            </option>
-                            <option name="1" xsi:type="array">
-                                <item name="value" xsi:type="number">0</item>
-                                <item name="label" xsi:type="string" translate="true">Inactive</item>
-                            </option>
-                        </options>
+                        <valueMap>
+                            <map name="false" xsi:type="number">0</map>
+                            <map name="true" xsi:type="number">1</map>
+                        </valueMap>
+                        <prefer>toggle</prefer>
                     </settings>
-                </select>
+                </checkbox>
             </formElements>
         </field>
         <field name="website_ids" formElement="multiselect">
@@ -211,6 +208,9 @@
                 </item>
             </argument>
             <settings>
+                <validation>
+                    <rule name="validate-digits" xsi:type="boolean">true</rule>
+                </validation>
                 <dataType>text</dataType>
                 <label translate="true">Priority</label>
                 <dataScope>sort_order</dataScope>
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 09d4f0068459a..cd2529a8fd725 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
@@ -7,14 +7,9 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
-use Magento\CatalogInventory\Api\Data\StockStatusInterface;
-use Magento\CatalogInventory\Api\StockConfigurationInterface;
-use Magento\CatalogInventory\Api\StockStatusCriteriaInterface;
-use Magento\CatalogInventory\Api\StockStatusRepositoryInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Select;
 use Magento\Store\Model\Store;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Catalog search full test search data provider.
@@ -129,16 +124,6 @@ class DataProvider
      */
     private $antiGapMultiplier;
 
-    /**
-     * @var StockConfigurationInterface
-     */
-    private $stockConfiguration;
-
-    /**
-     * @var StockStatusRepositoryInterface
-     */
-    private $stockStatusRepository;
-
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
@@ -563,8 +548,6 @@ public function prepareProductIndex($indexData, $productData, $storeId)
     {
         $index = [];
 
-        $indexData = $this->filterOutOfStockProducts($indexData, $storeId);
-
         foreach ($this->getSearchableAttributes('static') as $attribute) {
             $attributeCode = $attribute->getAttributeCode();
 
@@ -689,68 +672,4 @@ private function filterAttributeValue($value)
     {
         return preg_replace('/\s+/iu', ' ', trim(strip_tags($value)));
     }
-
-    /**
-     * Filter out of stock products for products.
-     *
-     * @param array $indexData
-     * @param int $storeId
-     * @return array
-     */
-    private function filterOutOfStockProducts($indexData, $storeId): array
-    {
-        if (!$this->getStockConfiguration()->isShowOutOfStock($storeId)) {
-            $productIds = array_keys($indexData);
-            $stockStatusCriteria = $this->createStockStatusCriteria();
-            $stockStatusCriteria->setProductsFilter($productIds);
-            $stockStatusCollection = $this->getStockStatusRepository()->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;
-    }
-
-    /**
-     * Get stock configuration.
-     *
-     * @return StockConfigurationInterface
-     */
-    private function getStockConfiguration()
-    {
-        if (null === $this->stockConfiguration) {
-            $this->stockConfiguration = ObjectManager::getInstance()->get(StockConfigurationInterface::class);
-        }
-        return $this->stockConfiguration;
-    }
-
-    /**
-     * Create stock status criteria.
-     *
-     * Substitution of autogenerated factory in backward compatibility reasons.
-     *
-     * @return StockStatusCriteriaInterface
-     */
-    private function createStockStatusCriteria()
-    {
-        return ObjectManager::getInstance()->create(StockStatusCriteriaInterface::class);
-    }
-
-    /**
-     * Get stock status repository.
-     *
-     * @return StockStatusRepositoryInterface
-     */
-    private function getStockStatusRepository()
-    {
-        if (null === $this->stockStatusRepository) {
-            $this->stockStatusRepository = ObjectManager::getInstance()->get(StockStatusRepositoryInterface::class);
-        }
-        return $this->stockStatusRepository;
-    }
 }
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product/Category/Action/Rows.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product/Category/Action/Rows.php
new file mode 100644
index 0000000000000..2b1844deb114c
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product/Category/Action/Rows.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Product\Category\Action;
+
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
+use Magento\Catalog\Model\Indexer\Product\Category\Action\Rows as ActionRows;
+
+/**
+ * Catalog search indexer plugin for catalog category products assignment
+ */
+class Rows
+{
+    /**
+     * @var IndexerRegistry
+     */
+    private $indexerRegistry;
+
+    /**
+     * @param IndexerRegistry $indexerRegistry
+     */
+    public function __construct(IndexerRegistry $indexerRegistry)
+    {
+        $this->indexerRegistry = $indexerRegistry;
+    }
+
+    /**
+     * Reindex after catalog category product reindex
+     *
+     * @param ActionRows $subject
+     * @param ActionRows $result
+     * @param array $entityIds
+     * @return ActionRows
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterExecute(ActionRows $subject, ActionRows $result, array $entityIds): ActionRows
+    {
+        if (!empty($entityIds)) {
+            $indexer = $this->indexerRegistry->get(FulltextIndexer::INDEXER_ID);
+            if ($indexer->isScheduled()) {
+                $indexer->reindexList($entityIds);
+            }
+        }
+        return $result;
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Plugin/StockedProductsFilterPlugin.php b/app/code/Magento/CatalogSearch/Model/Indexer/Plugin/StockedProductsFilterPlugin.php
new file mode 100644
index 0000000000000..02e48c5d8a1c0
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Plugin/StockedProductsFilterPlugin.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Model\Indexer\Plugin;
+
+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.
+ *
+ * This plugin reverts changes introduced in commit 9ab466d8569ea556cb01393989579c3aac53d9a3 which break extensions
+ * relying on stocks. Plugin location is changed for consistency purposes.
+ */
+class StockedProductsFilterPlugin
+{
+    /**
+     * @var StockConfigurationInterface
+     */
+    private $stockConfiguration;
+
+    /**
+     * @var StockStatusRepositoryInterface
+     */
+    private $stockStatusRepository;
+
+    /**
+     * @var StockStatusCriteriaInterfaceFactory
+     */
+    private $stockStatusCriteriaFactory;
+
+    /**
+     * @param StockConfigurationInterface $stockConfiguration
+     * @param StockStatusRepositoryInterface $stockStatusRepository
+     * @param StockStatusCriteriaInterfaceFactory $stockStatusCriteriaFactory
+     */
+    public function __construct(
+        StockConfigurationInterface $stockConfiguration,
+        StockStatusRepositoryInterface $stockStatusRepository,
+        StockStatusCriteriaInterfaceFactory $stockStatusCriteriaFactory
+    ) {
+        $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->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/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
index 85a32dc60b119..d8947ac4224a8 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -58,15 +58,18 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
         if (empty($attributeValue) && !is_numeric($attributeValue)) {
             return $this;
         }
+
         $attribute = $this->getAttributeModel();
         /** @var \Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection $productCollection */
         $productCollection = $this->getLayer()
             ->getProductCollection();
         $productCollection->addFieldToFilter($attribute->getAttributeCode(), $attributeValue);
-        $label = $this->getOptionText($attributeValue);
-        if (is_array($label)) {
-            $label = implode(',', $label);
+
+        $labels = [];
+        foreach ((array) $attributeValue as $value) {
+            $labels[] = (array) $this->getOptionText($value);
         }
+        $label = implode(',', array_unique(array_merge(...$labels)));
         $this->getLayer()
             ->getState()
             ->addFilter($this->_createItem($label, $attributeValue));
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
index edc65490a3c67..bbebbc99103a2 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
@@ -27,6 +27,7 @@
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Api\Search\SearchResultInterface;
+use Magento\Search\Model\EngineResolver;
 
 /**
  * Advanced search collection
@@ -40,6 +41,11 @@
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
+    /**
+     * Config search engine path.
+     */
+    private const SEARCH_ENGINE_VALUE_PATH = 'catalog/search/engine';
+
     /**
      * List Of filters
      * @var array
@@ -125,7 +131,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param Product\OptionFactory $productOptionFactory
@@ -160,7 +166,7 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \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,
@@ -344,6 +350,63 @@ protected function _renderFiltersBefore()
         parent::_renderFiltersBefore();
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function clear()
+    {
+        $this->searchResult = null;
+        return parent::clear();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _reset()
+    {
+        $this->searchResult = null;
+        return parent::_reset();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function _loadEntities($printQuery = false, $logQuery = false)
+    {
+        $this->getEntity();
+
+        $currentSearchEngine = $this->_scopeConfig->getValue(self::SEARCH_ENGINE_VALUE_PATH);
+        if ($this->_pageSize && $currentSearchEngine === EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE) {
+            $this->getSelect()->limitPage($this->getCurPage(), $this->_pageSize);
+        }
+
+        $this->printLogQuery($printQuery, $logQuery);
+
+        try {
+            /**
+             * Prepare select query
+             * @var string $query
+             */
+            $query = $this->getSelect();
+            $rows = $this->_fetchAll($query);
+        } catch (\Exception $e) {
+            $this->printLogQuery(false, true, $query);
+            throw $e;
+        }
+
+        foreach ($rows as $value) {
+            $object = $this->getNewEmptyItem()->setData($value);
+            $this->addItem($object);
+            if (isset($this->_itemsById[$object->getId()])) {
+                $this->_itemsById[$object->getId()][] = $object;
+            } else {
+                $this->_itemsById[$object->getId()] = [$object];
+            }
+        }
+
+        return $this;
+    }
+
     /**
      * Get total records resolver.
      *
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
index 14305359a71b3..3506437ea038d 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
@@ -27,6 +27,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\Search\Model\EngineResolver;
 
 /**
  * Fulltext Collection
@@ -41,6 +42,11 @@
  */
 class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
+    /**
+     * Config search engine path.
+     */
+    private const SEARCH_ENGINE_VALUE_PATH = 'catalog/search/engine';
+
     /**
      * @var  QueryResponse
      * @deprecated 100.1.0
@@ -146,7 +152,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @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
@@ -185,7 +191,7 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \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,
@@ -212,10 +218,8 @@ public function __construct(
         DefaultFilterStrategyApplyCheckerInterface $defaultFilterStrategyApplyChecker = null
     ) {
         $this->queryFactory = $catalogSearchData;
-        if ($searchResultFactory === null) {
-            $this->searchResultFactory = \Magento\Framework\App\ObjectManager::getInstance()
+        $this->searchResultFactory = $searchResultFactory ?? \Magento\Framework\App\ObjectManager::getInstance()
                 ->get(\Magento\Framework\Api\Search\SearchResultFactory::class);
-        }
         parent::__construct(
             $entityFactory,
             $logger,
@@ -375,6 +379,63 @@ public function addFieldToFilter($field, $condition = null)
         return $this;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function clear()
+    {
+        $this->searchResult = null;
+        return parent::clear();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _reset()
+    {
+        $this->searchResult = null;
+        return parent::_reset();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function _loadEntities($printQuery = false, $logQuery = false)
+    {
+        $this->getEntity();
+
+        $currentSearchEngine = $this->_scopeConfig->getValue(self::SEARCH_ENGINE_VALUE_PATH);
+        if ($this->_pageSize && $currentSearchEngine === EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE) {
+            $this->getSelect()->limitPage($this->getCurPage(), $this->_pageSize);
+        }
+
+        $this->printLogQuery($printQuery, $logQuery);
+
+        try {
+            /**
+             * Prepare select query
+             * @var string $query
+             */
+            $query = $this->getSelect();
+            $rows = $this->_fetchAll($query);
+        } catch (\Exception $e) {
+            $this->printLogQuery(false, true, $query);
+            throw $e;
+        }
+
+        foreach ($rows as $value) {
+            $object = $this->getNewEmptyItem()->setData($value);
+            $this->addItem($object);
+            if (isset($this->_itemsById[$object->getId()])) {
+                $this->_itemsById[$object->getId()][] = $object;
+            } else {
+                $this->_itemsById[$object->getId()] = [$object];
+            }
+        }
+
+        return $this;
+    }
+
     /**
      * Add search query filter
      *
@@ -427,25 +488,40 @@ protected function _renderFiltersBefore()
             return;
         }
 
-        $this->prepareSearchTermFilter();
-        $this->preparePriceAggregation();
-
-        $searchCriteria = $this->getSearchCriteriaResolver()->resolve();
-        try {
-            $this->searchResult = $this->getSearch()->search($searchCriteria);
-            $this->_totalRecords = $this->getTotalRecordsResolver($this->searchResult)->resolve();
-        } catch (EmptyRequestDataException $e) {
-            /** @var \Magento\Framework\Api\Search\SearchResultInterface $searchResult */
-            $this->searchResult = $this->searchResultFactory->create()->setItems([]);
-        } catch (NonExistingRequestNameException $e) {
-            $this->_logger->error($e->getMessage());
-            throw new LocalizedException(__('An error occurred. For details, see the error log.'));
+        if ($this->searchRequestName !== 'quick_search_container'
+            || strlen(trim($this->queryText))
+        ) {
+            $this->prepareSearchTermFilter();
+            $this->preparePriceAggregation();
+
+            $searchCriteria = $this->getSearchCriteriaResolver()->resolve();
+            try {
+                $this->searchResult =  $this->getSearch()->search($searchCriteria);
+                $this->_totalRecords = $this->getTotalRecordsResolver($this->searchResult)->resolve();
+            } catch (EmptyRequestDataException $e) {
+                $this->searchResult = $this->createEmptyResult();
+            } catch (NonExistingRequestNameException $e) {
+                $this->_logger->error($e->getMessage());
+                throw new LocalizedException(__('An error occurred. For details, see the error log.'));
+            }
+        } else {
+            $this->searchResult = $this->createEmptyResult();
         }
 
         $this->getSearchResultApplier($this->searchResult)->apply();
         parent::_renderFiltersBefore();
     }
 
+    /**
+     * Create empty search result
+     *
+     * @return SearchResultInterface
+     */
+    private function createEmptyResult()
+    {
+        return $this->searchResultFactory->create()->setItems([]);
+    }
+
     /**
      * Set sort order for search query.
      *
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
index 6cdcc7c55a26f..e625ccbe51fe3 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
@@ -50,7 +50,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @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
@@ -74,7 +74,7 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \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,
diff --git a/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php b/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php
index 7f6dbe033e3a5..21d5e82d494b5 100644
--- a/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php
+++ b/app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php
@@ -6,18 +6,21 @@
 
 namespace Magento\CatalogSearch\Setup\Patch\Data;
 
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Framework\App\State;
+use Magento\Framework\Indexer\IndexerInterfaceFactory;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
-use Magento\Framework\Indexer\IndexerInterfaceFactory;
-use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 
 /**
+ * This patch sets up search weight for the product's system attributes, reindex required after patch applying.
+ *
  * @deprecated
  * @see \Magento\ElasticSearch
  */
 class SetInitialSearchWeightForAttributes implements DataPatchInterface, PatchVersionInterface
 {
+
     /**
      * @var IndexerInterfaceFactory
      */
@@ -50,7 +53,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -60,13 +63,15 @@ public function apply()
         $this->state->emulateAreaCode(
             \Magento\Framework\App\Area::AREA_CRONTAB,
             function () use ($indexer) {
-                $indexer->reindexAll();
+                $indexer->getState()
+                    ->setStatus(\Magento\Framework\Indexer\StateInterface::STATUS_INVALID)
+                    ->save();
             }
         );
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -74,7 +79,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -82,7 +87,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
index a72762ff796e0..2022f809139ec 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml
@@ -41,6 +41,27 @@
         <see userInput="Search results for: '{{phrase}}'" selector="{{StorefrontCatalogSearchMainSection.SearchTitle}}" stepKey="assertQuickSearchName"/>
     </actionGroup>
 
+    <actionGroup name="StorefrontQuickSearchTooShortStringActionGroup" extends="StorefrontCheckQuickSearchStringActionGroup">
+        <annotations>
+            <description>Fill the Storefront Search field. Submits the Form. Validates that 'Minimum Search query length' warning appears.</description>
+        </annotations>
+        <arguments>
+            <argument name="minQueryLength" type="string"/>
+        </arguments>
+
+        <see selector="{{StorefrontQuickSearchResultsSection.messageSection}}" userInput="Minimum Search query length is {{minQueryLength}}" stepKey="assertQuickSearchNeedThreeOrMoreChars"/>
+    </actionGroup>
+
+    <actionGroup name="StorefrontQuickSearchRelatedSearchTermsAppearsActionGroup">
+        <arguments>
+            <argument name="term" type="string"/>
+        </arguments>
+
+        <waitForElementVisible selector="{{StorefrontCatalogSearchMainSection.relatedSearchTermsTitle}}" stepKey="waitMessageAppears"/>
+        <see selector="{{StorefrontCatalogSearchMainSection.relatedSearchTermsTitle}}" userInput="Related search terms" stepKey="checkRelatedTermsTitle"/>
+        <see selector="{{StorefrontCatalogSearchMainSection.relatedSearchTerm}}" userInput="{{term}}" stepKey="checkRelatedTermExists"/>
+    </actionGroup>
+
     <!-- Opens product from QuickSearch and performs assertions-->
     <actionGroup name="StorefrontOpenProductFromQuickSearch">
         <annotations>
@@ -51,6 +72,7 @@
             <argument name="productUrlKey" type="string"/>
         </arguments>
 
+        <scrollTo selector="{{StorefrontQuickSearchResultsSection.productByName(productName)}}" stepKey="scrollToProduct"/>
         <click stepKey="openProduct" selector="{{StorefrontQuickSearchResultsSection.productByName(productName)}}"/>
         <waitForPageLoad stepKey="waitForProductLoad"/>
         <seeInCurrentUrl url="{{productUrlKey}}" stepKey="checkUrl"/>
@@ -66,7 +88,8 @@
             <argument name="productName" type="string"/>
         </arguments>
 
-        <moveMouseOver stepKey="hoverOverProduct" selector="{{StorefrontQuickSearchResultsSection.productByIndex('1')}}"/>
+        <scrollTo selector="{{StorefrontQuickSearchResultsSection.productByName(productName)}}" stepKey="scrollToProduct"/>
+        <moveMouseOver stepKey="hoverOverProduct" selector="{{StorefrontQuickSearchResultsSection.productByName(productName)}}"/>
         <click selector="{{StorefrontQuickSearchResultsSection.productByName(productName)}} {{StorefrontQuickSearchResultsSection.addToCartBtn}}" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontQuickSearchResultsSection.messageSection}}" time="30" stepKey="waitForProductAdded"/>
         <see selector="{{StorefrontQuickSearchResultsSection.messageSection}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddedToCartMessage"/>
@@ -101,7 +124,7 @@
 
         <dontSee selector="{{StorefrontQuickSearchResultsSection.allResults}}" userInput="{{productName}}" stepKey="dontSeeProductName"/>
     </actionGroup>
-    
+
     <!-- Open advanced search page -->
     <actionGroup name="StorefrontOpenAdvancedSearchActionGroup">
         <annotations>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontFillFormAdvancedSearchActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontFillFormAdvancedSearchActionGroup.xml
new file mode 100644
index 0000000000000..1afdb6e5e46fa
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontFillFormAdvancedSearchActionGroup.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="StorefrontFillFormAdvancedSearchActionGroup">
+        <arguments>
+            <argument name="productName" type="string" defaultValue=""/>
+            <argument name="sku" type="string" defaultValue=""/>
+            <argument name="description" type="string" defaultValue=""/>
+            <argument name="short_description" type="string" defaultValue=""/>
+            <argument name="price_from" type="string" defaultValue=""/>
+            <argument name="price_to" type="string" defaultValue=""/>
+        </arguments>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.ProductName}}" userInput="{{productName}}" stepKey="fillName"/>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.SKU}}" userInput="{{sku}}" stepKey="fillSku"/>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.Description}}" userInput="{{description}}" stepKey="fillDescription"/>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.ShortDescription}}" userInput="{{short_description}}" stepKey="fillShortDescription"/>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceFrom}}" userInput="{{price_from}}" stepKey="fillPriceFrom"/>
+        <fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceTo}}" userInput="{{price_to}}" stepKey="fillPriceTo"/>
+        <click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml
index 6868456079110..9dab06ffb14f0 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml
@@ -23,5 +23,10 @@
     <entity name="SetMinQueryLengthToOne" type="number">
         <data key="value">1</data>
     </entity>
-
+    <entity name="SetCatalogSearchEngineToDefault" type="catalog_search_engine_default">
+        <requiredEntity type="enable">DefaultCatalogSearchEngine</requiredEntity>
+    </entity>
+    <entity name="DefaultCatalogSearchEngine" type="enable">
+        <data key="inherit">true</data>
+    </entity>
 </entities>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Data/ConfigData.xml
new file mode 100644
index 0000000000000..dd8c426592619
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Data/ConfigData.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="MinimalQueryLengthDefaultConfigData">
+        <data key="path">catalog/search/min_query_length</data>
+        <data key="value">3</data>
+    </entity>
+    <entity name="MinimalQueryLengthFourConfigData">
+        <data key="path">catalog/search/min_query_length</data>
+        <data key="value">4</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Metadata/catalog_search-meta.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Metadata/catalog_search-meta.xml
index 7405377249aa4..ce869f81a23df 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Metadata/catalog_search-meta.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Metadata/catalog_search-meta.xml
@@ -29,4 +29,15 @@
             </object>
         </object>
     </operation>
+    <operation name="CatalogSearchEngineDefault" dataType="catalog_search_engine_default" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
+        <object key="groups" dataType="catalog_search_engine_default">
+            <object key="search" dataType="catalog_search_engine_default">
+                <object key="fields" dataType="catalog_search_engine_default">
+                    <object key="engine" dataType="enable">
+                        <field key="inherit">boolean</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
 </operations>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
index 6b28b4f36c6a7..eb3bc8e79d7b5 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchAdvancedResultMainSection.xml
@@ -17,5 +17,6 @@
         <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"/>
+        <element name="nthProductName" type="text" selector="li.product-item:nth-of-type({{var1}}) .product-item-name>a" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml
index 667f08fea6579..b005e100b30bb 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml
@@ -16,5 +16,7 @@
         <element name="productCount" type="text" selector="#toolbar-amount"/>
         <element name="message" type="text" selector="div.message div"/>
         <element name="searchResults" type="block" selector="#maincontent .column.main"/>
+        <element name="relatedSearchTermsTitle" type="text" selector="div.message dl.block dt.title"/>
+        <element name="relatedSearchTerm" type="text" selector="div.message dl.block dd.item a"/>
     </section>
 </sections>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
index 13665100f79af..0e92d9fb0c7ad 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest.xml
@@ -13,6 +13,11 @@
             <features value="CatalogSearch"/>
             <group value="CatalogSearch"/>
         </annotations>
+
+        <!-- Perform reindex and flush cache -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameActionGroup" stepKey="search">
             <argument name="name" value="$$product.name$$"/>
@@ -26,6 +31,11 @@
             <features value="CatalogSearch"/>
             <group value="CatalogSearch"/>
         </annotations>
+
+        <!-- Perform reindex and flush cache -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByProductSkuActionGroup" stepKey="search">
             <argument name="sku" value="$$product.sku$$"/>
@@ -39,6 +49,10 @@
             <features value="CatalogSearch"/>
             <group value="CatalogSearch"/>
         </annotations>
+        <!-- Perform reindex and flush cache -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByDescriptionActionGroup" stepKey="search">
             <argument name="description" value="$$product.custom_attributes[description]$$"/>
@@ -52,6 +66,11 @@
             <features value="CatalogSearch"/>
             <group value="CatalogSearch"/>
         </annotations>
+
+        <!-- Perform reindex and flush cache -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByShortDescriptionActionGroup" stepKey="search">
             <argument name="shortDescription" value="$$product.custom_attributes[short_description]$$"/>
@@ -65,6 +84,11 @@
             <features value="CatalogSearch"/>
             <group value="CatalogSearch"/>
         </annotations>
+
+        <!-- Perform reindex and flush cache -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="search">
             <argument name="name" value="$$arg1.name$$"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index 99f3fc00a7401..aa7cf933f6328 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -9,6 +9,72 @@
 <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 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="4" 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>
+    <test name="EndToEndB2CGuestUserMysqlTest">
         <!-- Step 2: User searches for product -->
         <comment userInput="Start of searching products" stepKey="startOfSearchingProducts" after="endOfBrowsingCatalog"/>
         <!-- Advanced Search with Product 1 Data -->
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/LayerNavigationOfCatalogSearchTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/LayerNavigationOfCatalogSearchTest.xml
index 210b474af2e02..c8f84c732d6ba 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/LayerNavigationOfCatalogSearchTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/LayerNavigationOfCatalogSearchTest.xml
@@ -57,6 +57,10 @@
         <fillField selector="{{AdminProductAttributeSection.customAttribute($$createPriceAttribute.attribute_code$$)}}" userInput="70" stepKey="fillCustomPrice2"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton2"/>
         <waitForPageLoad stepKey="waitForSimpleProductSaved2"/>
+
+        <!--Run re-index task-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <!--Navigate to category on Storefront-->
         <comment userInput="Navigate to category on Storefront" stepKey="comment3"/>
         <amOnPage url="{{StorefrontCategoryPage.url($$subCategory.name$$)}}" stepKey="goToCategoryStorefront"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
index b6417e12a6db7..89269a1ad0d9e 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
@@ -18,6 +18,7 @@
             <testCaseId value="MC-6325"/>
             <useCaseId value="MAGETWO-58764"/>
             <group value="CatalogSearch"/>
+            <group value="SearchEngineMysql"/>
         </annotations>
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
index 19db201e91f40..1cec03a4c765e 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml
@@ -23,6 +23,10 @@
             <createData entity="_defaultProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <deleteData stepKey="deleteProduct" createDataKey="createSimpleProduct"/>
@@ -74,6 +78,7 @@
     </test>
     <test name="QuickSearchEmptyResults">
         <annotations>
+            <features value="CatalogSearch"/>
             <stories value="Search Product on Storefront"/>
             <title value="User should not get search results on query that doesn't return anything"/>
             <description value="Use invalid query to return no products"/>
@@ -87,19 +92,26 @@
             <createData entity="_defaultProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
-            <deleteData stepKey="deleteProduct" createDataKey="createSimpleProduct"/>
-            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
         </after>
+
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="ThisShouldn'tReturnAnything"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmpty"/>
     </test>
+
     <test name="QuickSearchWithTwoCharsEmptyResults" extends="QuickSearchEmptyResults">
         <annotations>
+            <features value="CatalogSearch"/>
             <stories value="Search Product on Storefront"/>
             <title value="User should not get search results on query that only contains two characters"/>
             <description value="Use of 2 character query to return no products"/>
@@ -107,15 +119,30 @@
             <testCaseId value="MC-14794"/>
             <group value="CatalogSearch"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MC-15827"/>
-            </skip>
         </annotations>
-        <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,2); return ret;" stepKey="getFirstTwoLetters" before="searchStorefront"/>
-        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-            <argument name="phrase" value="{$getFirstTwoLetters}"/>
+
+        <before>
+            <magentoCLI command="config:set {{MinimalQueryLengthFourConfigData.path}} {{MinimalQueryLengthFourConfigData.value}}" after="createSimpleProduct" stepKey="setMinimalQueryLengthToFour"/>
+        </before>
+
+        <after>
+            <magentoCLI command="config:set {{MinimalQueryLengthDefaultConfigData.path}} {{MinimalQueryLengthDefaultConfigData.value}}" after="deleteCategory" stepKey="setMinimalQueryLengthToFour"/>
+        </after>
+
+        <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,{{MinimalQueryLengthFourConfigData.value}} - 1); return ret;" before="searchStorefront" stepKey="getFirstLessThenConfigLetters"/>
+
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" after="checkEmpty" stepKey="searchStorefrontConfigLetters">
+            <argument name="phrase" value="$createSimpleProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontQuickSearchTooShortStringActionGroup" after="searchStorefrontConfigLetters" stepKey="checkCannotSearchWithTooShortString">
+            <argument name="phrase" value="$getFirstLessThenConfigLetters"/>
+            <argument name="minQueryLength" value="{{MinimalQueryLengthFourConfigData.value}}"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontQuickSearchRelatedSearchTermsAppearsActionGroup" after="checkCannotSearchWithTooShortString" stepKey="checkRelatedSearchTerm">
+            <argument name="term" value="$createSimpleProduct.name$"/>
         </actionGroup>
     </test>
+
     <test name="QuickSearchProductByNameWithThreeLetters" extends="QuickSearchProductBySku">
         <annotations>
             <stories value="Search Product on Storefront"/>
@@ -124,6 +151,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-15034"/>
             <group value="CatalogSearch"/>
+            <group value="SearchEngineMysql"/>
             <group value="mtf_migrated"/>
         </annotations>
         <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,3); return ret;" stepKey="getFirstThreeLetters" before="searchStorefront"/>
@@ -160,6 +188,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-14796"/>
             <group value="CatalogSearch"/>
+            <group value="SearchEngineMysql"/>
             <group value="mtf_migrated"/>
         </annotations>
         <before>
@@ -242,6 +271,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-14797"/>
             <group value="CatalogSearch"/>
+            <group value="SearchEngineMysql"/>
             <group value="mtf_migrated"/>
         </annotations>
         <before>
@@ -278,6 +308,10 @@
             <createData entity="_defaultProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <deleteData stepKey="deleteProduct" createDataKey="createSimpleProduct"/>
@@ -306,6 +340,10 @@
             <createData entity="VirtualProduct" stepKey="createVirtualProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <deleteData stepKey="deleteProduct" createDataKey="createVirtualProduct"/>
@@ -336,12 +374,18 @@
                 <argument name="product" value="_defaultProduct"/>
                 <argument name="category" value="$$createCategory$$"/>
             </actionGroup>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
             <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
                 <argument name="sku" value="{{_defaultProduct.sku}}"/>
             </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsGridFilters"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
         </after>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
@@ -368,6 +412,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="DownloadableProductWithOneLink" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
@@ -375,8 +420,13 @@
             <createData entity="downloadableLink1" stepKey="addDownloadableLink1">
                 <requiredEntity createDataKey="createProduct"/>
             </createData>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
             <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
@@ -399,19 +449,27 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="deleteAllProductsUsingProductGrid" stepKey="deleteAllProducts"/>
             <createData entity="ApiProductWithDescription" stepKey="simple1"/>
             <createData entity="ApiGroupedProduct" stepKey="createProduct"/>
             <createData entity="OneSimpleProductLink" stepKey="addProductOne">
                 <requiredEntity createDataKey="createProduct"/>
                 <requiredEntity createDataKey="simple1"/>
             </createData>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
-            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
+            <deleteData stepKey="deleteGroupedProduct" createDataKey="createProduct"/>
+            <deleteData stepKey="deleteSimpleProduct" createDataKey="simple1"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
         </after>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
-            <argument name="phrase" value="$createProduct.name$"/>
+            <argument name="phrase" value="&quot;$createProduct.name$&quot;"/>
         </actionGroup>
         <actionGroup ref="StorefrontAddToCartFromQuickSearch" stepKey="addProductToCart">
             <argument name="productName" value="$createProduct.name$"/>
@@ -450,11 +508,16 @@
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <amOnPage url="{{AdminProductEditPage.url($$createBundleProduct.id$$)}}" stepKey="goToProductEditPage"/>
             <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <deleteData stepKey="deleteBundleProduct" createDataKey="createBundleProduct"/>
             <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
         </after>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
@@ -512,11 +575,18 @@
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <amOnPage url="{{AdminProductEditPage.url($$createBundleProduct.id$$)}}" stepKey="goToProductEditPage"/>
             <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <deleteData stepKey="deleteBundleProduct" createDataKey="createBundleProduct"/>
             <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
         </after>
         <comment userInput="$simpleProduct1.name$" stepKey="asdf"/>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
@@ -601,6 +671,10 @@
                 <requiredEntity createDataKey="createConfigProduct"/>
                 <requiredEntity createDataKey="createConfigChildProduct1"/>
             </createData>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByAllParametersTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByAllParametersTest.xml
new file mode 100644
index 0000000000000..9ad868ff6db7e
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByAllParametersTest.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="StorefrontAdvancedSearchByAllParametersTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Search product in advanced search by name, sku, description, short description, price from and price to"/>
+            <description value="Search product in advanced search by name, sku, description, short description, price from and price to"/>
+            <testCaseId value="MAGETWO-24729"/>
+            <severity value="CRITICAL"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
+            <argument name="productName" value="$$createProduct.name$$"/>
+            <argument name="sku" value="abc_dfj"/>
+            <argument name="description" value="adc_Full"/>
+            <argument name="short_description" value="abc_short"/>
+            <argument name="price_to" value="500"/>
+            <argument name="price_from" value="49"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByDescriptionTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByDescriptionTest.xml
new file mode 100644
index 0000000000000..5693721e6ed65
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByDescriptionTest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAdvancedSearchByDescriptionTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Search product in advanced search by description"/>
+            <description value="Search product in advanced search by description"/>
+            <testCaseId value="MAGETWO-24729"/>
+            <severity value="CRITICAL"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="ABC_123_SimpleProduct" stepKey="createProduct"/>
+        </before>
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
+            <argument name="description" value="dfj_full"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByNameSkuDescriptionPriceTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByNameSkuDescriptionPriceTest.xml
new file mode 100644
index 0000000000000..4d3ba22f79356
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByNameSkuDescriptionPriceTest.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="StorefrontAdvancedSearchByNameSkuDescriptionPriceTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Search product in advanced search by name, sku, description, short description, price from 49 and price to 50"/>
+            <description value="Search product in advanced search by name, sku, description, short description, price from 49 and price to 50"/>
+            <testCaseId value="MAGETWO-24729"/>
+            <severity value="CRITICAL"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
+            <argument name="productName" value="$$createProduct.name$$"/>
+            <argument name="sku" value="abc_dfj"/>
+            <argument name="description" value="adc_Full"/>
+            <argument name="short_description" value="abc_short"/>
+            <argument name="price_to" value="50"/>
+            <argument name="price_from" value="49"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByNameTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByNameTest.xml
new file mode 100644
index 0000000000000..f0b81e08252fc
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByNameTest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!--
+         /**
+          * Copyright © Magento, Inc. All rights reserved.
+          * See COPYING.txt for license details.
+          */
+        -->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAdvancedSearchByNameTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Search product in advanced search by name"/>
+            <description value="Search product in advanced search by name"/>
+            <testCaseId value="MAGETWO-24729"/>
+            <severity value="CRITICAL"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="ABC_123_SimpleProduct" stepKey="createProduct"/>
+        </before>
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialNameTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialNameTest.xml
new file mode 100644
index 0000000000000..f875021bd9669
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialNameTest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAdvancedSearchByPartialNameTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Search product in advanced search by partial name"/>
+            <description value="Search product in advanced search by partial name"/>
+            <testCaseId value="MAGETWO-24729"/>
+            <severity value="CRITICAL"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+            <group value="SearchEngineMysql"/>
+        </annotations>
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
+            <argument name="productName" value="abc"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialShortDescriptionTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialShortDescriptionTest.xml
new file mode 100644
index 0000000000000..0edc3f31216bb
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialShortDescriptionTest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAdvancedSearchByPartialShortDescriptionTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Search product in advanced search by partial short description"/>
+            <description value="Search product in advanced search by partial short description"/>
+            <testCaseId value="MAGETWO-24729"/>
+            <severity value="CRITICAL"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
+            <argument name="short_description" value="abc_short"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialSkuAndDescriptionTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialSkuAndDescriptionTest.xml
new file mode 100644
index 0000000000000..b2b4ef9cc4782
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialSkuAndDescriptionTest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAdvancedSearchByPartialSkuAndDescriptionTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Search product in advanced search by partial sku and description"/>
+            <description value="Search product in advanced search by partial sku and description"/>
+            <testCaseId value="MAGETWO-24729"/>
+            <severity value="CRITICAL"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
+            <argument name="sku" value="abc"/>
+            <argument name="description" value="adc_full"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialSkuTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialSkuTest.xml
new file mode 100644
index 0000000000000..45cec0a899361
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialSkuTest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAdvancedSearchByPartialSkuTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Search product in advanced search by partial sku"/>
+            <description value="Search product in advanced search by partial sku"/>
+            <testCaseId value="MAGETWO-24729"/>
+            <severity value="CRITICAL"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
+            <argument name="sku" value="abc"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPriceFromAndPriceToTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPriceFromAndPriceToTest.xml
new file mode 100644
index 0000000000000..6b85cdf61c84c
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPriceFromAndPriceToTest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAdvancedSearchByPriceFromAndPriceToTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Search product in advanced search by price from and price to"/>
+            <description value="Search product in advanced search by price from and price to"/>
+            <testCaseId value="MAGETWO-24729"/>
+            <severity value="CRITICAL"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
+            <argument name="price_to" value="50"/>
+            <argument name="price_from" value="50"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPriceToTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPriceToTest.xml
new file mode 100644
index 0000000000000..33dff8aefa334
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPriceToTest.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="StorefrontAdvancedSearchByPriceToTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Search product in advanced search by price to"/>
+            <description value="Search product in advanced search by price to"/>
+            <testCaseId value="MAGETWO-24729"/>
+            <severity value="CRITICAL"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="ABC_123_SimpleProduct" stepKey="createProduct2" after="createProduct"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct2" stepKey="deleteProduct2" after="deleteProduct"/>
+        </after>
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
+            <argument name="price_to" value="100"/>
+        </actionGroup>
+        <!-- See that some items were found, other products may exist besides our test products -->
+        <see userInput="items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$createProduct2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProduct2Name" after="seeProductName"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByShortDescriptionTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByShortDescriptionTest.xml
new file mode 100644
index 0000000000000..c4622d02a5152
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByShortDescriptionTest.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="StorefrontAdvancedSearchByShortDescriptionTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Search product in advanced search by short description"/>
+            <description value="Search product in advanced search by short description"/>
+            <testCaseId value="MAGETWO-24729"/>
+            <severity value="CRITICAL"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <remove keyForRemoval="createProduct"/>
+        <remove keyForRemoval="deleteProduct"/>
+        <remove keyForRemoval="seeProductName"/>
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
+            <argument name="short_description" value="dfj_short"/>
+        </actionGroup>
+        <see userInput="We can't find any items matching these search criteria. Modify your search." selector="{{StorefrontQuickSearchResultsSection.messageSection}}" stepKey="see"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchBySkuTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchBySkuTest.xml
new file mode 100644
index 0000000000000..ca5e237099681
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchBySkuTest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAdvancedSearchBySkuTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Search product in advanced search by sku"/>
+            <description value="Search product in advanced search by sku"/>
+            <testCaseId value="MAGETWO-24729"/>
+            <severity value="CRITICAL"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
+            <argument name="sku" value="abc_dfj"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchEntitySimpleProductTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchEntitySimpleProductTest.xml
new file mode 100644
index 0000000000000..14df2133017d9
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchEntitySimpleProductTest.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="StorefrontAdvancedSearchEntitySimpleProductTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Use Advanced Search to Find the Product"/>
+            <description value="Use Advanced Search to Find the Product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-12421"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!-- Delete all products left by prev tests because it sensitive for search-->
+            <actionGroup ref="deleteAllProductsUsingProductGrid" stepKey="deleteAllProducts"/>
+            <!-- Create Data -->
+            <createData entity="ABC_dfj_SimpleProduct" stepKey="createProduct"/>
+        </before>
+        <after>
+            <!-- Delete data -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logoutAdmin"/>
+        </after>
+
+        <!-- Perform reindex and flush cache -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        <!-- 1. Navigate to Frontend -->
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefront"/>
+
+        <!-- 2. Click "Advanced Search" -->
+        <actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="openAdvancedSearch"/>
+
+        <!-- 3. Fill test data in to field(s) 4. Click "Search" button-->
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
+            <argument name="productName" value="$$createProduct.name$$"/>
+            <argument name="sku" value="abc_dfj"/>
+        </actionGroup>
+
+        <!-- 5. Perform all asserts -->
+        <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResult"/>
+        <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$createProduct.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productName}}" stepKey="seeProductName"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchNegativeProductSearchTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchNegativeProductSearchTest.xml
new file mode 100644
index 0000000000000..b4f2314295a00
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchNegativeProductSearchTest.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="StorefrontAdvancedSearchNegativeProductSearchTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Negative product search"/>
+            <description value="Negative product search"/>
+            <testCaseId value="MAGETWO-24729"/>
+            <severity value="CRITICAL"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <remove keyForRemoval="createProduct"/>
+        <remove keyForRemoval="deleteProduct"/>
+        <remove keyForRemoval="seeProductName"/>
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
+            <argument name="productName" value="Negative_product_search"/>
+        </actionGroup>
+        <see userInput="We can't find any items matching these search criteria. Modify your search." selector="{{StorefrontQuickSearchResultsSection.messageSection}}" stepKey="see"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchWithoutEnteringDataTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchWithoutEnteringDataTest.xml
new file mode 100644
index 0000000000000..8a29ab718bd25
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchWithoutEnteringDataTest.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="StorefrontAdvancedSearchWithoutEnteringDataTest">
+        <annotations>
+            <stories value="Use Advanced Search"/>
+            <title value="Do Advanced Search without entering data"/>
+            <description value="'Enter a search term and try again.' error message is missed in Advanced Search"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-14859"/>
+            <group value="searchFrontend"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <!-- 1. Navigate to Frontend -->
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefront"/>
+
+        <!-- 2. Click "Advanced Search" -->
+        <actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="openAdvancedSearch"/>
+
+        <!-- 3. Fill test data in to field(s) 4. Click "Search" button-->
+        <actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search"/>
+
+        <!-- 5. Perform all asserts -->
+        <see userInput="Enter a search term and try again." selector="{{StorefrontQuickSearchResultsSection.messageSection}}" stepKey="see"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Plugin/StockedProductsFilterPluginTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Plugin/StockedProductsFilterPluginTest.php
new file mode 100644
index 0000000000000..b9909ec2c74b2
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Plugin/StockedProductsFilterPluginTest.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\Test\Unit\Model\Indexer\Plugin;
+
+use Magento\CatalogSearch\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\CatalogSearch\Model\Indexer\Plugin\StockedProductsFilterPlugin class.
+ *
+ * This plugin reverts changes introduced in commit 9ab466d8569ea556cb01393989579c3aac53d9a3 which break extensions
+ * relying on stocks. Plugin location is changed for consistency purposes.
+ */
+class StockedProductsFilterPluginTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @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->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->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->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/CatalogSearch/Test/Unit/Ui/DataProvider/Product/AddFulltextFilterToCollectionTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Ui/DataProvider/Product/AddFulltextFilterToCollectionTest.php
new file mode 100644
index 0000000000000..881c843ecf92b
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Ui/DataProvider/Product/AddFulltextFilterToCollectionTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Test\Unit\Ui\DataProvider\Product;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\CatalogSearch\Model\ResourceModel\Search\Collection as SearchCollection;
+use Magento\Framework\Data\Collection;
+use Magento\CatalogSearch\Ui\DataProvider\Product\AddFulltextFilterToCollection;
+
+class AddFulltextFilterToCollectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SearchCollection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $searchCollection;
+
+    /**
+     * @var Collection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $collection;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManager;
+
+    /**
+     * @var AddFulltextFilterToCollection
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManagerHelper($this);
+
+        $this->searchCollection = $this->getMockBuilder(SearchCollection::class)
+            ->setMethods(['addBackendSearchFilter', 'load', 'getAllIds'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->searchCollection->expects($this->any())
+            ->method('load')
+            ->willReturnSelf();
+        $this->collection = $this->getMockBuilder(Collection::class)
+            ->setMethods(['addIdFilter'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = $this->objectManager->getObject(
+            AddFulltextFilterToCollection::class,
+            [
+                'searchCollection' => $this->searchCollection
+            ]
+        );
+    }
+
+    public function testAddFilter()
+    {
+        $this->searchCollection->expects($this->once())
+            ->method('addBackendSearchFilter')
+            ->with('test');
+        $this->searchCollection->expects($this->once())
+            ->method('getAllIds')
+            ->willReturn([]);
+        $this->collection->expects($this->once())
+            ->method('addIdFilter')
+            ->with(-1);
+        $this->model->addFilter($this->collection, 'test', ['fulltext' => 'test']);
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Ui/DataProvider/Product/AddFulltextFilterToCollection.php b/app/code/Magento/CatalogSearch/Ui/DataProvider/Product/AddFulltextFilterToCollection.php
index f312178e0bf0b..af5020a2f8c94 100644
--- a/app/code/Magento/CatalogSearch/Ui/DataProvider/Product/AddFulltextFilterToCollection.php
+++ b/app/code/Magento/CatalogSearch/Ui/DataProvider/Product/AddFulltextFilterToCollection.php
@@ -40,6 +40,10 @@ public function addFilter(Collection $collection, $field, $condition = null)
         if (isset($condition['fulltext']) && (string)$condition['fulltext'] !== '') {
             $this->searchCollection->addBackendSearchFilter($condition['fulltext']);
             $productIds = $this->searchCollection->load()->getAllIds();
+            if (empty($productIds)) {
+                //add dummy id to prevent returning full unfiltered collection
+                $productIds = -1;
+            }
             $collection->addIdFilter($productIds);
         }
     }
diff --git a/app/code/Magento/CatalogSearch/etc/di.xml b/app/code/Magento/CatalogSearch/etc/di.xml
index da0a60dad1f77..4e5b38878ee52 100644
--- a/app/code/Magento/CatalogSearch/etc/di.xml
+++ b/app/code/Magento/CatalogSearch/etc/di.xml
@@ -75,6 +75,9 @@
     <type name="Magento\Catalog\Model\Product\Action">
         <plugin name="catalogsearchFulltextMassAction" type="Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Product\Action"/>
     </type>
+    <type name="Magento\Catalog\Model\Indexer\Product\Category\Action\Rows">
+        <plugin name="catalogsearchFulltextCategoryAssignment" type="Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Product\Category\Action\Rows"/>
+    </type>
     <type name="Magento\Store\Model\ResourceModel\Store">
         <plugin name="catalogsearchFulltextIndexerStoreView" type="Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Store\View" />
     </type>
@@ -374,4 +377,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider">
+        <plugin name="stockedProductsFilterPlugin" type="Magento\CatalogSearch\Model\Indexer\Plugin\StockedProductsFilterPlugin"/>
+    </type>
 </config>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
index c63e6ff4abe0f..32b26eec9dbe6 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** This changes need to valid applying filters and configuration before search process is started. */
+$productList = $block->getProductListHtml();
 ?>
 <?php if ($block->getResultCount()) : ?>
     <?= /* @noEscape */ $block->getChildHtml('tagged_product_list_rss_link') ?>
@@ -16,7 +19,7 @@
         </div>
     </div>
     <?php endif; ?>
-    <?= $block->getProductListHtml() ?>
+    <?= /* @noEscape */ $productList ?>
 </div>
 <?php else : ?>
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php
index 4a191b54dea68..5d08ea33ff8a1 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php
@@ -6,6 +6,7 @@
 namespace Magento\CatalogUrlRewrite\Model\Product;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
 use Magento\CatalogUrlRewrite\Model\ObjectRegistry;
 use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
@@ -67,6 +68,9 @@ public function generate($storeId, Product $product, ObjectRegistry $productCate
             if ($anchorCategoryIds) {
                 foreach ($anchorCategoryIds as $anchorCategoryId) {
                     $anchorCategory = $this->categoryRepository->get($anchorCategoryId);
+                    if ((int)$anchorCategory->getParentId() === Category::TREE_ROOT_ID) {
+                        continue;
+                    }
                     $urls[] = $this->urlRewriteFactory->create()
                         ->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)
                         ->setEntityId($product->getId())
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
index edca633fb14cc..d9e9705ac039d 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php
@@ -148,7 +148,7 @@ private function getCategoryUrlSuffix($storeId = null): string
             CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
             ScopeInterface::SCOPE_STORE,
             $storeId
-        );
+        ) ?? '';
     }
 
     /**
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
index 7f987124040fd..0d0b0fb995706 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogUrlRewrite\Observer;
 
 use Magento\Catalog\Model\Category;
@@ -18,6 +20,14 @@
  */
 class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
 {
+
+    /**
+     * Reserved endpoint names.
+     *
+     * @var string[]
+     */
+    private $invalidValues = [];
+
     /**
      * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
      */
@@ -38,22 +48,34 @@ class CategoryUrlPathAutogeneratorObserver implements ObserverInterface
      */
     private $categoryRepository;
 
+    /**
+     * @var \Magento\Backend\App\Area\FrontNameResolver
+     */
+    private $frontNameResolver;
+
     /**
      * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
      * @param ChildrenCategoriesProvider $childrenCategoriesProvider
      * @param \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService
      * @param CategoryRepositoryInterface $categoryRepository
+     * @param \Magento\Backend\App\Area\FrontNameResolver $frontNameResolver
+     * @param string[] $invalidValues
      */
     public function __construct(
         CategoryUrlPathGenerator $categoryUrlPathGenerator,
         ChildrenCategoriesProvider $childrenCategoriesProvider,
         StoreViewService $storeViewService,
-        CategoryRepositoryInterface $categoryRepository
+        CategoryRepositoryInterface $categoryRepository,
+        \Magento\Backend\App\Area\FrontNameResolver $frontNameResolver = null,
+        array $invalidValues = []
     ) {
         $this->categoryUrlPathGenerator = $categoryUrlPathGenerator;
         $this->childrenCategoriesProvider = $childrenCategoriesProvider;
         $this->storeViewService = $storeViewService;
         $this->categoryRepository = $categoryRepository;
+        $this->frontNameResolver = $frontNameResolver ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Backend\App\Area\FrontNameResolver::class);
+        $this->invalidValues = $invalidValues;
     }
 
     /**
@@ -72,7 +94,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             $resultUrlKey = $this->categoryUrlPathGenerator->getUrlKey($category);
             $this->updateUrlKey($category, $resultUrlKey);
         } elseif ($useDefaultAttribute) {
-            if (!$category->isObjectNew()) {
+            if (!$category->isObjectNew() && $category->getStoreId() === Store::DEFAULT_STORE_ID) {
                 $resultUrlKey = $category->formatUrlKey($category->getOrigData('name'));
                 $this->updateUrlKey($category, $resultUrlKey);
             }
@@ -93,6 +115,17 @@ private function updateUrlKey($category, $urlKey)
         if (empty($urlKey)) {
             throw new \Magento\Framework\Exception\LocalizedException(__('Invalid URL key'));
         }
+
+        if (in_array($urlKey, $this->getInvalidValues())) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __(
+                    'URL key "%1" matches a reserved endpoint name (%2). Use another URL key.',
+                    $urlKey,
+                    implode(', ', $this->getInvalidValues())
+                )
+            );
+        }
+
         $category->setUrlKey($urlKey)
             ->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
         if (!$category->isObjectNew()) {
@@ -103,6 +136,16 @@ private function updateUrlKey($category, $urlKey)
         }
     }
 
+    /**
+     * Get reserved endpoint names.
+     *
+     * @return array
+     */
+    private function getInvalidValues()
+    {
+        return array_unique(array_merge($this->invalidValues, [$this->frontNameResolver->getFrontName()]));
+    }
+
     /**
      * Update url path for children category.
      *
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
index 083b39d621f2a..d1e78897e3269 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -7,8 +7,8 @@
 
 namespace Magento\CatalogUrlRewrite\Observer;
 
-use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
@@ -118,13 +118,15 @@ public function __construct(
         $this->productCollectionFactory = $productCollectionFactory;
         $this->categoryBasedProductRewriteGenerator = $categoryBasedProductRewriteGenerator;
 
-        $objectManager = ObjectManager::getInstance();
-        $mergeDataProviderFactory = $mergeDataProviderFactory ?: $objectManager->get(MergeDataProviderFactory::class);
+        $mergeDataProviderFactory = $mergeDataProviderFactory
+            ?? ObjectManager::getInstance()->get(MergeDataProviderFactory::class);
         $this->mergeDataProviderPrototype = $mergeDataProviderFactory->create();
-        $this->serializer = $serializer ?: $objectManager->get(Json::class);
+        $this->serializer = $serializer
+            ?? ObjectManager::getInstance()->get(Json::class);
         $this->productScopeRewriteGenerator = $productScopeRewriteGenerator
-            ?: $objectManager->get(ProductScopeRewriteGenerator::class);
-        $this->scopeConfig = $scopeConfig ?? $objectManager->get(ScopeConfigInterface::class);
+            ?? ObjectManager::getInstance()->get(ProductScopeRewriteGenerator::class);
+        $this->scopeConfig = $scopeConfig
+            ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
@@ -207,18 +209,14 @@ public function deleteCategoryRewritesForChildren(Category $category)
         foreach ($categoryIds as $categoryId) {
             $this->urlPersist->deleteByData(
                 [
-                    UrlRewrite::ENTITY_ID =>
-                        $categoryId,
-                    UrlRewrite::ENTITY_TYPE =>
-                        CategoryUrlRewriteGenerator::ENTITY_TYPE,
+                    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,
+                    UrlRewrite::METADATA => $this->serializer->serialize(['category_id' => $categoryId]),
+                    UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
                 ]
             );
         }
@@ -252,7 +250,7 @@ private function getCategoryProductsUrlRewrites(
             ->addAttributeToSelect('url_key')
             ->addAttributeToSelect('url_path');
 
-        foreach ($productCollection as $product) {
+        foreach ($this->getProducts($productCollection) as $product) {
             if (isset($this->isSkippedProduct[$category->getEntityId()]) &&
                 in_array($product->getId(), $this->isSkippedProduct[$category->getEntityId()])
             ) {
@@ -270,6 +268,27 @@ private function getCategoryProductsUrlRewrites(
         return $mergeDataProvider->getData();
     }
 
+    /**
+     * Get products from provided collection
+     *
+     * @param Collection $collection
+     * @return \Generator|Product[]
+     */
+    private function getProducts(Collection $collection): \Generator
+    {
+        $collection->setPageSize(1000);
+        $pageCount = $collection->getLastPageNumber();
+        $currentPage = 1;
+        while ($currentPage <= $pageCount) {
+            $collection->setCurPage($currentPage);
+            foreach ($collection as $key => $product) {
+                yield $key => $product;
+            }
+            $collection->clear();
+            $currentPage++;
+        }
+    }
+
     /**
      * Generates product URL rewrites.
      *
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/AdminCategoryRestrictedUrlMessageData.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/AdminCategoryRestrictedUrlMessageData.xml
new file mode 100644
index 0000000000000..b463b0524d5ff
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/AdminCategoryRestrictedUrlMessageData.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="AdminCategoryRestrictedUrlErrorMessage">
+        <data key="urlAdmin">URL key "admin" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.</data>
+        <data key="urlSoap">URL key "soap" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.</data>
+        <data key="urlRest">URL key "rest" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.</data>
+        <data key="urlGraphql">URL key "graphql" matches a reserved endpoint name (admin, soap, rest, graphql, standard). Use another URL key.</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminCategoryWithRestrictedUrlKeyNotCreatedTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminCategoryWithRestrictedUrlKeyNotCreatedTest.xml
new file mode 100644
index 0000000000000..58b489da5082b
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminCategoryWithRestrictedUrlKeyNotCreatedTest.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="AdminCategoryWithRestrictedUrlKeyNotCreatedTest">
+        <annotations>
+            <features value="CatalogUrlRewrite"/>
+            <stories value="Url rewrites"/>
+            <title value="Category with restricted Url Key cannot be created"/>
+            <description value="Category with restricted Url Key cannot be created"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-17515"/>
+            <useCaseId value="MAGETWO-69825"/>
+            <group value="CatalogUrlRewrite"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!--Delete created categories-->
+            <comment userInput="Delete created categories" stepKey="commentDeleteCreatedCategories"/>
+            <actionGroup ref="AdminDeleteCategoryByName" stepKey="deleteAdminCategory">
+                <argument name="categoryName" value="admin"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteCategoryByName" stepKey="deleteSoapCategory">
+                <argument name="categoryName" value="soap"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteCategoryByName" stepKey="deleteRestCategory">
+                <argument name="categoryName" value="rest"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteCategoryByName" stepKey="deleteGraphQlCategory">
+                <argument name="categoryName" value="graphql"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Check category creation with restricted url key 'admin'-->
+        <comment userInput="Check category creation with restricted url key 'admin'" stepKey="commentCheckAdminCategoryCreation"/>
+        <actionGroup ref="goToCreateCategoryPage" stepKey="goToCreateAdminCategoryPage"/>
+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillAdminFirstCategoryForm">
+            <argument name="categoryName" value="admin"/>
+            <argument name="categoryUrlKey" value=""/>
+        </actionGroup>
+        <see selector="{{AdminMessagesSection.error}}" userInput='{{AdminCategoryRestrictedUrlErrorMessage.urlAdmin}}' stepKey="seeAdminFirstErrorMessage"/>
+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillAdminSecondCategoryForm">
+            <argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
+            <argument name="categoryUrlKey" value="admin"/>
+        </actionGroup>
+        <see selector="{{AdminMessagesSection.error}}" userInput='{{AdminCategoryRestrictedUrlErrorMessage.urlAdmin}}' stepKey="seeAdminSecondErrorMessage"/>
+        <!--Create category with 'admin' name-->
+        <comment userInput="Create category with 'admin' name" stepKey="commentAdminCategoryCreation"/>
+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillAdminThirdCategoryForm">
+            <argument name="categoryName" value="admin"/>
+            <argument name="categoryUrlKey" value="{{SimpleSubCategory.name}}"/>
+        </actionGroup>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the category." stepKey="seeAdminSuccessMessage"/>
+        <seeElement selector="{{AdminCategorySidebarTreeSection.categoryByName('admin')}}" stepKey="seeAdminCategoryInTree"/>
+        <!--Check category creation with restricted url key 'soap'-->
+        <comment userInput="Check category creation with restricted url key 'soap'" stepKey="commentCheckSoapCategoryCreation"/>
+        <actionGroup ref="goToCreateCategoryPage" stepKey="goToCreateSoapCategoryPage"/>
+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillSoapFirstCategoryForm">
+            <argument name="categoryName" value="soap"/>
+            <argument name="categoryUrlKey" value=""/>
+        </actionGroup>
+        <see selector="{{AdminMessagesSection.error}}" userInput='{{AdminCategoryRestrictedUrlErrorMessage.urlSoap}}' stepKey="seeSoapFirstErrorMessage"/>
+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillSoapSecondCategoryForm">
+            <argument name="categoryName" value="{{ApiCategory.name}}"/>
+            <argument name="categoryUrlKey" value="soap"/>
+        </actionGroup>
+        <see selector="{{AdminMessagesSection.error}}" userInput='{{AdminCategoryRestrictedUrlErrorMessage.urlSoap}}' stepKey="seeSoapSecondErrorMessage"/>
+        <!--Create category with 'soap' name-->
+        <comment userInput="Create category with 'soap' name" stepKey="commentSoapCategoryCreation"/>
+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillSoapThirdCategoryForm">
+            <argument name="categoryName" value="soap"/>
+            <argument name="categoryUrlKey" value="{{ApiCategory.name}}"/>
+        </actionGroup>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the category." stepKey="seeSoapSuccessMessage"/>
+        <seeElement selector="{{AdminCategorySidebarTreeSection.categoryByName('soap')}}" stepKey="seeSoapCategoryInTree"/>
+        <!--Check category creation with restricted url key 'rest'-->
+        <comment userInput="Check category creation with restricted url key 'rest'" stepKey="commentCheckRestCategoryCreation"/>
+        <actionGroup ref="goToCreateCategoryPage" stepKey="goToCreateRestCategoryPage"/>
+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillRestFirstCategoryForm">
+            <argument name="categoryName" value="rest"/>
+            <argument name="categoryUrlKey" value=""/>
+        </actionGroup>
+        <see selector="{{AdminMessagesSection.error}}" userInput='{{AdminCategoryRestrictedUrlErrorMessage.urlRest}}' stepKey="seeRestFirstErrorMessage"/>
+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillRestSecondCategoryForm">
+            <argument name="categoryName" value="{{SubCategoryWithParent.name}}"/>
+            <argument name="categoryUrlKey" value="rest"/>
+        </actionGroup>
+        <see selector="{{AdminMessagesSection.error}}" userInput='{{AdminCategoryRestrictedUrlErrorMessage.urlRest}}' stepKey="seeRestSecondErrorMessage"/>
+        <!--Create category with 'rest' name-->
+        <comment userInput="Create category with 'rest' name" stepKey="commentRestCategoryCreation"/>
+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillRestThirdCategoryForm">
+            <argument name="categoryName" value="rest"/>
+            <argument name="categoryUrlKey" value="{{SubCategoryWithParent.name}}"/>
+        </actionGroup>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the category." stepKey="seeRestSuccessMesdgssage"/>
+        <seeElement selector="{{AdminCategorySidebarTreeSection.categoryByName('rest')}}" stepKey="seeRestCategoryInTree"/>
+        <!--Check category creation with restricted url key 'graphql'-->
+        <comment userInput="Check category creation with restricted url key 'graphql'" stepKey="commentCheckGraphQlCategoryCreation"/>
+        <actionGroup ref="goToCreateCategoryPage" stepKey="goToCreateCategoryPage"/>
+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillGraphQlFirstCategoryForm">
+            <argument name="categoryName" value="graphql"/>
+            <argument name="categoryUrlKey" value=""/>
+        </actionGroup>
+        <see selector="{{AdminMessagesSection.error}}" userInput='{{AdminCategoryRestrictedUrlErrorMessage.urlGraphql}}' stepKey="seeGraphQlFirstErrorMessage"/>
+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillGraphQlSecondCategoryForm">
+            <argument name="categoryName" value="{{NewSubCategoryWithParent.name}}"/>
+            <argument name="categoryUrlKey" value="graphql"/>
+        </actionGroup>
+        <see selector="{{AdminMessagesSection.error}}" userInput='{{AdminCategoryRestrictedUrlErrorMessage.urlGraphql}}' stepKey="seeGraphQlSecondErrorMessage"/>
+        <!--Create category with 'graphql' name-->
+        <comment userInput="Create category with 'graphql' name" stepKey="commentGraphQlCategoryCreation"/>
+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSave" stepKey="fillGraphQlThirdCategoryForm">
+            <argument name="categoryName" value="graphql"/>
+            <argument name="categoryUrlKey" value="{{NewSubCategoryWithParent.name}}"/>
+        </actionGroup>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the category." stepKey="seeGraphQlSuccessMessage"/>
+        <seeElement selector="{{AdminCategorySidebarTreeSection.categoryByName('graphql')}}" stepKey="seeGraphQlCategoryInTree"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/AnchorUrlRewriteGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/AnchorUrlRewriteGeneratorTest.php
new file mode 100644
index 0000000000000..662e156b8f100
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Product/AnchorUrlRewriteGeneratorTest.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Product;
+
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class AnchorUrlRewriteGeneratorTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \Magento\CatalogUrlRewrite\Model\Product\AnchorUrlRewriteGenerator */
+    protected $anchorUrlRewriteGenerator;
+
+    /** @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator|\PHPUnit_Framework_MockObject_MockObject */
+    protected $productUrlPathGenerator;
+
+    /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
+    protected $product;
+
+    /** @var \Magento\Catalog\Api\CategoryRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $categoryRepositoryInterface;
+
+    /** @var \Magento\CatalogUrlRewrite\Model\ObjectRegistry|\PHPUnit_Framework_MockObject_MockObject */
+    protected $categoryRegistry;
+
+    /** @var \Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory|\PHPUnit_Framework_MockObject_MockObject */
+    protected $urlRewriteFactory;
+
+    /** @var \Magento\UrlRewrite\Service\V1\Data\UrlRewrite|\PHPUnit_Framework_MockObject_MockObject */
+    protected $urlRewrite;
+
+    protected function setUp()
+    {
+        $this->urlRewriteFactory = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()->getMock();
+        $this->urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->categoryRepositoryInterface = $this->getMockBuilder(
+            \Magento\Catalog\Api\CategoryRepositoryInterface::class
+        )->disableOriginalConstructor()->getMock();
+        $this->categoryRegistry = $this->getMockBuilder(\Magento\CatalogUrlRewrite\Model\ObjectRegistry::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->productUrlPathGenerator = $this->getMockBuilder(
+            \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator::class
+        )->disableOriginalConstructor()->getMock();
+        $this->anchorUrlRewriteGenerator = (new ObjectManager($this))->getObject(
+            \Magento\CatalogUrlRewrite\Model\Product\AnchorUrlRewriteGenerator::class,
+            [
+                'productUrlPathGenerator' => $this->productUrlPathGenerator,
+                'urlRewriteFactory' => $this->urlRewriteFactory,
+                'categoryRepository' => $this->categoryRepositoryInterface
+            ]
+        );
+    }
+
+    public function testGenerateEmpty()
+    {
+        $this->categoryRegistry->expects($this->any())->method('getList')->will($this->returnValue([]));
+
+        $this->assertEquals(
+            [],
+            $this->anchorUrlRewriteGenerator->generate(1, $this->product, $this->categoryRegistry)
+        );
+    }
+
+    public function testGenerateCategories()
+    {
+        $urlPathWithCategory = 'category1/category2/category3/simple-product.html';
+        $storeId = 10;
+        $productId = 12;
+        $canonicalUrlPathWithCategory = 'canonical-path-with-category';
+        $categoryParentId = '1';
+        $categoryIds = [$categoryParentId,'2','3','4'];
+        $urls = ['category1/simple-product.html',
+            'category1/category2/simple-product.html',
+            'category1/category2/category3/simple-product.html'];
+
+        $this->product->expects($this->any())->method('getId')->will($this->returnValue($productId));
+        $this->productUrlPathGenerator->expects($this->any())->method('getUrlPathWithSuffix')
+            ->will($this->returnValue($urlPathWithCategory));
+        $this->productUrlPathGenerator->expects($this->any())->method('getCanonicalUrlPath')
+            ->will($this->returnValue($canonicalUrlPathWithCategory));
+        $category = $this->createMock(\Magento\Catalog\Model\Category::class);
+        $category->expects($this->any())->method('getId')->will($this->returnValue($categoryIds));
+        $category->expects($this->any())->method('getAnchorsAbove')->will($this->returnValue($categoryIds));
+        $category->expects($this->any())->method('getParentId')->will(
+            $this->onConsecutiveCalls(
+                $categoryIds[0],
+                $categoryIds[1],
+                $categoryIds[2],
+                $categoryIds[3]
+            )
+        );
+        $this->categoryRepositoryInterface
+            ->expects($this->any())
+            ->method('get')
+            ->withConsecutive(
+                [ 'category_id' => $categoryIds[0]],
+                [ 'category_id' => $categoryIds[1]],
+                [ 'category_id' => $categoryIds[2]]
+            )
+            ->will($this->returnValue($category));
+        $this->categoryRegistry->expects($this->any())->method('getList')
+            ->will($this->returnValue([$category]));
+        $this->urlRewrite->expects($this->any())->method('setStoreId')
+            ->with($storeId)
+            ->will($this->returnSelf());
+        $this->urlRewrite->expects($this->any())->method('setEntityId')
+            ->with($productId)
+            ->will($this->returnSelf());
+        $this->urlRewrite->expects($this->any())->method('setEntityType')
+            ->with(ProductUrlRewriteGenerator::ENTITY_TYPE)
+            ->will($this->returnSelf());
+        $this->urlRewrite->expects($this->any())->method('setRequestPath')
+            ->will($this->returnSelf());
+        $this->urlRewrite->expects($this->any())->method('setTargetPath')
+            ->will($this->returnSelf());
+        $this->urlRewrite->expects($this->any())->method('setMetadata')
+            ->will(
+                $this->onConsecutiveCalls(
+                    $urls[0],
+                    $urls[1],
+                    $urls[2]
+                )
+            );
+        $this->urlRewriteFactory->expects($this->any())->method('create')->will(
+            $this->returnValue($this->urlRewrite)
+        );
+
+        $this->assertEquals(
+            $urls,
+            $this->anchorUrlRewriteGenerator->generate($storeId, $this->product, $this->categoryRegistry)
+        );
+    }
+}
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php
index 0a570adab309a..9e2090e36f08e 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/CategoryUrlPathAutogeneratorObserverTest.php
@@ -159,6 +159,9 @@ public function testShouldThrowExceptionIfUrlKeyIsEmpty($useDefaultUrlKey, $isOb
         $this->expectExceptionMessage('Invalid URL key');
         $categoryData = ['use_default' => ['url_key' => $useDefaultUrlKey], 'url_key' => '', 'url_path' => ''];
         $this->category->setData($categoryData);
+        $this->category
+            ->method('getStoreId')
+            ->willReturn(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
         $this->category->isObjectNew($isObjectNew);
         $this->assertEquals($isObjectNew, $this->category->isObjectNew());
         $this->assertEquals($categoryData['url_key'], $this->category->getUrlKey());
diff --git a/app/code/Magento/CatalogUrlRewrite/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewrite.php b/app/code/Magento/CatalogUrlRewrite/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewrite.php
index bcb5154e35501..10791eae5405f 100644
--- a/app/code/Magento/CatalogUrlRewrite/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewrite.php
+++ b/app/code/Magento/CatalogUrlRewrite/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewrite.php
@@ -53,7 +53,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyMeta(array $meta)
     {
@@ -65,7 +65,7 @@ public function modifyMeta(array $meta)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {
@@ -95,16 +95,21 @@ protected function addUrlRewriteCheckbox(array $meta)
                 ScopeInterface::SCOPE_STORE,
                 $this->locator->getProduct()->getStoreId()
             );
-
-            $meta = $this->arrayManager->merge($containerPath, $meta, [
-                'arguments' => [
-                    'data' => [
-                        'config' => [
-                            'component' => 'Magento_Ui/js/form/components/group',
+            $meta = $this->arrayManager->merge(
+                $containerPath,
+                $meta,
+                [
+                    'arguments' => [
+                        'data' => [
+                            'config' => [
+                                'component' => 'Magento_Ui/js/form/components/group',
+                                'label' => false,
+                                'required' => false,
+                            ],
                         ],
                     ],
-                ],
-            ]);
+                ]
+            );
 
             $checkbox['arguments']['data']['config'] = [
                 'componentType' => Field::NAME,
diff --git a/app/code/Magento/CatalogUrlRewrite/etc/di.xml b/app/code/Magento/CatalogUrlRewrite/etc/di.xml
index e6fbcaefd0768..5fb7d33546d60 100644
--- a/app/code/Magento/CatalogUrlRewrite/etc/di.xml
+++ b/app/code/Magento/CatalogUrlRewrite/etc/di.xml
@@ -45,4 +45,29 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\CatalogUrlRewrite\Observer\CategoryUrlPathAutogeneratorObserver">
+        <arguments>
+            <argument name="invalidValues" xsi:type="array">
+                <item name="0" xsi:type="string">admin</item>
+                <item name="1" xsi:type="string">soap</item>
+                <item name="2" xsi:type="string">rest</item>
+                <item name="3" xsi:type="string">graphql</item>
+                <item name="4" xsi:type="string">standard</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Eav\Model\Config">
+        <arguments>
+            <argument name="attributesForPreload" xsi:type="array">
+                <item name="catalog_product" xsi:type="array">
+                    <item name="url_key" xsi:type="string">catalog_product</item>
+                    <item name="url_path" xsi:type="string">catalog_product</item>
+                </item>
+                <item name="catalog_category" xsi:type="array">
+                    <item name="url_key" xsi:type="string">catalog_category</item>
+                    <item name="url_path" xsi:type="string">catalog_category</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv b/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv
index b3335dc3523ca..0f21e8ddf9fc9 100644
--- a/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv
+++ b/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv
@@ -5,4 +5,5 @@
 "Product URL Suffix","Product URL Suffix"
 "Use Categories Path for Product URLs","Use Categories Path for Product URLs"
 "Create Permanent Redirect for URLs if URL Key Changed","Create Permanent Redirect for URLs if URL Key Changed"
-"Generate "category/product" URL Rewrites","Generate "category/product" URL Rewrites"
\ No newline at end of file
+"Generate "category/product" URL Rewrites","Generate "category/product" URL Rewrites"
+"URL key ""%1"" matches a reserved endpoint name (%2). Use another URL key.","URL key ""%1"" matches a reserved endpoint name (%2). Use another URL key."
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/etc/di.xml b/app/code/Magento/CatalogUrlRewriteGraphQl/etc/di.xml
index e99f89477e807..8724972e71b17 100644
--- a/app/code/Magento/CatalogUrlRewriteGraphQl/etc/di.xml
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/etc/di.xml
@@ -22,4 +22,12 @@
             </argument>
         </arguments>
     </type>
+
+    <type name="Magento\UrlRewriteGraphQl\Model\Resolver\UrlRewrite">
+        <arguments>
+            <argument name="entityTypeMapping" xsi:type="array">
+                <item name="catalog_product" xsi:type="const">Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator::ENTITY_TYPE</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
index 4941bf8451bf8..c99c9041941b1 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
@@ -85,7 +85,7 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
     protected $priceCurrency;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     public $moduleManager;
 
@@ -105,7 +105,7 @@ class Renderer extends \Magento\Framework\View\Element\Template implements
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param PriceCurrencyInterface $priceCurrency
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param InterpretationStrategyInterface $messageInterpretationStrategy
      * @param array $data
      * @param ItemResolverInterface|null $itemResolver
@@ -120,7 +120,7 @@ public function __construct(
         \Magento\Framework\Url\Helper\Data $urlHelper,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         PriceCurrencyInterface $priceCurrency,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         InterpretationStrategyInterface $messageInterpretationStrategy,
         array $data = [],
         ItemResolverInterface $itemResolver = null
diff --git a/app/code/Magento/Checkout/Block/Cart/Link.php b/app/code/Magento/Checkout/Block/Cart/Link.php
index 6ea5137521106..9e6db1754d9e4 100644
--- a/app/code/Magento/Checkout/Block/Cart/Link.php
+++ b/app/code/Magento/Checkout/Block/Cart/Link.php
@@ -13,7 +13,7 @@
 class Link extends \Magento\Framework\View\Element\Html\Link
 {
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $_moduleManager;
 
@@ -24,14 +24,14 @@ class Link extends \Magento\Framework\View\Element\Html\Link
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Checkout\Helper\Cart $cartHelper
      * @param array $data
      * @codeCoverageIgnore
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Checkout\Helper\Cart $cartHelper,
         array $data = []
     ) {
diff --git a/app/code/Magento/Checkout/Block/Link.php b/app/code/Magento/Checkout/Block/Link.php
index 3d0740181f4a5..4ab2981e9185e 100644
--- a/app/code/Magento/Checkout/Block/Link.php
+++ b/app/code/Magento/Checkout/Block/Link.php
@@ -13,7 +13,7 @@
 class Link extends \Magento\Framework\View\Element\Html\Link
 {
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $_moduleManager;
 
@@ -24,14 +24,14 @@ class Link extends \Magento\Framework\View\Element\Html\Link
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
      * @param array $data
      * @codeCoverageIgnore
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Checkout\Helper\Data $checkoutHelper,
         array $data = []
     ) {
diff --git a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
index 70352b50d8de4..fdf49d6765a29 100644
--- a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
+++ b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
@@ -397,6 +397,9 @@ private function getQuoteData()
         if ($this->checkoutSession->getQuote()->getId()) {
             $quote = $this->quoteRepository->get($this->checkoutSession->getQuote()->getId());
             $quoteData = $quote->toArray();
+            if (null !== $quote->getExtensionAttributes()) {
+                $quoteData['extension_attributes'] = $quote->getExtensionAttributes()->__toArray();
+            }
             $quoteData['is_virtual'] = $quote->getIsVirtual();
 
             if (!$quote->getCustomer()->getId()) {
diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
index da29482f0123f..cae78389d4120 100644
--- a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
@@ -193,7 +193,9 @@ private function limitShippingCarrier(Quote $quote) : void
         $shippingAddress = $quote->getShippingAddress();
         if ($shippingAddress && $shippingAddress->getShippingMethod()) {
             $shippingRate = $shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod());
-            $shippingAddress->setLimitCarrier($shippingRate->getCarrier());
+            if ($shippingRate) {
+                $shippingAddress->setLimitCarrier($shippingRate->getCarrier());
+            }
         }
     }
 }
diff --git a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
index 2eced5c642261..2f1a36318ebc8 100644
--- a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
@@ -124,9 +124,9 @@ public function savePaymentInformation(
             $shippingAddress = $quote->getShippingAddress();
             if ($shippingAddress && $shippingAddress->getShippingMethod()) {
                 $shippingRate = $shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod());
-                $shippingAddress->setLimitCarrier(
-                    $shippingRate ? $shippingRate->getCarrier() : $shippingAddress->getShippingMethod()
-                );
+                if ($shippingRate) {
+                    $shippingAddress->setLimitCarrier($shippingRate->getCarrier());
+                }
             }
         }
         $this->paymentMethodManagement->set($cartId, $paymentMethod);
diff --git a/app/code/Magento/Checkout/Model/Session.php b/app/code/Magento/Checkout/Model/Session.php
index a654c78853d7a..7af00f1df8e95 100644
--- a/app/code/Magento/Checkout/Model/Session.php
+++ b/app/code/Magento/Checkout/Model/Session.php
@@ -7,6 +7,8 @@
 
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 use Psr\Log\LoggerInterface;
@@ -21,9 +23,6 @@
  */
 class Session extends \Magento\Framework\Session\SessionManager
 {
-    /**
-     * Checkout state begin
-     */
     const CHECKOUT_STATE_BEGIN = 'begin';
 
     /**
@@ -228,7 +227,7 @@ public function setLoadInactive($load = true)
      *
      * @return Quote
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -273,21 +272,21 @@ public function getQuote()
                          */
                         $quote = $this->quoteRepository->get($this->getQuoteId());
                     }
-                } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+
+                    if ($quote->getTotalsCollectedFlag() === false) {
+                        $quote->collectTotals();
+                    }
+                } catch (NoSuchEntityException $e) {
                     $this->setQuoteId(null);
                 }
             }
 
             if (!$this->getQuoteId()) {
                 if ($this->_customerSession->isLoggedIn() || $this->_customer) {
-                    $customerId = $this->_customer
-                        ? $this->_customer->getId()
-                        : $this->_customerSession->getCustomerId();
-                    try {
-                        $quote = $this->quoteRepository->getActiveForCustomer($customerId);
-                        $this->setQuoteId($quote->getId());
-                    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-                        $this->logger->critical($e);
+                    $quoteByCustomer = $this->getQuoteByCustomer();
+                    if ($quoteByCustomer !== null) {
+                        $this->setQuoteId($quoteByCustomer->getId());
+                        $quote = $quoteByCustomer;
                     }
                 } else {
                     $quote->setIsCheckoutCart(true);
@@ -375,7 +374,7 @@ public function loadCustomerQuote()
 
         try {
             $customerQuote = $this->quoteRepository->getForCustomer($this->_customerSession->getCustomerId());
-        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        } catch (NoSuchEntityException $e) {
             $customerQuote = $this->quoteFactory->create();
         }
         $customerQuote->setStoreId($this->_storeManager->getStore()->getId());
@@ -558,7 +557,7 @@ public function restoreQuote()
                 $this->replaceQuote($quote)->unsLastRealOrderId();
                 $this->_eventManager->dispatch('restore_quote', ['order' => $order, 'quote' => $quote]);
                 return true;
-            } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+            } catch (NoSuchEntityException $e) {
                 $this->logger->critical($e);
             }
         }
@@ -588,4 +587,22 @@ protected function isQuoteMasked()
     {
         return $this->isQuoteMasked;
     }
+
+    /**
+     * Returns quote for customer if there is any
+     */
+    private function getQuoteByCustomer(): ?CartInterface
+    {
+        $customerId = $this->_customer
+            ? $this->_customer->getId()
+            : $this->_customerSession->getCustomerId();
+
+        try {
+            $quote = $this->quoteRepository->getActiveForCustomer($customerId);
+        } catch (NoSuchEntityException $e) {
+            $quote = null;
+        }
+
+        return $quote;
+    }
 }
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertIsNotVisibleCartPagerTextActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertIsNotVisibleCartPagerTextActionGroup.xml
new file mode 100644
index 0000000000000..2072cb6df1dc1
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertIsNotVisibleCartPagerTextActionGroup.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="AssertPagerTextIsNotVisibleActionGroup">
+        <arguments>
+            <argument name="text" type="string"/>
+        </arguments>
+        <waitForPageLoad stepKey="waitForCheckoutPageLoad"/>
+        <dontSee userInput="{{text}}" selector="{{StorefrontCartToolbarSection.toolbarNumber}}" stepKey="VerifyMissingPagerText"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontNotCalculatedValueInShippingTotalInOrderSummaryActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontNotCalculatedValueInShippingTotalInOrderSummaryActionGroup.xml
new file mode 100644
index 0000000000000..1ec42033a782b
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontNotCalculatedValueInShippingTotalInOrderSummaryActionGroup.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="AssertStorefrontNotCalculatedValueInShippingTotalInOrderSummaryActionGroup">
+        <annotations>
+            <description>Validates value of the Shipping total is not calculated.</description>
+        </annotations>
+
+        <arguments>
+            <argument name="value" defaultValue="Not yet calculated" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{CheckoutOrderSummarySection.shippingTotalNotYetCalculated}}" time="30" stepKey="waitForShippingTotalToBeVisible"/>
+        <see selector="{{CheckoutOrderSummarySection.shippingTotalNotYetCalculated}}" userInput="{{value}}" stepKey="assertShippingTotalIsNotYetCalculated"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontOrderCannotBePlacedActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontOrderCannotBePlacedActionGroup.xml
new file mode 100644
index 0000000000000..4f9555d84898d
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontOrderCannotBePlacedActionGroup.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="AssertStorefrontOrderCannotBePlacedActionGroup">
+        <annotations>
+            <description>Validates order cannot be placed and checks error message.</description>
+        </annotations>
+
+        <arguments>
+            <argument name="error" type="string"/>
+        </arguments>
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrderWithoutTimeout}}" stepKey="clickPlaceOrder"/>
+        <waitForElement selector="{{CheckoutCartMessageSection.errorMessage}}" time="30" stepKey="waitForErrorMessage"/>
+        <see selector="{{CheckoutCartMessageSection.errorMessage}}" userInput="{{error}}" stepKey="assertErrorMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontShippingLabelDescriptionInOrderSummaryActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontShippingLabelDescriptionInOrderSummaryActionGroup.xml
new file mode 100644
index 0000000000000..6a8efdb507c3e
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontShippingLabelDescriptionInOrderSummaryActionGroup.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="AssertStorefrontShippingLabelDescriptionInOrderSummaryActionGroup">
+        <annotations>
+            <description>Validates that the Shipping label description is present and correct.</description>
+        </annotations>
+
+        <arguments>
+            <argument name="labelDescription" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{CheckoutOrderSummarySection.orderSummaryShippingTotalLabelDescription}}" time="30" stepKey="waitForElement"/>
+        <see selector="{{CheckoutOrderSummarySection.orderSummaryShippingTotalLabelDescription}}" userInput="{{labelDescription}}" stepKey="seeShippingMethodLabelDescription"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertToolbarTextIsVisibleInCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertToolbarTextIsVisibleInCartActionGroup.xml
new file mode 100644
index 0000000000000..6ede2a0dd5388
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertToolbarTextIsVisibleInCartActionGroup.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="AssertToolbarTextIsVisibleInCartActionGroup">
+        <arguments>
+            <argument name="text" type="string"/>
+        </arguments>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="{{text}}" selector="{{StorefrontCartToolbarSection.toolbarNumber}}" stepKey="VerifyPageText"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
index 7f6980d0c9744..4c7d4e31b2d6f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
@@ -64,6 +64,7 @@
         <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
         <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('shippingMethod')}}" stepKey="waitForShippingMethod"/>
         <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('shippingMethod')}}" stepKey="selectShippingMethod"/>
         <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
         <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
@@ -170,6 +171,15 @@
         <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
     </actionGroup>
 
+    <!-- Submit Shipping Address on Checkout Shipping page -->
+    <actionGroup name="StorefrontCheckoutForwardFromShippingStep">
+        <annotations>
+            <description>Clicks next on Checkout Shipping step</description>
+        </annotations>
+        <waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+    </actionGroup>
+
     <!-- Logged in user checkout filling shipping section -->
     <actionGroup name="LoggedInUserCheckoutAddNewShippingSectionWithoutRegionActionGroup">
         <annotations>
@@ -221,7 +231,7 @@
     <!-- Check product in checkout cart items -->
     <actionGroup name="CheckProductInCheckoutCartItemsActionGroup">
         <annotations>
-            <description>Validates the the provided Product appears in the Storefront Checkout 'Order Summary' section.</description>
+            <description>Validates the provided Product appears in the Storefront Checkout 'Order Summary' section.</description>
         </annotations>
         <arguments>
             <argument name="productVar"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCartPageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCartPageActionGroup.xml
new file mode 100644
index 0000000000000..fe1e48e00c5bb
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCartPageActionGroup.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="StorefrontOpenCartPageActionGroup">
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="openCartPage" />
+        <waitForPageLoad stepKey="waitForPageLoaded" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
index c0a160fcb2a71..b07bcdccce674 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -103,7 +103,7 @@
         <arguments>
             <argument name="subtotal" type="string"/>
             <argument name="shipping" type="string"/>
-            <argument name="shippingMethod" type="string"/>
+            <argument name="shippingMethod" type="string" defaultValue="Flat Rate - Fixed"/>
             <argument name="total" type="string"/>
         </arguments>
 
@@ -112,6 +112,7 @@
         <conditionalClick selector="{{CheckoutCartSummarySection.shippingHeading}}" dependentSelector="{{CheckoutCartSummarySection.shippingMethodForm}}" visible="false" stepKey="openEstimateShippingSection"/>
         <waitForElementVisible selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="waitForShippingSection"/>
         <checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectShippingMethod"/>
+        <scrollTo selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="scrollToSummary"/>
         <see userInput="{{subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
         <see userInput="({{shippingMethod}})" selector="{{CheckoutCartSummarySection.shippingMethod}}" stepKey="assertShippingMethod"/>
         <reloadPage stepKey="reloadPage" after="assertShippingMethod" />
@@ -146,4 +147,15 @@
         <fillField stepKey="fillZip" selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{taxCode.zip}}"/>
         <waitForPageLoad stepKey="waitForFormUpdate"/>
     </actionGroup>
+
+    <actionGroup name="StorefrontCheckCartTotalWithDiscountCategoryActionGroup" extends="StorefrontCheckCartActionGroup">
+        <annotations>
+                <description>EXTENDS: StorefrontCheckCartActionGroup. Validates that the provided Discount is present in the Storefront Shopping Cart.</description>
+        </annotations>
+        <arguments>
+            <argument name="discount" type="string" defaultValue="0"/>
+        </arguments>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForDiscount"/>
+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-${{discount}}" stepKey="assertDiscount"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontRemoveCartItemActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontRemoveCartItemActionGroup.xml
new file mode 100644
index 0000000000000..f2d4088370a2b
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontRemoveCartItemActionGroup.xml
@@ -0,0 +1,13 @@
+<?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="StorefrontRemoveCartItemActionGroup">
+        <click selector="{{CheckoutCartProductSection.RemoveItem}}" stepKey="deleteProductFromCart"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
index a77b07a129dce..cf7f2baeb4b26 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml
@@ -9,6 +9,7 @@
 <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="StorefrontCartToolbarSection"/>
         <section name="CheckoutCartProductSection"/>
         <section name="CheckoutCartSummarySection"/>
         <section name="CheckoutCartCrossSellSection"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index 3ab3fa5857b78..af9d81249e8ac 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -18,6 +18,7 @@
         <element name="ProductRegularPriceByName" type="text"
                  selector="//div[descendant::*[contains(text(), '{{var1}}')]]//*[contains(@class, 'subtotal')]"
                  parameterized="true"/>
+        <element name="productFirstPrice" type="text" selector="td[class~=price] span[class='price']"/>
         <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"/>
@@ -32,6 +33,7 @@
                  selector="//table[@id='shopping-cart-table']//tbody//tr[contains(@class,'item-actions')]//a[contains(@class,'action-delete')]"/>
         <element name="removeProductByName" type="text" selector="//*[contains(text(), '{{productName}}')]/ancestor::tbody//a[@class='action action-delete']" parameterized="true" timeout="30"/>
         <element name="productName" type="text" selector="//tbody[@class='cart item']//strong[@class='product-item-name']"/>
+        <element name="moveToWishlistByProductName" type="button" selector="//a[contains(text(), '{{productName}}')]/ancestor::tbody/tr//a[contains(@class, 'towishlist')]" parameterized="true"/>
         <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"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
index 20b71608cd038..de71fc3f8ad0e 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
@@ -9,6 +9,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CheckoutCartSummarySection">
+        <element name="orderTotal" type="input" selector=".grand.totals .amount .price"/>
+        <element name="subTotal" type="input" selector="span[data-th='Subtotal']"/>
         <element name="expandShoppingCartSummary" type="button" selector="//*[contains(@class, 'items-in-cart')][not(contains(@class, 'active'))]"/>
         <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']"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml
index d3ad2aed96946..026265656379a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml
@@ -19,5 +19,7 @@
         <element name="additionalAddress" type="text" selector=".block.block-addresses-list"/>
         <element name="miniCartTabClosed" type="button" selector=".title[aria-expanded='false']" timeout="30"/>
         <element name="itemsQtyInCart" type="text" selector=".items-in-cart > .title > strong > span"/>
+        <element name="orderSummaryShippingTotalLabelDescription" type="text" selector=".shipping.totals .label.description"/>
+        <element name="shippingTotalNotYetCalculated" type="text" selector=".shipping.totals .not-calculated"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
index b5392cc5e3bb7..16fd373d3ae4d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -31,6 +31,7 @@
         <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="placeOrderWithoutTimeout" type="button" selector=".payment-method._active button.action.primary.checkout"/>
         <element name="paymentSectionTitle" type="text" selector="//*[@id='checkout-payment-method-load']//div[@data-role='title']" />
         <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']" />
@@ -52,6 +53,7 @@
         <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="myShippingAndBillingAddressSame" type="input" selector=".billing-address-same-as-shipping-block"/>
         <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"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
index 08a9d671a8d02..c486e13ecf58b 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
@@ -14,6 +14,7 @@
         <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="orderLinks" type="text" selector="a[href*=order_id]" 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="createAnAccount" type="button" selector="[data-bind*=&quot;i18n: 'Create an Account'&quot;]" timeout="30"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCartToolbarSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCartToolbarSection.xml
new file mode 100644
index 0000000000000..ff40449369530
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCartToolbarSection.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="StorefrontCartToolbarSection">
+        <element name="toolbarNumber" type="text" selector="div.toolbar > .pager > .toolbar-amount > .toolbar-number" />
+        <element name="toolbarPager" type="text" selector="div.toolbar > .pager > .pages" />
+        <element name="toolbarNextPage" type="text" selector="div.toolbar > .pager > .pages > .pages-item-next" />
+        <element name="toolbarPreviousPage" type="text" selector="div.toolbar > .pager > .pages > .pages-item-previous" />
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
index 3e1de2b14ba62..80ed4f90c2cd0 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
@@ -13,7 +13,9 @@
         <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="productPriceByItsName" type="text" selector="//a[normalize-space()='{{prodName}}']/../following-sibling::*//*[@class='price']"  parameterized="true"/>
+        <element name="productImageByName" type="text" selector="header ol[id='mini-cart'] span[class='product-image-container'] img[alt='{{prodName}}']"  parameterized="true"/>
+        <element name="productImageByItsName" type="text" selector="img[alt='{{prodName}}']"  parameterized="true"/>
         <element name="productName" type="text" selector=".product-item-name"/>
         <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"/>
@@ -23,6 +25,7 @@
         <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="editMiniCartItem" type="button" selector=".action.edit" timeout="30"/>
         <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"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteDownloadableProductFromShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteDownloadableProductFromShoppingCartTest.xml
index 1a51e1e02fe86..e16ef70c23e3d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteDownloadableProductFromShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteDownloadableProductFromShoppingCartTest.xml
@@ -20,6 +20,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <!-- Create downloadable product -->
             <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct"/>
             <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink">
@@ -30,6 +31,7 @@
             </createData>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <!-- Delete downloadable product -->
             <deleteData createDataKey="createDownloadableProduct" stepKey="deleteDownloadableProduct"/>
         </after>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml
index 20015f76e08e3..c61545e51d535 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml
@@ -25,6 +25,9 @@
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/>
+            <!--Clear cache and reindex-->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index 5335ec2ad775d..4281a0eb77da8 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -184,6 +184,194 @@
             <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>
+    <test name="EndToEndB2CGuestUserMysqlTest">
+        <!-- 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">
+            <argument name="subtotal" value="480.00"/>
+            <argument name="shipping" value="15.00"/>
+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
+            <argument name="total" value="495.00"/>
+        </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">
+            <argument name="subtotal" value="480.00"/>
+            <argument name="shippingTotal" value="15.00"/>
+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
+            <argument name="total" value="495.00"/>
+        </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">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
index 3c98f9177f4a7..fd6656b1d1b28 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
@@ -26,6 +26,8 @@
                 <field key="price">100.00</field>
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml
index 3ec73aec580d5..e85a47ab7a91d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml
@@ -20,6 +20,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <!-- Create category -->
             <createData entity="_defaultCategory" stepKey="createCategory"/>
 
@@ -90,6 +91,7 @@
             <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddDownloadableProductToShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddDownloadableProductToShoppingCartTest.xml
index 5a46dbc90e207..ec9852a6a939d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddDownloadableProductToShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddDownloadableProductToShoppingCartTest.xml
@@ -18,6 +18,7 @@
         </annotations>
 
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
             <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
             <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
             <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct"/>
@@ -31,6 +32,7 @@
             <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
             <deleteData createDataKey="createDownloadableProduct" stepKey="deleteProduct"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckPagerShoppingCartWithMoreThan20ProductsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckPagerShoppingCartWithMoreThan20ProductsTest.xml
new file mode 100644
index 0000000000000..9dbd5daba6f23
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckPagerShoppingCartWithMoreThan20ProductsTest.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="StorefrontCheckPagerShoppingCartWithMoreThan20ProductsTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Check if the cart pager is visible with more than 20 cart items and the pager disappears if an item is removed from cart"/>
+            <title value="Test if the cart pager is visible with more than 20 cart items and the pager disappears if an item is removed from cart."/>
+            <description value="Test if the cart pager is visible with more than 20 cart items and the pager disappears if an item is removed from cart."/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14700"/>
+            <group value="shoppingCart"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!--Set the default number of items on cart which is 20-->
+            <magentoCLI stepKey="allowSpecificValue" command="config:set checkout/cart/number_items_to_display_pager 20" />
+
+            <createData entity="SimpleTwo" stepKey="simpleProduct1"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem1">
+                <argument name="product" value="$$simpleProduct1$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct2"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem2">
+                <argument name="product" value="$simpleProduct2$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct3"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem3">
+                <argument name="product" value="$simpleProduct3$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct4"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem4">
+                <argument name="product" value="$simpleProduct4$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct5"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem5">
+                <argument name="product" value="$simpleProduct5$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct6"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem6">
+                <argument name="product" value="$simpleProduct6$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct7"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem7">
+                <argument name="product" value="$simpleProduct7$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct8"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem8">
+                <argument name="product" value="$simpleProduct8$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct9"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem9">
+                <argument name="product" value="$simpleProduct9$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct10"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem10">
+                <argument name="product" value="$$simpleProduct10$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct11"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem11">
+                <argument name="product" value="$$simpleProduct11$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct12"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem12">
+                <argument name="product" value="$$simpleProduct12$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct13"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem13">
+                <argument name="product" value="$$simpleProduct13$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct14"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem14">
+                <argument name="product" value="$$simpleProduct14$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct15"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem15">
+                <argument name="product" value="$$simpleProduct15$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct16"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem16">
+                <argument name="product" value="$$simpleProduct16$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct17"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem17">
+                <argument name="product" value="$$simpleProduct17$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct18"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem18">
+                <argument name="product" value="$$simpleProduct18$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct19"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem19">
+                <argument name="product" value="$$simpleProduct19$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct20"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem20">
+                <argument name="product" value="$$simpleProduct20$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct21"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem21">
+                <argument name="product" value="$$simpleProduct21$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteCartItem1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteCartItem2"/>
+            <deleteData createDataKey="simpleProduct3" stepKey="deleteCartItem3"/>
+            <deleteData createDataKey="simpleProduct4" stepKey="deleteCartItem4"/>
+            <deleteData createDataKey="simpleProduct5" stepKey="deleteCartItem5"/>
+            <deleteData createDataKey="simpleProduct6" stepKey="deleteCartItem6"/>
+            <deleteData createDataKey="simpleProduct7" stepKey="deleteCartItem7"/>
+            <deleteData createDataKey="simpleProduct8" stepKey="deleteCartItem8"/>
+            <deleteData createDataKey="simpleProduct9" stepKey="deleteCartItem9"/>
+            <deleteData createDataKey="simpleProduct10" stepKey="deleteCartItem10"/>
+            <deleteData createDataKey="simpleProduct11" stepKey="deleteCartItem11"/>
+            <deleteData createDataKey="simpleProduct12" stepKey="deleteCartItem12"/>
+            <deleteData createDataKey="simpleProduct13" stepKey="deleteCartItem13"/>
+            <deleteData createDataKey="simpleProduct14" stepKey="deleteCartItem14"/>
+            <deleteData createDataKey="simpleProduct15" stepKey="deleteCartItem15"/>
+            <deleteData createDataKey="simpleProduct16" stepKey="deleteCartItem16"/>
+            <deleteData createDataKey="simpleProduct17" stepKey="deleteCartItem17"/>
+            <deleteData createDataKey="simpleProduct18" stepKey="deleteCartItem18"/>
+            <deleteData createDataKey="simpleProduct19" stepKey="deleteCartItem19"/>
+            <deleteData createDataKey="simpleProduct20" stepKey="deleteCartItem20"/>
+            <deleteData createDataKey="simpleProduct21" stepKey="deleteCartItem21"/>
+        </after>
+        <actionGroup ref="StorefrontOpenCartPageActionGroup" stepKey="goToCartPage" />
+        <actionGroup ref="AssertToolbarTextIsVisibleInCartActionGroup" stepKey="VerifyPagerText">
+            <argument name="text" value="Items 1 to 20 of 21 total"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontRemoveCartItemActionGroup" stepKey="removeCartItem" />
+        <actionGroup ref="AssertPagerTextIsNotVisibleActionGroup" stepKey="VerifyMissingPagerText2" >
+            <argument name="text" value="Items 1 to 20"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml
new file mode 100644
index 0000000000000..97eceae962bfb
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCheckoutDisabledBundleProductTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Disabled bundle product is preventing customer to checkout for the first attempt"/>
+            <title value="Customer should be able to checkout if there is at least one available product in the cart"/>
+            <description value="Customer should be able to checkout if there is at least one available product in the cart"/>
+            <severity value="MINOR"/>
+            <testCaseId value="MC-29105"/>
+            <group value="checkout"/>
+        </annotations>
+
+        <before>
+            <!-- Create category and simple product -->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Create bundle product -->
+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createBundleDynamicProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="DropDownBundleOption" stepKey="bundleOption">
+                <requiredEntity createDataKey="createBundleDynamicProduct"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createNewBundleLink">
+                <requiredEntity createDataKey="createBundleDynamicProduct"/>
+                <requiredEntity createDataKey="bundleOption"/>
+                <requiredEntity createDataKey="createSimpleProduct"/>
+            </createData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="cacheFlush"/>
+        </before>
+        <after>
+            <!-- Delete category -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!-- Delete bundle product data -->
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createBundleDynamicProduct" stepKey="deleteBundleProduct"/>
+        </after>
+        <!-- Add simple product to the cart -->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="cartAddSimpleProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <!-- Go to bundle product page -->
+        <amOnPage url="{{StorefrontProductPage.url($$createBundleDynamicProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <!-- Add bundle product to the cart -->
+        <click selector="{{StorefrontBundleProductActionSection.customizeAndAddToCartButton}}" stepKey="clickCustomizeAndAddToCart"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCart">
+            <argument name="productName" value="$$createBundleDynamicProduct.name$$"/>
+        </actionGroup>
+        <!-- Login to 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"/>
+        <!-- Disabled bundle product from grid -->
+        <actionGroup ref="ChangeStatusProductUsingProductGridActionGroup" stepKey="disabledProductFromGrid">
+            <argument name="product" value="$$createBundleDynamicProduct$$"/>
+            <argument name="status" value="Disable"/>
+        </actionGroup>
+        <closeTab stepKey="closeTab"/>
+        <!-- Go to cart page-->
+        <actionGroup ref="StorefrontOpenCartPageActionGroup" stepKey="openCartPage"/>
+        <!-- Assert checkout button exists on the page-->
+        <seeElement selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="seeCheckoutButton"/>
+        <!-- Assert no error message is not shown on the page-->
+        <dontSee userInput="Some of the products are out of stock." stepKey="seeNoItemsInShoppingCart"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutDisabledProductAndCouponTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutDisabledProductAndCouponTest.xml
new file mode 100644
index 0000000000000..0e704e5336db9
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutDisabledProductAndCouponTest.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="StorefrontCustomerCheckoutDisabledProductAndCouponTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout via the Storefront"/>
+            <title value="Customer can login if product in his cart was disabled"/>
+            <description value="Customer can login with disabled product in the cart and a coupon applied"/>
+            <severity value="MINOR"/>
+            <testCaseId value="MC-21996"/>
+            <group value="checkout"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createUSCustomer"/>
+            <!-- Create sales rule with coupon -->
+            <createData entity="SalesRuleSpecificCouponAndByPercent" stepKey="createSalesRule"/>
+            <createData entity="SimpleSalesRuleCoupon" stepKey="createCouponForCartPriceRule">
+                <requiredEntity createDataKey="createSalesRule"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createUSCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createSalesRule" stepKey="deleteSalesRule"/>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductListing"/>
+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridToDefaultKeywordSearch"/>
+        </after>
+
+        <!-- Login as Customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$createUSCustomer$$" />
+        </actionGroup>
+
+        <!-- Add product to shopping cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
+        <actionGroup ref="AddSimpleProductToCart" stepKey="cartAddSimpleProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+
+        <!-- Open View and edit -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="clickMiniCart1"/>
+
+        <!-- Fill the Estimate Shipping and Tax section -->
+        <actionGroup ref="CheckoutFillEstimateShippingAndTaxActionGroup" stepKey="fillEstimateShippingAndTaxFields"/>
+
+        <!-- Apply Coupon -->
+        <actionGroup ref="StorefrontApplyCouponActionGroup" stepKey="applyDiscount">
+            <argument name="coupon" value="$$createCouponForCartPriceRule$$"/>
+        </actionGroup>
+
+        <!-- Sign out Customer from storefront -->
+        <actionGroup ref="StorefrontSignOutActionGroup" stepKey="customerLogout"/>
+
+        <!-- Login to 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"/>
+
+        <!-- Disabled simple product from grid -->
+        <actionGroup ref="ChangeStatusProductUsingProductGridActionGroup" stepKey="disabledProductFromGrid">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="status" value="Disable"/>
+        </actionGroup>
+        <closeTab stepKey="closeTab"/>
+
+        <!-- Login as Customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLoginSecondTime">
+            <argument name="Customer" value="$$createUSCustomer$$" />
+        </actionGroup>
+
+        <!-- Check cart -->
+        <click selector="{{StorefrontMiniCartSection.show}}" stepKey="clickMiniCart2"/>
+        <dontSeeElement selector="{{StorefrontMiniCartSection.quantity}}" stepKey="dontSeeCartItem"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
index a4f974603f1c8..218ff959750d6 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
@@ -125,6 +125,10 @@
             </actionGroup>
 
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+
+            <!--TODO: REMOVE AFTER FIX MC-21717 -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush full_page" stepKey="flushCache"/>
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
@@ -221,6 +225,10 @@
             <magentoCLI command="config:set payment/checkmo/allowspecific 1" stepKey="allowSpecificValue"  />
             <magentoCLI command="config:set payment/checkmo/specificcountry GB" stepKey="specificCountryValue" />
             <createData entity="Simple_US_Customer" stepKey="simpleuscustomer"/>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
@@ -270,4 +278,4 @@
             <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
         </actionGroup>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteDownloadableProductFromMiniShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteDownloadableProductFromMiniShoppingCartTest.xml
index 6a3f6ab4f7058..0fa503e1783b5 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteDownloadableProductFromMiniShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteDownloadableProductFromMiniShoppingCartTest.xml
@@ -19,6 +19,7 @@
         </annotations>
 
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
             <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
             <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
@@ -30,6 +31,7 @@
             <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
             <deleteData createDataKey="createDownloadableProduct" stepKey="deleteProduct"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
index 02a45af800567..a0914cfc27138 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
@@ -23,6 +23,10 @@
             <createData entity="ApiSimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <actionGroup ref="logout" stepKey="adminLogout"/>
@@ -77,11 +81,8 @@
             <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"/>
+            <testCaseId value="MC-16587"/>
             <group value="checkout"/>
-            <skip>
-                <issueId value="MC-17140"/>
-            </skip>
         </annotations>
         <before>
             <magentoCLI stepKey="disableSidebar" command="config:set checkout/sidebar/display 0" />
@@ -109,7 +110,8 @@
             </createData>
             <magentoCLI stepKey="allowSpecificValue" command="config:set payment/checkmo/allowspecific 1" />
             <magentoCLI stepKey="specificCountryValue" command="config:set payment/checkmo/specificcountry GB" />
-
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <actionGroup ref="logout" stepKey="adminLogout"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontMissingPagerShoppingCartWith20ProductsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontMissingPagerShoppingCartWith20ProductsTest.xml
new file mode 100644
index 0000000000000..afe4ebcfea40c
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontMissingPagerShoppingCartWith20ProductsTest.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontMissingPagerShoppingCartWith20ProductsTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Check if the cart pager is missing with 20 cart items"/>
+            <title value="Test if the cart pager is missing with 20 cart items."/>
+            <description value="Test if the cart pager is missing with 20 cart items."/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14698"/>
+            <group value="shoppingCart"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!--Set the default number of items on cart which is 20-->
+            <magentoCLI stepKey="allowSpecificValue" command="config:set checkout/cart/number_items_to_display_pager 20" />
+            <createData entity="SimpleTwo" stepKey="simpleProduct1"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem1">
+                <argument name="product" value="$$simpleProduct1$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct2"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem2">
+                <argument name="product" value="$$simpleProduct2$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct3"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem3">
+                <argument name="product" value="$$simpleProduct3$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct4"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem4">
+                <argument name="product" value="$$simpleProduct4$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct5"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem5">
+                <argument name="product" value="$$simpleProduct5$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct6"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem6">
+                <argument name="product" value="$$simpleProduct6$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct7"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem7">
+                <argument name="product" value="$$simpleProduct7$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct8"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem8">
+                <argument name="product" value="$$simpleProduct8$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct9"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem9">
+                <argument name="product" value="$$simpleProduct9$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct10"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem10">
+                <argument name="product" value="$$simpleProduct10$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct11"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem11">
+                <argument name="product" value="$$simpleProduct11$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct12"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem12">
+                <argument name="product" value="$$simpleProduct12$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct13"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem13">
+                <argument name="product" value="$$simpleProduct13$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct14"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem14">
+                <argument name="product" value="$$simpleProduct14$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct15"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem15">
+                <argument name="product" value="$$simpleProduct15$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct16"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem16">
+                <argument name="product" value="$$simpleProduct16$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct17"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem17">
+                <argument name="product" value="$$simpleProduct17$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct18"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem18">
+                <argument name="product" value="$$simpleProduct18$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct19"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem19">
+                <argument name="product" value="$$simpleProduct19$$"/>
+            </actionGroup>
+            <createData entity="SimpleTwo" stepKey="simpleProduct20"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="CartItem20">
+                <argument name="product" value="$$simpleProduct20$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteCartItem1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteCartItem2"/>
+            <deleteData createDataKey="simpleProduct3" stepKey="deleteCartItem3"/>
+            <deleteData createDataKey="simpleProduct4" stepKey="deleteCartItem4"/>
+            <deleteData createDataKey="simpleProduct5" stepKey="deleteCartItem5"/>
+            <deleteData createDataKey="simpleProduct6" stepKey="deleteCartItem6"/>
+            <deleteData createDataKey="simpleProduct7" stepKey="deleteCartItem7"/>
+            <deleteData createDataKey="simpleProduct8" stepKey="deleteCartItem8"/>
+            <deleteData createDataKey="simpleProduct9" stepKey="deleteCartItem9"/>
+            <deleteData createDataKey="simpleProduct10" stepKey="deleteCartItem10"/>
+            <deleteData createDataKey="simpleProduct11" stepKey="deleteCartItem11"/>
+            <deleteData createDataKey="simpleProduct12" stepKey="deleteCartItem12"/>
+            <deleteData createDataKey="simpleProduct13" stepKey="deleteCartItem13"/>
+            <deleteData createDataKey="simpleProduct14" stepKey="deleteCartItem14"/>
+            <deleteData createDataKey="simpleProduct15" stepKey="deleteCartItem15"/>
+            <deleteData createDataKey="simpleProduct16" stepKey="deleteCartItem16"/>
+            <deleteData createDataKey="simpleProduct17" stepKey="deleteCartItem17"/>
+            <deleteData createDataKey="simpleProduct18" stepKey="deleteCartItem18"/>
+            <deleteData createDataKey="simpleProduct19" stepKey="deleteCartItem19"/>
+            <deleteData createDataKey="simpleProduct20" stepKey="deleteCartItem20"/>
+        </after>
+        <!-- Go to the shopping cart and check if the pager is missing-->
+        <actionGroup ref="StorefrontOpenCartPageActionGroup" stepKey="goToCartPage" />
+        <actionGroup ref="AssertPagerTextIsNotVisibleActionGroup" stepKey="VerifyMissingPagerText" >
+            <argument name="text" value="Items 1 to 20"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontNotApplicableShippingMethodInReviewAndPaymentStepTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontNotApplicableShippingMethodInReviewAndPaymentStepTest.xml
new file mode 100644
index 0000000000000..8ec89ce1fe8f0
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontNotApplicableShippingMethodInReviewAndPaymentStepTest.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontNotApplicableShippingMethodInReviewAndPaymentStepTest">
+        <annotations>
+            <title value="Not applicable Shipping Method In Review and Payment Step"/>
+            <stories value="Checkout Shipping Method Recalculation after Coupon Code Added"/>
+            <description value="User should not be able to place order when free shipping declined after applying coupon code"/>
+            <features value="Checkout"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-22625"/>
+            <useCaseId value="MC-21926"/>
+            <group value="Checkout"/>
+            <skip>
+                <issueId value="MC-29597"/>
+            </skip>
+        </annotations>
+
+        <before>
+            <!-- Enable Free Shipping Method and set Minimum Order Amount to 100-->
+            <magentoCLI command="config:set {{AdminFreeshippingActiveConfigData.path}} {{AdminFreeshippingActiveConfigData.enabled}}" stepKey="enableFreeShippingMethod" />
+            <magentoCLI command="config:set {{AdminFreeshippingMinimumOrderAmountConfigData.path}} {{AdminFreeshippingMinimumOrderAmountConfigData.hundred}}" stepKey="setFreeShippingMethodMinimumOrderAmountToBe100" />
+
+            <!--Set Fedex configs data-->
+            <magentoCLI command="config:set {{AdminFedexEnableForCheckoutConfigData.path}} {{AdminFedexEnableForCheckoutConfigData.value}}" stepKey="enableCheckout"/>
+            <magentoCLI command="config:set {{AdminFedexEnableSandboxModeConfigData.path}} {{AdminFedexEnableSandboxModeConfigData.value}}" stepKey="enableSandbox"/>
+            <magentoCLI command="config:set {{AdminFedexEnableDebugConfigData.path}} {{AdminFedexEnableDebugConfigData.value}}" stepKey="enableDebug"/>
+            <magentoCLI command="config:set {{AdminFedexEnableShowMethodConfigData.path}} {{AdminFedexEnableShowMethodConfigData.value}}" stepKey="enableShowMethod"/>
+
+            <!--Set StoreInformation configs data-->
+            <magentoCLI command="config:set {{AdminGeneralSetStoreNameConfigData.path}} '{{AdminGeneralSetStoreNameConfigData.value}}'" stepKey="setStoreInformationName"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStorePhoneConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.telephone}}" stepKey="setStoreInformationPhone"/>
+            <magentoCLI command="config:set {{AdminGeneralSetCountryConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.country_id}}" stepKey="setStoreInformationCountry"/>
+            <magentoCLI command="config:set {{AdminGeneralSetCityConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.city}}" stepKey="setStoreInformationCity"/>
+            <magentoCLI command="config:set {{AdminGeneralSetPostcodeConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.postcode}}" stepKey="setStoreInformationPostcode"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStreetAddressConfigData.path}} '{{DE_Address_Berlin_Not_Default_Address.street[0]}}'" stepKey="setStoreInformationStreetAddress"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStreetAddress2ConfigData.path}} '{{US_Address_California.street[0]}}'" stepKey="setStoreInformationStreetAddress2"/>
+            <magentoCLI command="config:set {{AdminGeneralSetVatNumberConfigData.path}} {{AdminGeneralSetVatNumberConfigData.value}}" stepKey="setStoreInformationVatNumber"/>
+
+            <!--Set Shipping settings origin data-->
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginCountryConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.country_id}}" stepKey="setOriginCountry"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginCityConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.city}}" stepKey="setOriginCity"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginZipCodeConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.postcode}}" stepKey="setOriginZipCode"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddressConfigData.path}} '{{DE_Address_Berlin_Not_Default_Address.street[0]}}'" stepKey="setOriginStreetAddress"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddress2ConfigData.path}} '{{US_Address_California.street[0]}}'" stepKey="setOriginStreetAddress2"/>
+
+            <!-- Create Simple Product -->
+            <createData entity="defaultSimpleProduct" stepKey="createSimpleProduct">
+                <field key="price">100</field>
+            </createData>
+            <!-- Create Cart Price Rule with 10% discount -->
+            <createData entity="ApiSalesRule" stepKey="createCartPriceRule"/>
+            <!-- Create Coupon code for the Cart Price Rule -->
+            <createData entity="ApiSalesRuleCoupon" stepKey="createCartPriceRuleCoupon">
+                <requiredEntity createDataKey="createCartPriceRule"/>
+            </createData>
+            <!-- Create Customer with filled Shipping & Billing Address -->
+            <createData entity="CustomerEntityOne" stepKey="createCustomer"/>
+
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+
+        <after>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutFromStorefront"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCartPriceRule" stepKey="deleteCartPriceRule"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <magentoCLI command="config:set {{AdminFreeshippingMinimumOrderAmountConfigData.path}} {{AdminFreeshippingMinimumOrderAmountConfigData.default}}" stepKey="setFreeShippingMethodMinimumOrderAmountAsDefault" />
+            <magentoCLI command="config:set {{AdminFreeshippingActiveConfigData.path}} {{AdminFreeshippingActiveConfigData.disabled}}" stepKey="disableFreeShippingMethod" />
+            <!--Reset configs-->
+            <magentoCLI command="config:set {{AdminFedexDisableForCheckoutConfigData.path}} {{AdminFedexDisableForCheckoutConfigData.value}}" stepKey="disableCheckout"/>
+            <magentoCLI command="config:set {{AdminFedexDisableSandboxModeConfigData.path}} {{AdminFedexDisableSandboxModeConfigData.value}}" stepKey="disableSandbox"/>
+            <magentoCLI command="config:set {{AdminFedexDisableDebugConfigData.path}} {{AdminFedexDisableDebugConfigData.value}}" stepKey="disableDebug"/>
+            <magentoCLI command="config:set {{AdminFedexDisableShowMethodConfigData.path}} {{AdminFedexDisableShowMethodConfigData.value}}" stepKey="disableShowMethod"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStoreNameConfigData.path}} ''" stepKey="setStoreInformationName"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStorePhoneConfigData.path}} ''" stepKey="setStoreInformationPhone"/>
+            <magentoCLI command="config:set {{AdminGeneralSetCityConfigData.path}} ''" stepKey="setStoreInformationCity"/>
+            <magentoCLI command="config:set {{AdminGeneralSetPostcodeConfigData.path}} ''" stepKey="setStoreInformationPostcode"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStreetAddressConfigData.path}} ''" stepKey="setStoreInformationStreetAddress"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStreetAddress2ConfigData.path}} ''" stepKey="setStoreInformationStreetAddress2"/>
+            <magentoCLI command="config:set {{AdminGeneralSetVatNumberConfigData.path}} ''" stepKey="setStoreInformationVatNumber"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginCityConfigData.path}} ''" stepKey="setOriginCity"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginZipCodeConfigData.path}} ''" stepKey="setOriginZipCode"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddressConfigData.path}} ''" stepKey="setOriginStreetAddress"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddress2ConfigData.path}} ''" stepKey="setOriginStreetAddress2"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </after>
+
+        <!-- Guest Customer Test Scenario -->
+        <!-- Add Simple Product to Cart -->
+        <actionGroup ref="StorefrontAddSimpleProductToShoppingCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+
+        <!-- Go to Checkout -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckout"/>
+
+        <!-- Fill all required fields -->
+        <actionGroup ref="GuestCheckoutFillNewShippingAddressActionGroup" stepKey="fillNewShippingAddress">
+            <argument name="customer" value="Simple_Customer_Without_Address" />
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+
+        <!-- Select Free Shipping -->
+        <actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="setShippingMethodFreeShipping">
+            <argument name="shippingMethodName" value="Free Shipping"/>
+        </actionGroup>
+
+        <!-- Go to Order review -->
+        <actionGroup ref="StorefrontCheckoutForwardFromShippingStep" stepKey="goToCheckoutReview"/>
+
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+        <!-- Select payment solution -->
+        <checkOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="selectPaymentSolution" />
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+
+        <!-- Apply Discount Coupon to the Order -->
+        <actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyDiscountCoupon">
+            <argument name="discountCode" value="$createCartPriceRuleCoupon.code$"/>
+        </actionGroup>
+
+        <!-- Assert Shipping total is not yet calculated -->
+        <actionGroup ref="AssertStorefrontNotCalculatedValueInShippingTotalInOrderSummaryActionGroup" stepKey="assertNotYetCalculated"/>
+
+        <!--  Assert order cannot be placed and error message will shown. -->
+        <actionGroup ref="AssertStorefrontOrderCannotBePlacedActionGroup" stepKey="assertOrderCannotBePlaced">
+            <argument name="error" value="The shipping method is missing. Select the shipping method and try again."/>
+        </actionGroup>
+
+        <!-- Go to checkout page -->
+        <actionGroup ref="OpenStoreFrontCheckoutShippingPageActionGroup" stepKey="openCheckoutShippingPage"/>
+
+        <!-- Chose flat rate -->
+        <actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="setShippingMethodFlatRate">
+            <argument name="shippingMethodName" value="Flat Rate"/>
+        </actionGroup>
+
+        <!-- Go to Order review -->
+        <actionGroup ref="StorefrontCheckoutForwardFromShippingStep" stepKey="goToCheckoutReview2"/>
+
+        <!-- Place order assert succeed -->
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="checkoutPlaceOrder"/>
+
+        <!-- Loged in Customer Test Scenario -->
+        <!-- Login with created Customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!-- Add Simple Product to Cart -->
+        <actionGroup ref="StorefrontAddSimpleProductToShoppingCartActionGroup" stepKey="addProductToCart2">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+
+        <!-- Go to Checkout -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckout2"/>
+
+        <!-- Select Free Shipping -->
+        <actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="setShippingMethodFreeShipping2">
+            <argument name="shippingMethodName" value="Free Shipping"/>
+        </actionGroup>
+
+        <!-- Go to Order review -->
+        <actionGroup ref="StorefrontCheckoutForwardFromShippingStep" stepKey="goToCheckoutReview3"/>
+
+        <!-- Checkout select Check/Money Order payment -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
+
+        <!-- Select payment solution -->
+        <checkOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="selectPaymentSolution2" />
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton2"/>
+
+        <!-- Apply Discount Coupon to the Order -->
+        <actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyDiscountCoupon2">
+            <argument name="discountCode" value="$createCartPriceRuleCoupon.code$"/>
+        </actionGroup>
+
+        <!-- Assert Shipping total is not yet calculated -->
+        <actionGroup ref="AssertStorefrontNotCalculatedValueInShippingTotalInOrderSummaryActionGroup" stepKey="assertNotYetCalculated2"/>
+
+        <!--  Assert order cannot be placed and error message will shown. -->
+        <actionGroup ref="AssertStorefrontOrderCannotBePlacedActionGroup" stepKey="assertOrderCannotBePlaced2">
+            <argument name="error" value="The shipping method is missing. Select the shipping method and try again."/>
+        </actionGroup>
+
+        <!-- Go to checkout page -->
+        <actionGroup ref="OpenStoreFrontCheckoutShippingPageActionGroup" stepKey="openCheckoutShippingPage2"/>
+
+        <!-- Chose flat rate -->
+        <actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="setShippingMethodFlatRate2">
+            <argument name="shippingMethodName" value="Flat Rate"/>
+        </actionGroup>
+
+        <!-- Go to Order review -->
+        <actionGroup ref="StorefrontCheckoutForwardFromShippingStep" stepKey="goToCheckoutReview4"/>
+
+        <!-- Place order assert succeed -->
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="checkoutPlaceOrder2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutJsValidationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutJsValidationTest.xml
index 63751ad697ede..8ed8e590eb229 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutJsValidationTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutJsValidationTest.xml
@@ -11,6 +11,7 @@
     <test name="StorefrontOnePageCheckoutJsValidationTest">
         <annotations>
             <features value="Checkout"/>
+            <stories value="Checkout"/>
             <title value="Js validation error messages must be absent for required fields after checkout start."/>
             <description value="Js validation error messages must be absent for required fields after checkout start."/>
             <severity value="MAJOR" />
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartPagerForOneItemPerPageAnd2ProductsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartPagerForOneItemPerPageAnd2ProductsTest.xml
new file mode 100644
index 0000000000000..744401cf24d13
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartPagerForOneItemPerPageAnd2ProductsTest.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="StorefrontShoppingCartPagerForOneItemPerPageAnd2ProductsTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Check if the cart pager is visible with 2 cart items and one item per page"/>
+            <title value="Test if the cart pager is visible with 2 cart items and one item per page."/>
+            <description value="Test if the cart pager is visible with 2 cart items and one item per page."/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14701"/>
+            <group value="shoppingCart"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Changing the number of items to display in cart-->
+            <magentoCLI stepKey="allowSpecificValue" command="config:set checkout/cart/number_items_to_display_pager 1" />
+            <createData entity="SimpleTwo" stepKey="createSimpleProduct1"/>
+            <createData entity="SimpleTwo" stepKey="createSimpleProduct2"/>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="addToCartFromStorefrontProductPage1">
+                <argument name="product" value="$$createSimpleProduct1$$"/>
+            </actionGroup>
+            <actionGroup ref="AddSimpleProductToCart" stepKey="addToCartFromStorefrontProductPage2">
+                <argument name="product" value="$$createSimpleProduct2$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!--Set back the default number of items on cart which is 20-->
+            <magentoCLI stepKey="allowSpecificValue" command="config:set checkout/cart/number_items_to_display_pager 20" />
+            <deleteData createDataKey="createSimpleProduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="createSimpleProduct2" stepKey="deleteProduct2"/>
+        </after>
+        <actionGroup ref="StorefrontOpenCartPageActionGroup" stepKey="goToCartPage" />
+        <actionGroup ref="AssertToolbarTextIsVisibleInCartActionGroup" stepKey="VerifyPagerTextWithChangedConfiguration">
+            <argument name="text" value="Items 1 to 1 of 2 total"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml
index ebf24e710fe39..482e2fb6233a6 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml
@@ -18,7 +18,7 @@
         </annotations>
 
         <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <magentoCLI command="downloadable:domains:add" arguments="example.com static.magento.com" stepKey="addDownloadableDomain"/>
             <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct">
                 <field key="price">20.00</field>
             </createData>
@@ -38,10 +38,12 @@
             </createData>
         </before>
         <after>
+            <magentoCLI command="downloadable:domains:remove" arguments="example.com static.magento.com" stepKey="removeDownloadableDomain"/>
             <deleteData createDataKey="createDownloadableProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="virtualProduct" stepKey="deleteVirtualProduct"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="createSalesRule" stepKey="deleteSalesRule"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
@@ -106,6 +108,9 @@
         <seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}"  stepKey="assertEmptyCart" />
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
 
+        <!-- Login to Admin Page -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+
         <!-- Open Order Index Page -->
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
         <waitForPageLoad stepKey="waitForPageLoad5"/>
@@ -127,4 +132,4 @@
         <see selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$15.00" stepKey="seeGrandTotal"/>
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderStatus"/>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Unit/CustomerData/DirectoryDataTest.php b/app/code/Magento/Checkout/Test/Unit/CustomerData/DirectoryDataTest.php
new file mode 100644
index 0000000000000..3c0bae31c9c0d
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Unit/CustomerData/DirectoryDataTest.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Checkout\Test\Unit\CustomerData;
+
+use Magento\Checkout\CustomerData\DirectoryData;
+use Magento\Directory\Helper\Data as HelperData;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Directory\Model\Country;
+use PHPUnit\Framework\TestCase;
+
+class DirectoryDataTest extends TestCase
+{
+    /**
+     * @var DirectoryData
+     */
+    private $model;
+
+    /**
+     * @var HelperData|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $directoryHelperMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManager;
+
+    /**
+     * Setup environment for testing
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManagerHelper($this);
+        $this->directoryHelperMock = $this->createMock(HelperData::class);
+
+        $this->model = $this->objectManager->getObject(
+            DirectoryData::class,
+            [
+                'directoryHelper' => $this->directoryHelperMock
+            ]
+        );
+    }
+
+    /**
+     * Test getSectionData() function
+     */
+    public function testGetSectionData()
+    {
+        $regions = [
+            'US' => [
+                'TX' => [
+                    'code' => 'TX',
+                    'name' => 'Texas'
+                ]
+            ]
+        ];
+
+        $testCountryInfo = $this->objectManager->getObject(Country::class);
+        $testCountryInfo->setData('country_id', 'US');
+        $testCountryInfo->setData('iso2_code', 'US');
+        $testCountryInfo->setData('iso3_code', 'USA');
+        $testCountryInfo->setData('name_default', 'United States of America');
+        $testCountryInfo->setData('name_en_US', 'United States of America');
+        $countries = ['US' => $testCountryInfo];
+
+        $this->directoryHelperMock->expects($this->any())
+            ->method('getRegionData')
+            ->willReturn($regions);
+
+        $this->directoryHelperMock->expects($this->any())
+            ->method('getCountryCollection')
+            ->willReturn($countries);
+
+        /* Assert result */
+        $this->assertEquals(
+            [
+                'US' => [
+                    'name' => 'United States of America',
+                    'regions' => [
+                        'TX' => [
+                            'code' => 'TX',
+                            'name' => 'Texas'
+                        ]
+                    ]
+                ]
+            ],
+            $this->model->getSectionData()
+        );
+    }
+}
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php
index daabb080b1c9a..82384fa83ab94 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php
@@ -48,6 +48,9 @@ public function testProcess($cartData, $expected)
         $this->assertEquals($this->requestProcessor->process($cartData), $expected);
     }
 
+    /**
+     * @return array
+     */
     public function cartDataProvider()
     {
         return [
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php
index 3cc80e14fd026..350f9954208fa 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php
@@ -43,7 +43,7 @@ protected function setUp()
         );
         $this->checkoutSessionMock = $this->createPartialMock(\Magento\Checkout\Model\Session::class, ['clearStorage']);
         $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
-        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\ModuleManagerInterface::class);
+        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\Manager::class);
         $this->cacheConfigMock = $this->createMock(\Magento\PageCache\Model\Config::class);
         $this->depersonalizeCheckerMock = $this->createMock(\Magento\PageCache\Model\DepersonalizeChecker::class);
 
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php b/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php
index 26234992e6136..969631901adff 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php
@@ -9,7 +9,8 @@
  */
 namespace Magento\Checkout\Test\Unit\Model;
 
-use \Magento\Checkout\Model\Session;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -374,6 +375,68 @@ public function testGetStepData()
         $this->assertEquals($stepData['complex']['key'], $session->getStepData('complex', 'key'));
     }
 
+    /**
+     * Ensure that if quote not exist for customer quote will be null
+     *
+     * @return void
+     */
+    public function testGetQuote(): void
+    {
+        $storeManager = $this->getMockForAbstractClass(\Magento\Store\Model\StoreManagerInterface::class);
+        $customerSession = $this->createMock(\Magento\Customer\Model\Session::class);
+        $quoteRepository = $this->createMock(\Magento\Quote\Api\CartRepositoryInterface::class);
+        $quoteFactory = $this->createMock(\Magento\Quote\Model\QuoteFactory::class);
+        $quote = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $loggerMethods = get_class_methods(\Psr\Log\LoggerInterface::class);
+
+        $quoteFactory->expects($this->once())
+             ->method('create')
+             ->willReturn($quote);
+        $customerSession->expects($this->exactly(3))
+             ->method('isLoggedIn')
+             ->willReturn(true);
+        $store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+             ->disableOriginalConstructor()
+             ->setMethods(['getWebsiteId', '__wakeup'])
+             ->getMock();
+        $storeManager->expects($this->any())
+             ->method('getStore')
+             ->will($this->returnValue($store));
+        $storage = $this->getMockBuilder(\Magento\Framework\Session\Storage::class)
+             ->disableOriginalConstructor()
+             ->setMethods(['setData', 'getData'])
+             ->getMock();
+        $storage->expects($this->at(0))
+             ->method('getData')
+             ->willReturn(1);
+        $quoteRepository->expects($this->once())
+             ->method('getActiveForCustomer')
+         ->willThrowException(new NoSuchEntityException());
+
+        foreach ($loggerMethods as $method) {
+            $logger->expects($this->never())->method($method);
+        }
+
+        $quote->expects($this->once())
+             ->method('setCustomer')
+             ->with(null);
+
+        $constructArguments = $this->_helper->getConstructArguments(
+            \Magento\Checkout\Model\Session::class,
+            [
+                'storeManager' => $storeManager,
+                'quoteRepository' => $quoteRepository,
+                'customerSession' => $customerSession,
+                'storage' => $storage,
+                'quoteFactory' => $quoteFactory,
+                'logger' => $logger
+            ]
+        );
+        $this->_session = $this->_helper->getObject(\Magento\Checkout\Model\Session::class, $constructArguments);
+        $this->_session->getQuote();
+    }
+
     public function testSetStepData()
     {
         $stepData = [
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 03ad7d9e8d848..6d2b27fd0e293 100644
--- a/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
+++ b/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
@@ -6,13 +6,13 @@
 -->
 <!--@subject {{trans "Payment Transaction Failed Reminder"}} @-->
 <!--@vars {
-"var billingAddress.format('html')|raw":"Billing Address",
+"var billingAddressHtml|raw":"Billing Address",
 "var checkoutType":"Checkout Type",
 "var customerEmail":"Customer Email",
 "var customer":"Customer Name",
 "var dateAndTime":"Date and Time of Transaction",
 "var paymentMethod":"Payment Method",
-"var shippingAddress.format('html')|raw":"Shipping Address",
+"var shippingAddressHtml|raw":"Shipping Address",
 "var shippingMethod":"Shipping Method",
 "var items|raw":"Shopping Cart Items",
 "var total":"Total",
@@ -44,11 +44,11 @@ <h1>{{trans "Payment Transaction Failed"}}</h1>
     </li>
     <li>
         <strong>{{trans "Billing Address:"}}</strong><br />
-        {{var billingAddress.format('html')|raw}}
+        {{var billingAddressHtml|raw}}
     </li>
     <li>
         <strong>{{trans "Shipping Address:"}}</strong><br />
-        {{var shippingAddress.format('html')|raw}}
+        {{var shippingAddressHtml|raw}}
     </li>
     <li>
         <strong>{{trans "Shipping Method:"}}</strong><br />
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 a305413bcf1f3..fed0c951eff9f 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
@@ -118,7 +118,7 @@
                                                         </item>
                                                         <item name="component" xsi:type="string">Magento_Checkout/js/view/shipping</item>
                                                         <item name="provider" xsi:type="string">checkoutProvider</item>
-                                                        <item name="sortOrder" xsi:type="string">1</item>
+                                                        <item name="sortOrder" xsi:type="string">10</item>
                                                         <item name="children" xsi:type="array">
                                                             <item name="customer-email" xsi:type="array">
                                                                 <item name="component" xsi:type="string">Magento_Checkout/js/view/form/element/email</item>
@@ -246,6 +246,7 @@
                                                         <item name="component" xsi:type="string">Magento_Checkout/js/view/payment</item>
                                                         <item name="config" xsi:type="array">
                                                             <item name="title" xsi:type="string" translate="true">Payment</item>
+                                                            <item name="sortOrder" xsi:type="string">20</item>
                                                         </item>
                                                         <item name="children" xsi:type="array">
                                                             <item name="renders" xsi:type="array">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
index 2a7ccc38e9d83..b3b94cfae18dc 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
@@ -28,9 +28,9 @@ $taxDataHelper = $this->helper(Magento\Tax\Helper\Data::class);
                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
                             <dd>
                                 <?php if (isset($_formatedOptionValue['full_view'])) :?>
-                                    <?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
+                                    <?= /* @noEscape */ $_formatedOptionValue['full_view'] ?>
                                 <?php else :?>
-                                    <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
+                                    <?= /* @noEscape */ $_formatedOptionValue['value'] ?>
                                 <?php endif; ?>
                             </dd>
                         <?php endforeach; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/recollect-shipping-rates.js b/app/code/Magento/Checkout/view/frontend/web/js/action/recollect-shipping-rates.js
new file mode 100644
index 0000000000000..7cce025c4eafc
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/recollect-shipping-rates.js
@@ -0,0 +1,26 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @api
+ */
+define([
+    'Magento_Checkout/js/model/quote',
+    'Magento_Checkout/js/action/select-shipping-address',
+    'Magento_Checkout/js/model/shipping-rate-registry'
+], function (quote, selectShippingAddress, rateRegistry) {
+    'use strict';
+
+    return function () {
+        var shippingAddress = null;
+
+        if (!quote.isVirtual()) {
+            shippingAddress = quote.shippingAddress();
+
+            rateRegistry.set(shippingAddress.getCacheKey(), null);
+            selectShippingAddress(shippingAddress);
+        }
+    };
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/select-payment-method.js b/app/code/Magento/Checkout/view/frontend/web/js/action/select-payment-method.js
index 702df47526715..34f1700749794 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/action/select-payment-method.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/select-payment-method.js
@@ -12,6 +12,11 @@ define([
     'use strict';
 
     return function (paymentMethod) {
+        if (paymentMethod) {
+            paymentMethod.__disableTmpl = {
+                title: true
+            };
+        }
         quote.paymentMethod(paymentMethod);
     };
 });
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js
index 4085da82f4151..9de8a93905c99 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js
@@ -13,14 +13,33 @@ define([
     'Magento_Checkout/js/model/error-processor',
     'Magento_Customer/js/model/customer',
     'Magento_Checkout/js/action/get-totals',
-    'Magento_Checkout/js/model/full-screen-loader'
-], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader) {
+    'Magento_Checkout/js/model/full-screen-loader',
+    'underscore'
+], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader, _) {
     'use strict';
 
+    /**
+     * Filter template data.
+     *
+     * @param {Object|Array} data
+     */
+    var filterTemplateData = function (data) {
+        return _.each(data, function (value, key, list) {
+            if (_.isArray(value) || _.isObject(value)) {
+                list[key] = filterTemplateData(value);
+            }
+
+            if (key === '__disableTmpl') {
+                delete list[key];
+            }
+        });
+    };
+
     return function (messageContainer, paymentData, skipBilling) {
         var serviceUrl,
             payload;
 
+        paymentData = filterTemplateData(paymentData);
         skipBilling = skipBilling || false;
         payload = {
             cartId: quote.getQuoteId(),
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 9b20a782c38d9..6e1b031ab48ce 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
@@ -9,8 +9,9 @@ define([
     'jquery',
     'Magento_Checkout/js/model/new-customer-address',
     'Magento_Customer/js/customer-data',
-    'mage/utils/objects'
-], function ($, address, customerData, mageUtils) {
+    'mage/utils/objects',
+    'underscore'
+], function ($, address, customerData, mageUtils, _) {
     'use strict';
 
     var countryData = customerData.get('directory-data');
@@ -18,6 +19,7 @@ define([
     return {
         /**
          * Convert address form data to Address object
+         *
          * @param {Object} formData
          * @returns {Object}
          */
@@ -59,13 +61,15 @@ define([
             delete addressData['region_id'];
 
             if (addressData['custom_attributes']) {
-                addressData['custom_attributes'] = Object.entries(addressData['custom_attributes'])
-                    .map(function (customAttribute) {
+                addressData['custom_attributes'] = _.map(
+                    addressData['custom_attributes'],
+                    function (value, key) {
                         return {
-                            'attribute_code': customAttribute[0],
-                            'value': customAttribute[1]
+                            'attribute_code': key,
+                            'value': value
                         };
-                    });
+                    }
+                );
             }
 
             return address(addressData);
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 bc0ab59b622a2..66539ad211859 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
@@ -148,7 +148,7 @@ define([
             var selectedShippingRate = checkoutData.getSelectedShippingRate(),
                 availableRate = false;
 
-            if (ratesData.length === 1) {
+            if (ratesData.length === 1 && !quote.shippingMethod()) {
                 //set shipping rate if we have only one available shipping rate
                 selectShippingMethodAction(ratesData[0]);
 
@@ -169,10 +169,12 @@ define([
             }
 
             if (!availableRate && window.checkoutConfig.selectedShippingMethod) {
-                availableRate = window.checkoutConfig.selectedShippingMethod;
-                selectShippingMethodAction(window.checkoutConfig.selectedShippingMethod);
+                availableRate = _.find(ratesData, function (rate) {
+                    var selectedShippingMethod = window.checkoutConfig.selectedShippingMethod;
 
-                return;
+                    return rate['carrier_code'] == selectedShippingMethod['carrier_code'] && //eslint-disable-line
+                        rate['method_code'] == selectedShippingMethod['method_code']; //eslint-disable-line eqeqeq
+                });
             }
 
             //Unset selected shipping method if not available
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 f58a560a6b3ca..6fc5ef9d2a574 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -13,7 +13,8 @@ define([
     'jquery-ui-modules/widget',
     'mage/decorate',
     'mage/collapsible',
-    'mage/cookies'
+    'mage/cookies',
+    'jquery-ui-modules/effect-fade'
 ], function ($, authenticationPopup, customerData, alert, confirm, _) {
     'use strict';
 
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 59d1daa757138..e728a5c0fcdd5 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
@@ -159,7 +159,6 @@ function (
                     }
                     addressData['save_in_address_book'] = this.saveInAddressBook() ? 1 : 0;
                     newBillingAddress = createBillingAddress(addressData);
-
                     // New address must be selected as a billing address
                     selectBillingAddress(newBillingAddress);
                     checkoutData.setSelectedBillingAddress(newBillingAddress.getKey());
@@ -237,6 +236,30 @@ function (
          */
         getCode: function (parent) {
             return _.isFunction(parent.getCode) ? parent.getCode() : 'shared';
+        },
+
+        /**
+         * Get customer attribute label
+         *
+         * @param {*} attribute
+         * @returns {*}
+         */
+        getCustomAttributeLabel: function (attribute) {
+            var resultAttribute;
+
+            if (typeof attribute === 'string') {
+                return attribute;
+            }
+
+            if (attribute.label) {
+                return attribute.label;
+            }
+
+            resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
+                value: attribute.value
+            });
+
+            return resultAttribute && resultAttribute.label || attribute.value;
         }
     });
 });
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 c0de643d3a223..c570bda51a80e 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
@@ -145,12 +145,19 @@ define([
             var loginFormSelector = 'form[data-role=email-with-possible-login]',
                 usernameSelector = loginFormSelector + ' input[name=username]',
                 loginForm = $(loginFormSelector),
-                validator;
+                validator,
+                valid;
 
             loginForm.validation();
 
             if (focused === false && !!this.email()) {
-                return !!$(usernameSelector).valid();
+                valid = !!$(usernameSelector).valid();
+
+                if (valid) {
+                    $(usernameSelector).removeAttr('aria-invalid aria-describedby');
+                }
+
+                return valid;
             }
 
             validator = loginForm.validate();
@@ -185,6 +192,10 @@ define([
          * @returns {Boolean} - initial visibility state.
          */
         resolveInitialPasswordVisibility: function () {
+            if (checkoutData.getInputFieldEmailValue() !== '' && checkoutData.getCheckedEmailValue() === '') {
+                return true;
+            }
+
             if (checkoutData.getInputFieldEmailValue() !== '') {
                 return checkoutData.getInputFieldEmailValue() === checkoutData.getCheckedEmailValue();
             }
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/payment.js b/app/code/Magento/Checkout/view/frontend/web/js/view/payment.js
index e8994c61b7221..716fb367b2e1f 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/payment.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/payment.js
@@ -54,7 +54,7 @@ define([
                 $t('Review & Payments'),
                 this.isVisible,
                 _.bind(this.navigate, this),
-                20
+                this.sortOrder
             );
 
             return this;
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js
index 54381ad96b0b9..939a2af1a25aa 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js
@@ -7,12 +7,13 @@ define([
     'jquery',
     'ko',
     'uiComponent',
+    'underscore',
     'Magento_Checkout/js/action/select-shipping-address',
     'Magento_Checkout/js/model/quote',
     'Magento_Checkout/js/model/shipping-address/form-popup-state',
     'Magento_Checkout/js/checkout-data',
     'Magento_Customer/js/customer-data'
-], function ($, ko, Component, selectShippingAddressAction, quote, formPopUpState, checkoutData, customerData) {
+], function ($, ko, Component, _, selectShippingAddressAction, quote, formPopUpState, checkoutData, customerData) {
     'use strict';
 
     var countryData = customerData.get('directory-data');
@@ -47,6 +48,30 @@ define([
             return countryData()[countryId] != undefined ? countryData()[countryId].name : ''; //eslint-disable-line
         },
 
+        /**
+         * Get customer attribute label
+         *
+         * @param {*} attribute
+         * @returns {*}
+         */
+        getCustomAttributeLabel: function (attribute) {
+            var resultAttribute;
+
+            if (typeof attribute === 'string') {
+                return attribute;
+            }
+
+            if (attribute.label) {
+                return attribute.label;
+            }
+
+            resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
+                value: attribute.value
+            });
+
+            return resultAttribute && resultAttribute.label || attribute.value;
+        },
+
         /** Set selected customer shipping address  */
         selectAddress: function () {
             selectShippingAddressAction(this.address());
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/list.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/list.js
index 4f4fc3de3e1a5..2bdfd063cb6fb 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/list.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/list.js
@@ -16,7 +16,8 @@ define([
     var defaultRendererTemplate = {
         parent: '${ $.$data.parentName }',
         name: '${ $.$data.name }',
-        component: 'Magento_Checkout/js/view/shipping-address/address-renderer/default'
+        component: 'Magento_Checkout/js/view/shipping-address/address-renderer/default',
+        provider: 'checkoutProvider'
     };
 
     return Component.extend({
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information.js
index 2158873842687..73c9c53147c70 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information.js
@@ -31,13 +31,17 @@ define([
             var shippingMethod = quote.shippingMethod(),
                 shippingMethodTitle = '';
 
+            if (!shippingMethod) {
+                return '';
+            }
+
+            shippingMethodTitle = shippingMethod['carrier_title'];
+
             if (typeof shippingMethod['method_title'] !== 'undefined') {
-                shippingMethodTitle = ' - ' + shippingMethod['method_title'];
+                shippingMethodTitle += ' - ' + shippingMethod['method_title'];
             }
 
-            return shippingMethod ?
-                shippingMethod['carrier_title'] + shippingMethodTitle :
-                shippingMethod['carrier_title'];
+            return shippingMethodTitle;
         },
 
         /**
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js
index acc9f1c2391d9..009178cbb19b9 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js
@@ -5,8 +5,9 @@
 
 define([
     'uiComponent',
+    'underscore',
     'Magento_Customer/js/customer-data'
-], function (Component, customerData) {
+], function (Component, _, customerData) {
     'use strict';
 
     var countryData = customerData.get('directory-data');
@@ -22,6 +23,30 @@ define([
          */
         getCountryName: function (countryId) {
             return countryData()[countryId] != undefined ? countryData()[countryId].name : ''; //eslint-disable-line
+        },
+
+        /**
+         * Get customer attribute label
+         *
+         * @param {*} attribute
+         * @returns {*}
+         */
+        getCustomAttributeLabel: function (attribute) {
+            var resultAttribute;
+
+            if (typeof attribute === 'string') {
+                return attribute;
+            }
+
+            if (attribute.label) {
+                return attribute.label;
+            }
+
+            resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
+                value: attribute.value
+            });
+
+            return resultAttribute && resultAttribute.label || attribute.value;
         }
     });
 });
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/list.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/list.js
index 28eb83c8be3e3..3bb2715c78a7b 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/list.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/list.js
@@ -16,7 +16,8 @@ define([
     var defaultRendererTemplate = {
         parent: '${ $.$data.parentName }',
         name: '${ $.$data.name }',
-        component: 'Magento_Checkout/js/view/shipping-information/address-renderer/default'
+        component: 'Magento_Checkout/js/view/shipping-information/address-renderer/default',
+        provider: 'checkoutProvider'
     };
 
     return Component.extend({
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 d5098dbc6f734..fe8d7782e5eae 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
@@ -60,7 +60,10 @@ define([
             template: 'Magento_Checkout/shipping',
             shippingFormTemplate: 'Magento_Checkout/shipping-address/form',
             shippingMethodListTemplate: 'Magento_Checkout/shipping-address/shipping-method-list',
-            shippingMethodItemTemplate: 'Magento_Checkout/shipping-address/shipping-method-item'
+            shippingMethodItemTemplate: 'Magento_Checkout/shipping-address/shipping-method-item',
+            imports: {
+                countryOptions: '${ $.parentName }.shippingAddress.shipping-address-fieldset.country_id:indexedOptions'
+            }
         },
         visible: ko.observable(!quote.isVirtual()),
         errorValidationMessage: ko.observable(false),
@@ -87,7 +90,7 @@ define([
                     '',
                     $t('Shipping'),
                     this.visible, _.bind(this.navigate, this),
-                    10
+                    this.sortOrder
                 );
             }
             checkoutDataResolver.resolveShippingAddress();
@@ -276,9 +279,7 @@ define([
                 loginFormSelector = 'form[data-role=email-with-possible-login]',
                 emailValidationResult = customer.isLoggedIn(),
                 field,
-                country = registry.get(this.parentName + '.shippingAddress.shipping-address-fieldset.country_id'),
-                countryIndexedOptions = country.indexedOptions,
-                option = countryIndexedOptions[quote.shippingAddress().countryId],
+                option = _.isObject(this.countryOptions) && this.countryOptions[quote.shippingAddress().countryId],
                 messageContainer = registry.get('checkout.errors').messageContainer;
 
             if (!quote.shippingMethod()) {
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 10d49265e3bb9..a0bbc9dd55bff 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
@@ -5,9 +5,11 @@
 
 define([
     'jquery',
+    'underscore',
     'Magento_Checkout/js/view/summary/abstract-total',
-    'Magento_Checkout/js/model/quote'
-], function ($, Component, quote) {
+    'Magento_Checkout/js/model/quote',
+    'Magento_SalesRule/js/view/summary/discount'
+], function ($, _, Component, quote, discountView) {
     'use strict';
 
     return Component.extend({
@@ -21,7 +23,7 @@ define([
          * @return {*}
          */
         getShippingMethodTitle: function () {
-            var shippingMethod = '',
+            var shippingMethod,
                 shippingMethodTitle = '';
 
             if (!this.isCalculated()) {
@@ -29,11 +31,15 @@ define([
             }
             shippingMethod = quote.shippingMethod();
 
+            if (!_.isArray(shippingMethod) && !_.isObject(shippingMethod)) {
+                return '';
+            }
+
             if (typeof shippingMethod['method_title'] !== 'undefined') {
                 shippingMethodTitle = ' - ' + shippingMethod['method_title'];
             }
 
-            return shippingMethod ?
+            return shippingMethodTitle ?
                 shippingMethod['carrier_title'] + shippingMethodTitle :
                 shippingMethod['carrier_title'];
         },
@@ -57,6 +63,34 @@ define([
             price =  this.totals()['shipping_amount'];
 
             return this.getFormattedPrice(price);
+        },
+
+        /**
+         * If is set coupon code, but there wasn't displayed discount view.
+         *
+         * @return {Boolean}
+         */
+        haveToShowCoupon: function () {
+            var couponCode = this.totals()['coupon_code'];
+
+            if (typeof couponCode === 'undefined') {
+                couponCode = false;
+            }
+
+            return couponCode && !discountView().isDisplayed();
+        },
+
+        /**
+         * Returns coupon code description.
+         *
+         * @return {String}
+         */
+        getCouponDescription: function () {
+            if (!this.haveToShowCoupon()) {
+                return '';
+            }
+
+            return '(' + this.totals()['coupon_code'] + ')';
         }
     });
 });
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 a0827d17d6622..23bbce48fee2c 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
@@ -13,19 +13,8 @@
     <a if="currentBillingAddress().telephone" attr="'href': 'tel:' + currentBillingAddress().telephone" text="currentBillingAddress().telephone"></a><br/>
 
     <each args="data: currentBillingAddress().customAttributes, as: 'element'">
-        <if args="typeof element === 'object'">
-            <if args="element.label">
-                <text args="element.label"/>
-            </if>
-            <ifnot args="element.label">
-                <if args="element.value">
-                    <text args="element.value"/>
-                </if>
-            </ifnot>
-        </if>
-        <if args="typeof element === 'string'">
-            <text args="element"/>
-        </if><br/>
+        <text args="$parent.getCustomAttributeLabel(element)"/>
+        <br/>
     </each>
 
     <button visible="!isAddressSameAsShipping()"
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 cf64c0140b955..b14f4da3f5f7d 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
@@ -13,21 +13,8 @@
     <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>
+        <text args="$parent.getCustomAttributeLabel(element)"/>
+        <br/>
     </each>
 
     <button visible="address().isEditable()" type="button"
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 75e061426d816..26dd7742d1da8 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
@@ -13,18 +13,7 @@
     <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
 
     <each args="data: address().customAttributes, as: 'element'">
-        <if args="typeof element === 'object'">
-            <if args="element.label">
-                <text args="element.label"/>
-            </if>
-            <ifnot args="element.label">
-                <if args="element.value">
-                    <text args="element.value"/>
-                </if>
-            </ifnot>
-        </if>
-        <if args="typeof element === 'string'">
-            <text args="element"/>
-        </if><br/>
+        <text args="$parent.getCustomAttributeLabel(element)"/>
+        <br/>
     </each>
 </if>
diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
index 1217270d780e1..ff77db60a64e6 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php
@@ -102,7 +102,8 @@ protected function getAgreementsConfig()
                     : nl2br($this->escaper->escapeHtml($agreement->getContent())),
                 'checkboxText' => $this->escaper->escapeHtml($agreement->getCheckboxText()),
                 'mode' => $agreement->getMode(),
-                'agreementId' => $agreement->getAgreementId()
+                'agreementId' => $agreement->getAgreementId(),
+                'contentHeight' => $agreement->getContentHeight()
             ];
         }
 
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
index c8309bacb0a86..6b8477e0b4919 100644
--- a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
+++ b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php
@@ -77,6 +77,7 @@ public function testGetConfigIfContentIsHtml()
         $escapedCheckboxText = 'escaped_checkbox_text';
         $mode = \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO;
         $agreementId = 100;
+        $contentHeight = '100px';
         $expectedResult = [
             'checkoutAgreements' => [
                 'isEnabled' => 1,
@@ -86,6 +87,7 @@ public function testGetConfigIfContentIsHtml()
                         'checkboxText' => $escapedCheckboxText,
                         'mode' => $mode,
                         'agreementId' => $agreementId,
+                        'contentHeight' => $contentHeight
                     ],
                 ],
             ],
@@ -116,6 +118,7 @@ public function testGetConfigIfContentIsHtml()
         $agreement->expects($this->once())->method('getCheckboxText')->willReturn($checkboxText);
         $agreement->expects($this->once())->method('getMode')->willReturn($mode);
         $agreement->expects($this->once())->method('getAgreementId')->willReturn($agreementId);
+        $agreement->expects($this->once())->method('getContentHeight')->willReturn($contentHeight);
 
         $this->assertEquals($expectedResult, $this->model->getConfig());
     }
@@ -133,6 +136,7 @@ public function testGetConfigIfContentIsNotHtml()
         $escapedCheckboxText = 'escaped_checkbox_text';
         $mode = \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO;
         $agreementId = 100;
+        $contentHeight = '100px';
         $expectedResult = [
             'checkoutAgreements' => [
                 'isEnabled' => 1,
@@ -142,6 +146,7 @@ public function testGetConfigIfContentIsNotHtml()
                         'checkboxText' => $escapedCheckboxText,
                         'mode' => $mode,
                         'agreementId' => $agreementId,
+                        'contentHeight' => $contentHeight
                     ],
                 ],
             ],
@@ -172,6 +177,7 @@ public function testGetConfigIfContentIsNotHtml()
         $agreement->expects($this->once())->method('getCheckboxText')->willReturn($checkboxText);
         $agreement->expects($this->once())->method('getMode')->willReturn($mode);
         $agreement->expects($this->once())->method('getAgreementId')->willReturn($agreementId);
+        $agreement->expects($this->once())->method('getContentHeight')->willReturn($contentHeight);
 
         $this->assertEquals($expectedResult, $this->model->getConfig());
     }
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/web/js/view/checkout-agreements.js b/app/code/Magento/CheckoutAgreements/view/frontend/web/js/view/checkout-agreements.js
index 434676fc04116..a189c42918099 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/web/js/view/checkout-agreements.js
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/web/js/view/checkout-agreements.js
@@ -23,6 +23,7 @@ define([
         agreements: agreementsConfig.agreements,
         modalTitle: ko.observable(null),
         modalContent: ko.observable(null),
+        contentHeight: ko.observable(null),
         modalWindow: null,
 
         /**
@@ -42,6 +43,7 @@ define([
         showContent: function (element) {
             this.modalTitle(element.checkboxText);
             this.modalContent(element.content);
+            this.contentHeight(element.contentHeight ? element.contentHeight : 'auto');
             agreementsModal.showModal();
         },
 
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
index 4b1a68624e547..f1c807fab3d22 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
@@ -35,7 +35,7 @@
             <!-- /ko -->
         <!-- /ko -->
         <div id="checkout-agreements-modal" data-bind="afterRender: initModal" style="display: none">
-            <div class="checkout-agreements-item-content" data-bind="html: modalContent"></div>
+            <div class="checkout-agreements-item-content" data-bind="html: modalContent, style: {height: contentHeight, overflow:'auto' }"></div>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/Cms/Api/Data/PageInterface.php b/app/code/Magento/Cms/Api/Data/PageInterface.php
index 032f4916a85e4..7a31ab1b9a94f 100644
--- a/app/code/Magento/Cms/Api/Data/PageInterface.php
+++ b/app/code/Magento/Cms/Api/Data/PageInterface.php
@@ -125,6 +125,7 @@ public function getSortOrder();
      * Get layout update xml
      *
      * @return string|null
+     * @deprecated Existing updates are applied, new are not accepted.
      */
     public function getLayoutUpdateXml();
 
@@ -145,6 +146,8 @@ public function getCustomRootTemplate();
     /**
      * Get custom layout update xml
      *
+     * @deprecated Existing updates are applied, new are not accepted.
+     * @see \Magento\Cms\Model\Page\CustomLayout\Data\CustomLayoutSelectedInterface
      * @return string|null
      */
     public function getCustomLayoutUpdateXml();
@@ -272,6 +275,7 @@ public function setSortOrder($sortOrder);
      *
      * @param string $layoutUpdateXml
      * @return \Magento\Cms\Api\Data\PageInterface
+     * @deprecated Existing updates are applied, new are not accepted.
      */
     public function setLayoutUpdateXml($layoutUpdateXml);
 
@@ -296,6 +300,8 @@ public function setCustomRootTemplate($customRootTemplate);
      *
      * @param string $customLayoutUpdateXml
      * @return \Magento\Cms\Api\Data\PageInterface
+     * @deprecated Existing updates are applied, new are not accepted.
+     * @see \Magento\Cms\Model\Page\CustomLayout\Data\CustomLayoutSelectedInterface
      */
     public function setCustomLayoutUpdateXml($customLayoutUpdateXml);
 
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 e94992ae26b60..9efd24e5003ca 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Cms\Block\Adminhtml\Wysiwyg\Images;
 
 /**
@@ -45,8 +47,12 @@ protected function _construct()
         $this->buttonList->remove('edit');
         $this->buttonList->add(
             'cancel',
-            ['class' => 'cancel  action-quaternary', 'label' => __('Cancel'), 'type' => 'button',
-                'onclick' => 'MediabrowserUtility.closeDialog();'],
+            [
+                'class' => 'cancel action-quaternary',
+                'label' => __('Cancel'),
+                'type' => 'button',
+                'onclick' => 'MediabrowserUtility.closeDialog();'
+            ],
             0,
             0,
             'header'
@@ -54,7 +60,11 @@ protected function _construct()
 
         $this->buttonList->add(
             'delete_folder',
-            ['class' => 'delete no-display action-quaternary', 'label' => __('Delete Folder'), 'type' => 'button'],
+            [
+                'class' => 'delete no-display action-quaternary',
+                'label' => __('Delete Folder'),
+                'type' => 'button'
+            ],
             0,
             0,
             'header'
@@ -62,7 +72,11 @@ protected function _construct()
 
         $this->buttonList->add(
             'delete_files',
-            ['class' => 'delete no-display action-quaternary', 'label' => __('Delete Selected'), 'type' => 'button'],
+            [
+                'class' => 'delete no-display action-quaternary',
+                'label' => __('Delete Selected'),
+                'type' => 'button'
+            ],
             0,
             0,
             'header'
@@ -70,7 +84,11 @@ protected function _construct()
 
         $this->buttonList->add(
             'new_folder',
-            ['class' => 'save', 'label' => __('Create Folder'), 'type' => 'button'],
+            [
+                'class' => 'save new_folder',
+                'label' => __('Create Folder'),
+                'type' => 'button'
+            ],
             0,
             0,
             'header'
@@ -78,7 +96,11 @@ protected function _construct()
 
         $this->buttonList->add(
             'insert_files',
-            ['class' => 'save no-display action-primary', 'label' => __('Add Selected'), 'type' => 'button'],
+            [
+                'class' => 'save no-display action-primary',
+                'label' => __('Add Selected'),
+                'type' => 'button'
+            ],
             0,
             0,
             'header'
@@ -92,9 +114,7 @@ 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/Block.php b/app/code/Magento/Cms/Block/Block.php
index c611f4b1e9f05..86cf059525e1e 100644
--- a/app/code/Magento/Cms/Block/Block.php
+++ b/app/code/Magento/Cms/Block/Block.php
@@ -13,6 +13,11 @@
  */
 class Block extends AbstractBlock implements \Magento\Framework\DataObject\IdentityInterface
 {
+    /**
+     * Prefix for cache key of CMS block
+     */
+    const CACHE_KEY_PREFIX = 'CMS_BLOCK_';
+
     /**
      * @var \Magento\Cms\Model\Template\FilterProvider
      */
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
index 8774d7e69adfe..2237f35ed0b84 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
@@ -7,6 +7,7 @@
 
 use Magento\Backend\App\Action\Context;
 use Magento\Cms\Api\PageRepositoryInterface as PageRepository;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Cms\Api\Data\PageInterface;
 
@@ -15,7 +16,7 @@
  *
  * @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
@@ -56,6 +57,8 @@ public function __construct(
     }
 
     /**
+     * Process the request
+     *
      * @return \Magento\Framework\Controller\ResultInterface
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -68,10 +71,12 @@ public function execute()
 
         $postItems = $this->getRequest()->getParam('items', []);
         if (!($this->getRequest()->getParam('isAjax') && count($postItems))) {
-            return $resultJson->setData([
-                'messages' => [__('Please correct the data sent.')],
-                'error' => true,
-            ]);
+            return $resultJson->setData(
+                [
+                    'messages' => [__('Please correct the data sent.')],
+                    'error' => true,
+                ]
+            );
         }
 
         foreach (array_keys($postItems) as $pageId) {
@@ -98,10 +103,12 @@ public function execute()
             }
         }
 
-        return $resultJson->setData([
-            'messages' => $messages,
-            'error' => $error
-        ]);
+        return $resultJson->setData(
+            [
+                'messages' => $messages,
+                'error' => $error
+            ]
+        );
     }
 
     /**
@@ -131,7 +138,7 @@ protected function filterPost($postData = [])
      */
     protected function validatePost(array $pageData, \Magento\Cms\Model\Page $page, &$error, array &$messages)
     {
-        if (!($this->dataProcessor->validate($pageData) && $this->dataProcessor->validateRequireEntry($pageData))) {
+        if (!$this->dataProcessor->validateRequireEntry($pageData)) {
             $error = true;
             foreach ($this->messageManager->getMessages(true)->getItems() as $error) {
                 $messages[] = $this->getErrorWithPageId($page, $error->getText());
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
index 9b8933c8dba2e..f1862026f0e35 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
@@ -12,8 +12,7 @@
 use Magento\Framework\Config\Dom\ValidationSchemaException;
 
 /**
- * Class PostDataProcessor
- * @package Magento\Cms\Controller\Adminhtml\Page
+ * Controller helper for user input.
  */
 class PostDataProcessor
 {
@@ -80,6 +79,7 @@ public function filter($data)
      *
      * @param array $data
      * @return bool     Return FALSE if some item is invalid
+     * @deprecated
      */
     public function validate($data)
     {
@@ -140,7 +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 37cb45753174f..449fdb4224a57 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
@@ -8,11 +8,14 @@
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Cms\Model\Page;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Save CMS page action.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
@@ -59,11 +62,9 @@ public function __construct(
     ) {
         $this->dataProcessor = $dataProcessor;
         $this->dataPersistor = $dataPersistor;
-        $this->pageFactory = $pageFactory
-            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Cms\Model\PageFactory::class);
+        $this->pageFactory = $pageFactory ?: ObjectManager::getInstance()->get(\Magento\Cms\Model\PageFactory::class);
         $this->pageRepository = $pageRepository
-            ?: \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Cms\Api\PageRepositoryInterface::class);
+            ?: ObjectManager::getInstance()->get(\Magento\Cms\Api\PageRepositoryInterface::class);
         parent::__construct($context);
     }
 
@@ -100,24 +101,22 @@ public function execute()
                 }
             }
 
+            $data['layout_update_xml'] = $model->getLayoutUpdateXml();
+            $data['custom_layout_update_xml'] = $model->getCustomLayoutUpdateXml();
             $model->setData($data);
 
-            $this->_eventManager->dispatch(
-                'cms_page_prepare_save',
-                ['page' => $model, 'request' => $this->getRequest()]
-            );
-
-            if (!$this->dataProcessor->validate($data)) {
-                return $resultRedirect->setPath('*/*/edit', ['page_id' => $model->getId(), '_current' => true]);
-            }
-
             try {
+                $this->_eventManager->dispatch(
+                    'cms_page_prepare_save',
+                    ['page' => $model, 'request' => $this->getRequest()]
+                );
+
                 $this->pageRepository->save($model);
                 $this->messageManager->addSuccessMessage(__('You saved the page.'));
                 return $this->processResultRedirect($model, $resultRedirect, $data);
             } catch (LocalizedException $e) {
                 $this->messageManager->addExceptionMessage($e->getPrevious() ?: $e);
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving the page.'));
             }
 
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
index b21ea9fd7ef7b..97d0b35a2354f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
@@ -4,15 +4,28 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg;
 
 use Magento\Backend\App\Action;
 use Magento\Cms\Model\Template\Filter;
 use Magento\Cms\Model\Wysiwyg\Config;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Image\Adapter\AdapterInterface;
+use Magento\Framework\Image\AdapterFactory;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Url\DecoderInterface;
+use Magento\Framework\Controller\Result\Raw;
+use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Process template text for wysiwyg editor.
+ *
+ * Class Directive
  */
 class Directive extends Action implements HttpGetActionInterface
 {
@@ -25,34 +38,68 @@ class Directive extends Action implements HttpGetActionInterface
     const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
 
     /**
-     * @var \Magento\Framework\Url\DecoderInterface
+     * @var DecoderInterface
      */
     protected $urlDecoder;
 
     /**
-     * @var \Magento\Framework\Controller\Result\RawFactory
+     * @var RawFactory
      */
     protected $resultRawFactory;
 
     /**
-     * @param Action\Context $context
-     * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
-     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var AdapterFactory
+     */
+    private $adapterFactory;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var Filter
+     */
+    private $filter;
+
+    /**
+     * Constructor
+     *
+     * @param Context $context
+     * @param DecoderInterface $urlDecoder
+     * @param RawFactory $resultRawFactory
+     * @param AdapterFactory|null $adapterFactory
+     * @param LoggerInterface|null $logger
+     * @param Config|null $config
+     * @param Filter|null $filter
      */
     public function __construct(
-        Action\Context $context,
-        \Magento\Framework\Url\DecoderInterface $urlDecoder,
-        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+        Context $context,
+        DecoderInterface $urlDecoder,
+        RawFactory $resultRawFactory,
+        AdapterFactory $adapterFactory = null,
+        LoggerInterface $logger = null,
+        Config $config = null,
+        Filter $filter = null
     ) {
         parent::__construct($context);
         $this->urlDecoder = $urlDecoder;
         $this->resultRawFactory = $resultRawFactory;
+        $this->adapterFactory = $adapterFactory ?: ObjectManager::getInstance()->get(AdapterFactory::class);
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
+        $this->config = $config ?: ObjectManager::getInstance()->get(Config::class);
+        $this->filter = $filter ?: ObjectManager::getInstance()->get(Filter::class);
     }
 
     /**
      * Template directives callback
      *
-     * @return \Magento\Framework\Controller\Result\Raw
+     * @return Raw
      */
     public function execute()
     {
@@ -60,23 +107,25 @@ public function execute()
         $directive = $this->urlDecoder->decode($directive);
         try {
             /** @var Filter $filter */
-            $filter = $this->_objectManager->create(Filter::class);
-            $imagePath = $filter->filter($directive);
-            /** @var \Magento\Framework\Image\Adapter\AdapterInterface $image */
-            $image = $this->_objectManager->get(\Magento\Framework\Image\AdapterFactory::class)->create();
-            /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
+            $imagePath = $this->filter->filter($directive);
+            /** @var AdapterInterface $image */
+            $image = $this->adapterFactory->create();
+            /** @var Raw $resultRaw */
             $resultRaw = $this->resultRawFactory->create();
             $image->open($imagePath);
             $resultRaw->setHeader('Content-Type', $image->getMimeType());
             $resultRaw->setContents($image->getImage());
         } catch (\Exception $e) {
             /** @var Config $config */
-            $config = $this->_objectManager->get(Config::class);
-            $imagePath = $config->getSkinImagePlaceholderPath();
-            $image->open($imagePath);
-            $resultRaw->setHeader('Content-Type', $image->getMimeType());
-            $resultRaw->setContents($image->getImage());
-            $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
+            $imagePath = $this->config->getSkinImagePlaceholderPath();
+            try {
+                $image->open($imagePath);
+                $resultRaw->setHeader('Content-Type', $image->getMimeType());
+                $resultRaw->setContents($image->getImage());
+                $this->logger->warning($e);
+            } catch (\Exception $e) {
+                $this->logger->warning($e);
+            }
         }
         return $resultRaw;
     }
diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index 70e9437235ac3..39b292bf07239 100644
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -5,7 +5,12 @@
  */
 namespace Magento\Cms\Helper;
 
+use Magento\Cms\Model\Page\CustomLayoutManagerInterface;
+use Magento\Cms\Model\Page\CustomLayoutRepositoryInterface;
+use Magento\Cms\Model\Page\IdentityMap;
 use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * CMS Page Helper
@@ -76,6 +81,21 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $resultPageFactory;
 
+    /**
+     * @var CustomLayoutManagerInterface
+     */
+    private $customLayoutManager;
+
+    /**
+     * @var CustomLayoutRepositoryInterface
+     */
+    private $customLayoutRepo;
+
+    /**
+     * @var IdentityMap
+     */
+    private $identityMap;
+
     /**
      * Constructor
      *
@@ -88,6 +108,9 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param CustomLayoutManagerInterface|null $customLayoutManager
+     * @param CustomLayoutRepositoryInterface|null $customLayoutRepo
+     * @param IdentityMap|null $identityMap
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -99,7 +122,10 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Escaper $escaper,
-        \Magento\Framework\View\Result\PageFactory $resultPageFactory
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        ?CustomLayoutManagerInterface $customLayoutManager = null,
+        ?CustomLayoutRepositoryInterface $customLayoutRepo = null,
+        ?IdentityMap $identityMap = null
     ) {
         $this->messageManager = $messageManager;
         $this->_page = $page;
@@ -109,6 +135,11 @@ public function __construct(
         $this->_localeDate = $localeDate;
         $this->_escaper = $escaper;
         $this->resultPageFactory = $resultPageFactory;
+        $this->customLayoutManager = $customLayoutManager
+            ?? ObjectManager::getInstance()->get(CustomLayoutManagerInterface::class);
+        $this->customLayoutRepo = $customLayoutRepo
+            ?? ObjectManager::getInstance()->get(CustomLayoutRepositoryInterface::class);
+        $this->identityMap = $identityMap ?? ObjectManager::getInstance()->get(IdentityMap::class);
         parent::__construct($context);
     }
 
@@ -136,6 +167,7 @@ public function prepareResultPage(Action $action, $pageId = null)
         if (!$this->_page->getId()) {
             return false;
         }
+        $this->identityMap->add($this->_page);
 
         $inRange = $this->_localeDate->isScopeDateInInterval(
             null,
@@ -152,7 +184,19 @@ public function prepareResultPage(Action $action, $pageId = null)
         $resultPage = $this->resultPageFactory->create();
         $this->setLayoutType($inRange, $resultPage);
         $resultPage->addHandle('cms_page_view');
-        $resultPage->addPageLayoutHandles(['id' => str_replace('/', '_', $this->_page->getIdentifier())]);
+        $pageHandles = ['id' => str_replace('/', '_', $this->_page->getIdentifier())];
+        //Selected custom updates.
+        try {
+            $this->customLayoutManager->applyUpdate(
+                $resultPage,
+                $this->customLayoutRepo->getFor($this->_page->getId())
+            );
+            // phpcs:disable Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
+        } catch (NoSuchEntityException $exception) {
+            //No custom layout selected
+        }
+
+        $resultPage->addPageLayoutHandles($pageHandles);
 
         $this->_eventManager->dispatch(
             'cms_page_render',
diff --git a/app/code/Magento/Cms/Model/Page.php b/app/code/Magento/Cms/Model/Page.php
index 8eefe26236ba5..28d013f45f1fa 100644
--- a/app/code/Magento/Cms/Model/Page.php
+++ b/app/code/Magento/Cms/Model/Page.php
@@ -7,7 +7,9 @@
 
 use Magento\Cms\Api\Data\PageInterface;
 use Magento\Cms\Helper\Page as PageHelper;
+use Magento\Cms\Model\Page\CustomLayout\CustomLayoutRepository;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\AbstractModel;
@@ -57,6 +59,32 @@ class Page extends AbstractModel implements PageInterface, IdentityInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var CustomLayoutRepository
+     */
+    private $customLayoutRepository;
+
+    /**
+     * @param \Magento\Framework\Model\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
+     * @param array $data
+     * @param CustomLayoutRepository|null $customLayoutRepository
+     */
+    public function __construct(
+        \Magento\Framework\Model\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
+        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        array $data = [],
+        ?CustomLayoutRepository $customLayoutRepository = null
+    ) {
+        parent::__construct($context, $registry, $resource, $resourceCollection, $data);
+        $this->customLayoutRepository = $customLayoutRepository
+            ?? ObjectManager::getInstance()->get(CustomLayoutRepository::class);
+    }
+
     /**
      * Initialize resource model
      *
@@ -536,34 +564,56 @@ public function setIsActive($isActive)
     }
 
     /**
-     * @inheritdoc
-     * @since 101.0.0
+     * Validate identifier before saving the entity.
+     *
+     * @return void
+     * @throws LocalizedException
      */
-    public function beforeSave()
+    private function validateNewIdentifier(): void
     {
         $originalIdentifier = $this->getOrigData('identifier');
         $currentIdentifier = $this->getIdentifier();
+        if ($this->getId() && $originalIdentifier !== $currentIdentifier) {
+            switch ($originalIdentifier) {
+                case $this->getScopeConfig()->getValue(PageHelper::XML_PATH_NO_ROUTE_PAGE):
+                    throw new LocalizedException(
+                        __('This identifier is reserved for "CMS No Route Page" in configuration.')
+                    );
+                case $this->getScopeConfig()->getValue(PageHelper::XML_PATH_HOME_PAGE):
+                    throw new LocalizedException(
+                        __('This identifier is reserved for "CMS Home Page" in configuration.')
+                    );
+                case $this->getScopeConfig()->getValue(PageHelper::XML_PATH_NO_COOKIES_PAGE):
+                    throw new LocalizedException(
+                        __('This identifier is reserved for "CMS No Cookies Page" in configuration.')
+                    );
+            }
+        }
+    }
 
+    /**
+     * @inheritdoc
+     * @since 101.0.0
+     */
+    public function beforeSave()
+    {
         if ($this->hasDataChanges()) {
             $this->setUpdateTime(null);
         }
 
-        if (!$this->getId() || $originalIdentifier === $currentIdentifier) {
-            return parent::beforeSave();
-        }
+        $this->validateNewIdentifier();
 
-        switch ($originalIdentifier) {
-            case $this->getScopeConfig()->getValue(PageHelper::XML_PATH_NO_ROUTE_PAGE):
-                throw new LocalizedException(
-                    __('This identifier is reserved for "CMS No Route Page" in configuration.')
-                );
-            case $this->getScopeConfig()->getValue(PageHelper::XML_PATH_HOME_PAGE):
-                throw new LocalizedException(__('This identifier is reserved for "CMS Home Page" in configuration.'));
-            case $this->getScopeConfig()->getValue(PageHelper::XML_PATH_NO_COOKIES_PAGE):
-                throw new LocalizedException(
-                    __('This identifier is reserved for "CMS No Cookies Page" in configuration.')
-                );
+        //Removing deprecated custom layout update if a new value is provided
+        $layoutUpdate = $this->getData('layout_update_selected');
+        if ($layoutUpdate === '_no_update_' || ($layoutUpdate && $layoutUpdate !== '_existing_')) {
+            $this->setCustomLayoutUpdateXml(null);
+            $this->setLayoutUpdateXml(null);
+        }
+        if ($layoutUpdate === '_no_update_' || $layoutUpdate === '_existing_') {
+            $layoutUpdate = null;
         }
+        $this->setData('layout_update_selected', $layoutUpdate);
+        $this->customLayoutRepository->validateLayoutSelectedFor($this);
 
         return parent::beforeSave();
     }
diff --git a/app/code/Magento/Cms/Model/Page/Authorization.php b/app/code/Magento/Cms/Model/Page/Authorization.php
new file mode 100644
index 0000000000000..9075141ce15b5
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Page/Authorization.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Page;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\Exception\AuthorizationException;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use \Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Authorization for saving a page.
+ */
+class Authorization
+{
+    /**
+     * @var PageRepositoryInterface
+     */
+    private $pageRepository;
+
+    /**
+     * @var AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param PageRepositoryInterface $pageRepository
+     * @param AuthorizationInterface $authorization
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        PageRepositoryInterface $pageRepository,
+        AuthorizationInterface $authorization,
+        ScopeConfigInterface $scopeConfig,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->pageRepository = $pageRepository;
+        $this->authorization = $authorization;
+        $this->scopeConfig = $scopeConfig;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Check whether the design fields have been changed.
+     *
+     * @param PageInterface $page
+     * @param PageInterface|null $oldPage
+     * @return bool
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    private function hasPageChanged(PageInterface $page, ?PageInterface $oldPage): bool
+    {
+        if (!$oldPage) {
+            $oldPageLayout = $this->scopeConfig->getValue(
+                'web/default_layouts/default_cms_layout',
+                ScopeInterface::SCOPE_STORE,
+                $this->storeManager->getStore()
+            );
+            if ($page->getPageLayout() && $page->getPageLayout() !== $oldPageLayout) {
+                //If page layout is set and it's not a default value - design attributes are changed.
+                return true;
+            }
+            //Otherwise page layout is empty and is OK to save.
+            $oldPageLayout = $page->getPageLayout();
+        } else {
+            //Compare page layout to saved value.
+            $oldPageLayout = $oldPage->getPageLayout();
+        }
+        //Compare new values to saved values or require them to be empty
+        $oldUpdateXml = $oldPage ? $oldPage->getLayoutUpdateXml() : null;
+        $oldCustomTheme = $oldPage ? $oldPage->getCustomTheme() : null;
+        $oldLayoutUpdate = $oldPage ? $oldPage->getCustomLayoutUpdateXml() : null;
+        $oldThemeFrom = $oldPage ? $oldPage->getCustomThemeFrom() : null;
+        $oldThemeTo = $oldPage ? $oldPage->getCustomThemeTo() : null;
+
+        if ($page->getLayoutUpdateXml() != $oldUpdateXml
+            || $page->getPageLayout() != $oldPageLayout
+            || $page->getCustomTheme() != $oldCustomTheme
+            || $page->getCustomLayoutUpdateXml() != $oldLayoutUpdate
+            || $page->getCustomThemeFrom() != $oldThemeFrom
+            || $page->getCustomThemeTo() != $oldThemeTo
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Authorize user before updating a page.
+     *
+     * @param PageInterface $page
+     * @return void
+     * @throws AuthorizationException
+     * @throws \Magento\Framework\Exception\LocalizedException When it is impossible to perform authorization.
+     */
+    public function authorizeFor(PageInterface $page): void
+    {
+        //Validate design changes.
+        if (!$this->authorization->isAllowed('Magento_Cms::save_design')) {
+            $oldPage = null;
+            if ($page->getId()) {
+                $oldPage = $this->pageRepository->getById($page->getId());
+            }
+            if ($this->hasPageChanged($page, $oldPage)) {
+                throw new AuthorizationException(
+                    __('You are not allowed to change CMS pages design settings')
+                );
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Cms/Model/Page/CustomLayout/CustomLayoutManager.php b/app/code/Magento/Cms/Model/Page/CustomLayout/CustomLayoutManager.php
new file mode 100644
index 0000000000000..988bd5b4ac136
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Page/CustomLayout/CustomLayoutManager.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Page\CustomLayout;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Cms\Model\Page\CustomLayout\Data\CustomLayoutSelectedInterface;
+use Magento\Cms\Model\Page\CustomLayoutManagerInterface;
+use Magento\Cms\Model\Page\IdentityMap;
+use Magento\Framework\App\Area;
+use Magento\Framework\View\Design\Theme\FlyweightFactory;
+use Magento\Framework\View\DesignInterface;
+use Magento\Framework\View\Result\Page as PageLayout;
+use Magento\Framework\View\Model\Layout\Merge as LayoutProcessor;
+use Magento\Framework\View\Model\Layout\MergeFactory as LayoutProcessorFactory;
+
+/**
+ * @inheritDoc
+ */
+class CustomLayoutManager implements CustomLayoutManagerInterface
+{
+    /**
+     * @var FlyweightFactory
+     */
+    private $themeFactory;
+
+    /**
+     * @var DesignInterface
+     */
+    private $design;
+
+    /**
+     * @var PageRepositoryInterface
+     */
+    private $pageRepository;
+
+    /**
+     * @var LayoutProcessorFactory
+     */
+    private $layoutProcessorFactory;
+
+    /**
+     * @var LayoutProcessor|null
+     */
+    private $layoutProcessor;
+
+    /**
+     * @var IdentityMap
+     */
+    private $identityMap;
+
+    /**
+     * @param FlyweightFactory $themeFactory
+     * @param DesignInterface $design
+     * @param PageRepositoryInterface $pageRepository
+     * @param LayoutProcessorFactory $layoutProcessorFactory
+     * @param IdentityMap $identityMap
+     */
+    public function __construct(
+        FlyweightFactory $themeFactory,
+        DesignInterface $design,
+        PageRepositoryInterface $pageRepository,
+        LayoutProcessorFactory $layoutProcessorFactory,
+        IdentityMap $identityMap
+    ) {
+        $this->themeFactory = $themeFactory;
+        $this->design = $design;
+        $this->pageRepository = $pageRepository;
+        $this->layoutProcessorFactory = $layoutProcessorFactory;
+        $this->identityMap = $identityMap;
+    }
+
+    /**
+     * Adopt page's identifier to be used as layout handle.
+     *
+     * @param PageInterface $page
+     * @return string
+     */
+    private function sanitizeIdentifier(PageInterface $page): string
+    {
+        return str_replace('/', '_', $page->getIdentifier());
+    }
+
+    /**
+     * Get the processor instance.
+     *
+     * @return LayoutProcessor
+     */
+    private function getLayoutProcessor(): LayoutProcessor
+    {
+        if (!$this->layoutProcessor) {
+            $this->layoutProcessor = $this->layoutProcessorFactory->create(
+                [
+                    'theme' => $this->themeFactory->create(
+                        $this->design->getConfigurationDesignTheme(Area::AREA_FRONTEND)
+                    )
+                ]
+            );
+            $this->themeFactory = null;
+            $this->design = null;
+        }
+
+        return $this->layoutProcessor;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function fetchAvailableFiles(PageInterface $page): array
+    {
+        $identifier = $this->sanitizeIdentifier($page);
+        $handles = $this->getLayoutProcessor()->getAvailableHandles();
+
+        return array_filter(
+            array_map(
+                function (string $handle) use ($identifier) : ?string {
+                    preg_match(
+                        '/^cms\_page\_view\_selectable\_' .preg_quote($identifier) .'\_([a-z0-9]+)/i',
+                        $handle,
+                        $selectable
+                    );
+                    if (!empty($selectable[1])) {
+                        return $selectable[1];
+                    }
+
+                    return null;
+                },
+                $handles
+            )
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function applyUpdate(PageLayout $layout, CustomLayoutSelectedInterface $layoutSelected): void
+    {
+        $page = $this->identityMap->get($layoutSelected->getPageId());
+        if (!$page) {
+            $page = $this->pageRepository->getById($layoutSelected->getPageId());
+        }
+
+        $layout->addPageLayoutHandles(
+            ['selectable' => $this->sanitizeIdentifier($page) .'_' .$layoutSelected->getLayoutFileId()]
+        );
+    }
+}
diff --git a/app/code/Magento/Cms/Model/Page/CustomLayout/CustomLayoutRepository.php b/app/code/Magento/Cms/Model/Page/CustomLayout/CustomLayoutRepository.php
new file mode 100644
index 0000000000000..cf0db6eb27cb8
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Page/CustomLayout/CustomLayoutRepository.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Page\CustomLayout;
+
+use Magento\Cms\Model\Page as PageModel;
+use Magento\Cms\Model\PageFactory as PageModelFactory;
+use Magento\Cms\Model\Page\CustomLayout\Data\CustomLayoutSelectedInterface;
+use Magento\Cms\Model\Page\CustomLayout\Data\CustomLayoutSelected;
+use Magento\Cms\Model\Page\CustomLayoutRepositoryInterface;
+use Magento\Cms\Model\Page\IdentityMap;
+use Magento\Cms\Model\ResourceModel\Page;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Cms\Model\Page\CustomLayoutManagerInterface;
+
+/**
+ * @inheritDoc
+ */
+class CustomLayoutRepository implements CustomLayoutRepositoryInterface
+{
+    /**
+     * @var Page
+     */
+    private $pageRepository;
+
+    /**
+     * @var PageModelFactory;
+     */
+    private $pageFactory;
+
+    /**
+     * @var IdentityMap
+     */
+    private $identityMap;
+
+    /**
+     * @var CustomLayoutManagerInterface
+     */
+    private $manager;
+
+    /**
+     * @param Page $pageRepository
+     * @param PageModelFactory $factory
+     * @param IdentityMap $identityMap
+     * @param CustomLayoutManagerInterface $manager
+     */
+    public function __construct(
+        Page $pageRepository,
+        PageModelFactory $factory,
+        IdentityMap $identityMap,
+        CustomLayoutManagerInterface $manager
+    ) {
+        $this->pageRepository = $pageRepository;
+        $this->pageFactory = $factory;
+        $this->identityMap = $identityMap;
+        $this->manager = $manager;
+    }
+
+    /**
+     * Find page model by ID.
+     *
+     * @param int $id
+     * @return PageModel
+     * @throws NoSuchEntityException
+     */
+    private function findPage(int $id): PageModel
+    {
+        if (!$page = $this->identityMap->get($id)) {
+            /** @var PageModel $page */
+            $this->pageRepository->load($page = $this->pageFactory->create(), $id);
+            if (!$page->getIdentifier()) {
+                throw NoSuchEntityException::singleField('id', $id);
+            }
+        }
+
+        return $page;
+    }
+
+    /**
+     * Check whether the page can use this layout.
+     *
+     * @param PageModel $page
+     * @param string $layoutFile
+     * @return bool
+     */
+    private function isLayoutValidFor(PageModel $page, string $layoutFile): bool
+    {
+        return in_array($layoutFile, $this->manager->fetchAvailableFiles($page), true);
+    }
+
+    /**
+     * Save new custom layout file value for a page.
+     *
+     * @param int $pageId
+     * @param string|null $layoutFile
+     * @throws LocalizedException
+     * @throws \InvalidArgumentException When invalid file was selected.
+     * @throws NoSuchEntityException
+     */
+    private function saveLayout(int $pageId, ?string $layoutFile): void
+    {
+        $page = $this->findPage($pageId);
+        if ($layoutFile !== null && !$this->isLayoutValidFor($page, $layoutFile)) {
+            throw new \InvalidArgumentException(
+                $layoutFile .' is not available for page #' .$pageId
+            );
+        }
+
+        if ($page->getData('layout_update_selected') != $layoutFile) {
+            $page->setData('layout_update_selected', $layoutFile);
+            $this->pageRepository->save($page);
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save(CustomLayoutSelectedInterface $layout): void
+    {
+        $this->saveLayout($layout->getPageId(), $layout->getLayoutFileId());
+    }
+
+    /**
+     * Validate layout update of given page model.
+     *
+     * @param PageModel $page
+     * @return void
+     * @throws LocalizedException
+     */
+    public function validateLayoutSelectedFor(PageModel $page): void
+    {
+        $layoutFile = $page->getData('layout_update_selected');
+        if ($layoutFile && (!$page->getId() || !$this->isLayoutValidFor($page, $layoutFile))) {
+            throw new LocalizedException(__('Invalid Custom Layout Update selected'));
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function deleteFor(int $pageId): void
+    {
+        $this->saveLayout($pageId, null);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFor(int $pageId): CustomLayoutSelectedInterface
+    {
+        $page = $this->findPage($pageId);
+        if (!$page['layout_update_selected']) {
+            throw new NoSuchEntityException(
+                __('Page "%id" doesn\'t have custom layout assigned', ['id' => $page->getIdentifier()])
+            );
+        }
+
+        return new CustomLayoutSelected($pageId, $page['layout_update_selected']);
+    }
+}
diff --git a/app/code/Magento/Cms/Model/Page/CustomLayout/Data/CustomLayoutSelected.php b/app/code/Magento/Cms/Model/Page/CustomLayout/Data/CustomLayoutSelected.php
new file mode 100644
index 0000000000000..fc29ebd72e802
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Page/CustomLayout/Data/CustomLayoutSelected.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Page\CustomLayout\Data;
+
+/**
+ * @inheritDoc
+ */
+class CustomLayoutSelected implements CustomLayoutSelectedInterface
+{
+    /**
+     * @var int
+     */
+    private $pageId;
+
+    /**
+     * @var string
+     */
+    private $layoutFile;
+
+    /**
+     * @param int $pageId
+     * @param string $layoutFile
+     */
+    public function __construct(int $pageId, string $layoutFile)
+    {
+        $this->pageId = $pageId;
+        $this->layoutFile = $layoutFile;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getPageId(): int
+    {
+        return $this->pageId;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getLayoutFileId(): string
+    {
+        return $this->layoutFile;
+    }
+}
diff --git a/app/code/Magento/Cms/Model/Page/CustomLayout/Data/CustomLayoutSelectedInterface.php b/app/code/Magento/Cms/Model/Page/CustomLayout/Data/CustomLayoutSelectedInterface.php
new file mode 100644
index 0000000000000..68bac57e98d56
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Page/CustomLayout/Data/CustomLayoutSelectedInterface.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Page\CustomLayout\Data;
+
+/**
+ * Custom layout update file to be used for the specific CMS page.
+ */
+interface CustomLayoutSelectedInterface
+{
+    /**
+     * CMS page ID.
+     *
+     * @return int
+     */
+    public function getPageId(): int;
+
+    /**
+     * Custom layout file ID (layout update handle value).
+     *
+     * @return string
+     */
+    public function getLayoutFileId(): string;
+}
diff --git a/app/code/Magento/Cms/Model/Page/CustomLayoutManagerInterface.php b/app/code/Magento/Cms/Model/Page/CustomLayoutManagerInterface.php
new file mode 100644
index 0000000000000..6f15fcef7f8f4
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Page/CustomLayoutManagerInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Page;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Model\Page\CustomLayout\Data\CustomLayoutSelectedInterface;
+use Magento\Framework\View\Result\Page as View;
+
+/**
+ * Manage custom layout files for CMS pages.
+ */
+interface CustomLayoutManagerInterface
+{
+    /**
+     * List of available custom files for the given page.
+     *
+     * @param PageInterface $page
+     * @return string[]
+     */
+    public function fetchAvailableFiles(PageInterface $page): array;
+
+    /**
+     * Apply the page's layout settings.
+     *
+     * @param View $layout
+     * @param CustomLayoutSelectedInterface $layoutSelected
+     * @return void
+     */
+    public function applyUpdate(View $layout, CustomLayoutSelectedInterface $layoutSelected): void;
+}
diff --git a/app/code/Magento/Cms/Model/Page/CustomLayoutRepositoryInterface.php b/app/code/Magento/Cms/Model/Page/CustomLayoutRepositoryInterface.php
new file mode 100644
index 0000000000000..80eb39b7ab20f
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Page/CustomLayoutRepositoryInterface.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\Model\Page;
+
+use Magento\Cms\Model\Page\CustomLayout\Data\CustomLayoutSelectedInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Access to "custom layout" page property.
+ */
+interface CustomLayoutRepositoryInterface
+{
+
+    /**
+     * Save layout file to be used when rendering given page.
+     *
+     * @throws LocalizedException When failed to save new value.
+     * @throws \InvalidArgumentException When invalid file was selected.
+     * @throws NoSuchEntityException When given page is not found.
+     * @param CustomLayoutSelectedInterface $layout
+     * @return void
+     */
+    public function save(CustomLayoutSelectedInterface $layout): void;
+
+    /**
+     * Do not use custom layout update when rendering the page.
+     *
+     * @throws NoSuchEntityException When given page is not found.
+     * @throws LocalizedException When failed to remove existing value.
+     * @param int $pageId
+     * @return void
+     */
+    public function deleteFor(int $pageId): void;
+
+    /**
+     * Find custom layout settings for a page.
+     *
+     * @param int $pageId
+     * @return CustomLayoutSelectedInterface
+     * @throws NoSuchEntityException When either the page or any settings are found.
+     */
+    public function getFor(int $pageId): CustomLayoutSelectedInterface;
+}
diff --git a/app/code/Magento/Cms/Model/Page/DataProvider.php b/app/code/Magento/Cms/Model/Page/DataProvider.php
index 64abaffd04e66..41010575a1f27 100644
--- a/app/code/Magento/Cms/Model/Page/DataProvider.php
+++ b/app/code/Magento/Cms/Model/Page/DataProvider.php
@@ -5,9 +5,11 @@
  */
 namespace Magento\Cms\Model\Page;
 
+use Magento\Cms\Model\Page;
 use Magento\Cms\Model\ResourceModel\Page\CollectionFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Framework\App\RequestInterface;
 use Magento\Ui\DataProvider\Modifier\PoolInterface;
 use Magento\Framework\AuthorizationInterface;
 
@@ -36,6 +38,21 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
      */
     private $auth;
 
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var CustomLayoutManagerInterface
+     */
+    private $customLayoutManager;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
     /**
      * @param string $name
      * @param string $primaryFieldName
@@ -46,6 +63,9 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
      * @param array $data
      * @param PoolInterface|null $pool
      * @param AuthorizationInterface|null $auth
+     * @param RequestInterface|null $request
+     * @param CustomLayoutManagerInterface|null $customLayoutManager
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         $name,
@@ -56,13 +76,35 @@ public function __construct(
         array $meta = [],
         array $data = [],
         PoolInterface $pool = null,
-        ?AuthorizationInterface $auth = null
+        ?AuthorizationInterface $auth = null,
+        ?RequestInterface $request = null,
+        ?CustomLayoutManagerInterface $customLayoutManager = null
     ) {
         $this->collection = $pageCollectionFactory->create();
+        $this->collectionFactory = $pageCollectionFactory;
         $this->dataPersistor = $dataPersistor;
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data, $pool);
         $this->auth = $auth ?? ObjectManager::getInstance()->get(AuthorizationInterface::class);
         $this->meta = $this->prepareMeta($this->meta);
+        $this->request = $request ?? ObjectManager::getInstance()->get(RequestInterface::class);
+        $this->customLayoutManager = $customLayoutManager
+            ?? ObjectManager::getInstance()->get(CustomLayoutManagerInterface::class);
+    }
+
+    /**
+     * Find requested page.
+     *
+     * @return Page|null
+     */
+    private function findCurrentPage(): ?Page
+    {
+        if ($this->getRequestFieldName() && ($pageId = (int)$this->request->getParam($this->getRequestFieldName()))) {
+            //Loading data for the collection.
+            $this->getData();
+            return $this->collection->getItemById($pageId);
+        }
+
+        return null;
     }
 
     /**
@@ -86,10 +128,15 @@ public function getData()
         if (isset($this->loadedData)) {
             return $this->loadedData;
         }
+        $this->collection = $this->collectionFactory->create();
         $items = $this->collection->getItems();
         /** @var $page \Magento\Cms\Model\Page */
         foreach ($items as $page) {
             $this->loadedData[$page->getId()] = $page->getData();
+            if ($page->getCustomLayoutUpdateXml() || $page->getLayoutUpdateXml()) {
+                //Deprecated layout update exists.
+                $this->loadedData[$page->getId()]['layout_update_selected'] = '_existing_';
+            }
         }
 
         $data = $this->dataPersistor->get('cms_page');
@@ -97,6 +144,9 @@ public function getData()
             $page = $this->collection->getNewEmptyItem();
             $page->setData($data);
             $this->loadedData[$page->getId()] = $page->getData();
+            if ($page->getCustomLayoutUpdateXml() || $page->getLayoutUpdateXml()) {
+                $this->loadedData[$page->getId()]['layout_update_selected'] = '_existing_';
+            }
             $this->dataPersistor->clear('cms_page');
         }
 
@@ -134,6 +184,31 @@ public function getMeta()
             $meta = array_merge_recursive($meta, $designMeta);
         }
 
+        //List of custom layout files available for current page.
+        $options = [['label' => 'No update', 'value' => '_no_update_']];
+        if ($page = $this->findCurrentPage()) {
+            //We must have a specific page selected.
+            //If custom layout XML is set then displaying this special option.
+            if ($page->getCustomLayoutUpdateXml() || $page->getLayoutUpdateXml()) {
+                $options[] = ['label' => 'Use existing layout update XML', 'value' => '_existing_'];
+            }
+            foreach ($this->customLayoutManager->fetchAvailableFiles($page) as $layoutFile) {
+                $options[] = ['label' => $layoutFile, 'value' => $layoutFile];
+            }
+        }
+        $customLayoutMeta = [
+            'design' => [
+                'children' => [
+                    'custom_layout_update_select' => [
+                        'arguments' => [
+                            'data' => ['options' => $options]
+                        ]
+                    ]
+                ]
+            ]
+        ];
+        $meta = array_merge_recursive($meta, $customLayoutMeta);
+
         return $meta;
     }
 }
diff --git a/app/code/Magento/Cms/Model/Page/IdentityMap.php b/app/code/Magento/Cms/Model/Page/IdentityMap.php
new file mode 100644
index 0000000000000..249010fbf90ce
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Page/IdentityMap.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Page;
+
+use Magento\Cms\Model\Page;
+
+/**
+ * Identity map of loaded pages.
+ */
+class IdentityMap
+{
+    /**
+     * @var Page[]
+     */
+    private $pages = [];
+
+    /**
+     * Add a page to the list.
+     *
+     * @param Page $page
+     * @throws \InvalidArgumentException When page doesn't have an ID.
+     * @return void
+     */
+    public function add(Page $page): void
+    {
+        if (!$page->getId()) {
+            throw new \InvalidArgumentException('Cannot add non-persisted page to identity map');
+        }
+        $this->pages[$page->getId()] = $page;
+    }
+
+    /**
+     * Find a loaded page by ID.
+     *
+     * @param int $id
+     * @return Page|null
+     */
+    public function get(int $id): ?Page
+    {
+        if (array_key_exists($id, $this->pages)) {
+            return $this->pages[$id];
+        }
+
+        return null;
+    }
+
+    /**
+     * Remove the page from the list.
+     *
+     * @param int $id
+     * @return void
+     */
+    public function remove(int $id): void
+    {
+        unset($this->pages[$id]);
+    }
+
+    /**
+     * Clear the list.
+     *
+     * @return void
+     */
+    public function clear(): void
+    {
+        $this->pages = [];
+    }
+}
diff --git a/app/code/Magento/Cms/Model/PageRepository.php b/app/code/Magento/Cms/Model/PageRepository.php
index e6777659d7d88..72f07771f59d4 100644
--- a/app/code/Magento/Cms/Model/PageRepository.php
+++ b/app/code/Magento/Cms/Model/PageRepository.php
@@ -8,6 +8,7 @@
 
 use Magento\Cms\Api\Data;
 use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Cms\Model\Page\IdentityMap;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\App\ObjectManager;
@@ -18,8 +19,6 @@
 use Magento\Cms\Model\ResourceModel\Page as ResourcePage;
 use Magento\Cms\Model\ResourceModel\Page\CollectionFactory as PageCollectionFactory;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\AuthorizationInterface;
-use Magento\Authorization\Model\UserContextInterface;
 
 /**
  * Class PageRepository
@@ -73,14 +72,9 @@ class PageRepository implements PageRepositoryInterface
     private $collectionProcessor;
 
     /**
-     * @var UserContextInterface
+     * @var IdentityMap
      */
-    private $userContext;
-
-    /**
-     * @var AuthorizationInterface
-     */
-    private $authorization;
+    private $identityMap;
 
     /**
      * @param ResourcePage $resource
@@ -92,6 +86,7 @@ class PageRepository implements PageRepositoryInterface
      * @param DataObjectProcessor $dataObjectProcessor
      * @param StoreManagerInterface $storeManager
      * @param CollectionProcessorInterface $collectionProcessor
+     * @param IdentityMap|null $identityMap
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -103,7 +98,8 @@ public function __construct(
         DataObjectHelper $dataObjectHelper,
         DataObjectProcessor $dataObjectProcessor,
         StoreManagerInterface $storeManager,
-        CollectionProcessorInterface $collectionProcessor = null
+        CollectionProcessorInterface $collectionProcessor = null,
+        ?IdentityMap $identityMap = null
     ) {
         $this->resource = $resource;
         $this->pageFactory = $pageFactory;
@@ -114,34 +110,31 @@ public function __construct(
         $this->dataObjectProcessor = $dataObjectProcessor;
         $this->storeManager = $storeManager;
         $this->collectionProcessor = $collectionProcessor ?: $this->getCollectionProcessor();
+        $this->identityMap = $identityMap ?? ObjectManager::getInstance()->get(IdentityMap::class);
     }
 
     /**
-     * Get user context.
+     * Validate new layout update values.
      *
-     * @return UserContextInterface
+     * @param Data\PageInterface $page
+     * @return void
+     * @throws \InvalidArgumentException
      */
-    private function getUserContext(): UserContextInterface
+    private function validateLayoutUpdate(Data\PageInterface $page): void
     {
-        if (!$this->userContext) {
-            $this->userContext = ObjectManager::getInstance()->get(UserContextInterface::class);
+        //Persisted data
+        $savedPage = $page->getId() ? $this->getById($page->getId()) : null;
+        //Custom layout update can be removed or kept as is.
+        if ($page->getCustomLayoutUpdateXml()
+            && (!$savedPage || $page->getCustomLayoutUpdateXml() !== $savedPage->getCustomLayoutUpdateXml())
+        ) {
+            throw new \InvalidArgumentException('Custom layout updates must be selected from a file');
         }
-
-        return $this->userContext;
-    }
-
-    /**
-     * Get authorization service.
-     *
-     * @return AuthorizationInterface
-     */
-    private function getAuthorization(): AuthorizationInterface
-    {
-        if (!$this->authorization) {
-            $this->authorization = ObjectManager::getInstance()->get(AuthorizationInterface::class);
+        if ($page->getLayoutUpdateXml()
+            && (!$savedPage || $page->getLayoutUpdateXml() !== $savedPage->getLayoutUpdateXml())
+        ) {
+            throw new \InvalidArgumentException('Custom layout updates must be selected from a file');
         }
-
-        return $this->authorization;
     }
 
     /**
@@ -158,33 +151,9 @@ public function save(\Magento\Cms\Api\Data\PageInterface $page)
             $page->setStoreId($storeId);
         }
         try {
-            //Validate changing of design.
-            $userType = $this->getUserContext()->getUserType();
-            if ((
-                    $userType === UserContextInterface::USER_TYPE_ADMIN
-                    || $userType === UserContextInterface::USER_TYPE_INTEGRATION
-                )
-                && !$this->getAuthorization()->isAllowed('Magento_Cms::save_design')
-            ) {
-                if (!$page->getId()) {
-                    $page->setLayoutUpdateXml(null);
-                    $page->setPageLayout(null);
-                    $page->setCustomTheme(null);
-                    $page->setCustomLayoutUpdateXml(null);
-                    $page->setCustomThemeTo(null);
-                    $page->setCustomThemeFrom(null);
-                } else {
-                    $savedPage = $this->getById($page->getId());
-                    $page->setLayoutUpdateXml($savedPage->getLayoutUpdateXml());
-                    $page->setPageLayout($savedPage->getPageLayout());
-                    $page->setCustomTheme($savedPage->getCustomTheme());
-                    $page->setCustomLayoutUpdateXml($savedPage->getCustomLayoutUpdateXml());
-                    $page->setCustomThemeTo($savedPage->getCustomThemeTo());
-                    $page->setCustomThemeFrom($savedPage->getCustomThemeFrom());
-                }
-            }
-
+            $this->validateLayoutUpdate($page);
             $this->resource->save($page);
+            $this->identityMap->add($page);
         } catch (\Exception $exception) {
             throw new CouldNotSaveException(
                 __('Could not save the page: %1', $exception->getMessage()),
@@ -208,6 +177,8 @@ public function getById($pageId)
         if (!$page->getId()) {
             throw new NoSuchEntityException(__('The CMS page with the "%1" ID doesn\'t exist.', $pageId));
         }
+        $this->identityMap->add($page);
+
         return $page;
     }
 
@@ -245,6 +216,7 @@ public function delete(\Magento\Cms\Api\Data\PageInterface $page)
     {
         try {
             $this->resource->delete($page);
+            $this->identityMap->remove($page->getId());
         } catch (\Exception $exception) {
             throw new CouldNotDeleteException(
                 __('Could not delete the page: %1', $exception->getMessage())
@@ -276,7 +248,7 @@ private function getCollectionProcessor()
     {
         if (!$this->collectionProcessor) {
             $this->collectionProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                'Magento\Cms\Model\Api\SearchCriteria\PageCollectionProcessor'
+                \Magento\Cms\Model\Api\SearchCriteria\PageCollectionProcessor::class
             );
         }
         return $this->collectionProcessor;
diff --git a/app/code/Magento/Cms/Model/PageRepository/ValidationComposite.php b/app/code/Magento/Cms/Model/PageRepository/ValidationComposite.php
new file mode 100644
index 0000000000000..9fd94d4c11e1c
--- /dev/null
+++ b/app/code/Magento/Cms/Model/PageRepository/ValidationComposite.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\PageRepository;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+
+/**
+ * Validates and saves a page
+ */
+class ValidationComposite implements PageRepositoryInterface
+{
+    /**
+     * @var PageRepositoryInterface
+     */
+    private $repository;
+
+    /**
+     * @var array
+     */
+    private $validators;
+
+    /**
+     * @param PageRepositoryInterface $repository
+     * @param ValidatorInterface[] $validators
+     */
+    public function __construct(
+        PageRepositoryInterface $repository,
+        array $validators = []
+    ) {
+        foreach ($validators as $validator) {
+            if (!$validator instanceof ValidatorInterface) {
+                throw new \InvalidArgumentException(
+                    sprintf('Supplied validator does not implement %s', ValidatorInterface::class)
+                );
+            }
+        }
+        $this->repository = $repository;
+        $this->validators = $validators;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function save(PageInterface $page)
+    {
+        foreach ($this->validators as $validator) {
+            $validator->validate($page);
+        }
+
+        return $this->repository->save($page);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getById($pageId)
+    {
+        return $this->repository->getById($pageId);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getList(SearchCriteriaInterface $searchCriteria)
+    {
+        return $this->repository->getList($searchCriteria);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function delete(PageInterface $page)
+    {
+        return $this->repository->delete($page);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteById($pageId)
+    {
+        return $this->repository->deleteById($pageId);
+    }
+}
diff --git a/app/code/Magento/Cms/Model/PageRepository/Validator/LayoutUpdateValidator.php b/app/code/Magento/Cms/Model/PageRepository/Validator/LayoutUpdateValidator.php
new file mode 100644
index 0000000000000..721fd9efbdd91
--- /dev/null
+++ b/app/code/Magento/Cms/Model/PageRepository/Validator/LayoutUpdateValidator.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\PageRepository\Validator;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Model\PageRepository\ValidatorInterface;
+use Magento\Framework\Config\Dom\ValidationException;
+use Magento\Framework\Config\Dom\ValidationSchemaException;
+use Magento\Framework\Config\ValidationStateInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\View\Model\Layout\Update\Validator;
+use Magento\Framework\View\Model\Layout\Update\ValidatorFactory;
+
+/**
+ * Validate a given page
+ */
+class LayoutUpdateValidator implements ValidatorInterface
+{
+    /**
+     * @var ValidatorFactory
+     */
+    private $validatorFactory;
+
+    /**
+     * @var ValidationStateInterface
+     */
+    private $validationState;
+
+    /**
+     * @param ValidatorFactory $validatorFactory
+     * @param ValidationStateInterface $validationState
+     */
+    public function __construct(
+        ValidatorFactory $validatorFactory,
+        ValidationStateInterface $validationState
+    ) {
+        $this->validatorFactory = $validatorFactory;
+        $this->validationState = $validationState;
+    }
+
+    /**
+     * Validate the data before saving
+     *
+     * @param PageInterface $page
+     * @throws LocalizedException
+     */
+    public function validate(PageInterface $page): void
+    {
+        $this->validateRequiredFields($page);
+        $this->validateLayoutUpdate($page);
+        $this->validateCustomLayoutUpdate($page);
+    }
+
+    /**
+     * Validate required fields
+     *
+     * @param PageInterface $page
+     * @throws LocalizedException
+     */
+    private function validateRequiredFields(PageInterface $page): void
+    {
+        if (empty($page->getTitle())) {
+            throw new LocalizedException(__('Required field "%1" is empty.', 'title'));
+        }
+    }
+
+    /**
+     * Validate layout update
+     *
+     * @param PageInterface $page
+     * @throws LocalizedException
+     */
+    private function validateLayoutUpdate(PageInterface $page): void
+    {
+        $layoutXmlValidator = $this->getLayoutValidator();
+
+        try {
+            if (!empty($page->getLayoutUpdateXml())
+                && !$layoutXmlValidator->isValid($page->getLayoutUpdateXml())
+            ) {
+                throw new LocalizedException(__('Layout update is invalid'));
+            }
+        } catch (ValidationException|ValidationSchemaException $e) {
+            throw new LocalizedException(__('Layout update is invalid'));
+        }
+    }
+
+    /**
+     * Validate custom layout update
+     *
+     * @param PageInterface $page
+     * @throws LocalizedException
+     */
+    private function validateCustomLayoutUpdate(PageInterface $page): void
+    {
+        $layoutXmlValidator = $this->getLayoutValidator();
+
+        try {
+            if (!empty($page->getCustomLayoutUpdateXml())
+                && !$layoutXmlValidator->isValid($page->getCustomLayoutUpdateXml())
+            ) {
+                throw new LocalizedException(__('Custom layout update is invalid'));
+            }
+        } catch (ValidationException|ValidationSchemaException $e) {
+            throw new LocalizedException(__('Custom layout update is invalid'));
+        }
+    }
+
+    /**
+     * Return a new validator
+     *
+     * @return Validator
+     */
+    private function getLayoutValidator(): Validator
+    {
+        return $this->validatorFactory->create(
+            [
+                'validationState' => $this->validationState,
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/Cms/Model/PageRepository/ValidatorInterface.php b/app/code/Magento/Cms/Model/PageRepository/ValidatorInterface.php
new file mode 100644
index 0000000000000..ff5c7648a9fa2
--- /dev/null
+++ b/app/code/Magento/Cms/Model/PageRepository/ValidatorInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\PageRepository;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Validate a page repository
+ */
+interface ValidatorInterface
+{
+    /**
+     * Assert the given page valid
+     *
+     * @param PageInterface $page
+     * @return void
+     * @throws LocalizedException
+     */
+    public function validate(PageInterface $page): void;
+}
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index e02d2b461a94e..21f3b232e783c 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -416,7 +416,7 @@ public function createDirectory($name, $path)
     {
         if (!preg_match(self::DIRECTORY_NAME_REGEXP, $name)) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('Please rename the folder using only letters, numbers, underscores and dashes.')
+                __('Please rename the folder using only Latin letters, numbers, underscores and dashes.')
             );
         }
 
diff --git a/app/code/Magento/Cms/Observer/PageAclPlugin.php b/app/code/Magento/Cms/Observer/PageAclPlugin.php
new file mode 100644
index 0000000000000..c71fe0af396c0
--- /dev/null
+++ b/app/code/Magento/Cms/Observer/PageAclPlugin.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\Observer;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Cms\Model\Page\Authorization;
+
+/**
+ * Perform additional authorization before saving a page.
+ */
+class PageAclPlugin
+{
+    /**
+     * @var Authorization
+     */
+    private $authorization;
+
+    /**
+     * @param Authorization $authorization
+     */
+    public function __construct(Authorization $authorization)
+    {
+        $this->authorization = $authorization;
+    }
+
+    /**
+     * Authorize saving before it is executed.
+     *
+     * @param PageRepositoryInterface $subject
+     * @param PageInterface $page
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeSave(PageRepositoryInterface $subject, PageInterface $page): array
+    {
+        $this->authorization->authorizeFor($page);
+
+        return [$page];
+    }
+}
diff --git a/app/code/Magento/Cms/Observer/PageValidatorObserver.php b/app/code/Magento/Cms/Observer/PageValidatorObserver.php
new file mode 100644
index 0000000000000..b4e5d2bc0e0a7
--- /dev/null
+++ b/app/code/Magento/Cms/Observer/PageValidatorObserver.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Observer;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Model\Page\Authorization;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Performing additional validation each time a user saves a CMS page.
+ */
+class PageValidatorObserver implements ObserverInterface
+{
+    /**
+     * @var Authorization
+     */
+    private $authorization;
+
+    /**
+     * @param Authorization $authorization
+     */
+    public function __construct(Authorization $authorization)
+    {
+        $this->authorization = $authorization;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @throws LocalizedException
+     */
+    public function execute(Observer $observer)
+    {
+        /** @var PageInterface $page */
+        $page = $observer->getEvent()->getData('page');
+        $this->authorization->authorizeFor($page);
+    }
+}
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsPageActionGroup.xml
new file mode 100644
index 0000000000000..7e907b5b395a4
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsPageActionGroup.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="AdminOpenCmsPageActionGroup">
+        <arguments>
+            <argument name="page_id" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCmsPageEditPage.url(page_id)}}" stepKey="openEditCmsPage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml
index dff2d60c9e8c3..52a5757ec7b9a 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/DeleteImageFromStorageActionGroup.xml
@@ -18,7 +18,8 @@
         
         <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.lastImageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="waitForLastImage"/>
+        <click selector="{{MediaGallerySection.lastImageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="selectImage"/>
         <waitForElementVisible selector="{{MediaGallerySection.DeleteSelectedBtn}}" stepKey="waitForDeleteBtn"/>
         <click selector="{{MediaGallerySection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/SelectImageFromMediaStorageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SelectImageFromMediaStorageActionGroup.xml
index e2a3bbcbdc797..073c299c240e9 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/SelectImageFromMediaStorageActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SelectImageFromMediaStorageActionGroup.xml
@@ -52,7 +52,8 @@
     
     <actionGroup name="attachImage">
         <annotations>
-            <description>Uploads the provided Image to Media Gallery.</description>
+            <description>Uploads the provided Image to Media Gallery.
+                If you use this action group, you MUST add steps to delete the image in the "after" steps.</description>
         </annotations>
         <arguments>
             <argument name="Image"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/StorefrontClickHeaderLinkActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/StorefrontClickHeaderLinkActionGroup.xml
new file mode 100644
index 0000000000000..48e7ec81ae1c1
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/StorefrontClickHeaderLinkActionGroup.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="StorefrontClickHeaderLinkActionGroup">
+        <annotations>
+            <description>Clicks a link in the storefront header.</description>
+        </annotations>
+        <arguments>
+            <argument name="linkName" type="string" defaultValue="Create an Account"/>
+        </arguments>
+
+        <click stepKey="clickTheLink" selector="{{StorefrontHeaderSection.headerLinkByText(linkName)}}"/>
+        <waitForPageLoad stepKey="wait"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/StorefrontSeeHeaderLinksActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/StorefrontSeeHeaderLinksActionGroup.xml
new file mode 100644
index 0000000000000..ec5c388ee1c6b
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/StorefrontSeeHeaderLinksActionGroup.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="StorefrontSeeHeaderLinksActionGroup">
+        <annotations>
+            <description>See a link by name in the storefront header.</description>
+        </annotations>
+        <arguments>
+            <argument name="linkName" type="string" defaultValue="Create an Account"/>
+        </arguments>
+        <see stepKey="seeElement" selector="{{StorefrontHeaderSection.headerlinks}}" userInput="{{linkName}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsPageEditPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsPageEditPage.xml
new file mode 100644
index 0000000000000..978b6d6a6d261
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsPageEditPage.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="AdminCmsPageEditPage" area="admin" url="/cms/page/edit/page_id/{{id}}" parameterized="true" 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/Section/StorefrontHeaderSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml
new file mode 100644
index 0000000000000..7b47c6b49db7b
--- /dev/null
+++ b/app/code/Magento/Cms/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="headerlinks" type="text" selector="ul.header.links"/>
+        <element name="headerLinkByText" type="text" selector="//ul[contains(@class, 'header') and contains(@class, 'links')]/li/a[contains(text(),'{{LinkName}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
index b1d0faa7507f0..b85c7554b58ae 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -40,6 +40,7 @@
         <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="lastImageOrImageCopy" type="text" selector="(//div[contains(@class,'media-gallery-modal')]//img[contains(@alt, '{{arg1}}.{{arg2}}')]|//img[contains(@alt,'{{arg1}}_') and contains(@alt,'.{{arg2}}')])[last()]" 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" />
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml
new file mode 100644
index 0000000000000..ce093144e6a2a
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CheckOrderOfProdsInWidgetOnCMSPageTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Widgets"/>
+            <title value="Checking order of products in a widget on a CMS page - SKU condition"/>
+            <description value="Checking order of products in a widget on a CMS page - SKU condition"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-13718"/>
+            <useCaseId value="MC-5906"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="enableTinyMCE4"/>
+            <waitForPageLoad stepKey="waitConfigToSave"/>
+            <createData entity="ApiCategory" stepKey="createFirstCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="product1">
+                <requiredEntity createDataKey="createFirstCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="product2">
+                <requiredEntity createDataKey="createFirstCategory"/>
+            </createData>
+            <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
+        </before>
+        <after>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
+            <deleteData createDataKey="createFirstCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="product1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="product2" stepKey="deleteProduct2"/>
+            <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage1">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+        <conditionalClick selector="{{CmsNewPagePageContentSection.header}}"
+                          dependentSelector="{{CmsNewPagePageContentSection.header}}._show" visible="false"
+                          stepKey="clickContentTab1"/>
+        <waitForPageLoad stepKey="waitForContentSectionLoad1"/>
+        <waitForElementNotVisible selector="{{CmsWYSIWYGSection.CheckIfTabExpand}}" stepKey="waitForTabExpand1"/>
+        <click selector="{{CmsNewPagePageActionsSection.showHideEditor}}" stepKey="showHiddenButtons"/>
+        <seeElement selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="seeWidgetButton"/>
+        <click selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="clickInsertWidgetButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage"/>
+        <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget"
+             stepKey="seeInsertWidgetDisabled"/>
+        <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled"/>
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Products List"
+                      stepKey="selectCatalogProductsList"/>
+        <waitForPageLoad stepKey="waitBeforeClickingOnAddParamBtn"/>
+        <click selector="{{WidgetSection.AddParam}}" stepKey="clickAddParamBtn"/>
+        <waitForElement selector="{{WidgetSection.ConditionsDropdown}}" stepKey="addingWaitForConditionsDropDown"/>
+        <waitForElementVisible selector="{{WidgetSection.ConditionsDropdown}}" stepKey="waitForDropdownVisible"/>
+        <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="SKU"
+                      stepKey="selectCategoryCondition"/>
+        <waitForPageLoad stepKey="waitBeforeClickingOnRuleParam"/>
+        <click selector="{{WidgetSection.RuleParam1('3')}}" stepKey="clickOnRuleParam1"/>
+        <waitForElementVisible selector="{{WidgetSection.RuleParamSelect('1','1')}}"
+                               stepKey="waitDropdownToAppear"/>
+        <selectOption selector="{{WidgetSection.RuleParamSelect('1','1')}}" userInput="is one of"
+                      stepKey="selectOption"/>
+        <waitForElement selector="{{WidgetSection.RuleParam}}" stepKey="waitForRuleParam"/>
+        <click selector="{{WidgetSection.RuleParam}}" stepKey="clickOnRuleParam"/>
+        <waitForElementVisible selector="{{WidgetSection.Chooser}}" stepKey="waitForElement"/>
+        <click selector="{{WidgetSection.Chooser}}" stepKey="clickChooser"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <fillField selector="{{WidgetSection.ChooserName}}" userInput="$$product1.name$$"
+                   stepKey="fillProduct1Name"/>
+        <waitForPageLoad stepKey="waitForPageToLoadBeforeClickingOnSearchFilter1"/>
+        <click selector="{{AdminNewWidgetSection.searchBlock}}" stepKey="searchFilter1"/>
+        <waitForPageLoad stepKey="waitForPageToLoadBeforeSelectingProduct"/>
+        <click selector="{{WidgetSection.PreCreateProduct('$$product1.name$$')}}" stepKey="selectProduct1"/>
+        <click selector="{{AdminWidgetsSection.resetFilter}}" stepKey="resetFilter1"/>
+        <waitForPageLoad stepKey="waitForPageToLoadBeforeFillingProductName"/>
+        <fillField selector="{{WidgetSection.ChooserName}}" userInput="$$product2.name$$"
+                   stepKey="fillProduct2Name"/>
+        <click selector="{{AdminNewWidgetSection.searchBlock}}" stepKey="clickOnSearch"/>
+        <waitForPageLoad stepKey="waitForPageToLoadBeforeSelectingProduct2"/>
+        <click selector="{{WidgetSection.PreCreateProduct('$$product2.name$$')}}" stepKey="selectProduct2"/>
+        <click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="applyProducts"/>
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickOnInsertWidgetButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoadBeforeClickingOnSaveWidget1"/>
+        <click selector="{{InsertWidgetSection.save}}" stepKey="saveWidget"/>
+        <waitForPageLoad stepKey="waitForSaveComplete"/>
+        <actionGroup ref="CompareTwoProductsOrder" stepKey="compareProductOrders1">
+            <argument name="page" value="$$createCMSPage.identifier$$"/>
+            <argument name="product_1" value="$$product1$$"/>
+            <argument name="product_2" value="$$product2$$"/>
+        </actionGroup>
+        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage2">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+        <conditionalClick selector="{{CmsNewPagePageContentSection.header}}"
+                          dependentSelector="{{CmsNewPagePageContentSection.header}}._show" visible="false"
+                          stepKey="clickContentTab2"/>
+        <waitForPageLoad stepKey="waitForContentSectionLoad2"/>
+        <waitForElementNotVisible selector="{{CmsWYSIWYGSection.CheckIfTabExpand}}" stepKey="waitForTabExpand2"/>
+        <executeJS function="jQuery('[id=\'cms_page_form_content_ifr\']').attr('name', 'preview-iframe')"
+                   stepKey="setPreviewFrameName"/>
+        <switchToIFrame selector="preview-iframe" stepKey="switchToIframe"/>
+        <doubleClick selector="{{TinyMCESection.WidgetButton}}" stepKey="clickToEditWidget"/>
+        <switchToIFrame stepKey="switchOutFromIframe"/>
+        <waitForPageLoad stepKey="waitForPageToLoadBeforeOpeningProductsList"/>
+        <click selector="{{WidgetSection.RuleParam1('4')}}" stepKey="openProductsList"/>
+        <waitForElementVisible selector="{{WidgetSection.Chooser}}" stepKey="waitForElement2"/>
+        <click selector="{{WidgetSection.Chooser}}" stepKey="clickChooser2"/>
+        <waitForPageLoad stepKey="waitForPageToLoadBeforeFillingProduct1Name"/>
+        <fillField selector="{{WidgetSection.ChooserName}}" userInput="$$product1.name$$" stepKey="fillProduct1Name_2"/>
+        <waitForPageLoad stepKey="waitForPageToLoadBeforeClickingOnSearchFilter2"/>
+        <click selector="{{AdminNewWidgetSection.searchBlock}}" stepKey="searchFilter2"/>
+        <waitForPageLoad stepKey="waitForPageToLoadBeforeSelectingProduct1"/>
+        <click selector="{{WidgetSection.PreCreateProduct('$$product1.name$$')}}" stepKey="selectProduct1_1"/>
+        <click selector="{{WidgetSection.PreCreateProduct('$$product1.name$$')}}" stepKey="selectProduct2_2"/>
+        <click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="applyProducts1"/>
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickOnInsertWidgetButton1"/>
+        <waitForPageLoad stepKey="waitForPageToLoadBeforeClickingOnSaveWidget2"/>
+        <click selector="{{InsertWidgetSection.save}}" stepKey="saveWidget1"/>
+        <waitForPageLoad stepKey="waitForSaveComplete1"/>
+
+        <actionGroup ref="CompareTwoProductsOrder" stepKey="compareProductOrders2">
+            <argument name="page" value="$$createCMSPage.identifier$$"/>
+            <argument name="product_1" value="$$product2$$"/>
+            <argument name="product_2" value="$$product1$$"/>
+        </actionGroup>
+    </test>
+</tests>
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 0d44f66048ba3..c5bb26d04c734 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
@@ -373,6 +373,58 @@ public function testSaveAndClose()
         $this->assertSame($this->resultRedirect, $this->saveController->execute());
     }
 
+    public function testSaveActionWithMarginalSpace()
+    {
+        $postData = [
+            'title' => 'unique_title_123',
+            'identifier' => '  unique_title_123',
+            'stores' => ['0'],
+            'is_active' => true,
+            'content' => '',
+            'back' => 'continue'
+        ];
+
+        $this->requestMock->expects($this->any())->method('getPostValue')->willReturn($postData);
+        $this->requestMock->expects($this->atLeastOnce())
+            ->method('getParam')
+            ->willReturnMap(
+                [
+                    ['block_id', null, 1],
+                    ['back', null, true],
+                ]
+            );
+
+        $this->blockFactory->expects($this->atLeastOnce())
+            ->method('create')
+            ->willReturn($this->blockMock);
+
+            $this->blockRepository->expects($this->once())
+            ->method('getById')
+            ->with($this->blockId)
+            ->willReturn($this->blockMock);
+
+        $this->blockMock->expects($this->once())->method('setData');
+        $this->blockRepository->expects($this->once())->method('save')
+            ->with($this->blockMock)
+            ->willThrowException(new \Exception('No marginal white space please.'));
+
+        $this->messageManagerMock->expects($this->never())
+            ->method('addSuccessMessage');
+        $this->messageManagerMock->expects($this->once())
+            ->method('addExceptionMessage');
+
+        $this->dataPersistorMock->expects($this->any())
+            ->method('set')
+            ->with('cms_block', array_merge($postData, ['block_id' => null]));
+
+        $this->resultRedirect->expects($this->atLeastOnce())
+            ->method('setPath')
+            ->with('*/*/edit', ['block_id' => $this->blockId])
+            ->willReturnSelf();
+
+        $this->assertSame($this->resultRedirect, $this->saveController->execute());
+    }
+
     public function testSaveActionThrowsException()
     {
         $postData = [
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/InlineEditTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/InlineEditTest.php
index 9d51431b26d8f..7f2ff2086df91 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/InlineEditTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/InlineEditTest.php
@@ -102,10 +102,6 @@ public function prepareMocksForTestExecute()
             ->method('filter')
             ->with($postData[1])
             ->willReturnArgument(0);
-        $this->dataProcessor->expects($this->once())
-            ->method('validate')
-            ->with($postData[1])
-            ->willReturn(false);
         $this->messageManager->expects($this->once())
             ->method('getMessages')
             ->with(true)
@@ -122,19 +118,23 @@ public function prepareMocksForTestExecute()
             ->willReturn('1');
         $this->cmsPage->expects($this->atLeastOnce())
             ->method('getData')
-            ->willReturn([
-                'layout' => '1column',
-                'identifier' => 'test-identifier'
-            ]);
+            ->willReturn(
+                [
+                    'layout' => '1column',
+                    'identifier' => 'test-identifier'
+                ]
+            );
         $this->cmsPage->expects($this->once())
             ->method('setData')
-            ->with([
-                'layout' => '1column',
-                'title' => '404 Not Found',
-                'identifier' => 'no-route',
-                'custom_theme' => '1',
-                'custom_root_template' => '2'
-            ]);
+            ->with(
+                [
+                    'layout' => '1column',
+                    'title' => '404 Not Found',
+                    'identifier' => 'no-route',
+                    'custom_theme' => '1',
+                    'custom_root_template' => '2'
+                ]
+            );
         $this->jsonFactory->expects($this->once())
             ->method('create')
             ->willReturn($this->resultJson);
@@ -149,13 +149,15 @@ public function testExecuteWithLocalizedException()
             ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('LocalizedException')));
         $this->resultJson->expects($this->once())
             ->method('setData')
-            ->with([
-                'messages' => [
-                    '[Page ID: 1] Error message',
-                    '[Page ID: 1] LocalizedException'
-                ],
-                'error' => true
-            ])
+            ->with(
+                [
+                    'messages' => [
+                        '[Page ID: 1] Error message',
+                        '[Page ID: 1] LocalizedException'
+                    ],
+                    'error' => true
+                ]
+            )
             ->willReturnSelf();
 
         $this->assertSame($this->resultJson, $this->controller->execute());
@@ -170,13 +172,15 @@ public function testExecuteWithRuntimeException()
             ->willThrowException(new \RuntimeException(__('RuntimeException')));
         $this->resultJson->expects($this->once())
             ->method('setData')
-            ->with([
-                'messages' => [
-                    '[Page ID: 1] Error message',
-                    '[Page ID: 1] RuntimeException'
-                ],
-                'error' => true
-            ])
+            ->with(
+                [
+                    'messages' => [
+                        '[Page ID: 1] Error message',
+                        '[Page ID: 1] RuntimeException'
+                    ],
+                    'error' => true
+                ]
+            )
             ->willReturnSelf();
 
         $this->assertSame($this->resultJson, $this->controller->execute());
@@ -191,13 +195,15 @@ public function testExecuteWithException()
             ->willThrowException(new \Exception(__('Exception')));
         $this->resultJson->expects($this->once())
             ->method('setData')
-            ->with([
-                'messages' => [
-                    '[Page ID: 1] Error message',
-                    '[Page ID: 1] Something went wrong while saving the page.'
-                ],
-                'error' => true
-            ])
+            ->with(
+                [
+                    'messages' => [
+                        '[Page ID: 1] Error message',
+                        '[Page ID: 1] Something went wrong while saving the page.'
+                    ],
+                    'error' => true
+                ]
+            )
             ->willReturnSelf();
 
         $this->assertSame($this->resultJson, $this->controller->execute());
@@ -218,12 +224,14 @@ public function testExecuteWithoutData()
             );
         $this->resultJson->expects($this->once())
             ->method('setData')
-            ->with([
-                'messages' => [
-                    'Please correct the data sent.'
-                ],
-                'error' => true
-            ])
+            ->with(
+                [
+                    'messages' => [
+                        'Please correct the data sent.'
+                    ],
+                    'error' => true
+                ]
+            )
             ->willReturnSelf();
 
         $this->assertSame($this->resultJson, $this->controller->execute());
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 26b4055923107..91adcdd6db4c8 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
@@ -157,6 +157,7 @@ public function testSaveAction()
 
         $this->pageRepository->expects($this->once())->method('getById')->with($this->pageId)->willReturn($page);
         $page->expects($this->once())->method('setData');
+        $page->method('getId')->willReturn($this->pageId);
         $this->pageRepository->expects($this->once())->method('save')->with($page);
 
         $this->dataPersistorMock->expects($this->any())
@@ -235,6 +236,7 @@ public function testSaveAndContinue()
         $page = $this->getMockBuilder(\Magento\Cms\Model\Page::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $page->method('getId')->willReturn(1);
         $this->pageFactory->expects($this->atLeastOnce())
             ->method('create')
             ->willReturn($page);
@@ -293,7 +295,14 @@ public function testSaveActionThrowsException()
 
         $this->dataPersistorMock->expects($this->any())
             ->method('set')
-            ->with('cms_page', ['page_id' => $this->pageId]);
+            ->with(
+                'cms_page',
+                [
+                    'page_id' => $this->pageId,
+                    'layout_update_xml' => null,
+                    'custom_layout_update_xml' => null
+                ]
+            );
 
         $this->resultRedirect->expects($this->atLeastOnce())
             ->method('setPath')
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
index 16b218ebf6493..5fea276225622 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
@@ -151,7 +151,11 @@ protected function setUp()
             [
                 'context' => $this->actionContextMock,
                 'urlDecoder' => $this->urlDecoderMock,
-                'resultRawFactory' => $this->rawFactoryMock
+                'resultRawFactory' => $this->rawFactoryMock,
+                'adapterFactory' => $this->imageAdapterFactoryMock,
+                'logger' => $this->loggerMock,
+                'config' => $this->wysiwygConfigMock,
+                'filter' => $this->templateFilterMock
             ]
         );
     }
@@ -228,7 +232,7 @@ public function testExecuteException()
             ->method('getImage')
             ->willReturn($imageBody);
         $this->loggerMock->expects($this->once())
-            ->method('critical')
+            ->method('warning')
             ->with($exception);
         $this->rawFactoryMock->expects($this->any())
             ->method('create')
@@ -253,25 +257,46 @@ protected function prepareExecuteTest()
             ->method('decode')
             ->with($directiveParam)
             ->willReturn($directive);
-        $this->objectManagerMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\Cms\Model\Template\Filter::class)
-            ->willReturn($this->templateFilterMock);
+
         $this->templateFilterMock->expects($this->once())
             ->method('filter')
             ->with($directive)
             ->willReturn(self::IMAGE_PATH);
-        $this->objectManagerMock->expects($this->any())
-            ->method('get')
-            ->willReturnMap(
-                [
-                    [\Magento\Framework\Image\AdapterFactory::class, $this->imageAdapterFactoryMock],
-                    [\Magento\Cms\Model\Wysiwyg\Config::class, $this->wysiwygConfigMock],
-                    [\Psr\Log\LoggerInterface::class, $this->loggerMock]
-                ]
-            );
+
         $this->imageAdapterFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($this->imageAdapterMock);
     }
+
+    /**
+     * Test Execute With Deleted Image
+     *
+     * @covers \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive::execute
+     */
+    public function testExecuteWithDeletedImage()
+    {
+        $exception = new \Exception('epic fail');
+        $placeholderPath = 'pub/static/adminhtml/Magento/backend/en_US/Magento_Cms/images/wysiwyg_skin_image.png';
+        $this->prepareExecuteTest();
+
+        $this->imageAdapterMock->expects($this->any())
+            ->method('open')
+            ->with(self::IMAGE_PATH)
+            ->willThrowException($exception);
+
+        $this->wysiwygConfigMock->expects($this->once())
+            ->method('getSkinImagePlaceholderPath')
+            ->willReturn($placeholderPath);
+
+        $this->imageAdapterMock->expects($this->any())
+            ->method('open')
+            ->with($placeholderPath)
+            ->willThrowException($exception);
+
+        $this->loggerMock->expects($this->once())
+            ->method('warning')
+            ->with($exception);
+
+        $this->wysiwygDirective->execute();
+    }
 }
diff --git a/app/code/Magento/Cms/Test/Unit/Model/PageRepository/ValidationCompositeTest.php b/app/code/Magento/Cms/Test/Unit/Model/PageRepository/ValidationCompositeTest.php
new file mode 100644
index 0000000000000..f73396230a669
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Model/PageRepository/ValidationCompositeTest.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Test\Unit\Model\PageRepository;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Cms\Model\PageRepository\ValidationComposite;
+use Magento\Cms\Model\PageRepository\ValidatorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Exception\LocalizedException;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Validate behavior of the validation composite
+ */
+class ValidationCompositeTest extends TestCase
+{
+    /**
+     * @var PageRepositoryInterface|MockObject
+     */
+    private $subject;
+
+    protected function setUp()
+    {
+        /** @var PageRepositoryInterface subject */
+        $this->subject = $this->createMock(PageRepositoryInterface::class);
+    }
+
+    /**
+     * @param $validators
+     * @expectedException \InvalidArgumentException
+     * @dataProvider constructorArgumentProvider
+     */
+    public function testConstructorValidation($validators)
+    {
+        new ValidationComposite($this->subject, $validators);
+    }
+
+    public function testSaveInvokesValidatorsWithSucess()
+    {
+        $validator1 = $this->createMock(ValidatorInterface::class);
+        $validator2 = $this->createMock(ValidatorInterface::class);
+        $page = $this->createMock(PageInterface::class);
+
+        // Assert each are called
+        $validator1
+            ->expects($this->once())
+            ->method('validate')
+            ->with($page);
+        $validator2
+            ->expects($this->once())
+            ->method('validate')
+            ->with($page);
+
+        // Assert that the success is called
+        $this->subject
+            ->expects($this->once())
+            ->method('save')
+            ->with($page)
+            ->willReturn('foo');
+
+        $composite = new ValidationComposite($this->subject, [$validator1, $validator2]);
+        $result = $composite->save($page);
+
+        self::assertSame('foo', $result);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Oh no. That isn't right.
+     */
+    public function testSaveInvokesValidatorsWithErrors()
+    {
+        $validator1 = $this->createMock(ValidatorInterface::class);
+        $validator2 = $this->createMock(ValidatorInterface::class);
+        $page = $this->createMock(PageInterface::class);
+
+        // Assert the first is called
+        $validator1
+            ->expects($this->once())
+            ->method('validate')
+            ->with($page)
+            ->willThrowException(new LocalizedException(__('Oh no. That isn\'t right.')));
+
+        // Assert the second is NOT called
+        $validator2
+            ->expects($this->never())
+            ->method('validate');
+
+        // Assert that the success is NOT called
+        $this->subject
+            ->expects($this->never())
+            ->method('save');
+
+        $composite = new ValidationComposite($this->subject, [$validator1, $validator2]);
+        $composite->save($page);
+    }
+
+    /**
+     * @param $method
+     * @param $arg
+     * @dataProvider passthroughMethodDataProvider
+     */
+    public function testPassthroughMethods($method, $arg)
+    {
+        $this->subject
+            ->method($method)
+            ->with($arg)
+            ->willReturn('foo');
+
+        $composite = new ValidationComposite($this->subject, []);
+        $result = $composite->{$method}($arg);
+
+        self::assertSame('foo', $result);
+    }
+
+    public function constructorArgumentProvider()
+    {
+        return [
+            [[null], false],
+            [[''], false],
+            [['foo'], false],
+            [[new \stdClass()], false],
+            [[$this->createMock(ValidatorInterface::class), 'foo'], false],
+        ];
+    }
+
+    public function passthroughMethodDataProvider()
+    {
+        return [
+            ['save', $this->createMock(PageInterface::class)],
+            ['getById', 1],
+            ['getList', $this->createMock(SearchCriteriaInterface::class)],
+            ['delete', $this->createMock(PageInterface::class)],
+            ['deleteById', 1],
+        ];
+    }
+}
diff --git a/app/code/Magento/Cms/Test/Unit/Model/PageRepository/Validator/LayoutUpdateValidatorTest.php b/app/code/Magento/Cms/Test/Unit/Model/PageRepository/Validator/LayoutUpdateValidatorTest.php
new file mode 100644
index 0000000000000..487a90bb9a185
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Model/PageRepository/Validator/LayoutUpdateValidatorTest.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Test\Unit\Model\PageRepository\Validator;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Model\PageRepository\Validator\LayoutUpdateValidator;
+use Magento\Framework\Config\Dom\ValidationException;
+use Magento\Framework\Config\Dom\ValidationSchemaException;
+use Magento\Framework\Config\ValidationStateInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\View\Model\Layout\Update\ValidatorFactory;
+use Magento\Framework\View\Model\Layout\Update\Validator;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test cases for the layout update validator
+ */
+class LayoutUpdateValidatorTest extends TestCase
+{
+    /**
+     * @var Validator|MockObject
+     */
+    private $layoutValidator;
+
+    /**
+     * @var LayoutUpdateValidator
+     */
+    private $validator;
+
+    protected function setUp()
+    {
+        $layoutValidatorFactory = $this->createMock(ValidatorFactory::class);
+        $this->layoutValidator = $this->createMock(Validator::class);
+        $layoutValidatorState = $this->createMock(ValidationStateInterface::class);
+
+        $layoutValidatorFactory
+            ->method('create')
+            ->with(['validationState' => $layoutValidatorState])
+            ->willReturn($this->layoutValidator);
+
+        $this->validator = new LayoutUpdateValidator($layoutValidatorFactory, $layoutValidatorState);
+    }
+
+    /**
+     * @dataProvider validationSetDataProvider
+     */
+    public function testValidate($data, $expectedExceptionMessage, $layoutValidatorException, $isLayoutValid = false)
+    {
+        if ($expectedExceptionMessage) {
+            $this->expectException(LocalizedException::class);
+            $this->expectExceptionMessage($expectedExceptionMessage);
+        }
+
+        if ($layoutValidatorException) {
+            $this->layoutValidator
+                ->method('isValid')
+                ->with($data['getLayoutUpdateXml'] ?? $data['getCustomLayoutUpdateXml'])
+                ->willThrowException($layoutValidatorException);
+        } elseif (!empty($data['getLayoutUpdateXml'])) {
+            $this->layoutValidator
+                ->method('isValid')
+                ->with($data['getLayoutUpdateXml'])
+                ->willReturn($isLayoutValid);
+        } elseif (!empty($data['getCustomLayoutUpdateXml'])) {
+            $this->layoutValidator
+                ->method('isValid')
+                ->with($data['getCustomLayoutUpdateXml'])
+                ->willReturn($isLayoutValid);
+        }
+
+        $page = $this->createMock(PageInterface::class);
+        foreach ($data as $method => $value) {
+            $page
+                ->method($method)
+                ->willReturn($value);
+        }
+
+        self::assertNull($this->validator->validate($page));
+    }
+
+    public function validationSetDataProvider()
+    {
+        $layoutError = 'Layout update is invalid';
+        $customLayoutError = 'Custom layout update is invalid';
+        $validationException = new ValidationException('Invalid format');
+        $schemaException = new ValidationSchemaException(__('Invalid format'));
+
+        return [
+            [['getTitle' => ''], 'Required field "title" is empty.', null],
+            [['getTitle' => null], 'Required field "title" is empty.', null],
+            [['getTitle' => false], 'Required field "title" is empty.', null],
+            [['getTitle' => 0], 'Required field "title" is empty.', null],
+            [['getTitle' => '0'], 'Required field "title" is empty.', null],
+            [['getTitle' => []], 'Required field "title" is empty.', null],
+            [['getTitle' => 'foo', 'getLayoutUpdateXml' => ''], null, null],
+            [['getTitle' => 'foo', 'getLayoutUpdateXml' => null], null, null],
+            [['getTitle' => 'foo', 'getLayoutUpdateXml' => false], null, null],
+            [['getTitle' => 'foo', 'getLayoutUpdateXml' => 0], null, null],
+            [['getTitle' => 'foo', 'getLayoutUpdateXml' => '0'], null, null],
+            [['getTitle' => 'foo', 'getLayoutUpdateXml' => []], null, null],
+            [['getTitle' => 'foo', 'getLayoutUpdateXml' => 'foo'], $layoutError, null],
+            [['getTitle' => 'foo', 'getLayoutUpdateXml' => 'foo'], $layoutError, $validationException],
+            [['getTitle' => 'foo', 'getLayoutUpdateXml' => 'foo'], $layoutError, $schemaException],
+            [['getTitle' => 'foo', 'getLayoutUpdateXml' => 'foo'], null, null, true],
+            [['getTitle' => 'foo', 'getCustomLayoutUpdateXml' => ''], null, null],
+            [['getTitle' => 'foo', 'getCustomLayoutUpdateXml' => null], null, null],
+            [['getTitle' => 'foo', 'getCustomLayoutUpdateXml' => false], null, null],
+            [['getTitle' => 'foo', 'getCustomLayoutUpdateXml' => 0], null, null],
+            [['getTitle' => 'foo', 'getCustomLayoutUpdateXml' => '0'], null, null],
+            [['getTitle' => 'foo', 'getCustomLayoutUpdateXml' => []], null, null],
+            [['getTitle' => 'foo', 'getCustomLayoutUpdateXml' => 'foo'], $customLayoutError, null],
+            [['getTitle' => 'foo', 'getCustomLayoutUpdateXml' => 'foo'], $customLayoutError, $validationException],
+            [['getTitle' => 'foo', 'getCustomLayoutUpdateXml' => 'foo'], $customLayoutError, $schemaException],
+            [['getTitle' => 'foo', 'getCustomLayoutUpdateXml' => 'foo'], null, null, true],
+        ];
+    }
+}
diff --git a/app/code/Magento/Cms/Test/Unit/Model/PageRepositoryTest.php b/app/code/Magento/Cms/Test/Unit/Model/PageRepositoryTest.php
deleted file mode 100644
index 61001794e2a0b..0000000000000
--- a/app/code/Magento/Cms/Test/Unit/Model/PageRepositoryTest.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Cms\Test\Unit\Model;
-
-use Magento\Cms\Model\PageRepository;
-use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-
-/**
- * Test for Magento\Cms\Model\PageRepository
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class PageRepositoryTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var PageRepository
-     */
-    protected $repository;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Cms\Model\ResourceModel\Page
-     */
-    protected $pageResource;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Cms\Model\Page
-     */
-    protected $page;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Cms\Api\Data\PageInterface
-     */
-    protected $pageData;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Cms\Api\Data\PageSearchResultsInterface
-     */
-    protected $pageSearchResult;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Api\DataObjectHelper
-     */
-    protected $dataHelper;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Reflection\DataObjectProcessor
-     */
-    protected $dataObjectProcessor;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Cms\Model\ResourceModel\Page\Collection
-     */
-    protected $collection;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
-     */
-    private $storeManager;
-
-    /**
-     * @var CollectionProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $collectionProcessor;
-
-    /**
-     * Initialize repository
-     */
-    protected function setUp()
-    {
-        $this->pageResource = $this->getMockBuilder(\Magento\Cms\Model\ResourceModel\Page::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->dataObjectProcessor = $this->getMockBuilder(\Magento\Framework\Reflection\DataObjectProcessor::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $pageFactory = $this->getMockBuilder(\Magento\Cms\Model\PageFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $pageDataFactory = $this->getMockBuilder(\Magento\Cms\Api\Data\PageInterfaceFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $pageSearchResultFactory = $this->getMockBuilder(\Magento\Cms\Api\Data\PageSearchResultsInterfaceFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $collectionFactory = $this->getMockBuilder(\Magento\Cms\Model\ResourceModel\Page\CollectionFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $store->expects($this->any())->method('getId')->willReturn(0);
-        $this->storeManager->expects($this->any())->method('getStore')->willReturn($store);
-
-        $this->page = $this->getMockBuilder(\Magento\Cms\Model\Page::class)->disableOriginalConstructor()->getMock();
-        $this->pageData = $this->getMockBuilder(\Magento\Cms\Api\Data\PageInterface::class)
-            ->getMock();
-        $this->pageSearchResult = $this->getMockBuilder(\Magento\Cms\Api\Data\PageSearchResultsInterface::class)
-            ->getMock();
-        $this->collection = $this->getMockBuilder(\Magento\Cms\Model\ResourceModel\Page\Collection::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getSize', 'setCurPage', 'setPageSize', 'load', 'addOrder'])
-            ->getMock();
-
-        $pageFactory->expects($this->any())
-            ->method('create')
-            ->willReturn($this->page);
-        $pageDataFactory->expects($this->any())
-            ->method('create')
-            ->willReturn($this->pageData);
-        $pageSearchResultFactory->expects($this->any())
-            ->method('create')
-            ->willReturn($this->pageSearchResult);
-        $collectionFactory->expects($this->any())
-            ->method('create')
-            ->willReturn($this->collection);
-        /**
-         * @var \Magento\Cms\Model\PageFactory $pageFactory
-         * @var \Magento\Cms\Api\Data\PageInterfaceFactory $pageDataFactory
-         * @var \Magento\Cms\Api\Data\PageSearchResultsInterfaceFactory $pageSearchResultFactory
-         * @var \Magento\Cms\Model\ResourceModel\Page\CollectionFactory $collectionFactory
-         */
-
-        $this->dataHelper = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->collectionProcessor = $this->getMockBuilder(CollectionProcessorInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->repository = new PageRepository(
-            $this->pageResource,
-            $pageFactory,
-            $pageDataFactory,
-            $collectionFactory,
-            $pageSearchResultFactory,
-            $this->dataHelper,
-            $this->dataObjectProcessor,
-            $this->storeManager,
-            $this->collectionProcessor
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function testSave()
-    {
-        $this->pageResource->expects($this->once())
-            ->method('save')
-            ->with($this->page)
-            ->willReturnSelf();
-        $this->assertEquals($this->page, $this->repository->save($this->page));
-    }
-
-    /**
-     * @test
-     */
-    public function testDeleteById()
-    {
-        $pageId = '123';
-
-        $this->page->expects($this->once())
-            ->method('getId')
-            ->willReturn(true);
-        $this->page->expects($this->once())
-            ->method('load')
-            ->with($pageId)
-            ->willReturnSelf();
-        $this->pageResource->expects($this->once())
-            ->method('delete')
-            ->with($this->page)
-            ->willReturnSelf();
-
-        $this->assertTrue($this->repository->deleteById($pageId));
-    }
-
-    /**
-     * @test
-     *
-     * @expectedException \Magento\Framework\Exception\CouldNotSaveException
-     */
-    public function testSaveException()
-    {
-        $this->pageResource->expects($this->once())
-            ->method('save')
-            ->with($this->page)
-            ->willThrowException(new \Exception());
-        $this->repository->save($this->page);
-    }
-
-    /**
-     * @test
-     *
-     * @expectedException \Magento\Framework\Exception\CouldNotDeleteException
-     */
-    public function testDeleteException()
-    {
-        $this->pageResource->expects($this->once())
-            ->method('delete')
-            ->with($this->page)
-            ->willThrowException(new \Exception());
-        $this->repository->delete($this->page);
-    }
-
-    /**
-     * @test
-     *
-     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
-     */
-    public function testGetByIdException()
-    {
-        $pageId = '123';
-
-        $this->page->expects($this->once())
-            ->method('getId')
-            ->willReturn(false);
-        $this->page->expects($this->once())
-            ->method('load')
-            ->with($pageId)
-            ->willReturnSelf();
-        $this->repository->getById($pageId);
-    }
-
-    /**
-     * @test
-     */
-    public function testGetList()
-    {
-        $total = 10;
-
-        /** @var \Magento\Framework\Api\SearchCriteriaInterface $criteria */
-        $criteria = $this->getMockBuilder(\Magento\Framework\Api\SearchCriteriaInterface::class)->getMock();
-
-        $this->collection->addItem($this->page);
-        $this->collection->expects($this->once())
-            ->method('getSize')
-            ->willReturn($total);
-
-        $this->collectionProcessor->expects($this->once())
-            ->method('process')
-            ->with($criteria, $this->collection)
-            ->willReturnSelf();
-
-        $this->pageSearchResult->expects($this->once())
-            ->method('setSearchCriteria')
-            ->with($criteria)
-            ->willReturnSelf();
-        $this->pageSearchResult->expects($this->once())
-            ->method('setTotalCount')
-            ->with($total)
-            ->willReturnSelf();
-        $this->pageSearchResult->expects($this->once())
-            ->method('setItems')
-            ->with([$this->page])
-            ->willReturnSelf();
-        $this->assertEquals($this->pageSearchResult, $this->repository->getList($criteria));
-    }
-}
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 ed87c66b6e1c5..9a9c63195051c 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
@@ -7,6 +7,7 @@
 
 use Magento\Cms\Model\Wysiwyg\Images\Storage\Collection as StorageCollection;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * @SuppressWarnings(PHPMD.LongVariable)
@@ -454,7 +455,7 @@ protected function generalTestGetDirsCollection($path, $collectionArray = [], $e
         $storageCollectionMock->expects($this->once())
             ->method('getIterator')
             ->willReturn(new \ArrayIterator($collectionArray));
-        $storageCollectionInvMock = $storageCollectionMock->expects($this->exactly(sizeof($expectedRemoveKeys)))
+        $storageCollectionInvMock = $storageCollectionMock->expects($this->exactly(count($expectedRemoveKeys)))
             ->method('removeItemByKey');
         call_user_func_array([$storageCollectionInvMock, 'withConsecutive'], $expectedRemoveKeys);
 
@@ -539,4 +540,18 @@ public function testUploadFile()
 
         $this->assertEquals($result, $this->imagesStorage->uploadFile($targetPath, $type));
     }
+
+    /**
+     * Test create directory with invalid name
+     */
+    public function testCreateDirectoryWithInvalidName()
+    {
+        $name = 'папка';
+        $path = '/tmp/path';
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage(
+            (string)__('Please rename the folder using only Latin letters, numbers, underscores and dashes.')
+        );
+        $this->imagesStorage->createDirectory($name, $path);
+    }
 }
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 8741e37016b64..4ffe4a6ad8774 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
@@ -58,7 +58,10 @@ protected function setUp()
 
         $this->blockActions = $objectManager->getObject(
             BlockActions::class,
-            ['context' => $context, 'urlBuilder' => $this->urlBuilder]
+            [
+                'context' => $context,
+                'urlBuilder' => $this->urlBuilder
+            ]
         );
 
         $objectManager->setBackwardCompatibleProperty($this->blockActions, 'escaper', $this->escaper);
@@ -93,6 +96,7 @@ public function testPrepareDataSource()
                     'edit' => [
                         'href' => 'test/url/edit',
                         'label' => __('Edit'),
+                        '__disableTmpl' => true,
                     ],
                     'delete' => [
                         'href' => 'test/url/delete',
@@ -102,6 +106,7 @@ public function testPrepareDataSource()
                             'message' => __('Are you sure you want to delete a %1 record?', $title),
                         ],
                         'post' => true,
+                        '__disableTmpl' => 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 32bbeed0788a3..53d8ee5220768 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
@@ -65,6 +65,7 @@ public function testPrepareItemsByPageId()
                     'edit' => [
                         'href' => 'test/url/edit',
                         'label' => __('Edit'),
+                        '__disableTmpl' => true,
                     ],
                     'delete' => [
                         'href' => 'test/url/delete',
@@ -75,6 +76,7 @@ public function testPrepareItemsByPageId()
                             '__disableTmpl' => true,
                         ],
                         'post' => true,
+                        '__disableTmpl' => true,
                     ],
                 ],
             ],
@@ -84,7 +86,6 @@ public function testPrepareItemsByPageId()
             ->method('escapeHtml')
             ->with($title)
             ->willReturn($title);
-
         // Configure mocks and object data
         $urlBuilderMock->expects($this->any())
             ->method('getUrl')
@@ -106,7 +107,6 @@ public function testPrepareItemsByPageId()
                     ],
                 ]
             );
-
         $model->setName($name);
         $items = $model->prepareDataSource($items);
         // Run test
diff --git a/app/code/Magento/Cms/Test/Unit/ViewModel/Page/Grid/UrlBuilderTest.php b/app/code/Magento/Cms/Test/Unit/ViewModel/Page/Grid/UrlBuilderTest.php
new file mode 100644
index 0000000000000..fbb2fb1eb65c5
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/ViewModel/Page/Grid/UrlBuilderTest.php
@@ -0,0 +1,194 @@
+<?php
+/***
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Test\Unit\ViewModel\Page\Grid;
+
+use Magento\Cms\ViewModel\Page\Grid\UrlBuilder;
+use Magento\Framework\Url\EncoderInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class UrlBuilderTest
+ *
+ * Testing the UrlBuilder
+ */
+class UrlBuilderTest extends TestCase
+{
+    /**
+     * @var UrlBuilder
+     */
+    private $viewModel;
+
+    /**
+     * @var UrlInterface|MockObject
+     */
+    private $frontendUrlBuilderMock;
+
+    /**
+     * @var EncoderInterface|MockObject
+     */
+    private $urlEncoderMock;
+
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * Set Up
+     */
+    public function setUp()
+    {
+        $this->frontendUrlBuilderMock = $this->getMockBuilder(UrlInterface::class)
+            ->setMethods(['getUrl', 'setScope'])
+            ->getMockForAbstractClass();
+        $this->urlEncoderMock = $this->createMock(EncoderInterface::class);
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->viewModel = new UrlBuilder(
+            $this->frontendUrlBuilderMock,
+            $this->urlEncoderMock,
+            $this->storeManagerMock
+        );
+    }
+
+    /**
+     * Testing url builder with no scope provided
+     *
+     * @dataProvider nonScopedUrlsDataProvider
+     *
+     * @param array $url
+     * @param string $expected
+     * @param string $store
+     * @param null $scope
+     */
+    public function testUrlBuilderWithNoScope(array $url, string $expected, string $store, $scope = null)
+    {
+        $this->frontendUrlBuilderMock->expects($this->any())
+            ->method('getUrl')
+            ->with($url['path'], $url['params'])
+            ->willReturn($expected);
+
+        $result = $this->viewModel->getUrl($url['path'], $scope, $store);
+
+        $this->assertSame($expected, $result);
+    }
+
+    /**
+     * Providing a non scoped urls
+     *
+     * @return array
+     */
+    public function nonScopedUrlsDataProvider(): array
+    {
+        return [
+            [
+                [
+                    'path' => 'test/view',
+                    'params' => [
+                        '_current' => false,
+                        '_nosid' => true
+                    ]
+                ],
+                'http://domain.com/test/view/',
+                'en'
+            ]
+        ];
+    }
+
+    /**
+     * Testing url builder with a scope provided
+     *
+     * @dataProvider scopedUrlsDataProvider
+     *
+     * @param string $storeCode
+     * @param string $defaultStoreCode
+     * @param array $urlParams
+     * @param string $scope
+     */
+    public function testScopedUrlBuilder(
+        string $storeCode,
+        string $defaultStoreCode,
+        array $urlParams,
+        string $scope = 'store'
+    ) {
+        /** @var StoreInterface|MockObject $storeMock */
+        $storeMock = $this->createMock(StoreInterface::class);
+        $storeMock->expects($this->any())
+            ->method('getCode')
+            ->willReturn($defaultStoreCode);
+        $this->storeManagerMock->expects($this->once())
+            ->method('getDefaultStoreView')
+            ->willReturn($storeMock);
+
+        $this->frontendUrlBuilderMock->expects($this->any())
+            ->method('getUrl')
+            ->withConsecutive(
+                [
+                    'test/index',
+                    [
+                        '_current' => false,
+                        '_nosid' => true,
+                        '_query' => [
+                            StoreManagerInterface::PARAM_NAME => $storeCode
+                        ]
+                    ]
+                ],
+                [
+                    'stores/store/switch',
+                    $urlParams
+                ]
+            )
+            ->willReturnOnConsecutiveCalls(
+                'http://domain.com/test',
+                'http://domain.com/test/index'
+            );
+
+        $result = $this->viewModel->getUrl('test/index', $scope, $storeCode);
+
+        $this->assertSame('http://domain.com/test/index', $result);
+    }
+
+    /**
+     * Providing a scoped urls
+     *
+     * @return array
+     */
+    public function scopedUrlsDataProvider(): array
+    {
+        $enStoreCode = 'en';
+        $frStoreCode = 'fr';
+        $scopedDefaultUrlParams = $defaultUrlParams = [
+            '_current' => false,
+            '_nosid' => true,
+            '_query' => [
+                '___store' => $enStoreCode,
+                'uenc' => null,
+            ]
+        ];
+        $scopedDefaultUrlParams['_query']['___from_store'] = $frStoreCode;
+
+        return [
+            [
+                $enStoreCode,
+                $enStoreCode,
+                $defaultUrlParams,
+            ],
+            [
+                $enStoreCode,
+                $frStoreCode,
+                $scopedDefaultUrlParams
+            ]
+        ];
+    }
+}
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 6e9eef47281c0..65940c5d7b4f9 100644
--- a/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
+++ b/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
@@ -70,6 +70,7 @@ public function prepareDataSource(array $dataSource)
                                 ]
                             ),
                             'label' => __('Edit'),
+                            '__disableTmpl' => true,
                         ],
                         'delete' => [
                             'href' => $this->urlBuilder->getUrl(
@@ -84,6 +85,7 @@ public function prepareDataSource(array $dataSource)
                                 'message' => __('Are you sure you want to delete a %1 record?', $title),
                             ],
                             'post' => true,
+                            '__disableTmpl' => true,
                         ],
                     ];
                 }
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 5cefa212d1655..fa3756abfded4 100644
--- a/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
+++ b/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
@@ -86,7 +86,8 @@ public function prepareDataSource(array $dataSource)
                 if (isset($item['page_id'])) {
                     $item[$name]['edit'] = [
                         'href' => $this->urlBuilder->getUrl($this->editUrl, ['page_id' => $item['page_id']]),
-                        'label' => __('Edit')
+                        'label' => __('Edit'),
+                        '__disableTmpl' => true,
                     ];
                     $title = $this->getEscaper()->escapeHtml($item['title']);
                     $item[$name]['delete'] = [
@@ -98,6 +99,7 @@ public function prepareDataSource(array $dataSource)
                             '__disableTmpl' => true,
                         ],
                         'post' => true,
+                        '__disableTmpl' => true,
                     ];
                 }
                 if (isset($item['identifier'])) {
@@ -107,7 +109,8 @@ public function prepareDataSource(array $dataSource)
                             isset($item['_first_store_id']) ? $item['_first_store_id'] : null,
                             isset($item['store_code']) ? $item['store_code'] : null
                         ),
-                        'label' => __('View')
+                        'label' => __('View'),
+                        '__disableTmpl' => true,
                     ];
                 }
             }
diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json
index d04587bbdd728..91036d31fdc2b 100644
--- a/app/code/Magento/Cms/composer.json
+++ b/app/code/Magento/Cms/composer.json
@@ -15,8 +15,7 @@
         "magento/module-theme": "*",
         "magento/module-ui": "*",
         "magento/module-variable": "*",
-        "magento/module-widget": "*",
-        "magento/module-authorization": "*"
+        "magento/module-widget": "*"
     },
     "suggest": {
         "magento/module-cms-sample-data": "*"
diff --git a/app/code/Magento/Cms/etc/db_schema.xml b/app/code/Magento/Cms/etc/db_schema.xml
index 1e64c905badd8..9ff3153098482 100644
--- a/app/code/Magento/Cms/etc/db_schema.xml
+++ b/app/code/Magento/Cms/etc/db_schema.xml
@@ -68,6 +68,8 @@
                 comment="Page Custom Template"/>
         <column xsi:type="text" name="custom_layout_update_xml" nullable="true"
                 comment="Page Custom Layout Update Content"/>
+        <column xsi:type="varchar" name="layout_update_selected" nullable="true"
+                length="128" comment="Page Custom Layout File"/>
         <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"/>
diff --git a/app/code/Magento/Cms/etc/db_schema_whitelist.json b/app/code/Magento/Cms/etc/db_schema_whitelist.json
index 8da44baf71719..fe0e9c1f2e22e 100644
--- a/app/code/Magento/Cms/etc/db_schema_whitelist.json
+++ b/app/code/Magento/Cms/etc/db_schema_whitelist.json
@@ -50,7 +50,8 @@
             "custom_layout_update_xml": true,
             "custom_theme_from": true,
             "custom_theme_to": true,
-            "meta_title": true
+            "meta_title": true,
+            "layout_update_selected": true
         },
         "index": {
             "CMS_PAGE_IDENTIFIER": true,
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index d82dc4ea86239..35fb7d82651f0 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -15,7 +15,7 @@
     <preference for="Magento\Cms\Api\Data\PageInterface" type="Magento\Cms\Model\Page" />
     <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\Cms\Api\PageRepositoryInterface" type="Magento\Cms\Model\PageRepository\ValidationComposite" />
     <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">
@@ -235,4 +235,19 @@
     <type name="Magento\Catalog\Model\Product">
         <plugin name="cms" type="Magento\Cms\Model\Plugin\Product" sortOrder="100"/>
     </type>
+    <type name="Magento\Cms\Model\PageRepository\ValidationComposite">
+        <arguments>
+            <argument name="repository" xsi:type="object">Magento\Cms\Model\PageRepository</argument>
+            <argument name="validators" xsi:type="array">
+                <item name="layout_update" xsi:type="object">Magento\Cms\Model\PageRepository\Validator\LayoutUpdateValidator</item>
+            </argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Cms\Model\Page\CustomLayoutManagerInterface" type="Magento\Cms\Model\Page\CustomLayout\CustomLayoutManager" />
+    <type name="Magento\Cms\Model\Page\CustomLayout\CustomLayoutManager">
+        <arguments>
+            <argument name="themeFactory" xsi:type="object">Magento\Framework\View\Design\Theme\FlyweightFactory\Proxy</argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Cms\Model\Page\CustomLayoutRepositoryInterface" type="Magento\Cms\Model\Page\CustomLayout\CustomLayoutRepository" />
 </config>
diff --git a/app/code/Magento/Cms/etc/events.xml b/app/code/Magento/Cms/etc/events.xml
index d6b9ad4ee0248..1ad847e215ccc 100644
--- a/app/code/Magento/Cms/etc/events.xml
+++ b/app/code/Magento/Cms/etc/events.xml
@@ -36,4 +36,7 @@
     <event name="magento_cms_api_data_pageinterface_load_after">
         <observer name="legacy_model_cms_page_after_load" instance="Magento\Framework\EntityManager\Observer\AfterEntityLoad" />
     </event>
+    <event name="cms_page_prepare_save">
+        <observer name="validate_cms_page" instance="Magento\Cms\Observer\PageValidatorObserver" />
+    </event>
 </config>
diff --git a/app/code/Magento/Cms/etc/webapi_rest/di.xml b/app/code/Magento/Cms/etc/webapi_rest/di.xml
new file mode 100644
index 0000000000000..686305f2ed300
--- /dev/null
+++ b/app/code/Magento/Cms/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\Cms\Api\PageRepositoryInterface">
+        <plugin name="aclCheck" type="Magento\Cms\Observer\PageAclPlugin" sortOrder="100" />
+    </type>
+</config>
diff --git a/app/code/Magento/Cms/etc/webapi_soap/di.xml b/app/code/Magento/Cms/etc/webapi_soap/di.xml
new file mode 100644
index 0000000000000..686305f2ed300
--- /dev/null
+++ b/app/code/Magento/Cms/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\Cms\Api\PageRepositoryInterface">
+        <plugin name="aclCheck" type="Magento\Cms\Observer\PageAclPlugin" sortOrder="100" />
+    </type>
+</config>
diff --git a/app/code/Magento/Cms/i18n/en_US.csv b/app/code/Magento/Cms/i18n/en_US.csv
index 2947c567d75ff..b860a8fb1041e 100644
--- a/app/code/Magento/Cms/i18n/en_US.csv
+++ b/app/code/Magento/Cms/i18n/en_US.csv
@@ -76,6 +76,7 @@ Pages,Pages
 "The page URL key contains capital letters or disallowed symbols.","The page URL key contains capital letters or disallowed symbols."
 "The page URL key cannot be made of only numbers.","The page URL key cannot be made of only numbers."
 "Please rename the folder using only letters, numbers, underscores and dashes.","Please rename the folder using only letters, numbers, underscores and dashes."
+"Please rename the folder using only Latin letters, numbers, underscores and dashes.","Please rename the folder using only Latin letters, numbers, underscores and dashes."
 "We found a directory with the same name. Please try another folder name.","We found a directory with the same name. Please try another folder name."
 "We cannot create a new directory.","We cannot create a new directory."
 "We cannot delete directory %1.","We cannot delete directory %1."
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 ad0f33df59d4e..a2ce0ec1b8740 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
@@ -105,6 +105,7 @@
             <settings>
                 <validation>
                     <rule name="required-entry" xsi:type="boolean">true</rule>
+                    <rule name="no-marginal-whitespace" xsi:type="boolean">true</rule>
                 </validation>
                 <dataType>text</dataType>
                 <label translate="true">Identifier</label>
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 dd58d17cbf577..396923a2b6f3b 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
@@ -249,6 +249,7 @@
         </field>
         <field name="layout_update_xml" formElement="textarea">
             <argument name="data" xsi:type="array">
+                <item name="disabled" xsi:type="boolean">true</item>
                 <item name="config" xsi:type="array">
                     <item name="source" xsi:type="string">page</item>
                 </item>
@@ -259,6 +260,26 @@
                 <dataScope>layout_update_xml</dataScope>
             </settings>
         </field>
+        <field name="custom_layout_update_select" formElement="select">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="source" xsi:type="string">page</item>
+                </item>
+            </argument>
+            <settings>
+                <dataType>text</dataType>
+                <label translate="true">Custom Layout Update</label>
+                <tooltip>
+                    <description translate="true">
+                        List of layout files with an update handle "selectable"
+                        matching *PageIdentifier*_*UpdateID*.
+                        &lt;br/&gt;
+                        See Magento documentation for more information
+                    </description>
+                </tooltip>
+                <dataScope>layout_update_selected</dataScope>
+            </settings>
+        </field>
     </fieldset>
     <fieldset name="custom_design_update" sortOrder="60">
         <settings>
diff --git a/app/code/Magento/Cms/view/adminhtml/web/css/source/_module.less b/app/code/Magento/Cms/view/adminhtml/web/css/source/_module.less
deleted file mode 100644
index af8fa2758f5af..0000000000000
--- a/app/code/Magento/Cms/view/adminhtml/web/css/source/_module.less
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-.modal-slide {
-  .media-gallery-modal {
-    .page-main-actions {
-      margin-bottom: 3rem;
-    }
-
-    #new_folder {
-      margin-right: 10px;
-    }
-  }
-}
diff --git a/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php
index fa4944381b858..21bdca732b606 100644
--- a/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php
+++ b/app/code/Magento/CmsGraphQl/Model/Resolver/DataProvider/Block.php
@@ -56,7 +56,7 @@ public function getData(string $blockIdentifier): array
             );
         }
 
-        $renderedContent = $this->widgetFilter->filter($block->getContent());
+        $renderedContent = $this->widgetFilter->filterDirective($block->getContent());
 
         $blockData = [
             BlockInterface::BLOCK_ID => $block->getId(),
diff --git a/app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlPathGeneratorTest.php b/app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlPathGeneratorTest.php
new file mode 100644
index 0000000000000..6b57254dd0ec1
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlPathGeneratorTest.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CmsUrlRewrite\Test\Unit\Model;
+
+use Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Filter\FilterManager;
+use Magento\Cms\Api\Data\PageInterface;
+
+/**
+ * Class \Magento\CmsUrlRewrite\Test\Unit\Model\CmsPageUrlPathGeneratorTest
+ */
+class CmsPageUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManager;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|FilterManager
+     */
+    private $filterManagerMock;
+
+    /**
+     * @var CmsPageUrlPathGenerator
+     */
+    private $model;
+
+    /**
+     * Setup environment for test
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManagerHelper($this);
+        $this->filterManagerMock = $this->getMockBuilder(FilterManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['translitUrl'])
+            ->getMock();
+
+        $this->model = $this->objectManager->getObject(
+            CmsPageUrlPathGenerator::class,
+            [
+                'filterManager' => $this->filterManagerMock
+            ]
+        );
+    }
+
+    /**
+     * Test getUrlPath with page has identifier = cms-cookie
+     */
+    public function testGetUrlPath()
+    {
+        /* @var PageInterface $cmsPageMock*/
+        $cmsPageMock = $this->getMockBuilder(PageInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $cmsPageMock->expects($this->any())
+            ->method('getIdentifier')
+            ->willReturn('cms-cookie');
+
+        $this->assertEquals('cms-cookie', $this->model->getUrlPath($cmsPageMock));
+    }
+
+    /**
+     * Test getCanonicalUrlPath() with page has id = 1
+     */
+    public function testGetCanonicalUrlPath()
+    {
+        /* @var PageInterface $cmsPageMock*/
+        $cmsPageMock = $this->getMockBuilder(PageInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $cmsPageMock->expects($this->any())
+            ->method('getId')
+            ->willReturn('1');
+
+        $this->assertEquals('cms/page/view/page_id/1', $this->model->getCanonicalUrlPath($cmsPageMock));
+    }
+
+    /**
+     * Test generateUrlKey() with page has no identifier
+     */
+    public function testGenerateUrlKeyWithNullIdentifier()
+    {
+        /**
+         * Data set
+         */
+        $page = [
+            'identifier' => null,
+            'title' => 'CMS Cookie'
+        ];
+
+        /* @var PageInterface $cmsPageMock*/
+        $cmsPageMock = $this->getMockBuilder(PageInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $cmsPageMock->expects($this->any())
+            ->method('getIdentifier')
+            ->willReturn($page['identifier']);
+
+        $cmsPageMock->expects($this->any())
+            ->method('getTitle')
+            ->willReturn($page['title']);
+
+        $this->filterManagerMock->expects($this->any())
+            ->method('translitUrl')
+            ->with($page['title'])
+            ->willReturn('cms-cookie');
+
+        $this->assertEquals('cms-cookie', $this->model->generateUrlKey($cmsPageMock));
+    }
+
+    /**
+     * Test generateUrlKey() with page has identifier
+     */
+    public function testGenerateUrlKeyWithIdentifier()
+    {
+        /**
+         * Data set
+         */
+        $page = [
+            'identifier' => 'home',
+            'title' => 'Home Page'
+        ];
+
+        /* @var PageInterface $cmsPageMock*/
+        $cmsPageMock = $this->getMockBuilder(PageInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $cmsPageMock->expects($this->any())
+            ->method('getIdentifier')
+            ->willReturn($page['identifier']);
+
+        $cmsPageMock->expects($this->any())
+            ->method('getTitle')
+            ->willReturn($page['title']);
+
+        $this->filterManagerMock->expects($this->any())
+            ->method('translitUrl')
+            ->with($page['identifier'])
+            ->willReturn('home');
+
+        $this->assertEquals('home', $this->model->generateUrlKey($cmsPageMock));
+    }
+}
diff --git a/app/code/Magento/Config/Model/Config/Backend/Encrypted.php b/app/code/Magento/Config/Model/Config/Backend/Encrypted.php
index 80ce061a0a17e..62d6531978d8a 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Encrypted.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Encrypted.php
@@ -48,9 +48,6 @@ public function __construct(
      * Magic method called during class serialization
      *
      * @return string[]
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -62,9 +59,6 @@ public function __sleep()
      * Magic method called during class un-serialization
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Template.php b/app/code/Magento/Config/Model/Config/Source/Email/Template.php
index 04222733418d3..e4f1ae65bcacd 100644
--- a/app/code/Magento/Config/Model/Config/Source/Email/Template.php
+++ b/app/code/Magento/Config/Model/Config/Source/Email/Template.php
@@ -6,6 +6,8 @@
 namespace Magento\Config\Model\Config\Source\Email;
 
 /**
+ * Source for template
+ *
  * @api
  * @since 100.0.2
  */
@@ -62,6 +64,12 @@ public function toOptionArray()
         $templateLabel = $this->_emailConfig->getTemplateLabel($templateId);
         $templateLabel = __('%1 (Default)', $templateLabel);
         array_unshift($options, ['value' => $templateId, 'label' => $templateLabel]);
+        array_walk(
+            $options,
+            function (&$item) {
+                $item['__disableTmpl'] = true;
+            }
+        );
         return $options;
     }
 }
diff --git a/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php b/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
index db815ec87ed76..23a3dea1a7029 100644
--- a/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
+++ b/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
@@ -40,7 +40,7 @@ abstract class AbstractElement implements StructureElementInterface
     protected $_storeManager;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
@@ -50,15 +50,11 @@ abstract class AbstractElement implements StructureElementInterface
     private $elementVisibility;
 
     /**
-     * Construct.
-     *
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      */
-    public function __construct(
-        StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager
-    ) {
+    public function __construct(StoreManagerInterface $storeManager, \Magento\Framework\Module\Manager $moduleManager)
+    {
         $this->_storeManager = $storeManager;
         $this->moduleManager = $moduleManager;
     }
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/AbstractComposite.php b/app/code/Magento/Config/Model/Config/Structure/Element/AbstractComposite.php
index efb918226aa31..a14114a116e78 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/AbstractComposite.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/AbstractComposite.php
@@ -23,12 +23,12 @@ abstract class AbstractComposite extends \Magento\Config\Model\Config\Structure\
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param Iterator $childrenIterator
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         Iterator $childrenIterator
     ) {
         parent::__construct($storeManager, $moduleManager);
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Field.php b/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Field.php
index 8f4d82eed51c5..15f23c7737294 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Field.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Field.php
@@ -9,6 +9,12 @@
  * @api
  * @since 100.0.2
  */
+
+/**
+ * Class Field
+ *
+ * Fields are used to describe possible values for a type/interface.
+ */
 class Field
 {
     /**
@@ -41,7 +47,7 @@ public function __construct(array $fieldData = [], $fieldPrefix = "")
         if (isset($fieldData['separator'])) {
             $this->_values = explode($fieldData['separator'], $fieldData['value']);
         } else {
-            $this->_values = [$fieldData['value']];
+            $this->_values = [isset($fieldData['value']) ? $fieldData['value'] : ''];
         }
         $fieldId = $fieldPrefix . (isset(
             $fieldData['dependPath']
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Field.php b/app/code/Magento/Config/Model/Config/Structure/Element/Field.php
index 6a8cc6e767466..834b2a9e17e37 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Field.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Field.php
@@ -56,7 +56,7 @@ class Field extends \Magento\Config\Model\Config\Structure\AbstractElement
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Config\Model\Config\BackendFactory $backendFactory
      * @param \Magento\Config\Model\Config\SourceFactory $sourceFactory
      * @param \Magento\Config\Model\Config\CommentFactory $commentFactory
@@ -65,7 +65,7 @@ class Field extends \Magento\Config\Model\Config\Structure\AbstractElement
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Config\Model\Config\BackendFactory $backendFactory,
         \Magento\Config\Model\Config\SourceFactory $sourceFactory,
         \Magento\Config\Model\Config\CommentFactory $commentFactory,
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Group.php b/app/code/Magento/Config/Model/Config/Structure/Element/Group.php
index db479e8b795a0..1ca0afa942f8d 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Group.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Group.php
@@ -29,14 +29,14 @@ class Group extends AbstractComposite
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param Iterator\Field $childrenIterator
      * @param \Magento\Config\Model\Config\BackendClone\Factory $cloneModelFactory
      * @param Dependency\Mapper $dependencyMapper
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Config\Model\Config\Structure\Element\Iterator\Field $childrenIterator,
         \Magento\Config\Model\Config\BackendClone\Factory $cloneModelFactory,
         \Magento\Config\Model\Config\Structure\Element\Dependency\Mapper $dependencyMapper
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Section.php b/app/code/Magento/Config/Model/Config/Structure/Element/Section.php
index 134411fbd87ca..80c029dfea2d0 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Element/Section.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Element/Section.php
@@ -22,13 +22,13 @@ class Section extends AbstractComposite
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param Iterator $childrenIterator
      * @param \Magento\Framework\AuthorizationInterface $authorization
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         Iterator $childrenIterator,
         \Magento\Framework\AuthorizationInterface $authorization
     ) {
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml
index 10d22b61ecae0..2a3a14293a059 100644
--- a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SetGroupForValidVATIdIntraUnionActionGroup">
         <annotations>
-            <description>Goes to the 'Configuration' page for 'Customer Configuration'. Sets the 'Group For Valid VAT ID Intra Union' option. Clicks on the Save button. Validates the the Save message is present.</description>
+            <description>Goes to the 'Configuration' page for 'Customer Configuration'. Sets the 'Group For Valid VAT ID Intra Union' option. Clicks on the Save button. Validates the Save message is present.</description>
         </annotations>
         <arguments>
             <argument name="value" type="string"/>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminExpandConfigSectionActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminExpandConfigSectionActionGroup.xml
new file mode 100644
index 0000000000000..03a3a45ef0947
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminExpandConfigSectionActionGroup.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="AdminExpandConfigSectionActionGroup">
+        <annotations>
+            <description>Expands configuration section passed via argument as Section Name.</description>
+        </annotations>
+        <arguments>
+            <argument name="sectionName" type="string"/>
+        </arguments>
+
+        <conditionalClick selector="{{AdminConfigSection.collapsibleSectionByTitle(sectionName)}}" dependentSelector="{{AdminConfigSection.expandedSectionByTitle(sectionName)}}" visible="false" stepKey="expandSection" />
+        <waitForElement selector="{{AdminConfigSection.expandedSectionByTitle(sectionName)}}" stepKey="waitOpenedSection"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminExpandSecurityTabActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminExpandSecurityTabActionGroup.xml
new file mode 100644
index 0000000000000..f07d4df9d86b2
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminExpandSecurityTabActionGroup.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="AdminExpandSecurityTabActionGroup">
+        <conditionalClick selector="{{AdminSection.SecurityTab}}" dependentSelector="{{AdminSection.CheckIfTabExpand}}" visible="true" stepKey="openSecurityTab"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenConfigAdminPageActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenConfigAdminPageActionGroup.xml
new file mode 100644
index 0000000000000..6d4fba179ecf4
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenConfigAdminPageActionGroup.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="AdminOpenConfigAdminPageActionGroup">
+        <amOnPage url="{{AdminConfigAdminPage.url}}" stepKey="goToConfigAdminSectionPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMaximumLoginFailuresToLockoutAccountActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMaximumLoginFailuresToLockoutAccountActionGroup.xml
new file mode 100644
index 0000000000000..ada58e9f4225e
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMaximumLoginFailuresToLockoutAccountActionGroup.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="AdminSetMaximumLoginFailuresToLockoutAccountActionGroup">
+        <arguments>
+            <argument name="qty" type="string" defaultValue="3"/>
+        </arguments>
+        <uncheckOption selector="{{AdminSection.systemValueForMaximumLoginFailures}}" stepKey="uncheckUseSystemValue"/>
+        <fillField selector="{{AdminSection.MaximumLoginFailures}}" userInput="{{qty}}" stepKey="setMaximumLoginFailures"/>
+        <seeInField selector="{{AdminSection.MaximumLoginFailures}}" userInput="{{qty}}"  stepKey="seeNewValueInField"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminConfigAdminPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigAdminPage.xml
new file mode 100644
index 0000000000000..661bb734bcbe4
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigAdminPage.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="AdminConfigAdminPage" url="admin/system_config/edit/section/admin" module="Magento_Config" area="admin">
+        <section name="AdminSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
index 8fafdc202bf09..a1ee5348d094c 100644
--- a/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
+++ b/app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml
@@ -24,4 +24,7 @@
     <page name="AdminConfigDeveloperPage" url="admin/system_config/edit/section/dev/" area="admin" module="Magento_Config">
         <section name="AdminConfigSection" />
     </page>
+    <page name="AdminConfigAdvancedAdmin" url="admin/system_config/edit/section/admin/" area="admin" module="Magento_Config">
+        <section name="AdvanceAdminSection"/>
+    </page>
 </pages>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
index ffe3f0076ca8d..a4fb3c7e32975 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml
@@ -19,5 +19,8 @@
         <element name="defaultConfigButton" type="button" selector="#store-change-button" timeout="30"/>
         <element name="defaultConfigDropdown" type="button" selector="//ul[@class='dropdown-menu']" timeout="30"/>
         <element name="fieldError" type="text" selector="label.mage-error"/>
+        <element name="useSystemValue" type="checkbox" selector="#{{configRowId}} > .use-default > input" parameterized="true"/>
+        <element name="collapsibleSectionByTitle" type="text" selector="//form[@id='config-edit-form']//div[@class='section-config'][contains(.,'{{sectionTitle}}')]" parameterized="true" />
+        <element name="expandedSectionByTitle" type="text" selector="//form[@id='config-edit-form']//div[@class='section-config active'][contains(.,'{{sectionTitle}}')]" parameterized="true" />
     </section>
 </sections>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminSection.xml
index 7b6c9f8ab3b79..4aea038bec716 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/AdminSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminSection.xml
@@ -13,5 +13,7 @@
         <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"/>
+        <element name="systemValueForMaximumLoginFailures" type="checkbox" selector="#admin_security_lockout_failures_inherit"/>
+        <element name="MaximumLoginFailures" type="input" selector="#admin_security_lockout_failures"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
index b29ad244e7a81..9fabe6fef0c8e 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Config\Test\Unit\Model\Config\Source\Email;
 
+/**
+ * Test class for Template.
+ */
 class TemplateTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -76,9 +79,21 @@ public function testToOptionArray()
             $this->returnValue('Template New')
         );
         $expectedResult = [
-            ['value' => 'template_new', 'label' => 'Template New (Default)'],
-            ['value' => 'template_one', 'label' => 'Template One'],
-            ['value' => 'template_two', 'label' => 'Template Two'],
+            [
+                'value' => 'template_new',
+                'label' => 'Template New (Default)',
+                '__disableTmpl' => true
+            ],
+            [
+                'value' => 'template_one',
+                'label' => 'Template One',
+                '__disableTmpl' => true
+            ],
+            [
+                'value' => 'template_two',
+                'label' => 'Template Two',
+                '__disableTmpl' => true
+            ],
         ];
         $this->_model->setPath('template/new');
         $this->assertEquals($expectedResult, $this->_model->toOptionArray());
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/AbstractCompositeTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/AbstractCompositeTest.php
index e448b628ef020..8c54a02a491c0 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/AbstractCompositeTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/AbstractCompositeTest.php
@@ -29,7 +29,7 @@ class AbstractCompositeTest extends \PHPUnit\Framework\TestCase
     protected $_iteratorMock;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Module\Manager | \PHPUnit_Framework_MockObject_MockObject
      */
     protected $moduleManagerMock;
 
@@ -56,7 +56,7 @@ protected function setUp()
             ->getMockForAbstractClass();
         $this->_iteratorMock = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Iterator::class);
         $this->_storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManager::class);
-        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\ModuleManagerInterface::class);
+        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\Manager::class);
         $this->_model = $this->getMockForAbstractClass(
             \Magento\Config\Model\Config\Structure\Element\AbstractComposite::class,
             [$this->_storeManagerMock, $this->moduleManagerMock, $this->_iteratorMock]
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 750a829eef7ec..22cf979a9bd63 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
@@ -12,6 +12,8 @@ class FieldTest extends \PHPUnit\Framework\TestCase
      */
     const SIMPLE_VALUE = 'someValue';
 
+    const EMPTY_VALUE = '';
+
     const COMPLEX_VALUE1 = 'value_1';
 
     const COMPLEX_VALUE2 = 'value_2';
@@ -150,8 +152,19 @@ public function getValuesDataProvider()
         return [
             [$this->_getSimpleData(), true, [self::SIMPLE_VALUE]],
             [$this->_getSimpleData(), false, [self::SIMPLE_VALUE]],
+            [$this->_getSimpleEmptyData(), false, [static::EMPTY_VALUE]],
             [$this->_getComplexData(), true, $complexDataValues],
             [$this->_getComplexData(), false, $complexDataValues]
         ];
     }
+
+    /**
+     * Providing a field data with no field value
+     *
+     * @return array
+     */
+    protected function _getSimpleEmptyData(): array
+    {
+        return ['dependPath' => ['section_2', 'group_3', 'field_4']];
+    }
 }
diff --git a/app/code/Magento/Config/etc/db_schema.xml b/app/code/Magento/Config/etc/db_schema.xml
index 46dd77959b9d4..54680c0be7b06 100644
--- a/app/code/Magento/Config/etc/db_schema.xml
+++ b/app/code/Magento/Config/etc/db_schema.xml
@@ -15,6 +15,8 @@
                 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"/>
+        <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="config_id"/>
         </constraint>
diff --git a/app/code/Magento/Config/etc/db_schema_whitelist.json b/app/code/Magento/Config/etc/db_schema_whitelist.json
index 850e160bc732f..51ca41d8e6af8 100644
--- a/app/code/Magento/Config/etc/db_schema_whitelist.json
+++ b/app/code/Magento/Config/etc/db_schema_whitelist.json
@@ -5,11 +5,12 @@
             "scope": true,
             "scope_id": true,
             "path": true,
-            "value": true
+            "value": true,
+            "updated_at": true
         },
         "constraint": {
             "PRIMARY": true,
             "CORE_CONFIG_DATA_SCOPE_SCOPE_ID_PATH": true
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php
index 11384263b59a2..b9fcf307b613f 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/Matrix.php
@@ -412,6 +412,7 @@ private function prepareAttributes(
                 'id' => $attribute->getAttributeId(),
                 'position' => $configurableAttributes[$attribute->getAttributeId()]['position'],
                 'chosen' => [],
+                '__disableTmpl' => true
             ];
             $options = $attribute->usesSource() ? $attribute->getSource()->getAllOptions() : [];
             foreach ($options as $option) {
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 71db9d32aa593..55c0c8f6ca4ce 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -182,11 +182,10 @@ public function getAllowProducts()
     {
         if (!$this->hasAllowProducts()) {
             $products = [];
-            $skipSaleableCheck = $this->catalogProduct->getSkipSaleableCheck();
             $allProducts = $this->getProduct()->getTypeInstance()->getUsedProducts($this->getProduct(), null);
             /** @var $product \Magento\Catalog\Model\Product */
             foreach ($allProducts as $product) {
-                if ($skipSaleableCheck || ((int) $product->getStatus()) === Status::STATUS_ENABLED) {
+                if ((int) $product->getStatus() === Status::STATUS_ENABLED) {
                     $products[] = $product;
                 }
             }
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index c60953e33e9eb..5b50cc0ebd5e0 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -9,12 +9,14 @@
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 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\Framework\Api\SearchCriteriaBuilder;
 
 /**
  * Configurable product type implementation
@@ -194,9 +196,18 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      */
     private $salableProcessor;
 
+    /**
+     * @var ProductAttributeRepositoryInterface|null
+     */
+    private $productAttributeRepository;
+
+    /**
+     * @var SearchCriteriaBuilder|null
+     */
+    private $searchCriteriaBuilder;
+
     /**
      * @codingStandardsIgnoreStart/End
-     *
      * @param \Magento\Catalog\Model\Product\Option $catalogProductOption
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
@@ -214,9 +225,13 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * @param \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable $catalogProductTypeConfigurable
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
+     * @param \Magento\Framework\Cache\FrontendInterface|null $cache
+     * @param \Magento\Customer\Model\Session|null $customerSession
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
      * @param ProductInterfaceFactory $productFactory
      * @param SalableProcessor $salableProcessor
+     * @param ProductAttributeRepositoryInterface|null $productAttributeRepository
+     * @param SearchCriteriaBuilder|null $searchCriteriaBuilder
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -241,7 +256,9 @@ public function __construct(
         \Magento\Customer\Model\Session $customerSession = null,
         \Magento\Framework\Serialize\Serializer\Json $serializer = null,
         ProductInterfaceFactory $productFactory = null,
-        SalableProcessor $salableProcessor = null
+        SalableProcessor $salableProcessor = null,
+        ProductAttributeRepositoryInterface $productAttributeRepository = null,
+        SearchCriteriaBuilder $searchCriteriaBuilder = null
     ) {
         $this->typeConfigurableFactory = $typeConfigurableFactory;
         $this->_eavAttributeFactory = $eavAttributeFactory;
@@ -256,6 +273,10 @@ public function __construct(
         $this->productFactory = $productFactory ?: ObjectManager::getInstance()
             ->get(ProductInterfaceFactory::class);
         $this->salableProcessor = $salableProcessor ?: ObjectManager::getInstance()->get(SalableProcessor::class);
+        $this->productAttributeRepository = $productAttributeRepository ?:
+            ObjectManager::getInstance()->get(ProductAttributeRepositoryInterface::class);
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder ?:
+            ObjectManager::getInstance()->get(SearchCriteriaBuilder::class);
         parent::__construct(
             $catalogProductOption,
             $eavConfig,
@@ -1231,19 +1252,16 @@ public function isPossibleBuyFromList($product)
 
     /**
      * Returns array of sub-products for specified configurable product
-     *
-     * $requiredAttributeIds - one dimensional array, if provided
      * Result array contains all children for specified configurable product
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @param array $requiredAttributeIds
+     * @param array $requiredAttributeIds Attributes to include in the select; one-dimensional array
      * @return ProductInterface[]
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getUsedProducts($product, $requiredAttributeIds = null)
     {
         if (!$product->hasData($this->_usedProducts)) {
-            $collection = $this->getConfiguredUsedProductCollection($product, false);
+            $collection = $this->getConfiguredUsedProductCollection($product, false, $requiredAttributeIds);
             $usedProducts = array_values($collection->getItems());
             $product->setData($this->_usedProducts, $usedProducts);
         }
@@ -1390,16 +1408,18 @@ private function getUsedProductsCacheKey($keyParts)
 
     /**
      * Prepare collection for retrieving sub-products of specified configurable product
-     *
      * Retrieve related products collection with additional configuration
      *
      * @param \Magento\Catalog\Model\Product $product
      * @param bool $skipStockFilter
+     * @param array $requiredAttributeIds Attributes to include in the select
      * @return \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function getConfiguredUsedProductCollection(
         \Magento\Catalog\Model\Product $product,
-        $skipStockFilter = true
+        $skipStockFilter = true,
+        $requiredAttributeIds = null
     ) {
         $collection = $this->getUsedProductCollection($product);
 
@@ -1407,8 +1427,19 @@ private function getConfiguredUsedProductCollection(
             $collection->setFlag('has_stock_status_filter', true);
         }
 
+        $attributesForSelect = $this->getAttributesForCollection($product);
+        if ($requiredAttributeIds) {
+            $this->searchCriteriaBuilder->addFilter('attribute_id', $requiredAttributeIds, 'in');
+            $requiredAttributes = $this->productAttributeRepository
+                ->getList($this->searchCriteriaBuilder->create())->getItems();
+            $requiredAttributeCodes = [];
+            foreach ($requiredAttributes as $requiredAttribute) {
+                $requiredAttributeCodes[] = $requiredAttribute->getAttributeCode();
+            }
+            $attributesForSelect = array_unique(array_merge($attributesForSelect, $requiredAttributeCodes));
+        }
         $collection
-            ->addAttributeToSelect($this->getAttributesForCollection($product))
+            ->addAttributeToSelect($attributesForSelect)
             ->addFilterByRequiredOptions()
             ->setStoreId($product->getStoreId());
 
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 01549ffcd2755..aa801088de7fd 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
@@ -264,9 +264,6 @@ public function setProductId($value)
 
     /**
      * @inheritdoc
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -278,9 +275,6 @@ public function __sleep()
 
     /**
      * @inheritdoc
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Plugin.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Plugin.php
index e8b7299a03db9..cb4ac975cd582 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Plugin.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Plugin.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\ConfigurableProduct\Model\Product\Type;
 
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 
 /**
  * Type plugin.
@@ -14,14 +14,14 @@
 class Plugin
 {
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
     /**
-     * @param ModuleManagerInterface $moduleManager
+     * @param Manager $moduleManager
      */
-    public function __construct(ModuleManagerInterface $moduleManager)
+    public function __construct(Manager $moduleManager)
     {
         $this->moduleManager = $moduleManager;
     }
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
index 3aa90c7b3ce57..57f701721a6f3 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
@@ -331,6 +331,7 @@ protected function loadOptions()
                     'use_default_value' => true
                 ];
             }
+            $item->setOptionsMap($values);
             $values = array_values($values);
             $item->setOptions($values);
         }
@@ -357,9 +358,6 @@ protected function getIncludedOptions(array $usedProducts, AbstractAttribute $pr
     /**
      * @inheritdoc
      * @since 100.0.6
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -379,9 +377,6 @@ public function __sleep()
     /**
      * @inheritdoc
      * @since 100.0.6
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php b/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php
index 1ed4432347b7a..c97b24c295189 100644
--- a/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php
@@ -56,7 +56,10 @@ private function getProductToValidate(
         $attrCode = $subject->getAttribute();
 
         /* Check for attributes which are not available for configurable products */
-        if ($product->getTypeId() == Configurable::TYPE_CODE && !$product->hasData($attrCode)) {
+        if ($product->getTypeId() == Configurable::TYPE_CODE &&
+            !$product->hasData($attrCode) &&
+            count($model->getChildren())
+        ) {
             /** @var \Magento\Catalog\Model\AbstractModel $childProduct */
             $childProduct = current($model->getChildren())->getProduct();
             if ($childProduct->hasData($attrCode)) {
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminChangeConfigurableProductVariationQtyActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminChangeConfigurableProductVariationQtyActionGroup.xml
new file mode 100644
index 0000000000000..3441b979226dd
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminChangeConfigurableProductVariationQtyActionGroup.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="AdminChangeConfigurableProductVariationQty">
+        <annotations>
+            <description>Change quantity value for configurable product generated variation</description>
+        </annotations>
+        <arguments>
+            <argument name="rowIndex" type="string" defaultValue="0"/>
+            <argument name="quantity" type="string" defaultValue="0"/>
+        </arguments>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.variationQty(rowIndex)}}" userInput="{{quantity}}" stepKey="fillVariationQuantity"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
index 488667a4585bb..02c7aeb3db6ac 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
@@ -8,6 +8,47 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CreateConfigurableProductWithAttributeSet">
+        <annotations>
+            <description>Admin edit created product as configurable. Choose created options</description>
+        </annotations>
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+            <argument name="category" defaultValue="_defaultCategory"/>
+            <argument name="label" type="string" defaultValue="mySet"/>
+            <argument name="option" type="string" defaultValue="['option1', 'option2', 'option3', 'option4']"/>
+        </arguments>
+        <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
+        <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{label}}" stepKey="searchForAttrSet"/>
+        <click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet"/>
+        <fillField userInput="{{product.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
+        <selectOption selector="{{AdminProductFormSection.additionalOptions}}" parameterArray="{{option}}" stepKey="searchAndMultiSelectCreatedOption"/>
+    </actionGroup>
+    <actionGroup name="AdminCreateConfigurationsForAttribute" extends="generateConfigurationsByAttributeCode">
+        <annotations>
+            <description>EXTENDS: generateConfigurationsByAttributeCode. Click to apply single price to all Skus. Enter Attribute price</description>
+        </annotations>
+        <arguments>
+            <argument name="price" type="string" defaultValue="100"/>
+        </arguments>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" after="clickOnNextButton2" stepKey="waitForNextPageOpened2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" after="waitForNextPageOpened2" stepKey="clickOnApplySinglePriceToAllSkus"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.singlePrice}}" userInput="{{price}}" before="clickOnApplySingleQuantityToEachSku" stepKey="enterAttributePrice"/>
+    </actionGroup>
+    <actionGroup name="AdminCreateConfigurableProductWithAttributeUncheckOption" extends="generateConfigurationsByAttributeCode">
+        <annotations>
+            <description>EXTENDS: generateConfigurationsByAttributeCode. Click to uncheck created option. Enter Attribute price</description>
+        </annotations>
+        <arguments>
+            <argument name="attributeOption" type="string" defaultValue="option1"/>
+            <argument name="price" type="string" defaultValue="100"/>
+        </arguments>
+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeOption('attributeOption')}}" after="clickOnSelectAll" stepKey="clickToUncheckOption"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" after="clickToUncheckOption" stepKey="clickOnNextButton22"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" after="clickOnNextButton22" stepKey="waitForNextPageOpened2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" after="waitForNextPageOpened2" stepKey="clickOnApplySinglePriceToAllSkus"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.singlePrice}}" userInput="{{price}}" before="clickOnApplySingleQuantityToEachSku" stepKey="enterAttributePrice"/>
+    </actionGroup>
     <!--Filter the product grid and view expected products-->
     <actionGroup name="viewConfigurableProductInAdminGrid">
         <annotations>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminFilterAttributeInConfigurableAttributesGridActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminFilterAttributeInConfigurableAttributesGridActionGroup.xml
new file mode 100644
index 0000000000000..56a70a0ba29f9
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminFilterAttributeInConfigurableAttributesGridActionGroup.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="AdminFilterAttributeInConfigurableAttributesGrid">
+        <annotations>
+            <description>Filter attribute in configurable attributes grid by attribute code value</description>
+        </annotations>
+        <arguments>
+            <argument name="attributeCode" type="string" defaultValue="{{newProductAttribute.attribute_code}}"/>
+        </arguments>
+        <conditionalClick selector="{{AdminDataGridFilterSection.clear}}" visible="true" dependentSelector="{{AdminDataGridFilterSection.clear}}" stepKey="clearFilters"/>
+        <waitForPageLoad stepKey="waitForFiltersReset"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="waitForFiltersAppear"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="expandFilters"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="{{attributeCode}}" stepKey="fillFilterValue"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFilters"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminSelectAttributeInConfigurableAttributesGridActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminSelectAttributeInConfigurableAttributesGridActionGroup.xml
new file mode 100644
index 0000000000000..72ab16df87dac
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminSelectAttributeInConfigurableAttributesGridActionGroup.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="AdminSelectAttributeInConfigurableAttributesGrid" extends="AdminFilterAttributeInConfigurableAttributesGrid">
+        <annotations>
+            <description>EXTENDS: AdminFilterAttributeInConfigurableAttributesGrid. Select first filtered attribute.</description>
+        </annotations>
+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="checkAttributeInGrid"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
index 3f21c98068d8a..3edb7c0f17ab9 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductData.xml
@@ -60,10 +60,38 @@
         <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
+    <entity name="ApiConfigurableProductWithDescriptionUnderscoredSku" 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>
+    <entity name="ConfigurableProductWithAttributeSet" type="product">
+        <data key="sku" unique="suffix">configurable</data>
+        <data key="type_id">configurable</data>
+        <data key="attribute_set_id">4</data>
+        <data key="attribute_set_name">mySet</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">Configurable product</data>
+        <data key="price">1.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="ConfigurableProductPrice10Qty1" type="product">
         <data key="sku" unique="suffix">configurable-product_</data>
         <data key="type_id">configurable</data>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
index f3c628d002e7a..92e2450ef4f3d 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCreateProductConfigurationsPanel">
+        <element name="attributeOption" type="checkbox" selector="li[data-attribute-option-title='{{colorOption}}']" parameterized="true"/>
         <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']"/>
@@ -16,6 +17,8 @@
         <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="variationsGrid" type="block" selector=".admin__field[data-index='configurable-matrix']"/>
+        <element name="variationQty" type="input" selector=".admin__field[data-index='configurable-matrix'] input[name='configurable-matrix[{{rowIndex}}][qty]']" parameterized="true"/>
         <element name="attributeCheckbox" type="checkbox" selector="//div[contains(text(), '{{arg}}')]/ancestor::tr//input[@data-action='select-row']" parameterized="true"/>
         <element name="defaultLabel" type="text" selector="//div[contains(text(), '{{arg}}')]/ancestor::tr//td[3]/div[@class='data-grid-cell-content']" parameterized="true"/>
 
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml
index a9d2f1c3379df..36c135c427365 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml
@@ -29,6 +29,11 @@
             <deleteData createDataKey="createConfigProductAttributeCreateConfigurableProduct" stepKey="deleteConfigProductAttribute"/>
             <deleteData createDataKey="createConfigChildProduct1CreateConfigurableProduct" stepKey="deleteConfigChildProduct1"/>
             <deleteData createDataKey="createConfigChildProduct2CreateConfigurableProduct" stepKey="deleteConfigChildProduct2"/>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductFilters"/>
+            <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
+                <argument name="productName" value="$$createConfigProductAttributeCreateConfigurableProduct.name$$"/>
+            </actionGroup>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml
index 68bf703ecdab4..c085229da8028 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml
@@ -69,7 +69,7 @@
         <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmPopup"/>
 
         <!-- Assert product auto incremented sku notice message; see success message -->
-        <see selector="{{AdminMessagesSection.noticeMessage}}" stepKey="seeNoticeMessage" userInput="SKU for product {{ApiConfigurableProduct.name}} has been changed to {{ApiConfigurableProduct.sku}}-2."/>
-        <see selector="{{AdminMessagesSection.successMessage}}" stepKey="seeSuccessMessage" userInput="You saved the product."/>
+        <see selector="{{AdminMessagesSection.notice}}" stepKey="seeNoticeMessage" userInput="SKU for product {{ApiConfigurableProduct.name}} has been changed to {{ApiConfigurableProduct.sku}}-2."/>
+        <see selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage" userInput="You saved the product."/>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml
new file mode 100644
index 0000000000000..de0cca11235ea
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCheckResultsOfColorAndOtherFiltersTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Checking filters results"/>
+            <title value="Checking results of color and other filters"/>
+            <description value="Checking results of filters: color and other filters"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-6192"/>
+            <useCaseId value="MAGETWO-91753"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+        <before>
+            <!-- Create default category with subcategory -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="SubCategoryWithParent" stepKey="createSubcategory">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Create three configurable product -->
+            <createData entity="ConfigurableProductWithAttributeSet" stepKey="createFirstConfigurableProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ConfigurableProductWithAttributeSet" stepKey="createSecondConfigurableProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ConfigurableProductWithAttributeSet" stepKey="createThirdConfigurableProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Add first 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="productAttributeOption3" stepKey="createConfigProductAttributeOption3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption4" stepKey="createConfigProductAttributeOption4">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption5" stepKey="createConfigProductAttributeOption5">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <!-- Add second attribute with options-->
+            <createData entity="multipleSelectProductAttribute" stepKey="createConfigProductAttribute2"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption12">
+                <requiredEntity createDataKey="createConfigProductAttribute2"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption6">
+                <requiredEntity createDataKey="createConfigProductAttribute2"/>
+            </createData>
+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOption7">
+                <requiredEntity createDataKey="createConfigProductAttribute2"/>
+            </createData>
+            <createData entity="productAttributeOption4" stepKey="createConfigProductAttributeOption8">
+                <requiredEntity createDataKey="createConfigProductAttribute2"/>
+            </createData>
+            <!-- Login as Admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!-- Add created attributes with options to Attribute Set -->
+            <actionGroup ref="AdminAddUnassignedAttributeToGroup" stepKey="createDefaultAttributeSet">
+                <argument name="label" value="mySet"/>
+                <argument name="firstOption" value="$$createConfigProductAttribute.attribute_code$$"/>
+                <argument name="secondOption" value="$$createConfigProductAttribute2.attribute_code$$"/>
+                <argument name="group" value="Product Details"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!-- Delete all created data -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createFirstConfigurableProduct" stepKey="deleteFirstProduct"/>
+            <deleteData createDataKey="createSecondConfigurableProduct" stepKey="deleteSecondProduct"/>
+            <deleteData createDataKey="createThirdConfigurableProduct" stepKey="deleteThirdProduct"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <!-- Delete attribute set -->
+            <actionGroup ref="deleteAttributeSetByLabel" stepKey="deleteAttributeSet">
+                <argument name="label" value="mySet"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearAttributeSetsFilter"/>
+            <!-- Delete First attribute -->
+            <actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openProductAttributeFromSearchResultInGrid">
+                <argument name="productAttributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
+            </actionGroup>
+            <actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeByAttributeCode">
+                <argument name="productAttributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
+            </actionGroup>
+            <!-- Delete Second attribute -->
+            <actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openSecondProductAttributeFromSearchResultInGrid">
+                <argument name="productAttributeCode" value="$$createConfigProductAttribute2.attribute_code$$"/>
+            </actionGroup>
+            <actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteSecondProductAttributeByAttributeCode">
+                <argument name="productAttributeCode" value="$$createConfigProductAttribute2.attribute_code$$"/>
+            </actionGroup>
+            <!-- Clear filters -->
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductAttributesFilter"/>
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductsGridFilter"/>
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Create three configurable products with options -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+        <waitForPageLoad time="30" stepKey="wait1"/>
+        <!-- Edit created first product as configurable product with options -->
+        <actionGroup ref="filterProductGridBySku" stepKey="filterGridByFirstProduct">
+            <argument name="product" value="$$createFirstConfigurableProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductFirst">
+            <argument name="product" value="$$createFirstConfigurableProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="CreateConfigurableProductWithAttributeSet" stepKey="createProductFirst">
+            <argument name="product" value="$$createFirstConfigurableProduct$$"/>
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="label" value="mySet"/>
+            <argument name="option1" value="['option1', 'option2', 'option3', 'option4']"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateConfigurationsForAttribute" stepKey="createConfigurationFirst">
+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
+            <argument name="price" value="34"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}"  stepKey="expandSplitBtnFirst" />
+        <click selector="{{CmsNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveAndCloseFirst"/>
+        <waitForPageLoad stepKey="waitForMessage"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageFirst"/>
+        <!-- Edit created second product as configurable product with options -->
+        <actionGroup ref="filterProductGridBySku" stepKey="filterGridBySecondProduct">
+            <argument name="product" value="$$createSecondConfigurableProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductSecond">
+            <argument name="product" value="$$createSecondConfigurableProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="CreateConfigurableProductWithAttributeSet" stepKey="createProductSecond">
+            <argument name="product" value="$$createSecondConfigurableProduct$$"/>
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="label" value="mySet"/>
+            <argument name="option1" value="['option1', 'option2', 'option3']"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateConfigurableProductWithAttributeUncheckOption" stepKey="createConfigurationSecond">
+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
+            <argument name="price" value="34"/>
+            <argument name="attributeOption" value="option5"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForPageLoadThird"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}"  stepKey="expandSplitBtnSecond" />
+        <click selector="{{CmsNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveAndCloseSecond"/>
+        <waitForPageLoad stepKey="waitForSuccessMessage"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageSecond"/>
+        <!-- Edit created third product as configurable product with options -->
+        <actionGroup ref="filterProductGridBySku" stepKey="filterGridByThirdProduct">
+            <argument name="product" value="$$createThirdConfigurableProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProductThird">
+            <argument name="product" value="$$createThirdConfigurableProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="CreateConfigurableProductWithAttributeSet" stepKey="createProductThird">
+            <argument name="product" value="$$createThirdConfigurableProduct$$"/>
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="label" value="mySet"/>
+            <argument name="option1" value="['option2', 'option3', 'option4']"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateConfigurableProductWithAttributeUncheckOption" stepKey="createConfigurationThird">
+            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
+            <argument name="price" value="34"/>
+            <argument name="attributeOption" value="option1"/>
+        </actionGroup>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}"  stepKey="expandSplitBtnThird" />
+        <click selector="{{CmsNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveAndCloseThird"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveConfigurableProductMessage"/>
+        <!-- Create Simple product with options -->
+        <actionGroup ref="filterProductGridBySku" stepKey="filterGridBySimpleProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditSimpleProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="CreateConfigurableProductWithAttributeSet" stepKey="createSimpleProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="label" value="mySet"/>
+            <argument name="option1" value="['option1', 'option2']"/>
+        </actionGroup>
+        <click selector="{{AdminGridMainControls.save}}" stepKey="clickToSaveProduct"/>
+        <waitForPageLoad stepKey="waitForNewSimpleProductPage"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageThird"/>
+         <!--TODO: REMOVE AFTER FIX MC-21717 -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush full_page" stepKey="flushCache"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml
index c47e320b3a170..cd09cbd295877 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml
@@ -87,6 +87,9 @@
         <see selector="{{AdminProductFormConfigurationsSection.currentVariationsSkuCells}}" userInput="LongSku-$$getConfigAttributeOption2.label$$" stepKey="seeChildProductSku2"/>
         <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{ProductWithLongNameSku.price}}" stepKey="seeConfigurationsPrice"/>
 
+        <!--Run re-index task-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
          <!--Assert storefront category list page-->
         <amOnPage url="/" stepKey="amOnStorefront"/>
         <waitForPageLoad stepKey="waitForStorefrontLoad"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
index 5d5590011a852..7c6cd57097591 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest.xml
@@ -17,9 +17,6 @@
             <testCaseId value="MC-88"/>
             <group value="ConfigurableProduct"/>
             <severity value="AVERAGE"/>
-            <skip>
-                <issueId value="MC-17140"/>
-            </skip>
         </annotations>
 
         <before>
@@ -37,14 +34,20 @@
         </before>
 
         <after>
-            <actionGroup ref="logout" stepKey="adminLogout"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct1" stepKey="deleteFirstProduct"/>
+            <deleteData createDataKey="createProduct2" stepKey="deleteSecondProduct"/>
+            <deleteData createDataKey="createProduct3" stepKey="deleteThirdProduct"/>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+            <waitForPageLoad stepKey="waitForPageLoad"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsGridFilters"/>
+            <actionGroup ref="logout" stepKey="logout"/>
         </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"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clearAll"/>
         <actionGroup ref="searchProductGridByKeyword" stepKey="searchForProduct">
             <argument name="keyword" value="ApiConfigurableProduct.name"/>
         </actionGroup>
@@ -59,25 +62,25 @@
         <!-- 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="Message is added to queue" stepKey="seeSaveSuccess"/>
+        <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="clickSave"/>
+        <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" time="60" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpdateSuccessMsg"/>
 
         <!-- Run cron twice -->
-        <magentoCLI command="cron:run" stepKey="runCron1"/>
-        <magentoCLI command="cron:run" stepKey="runCron2"/>
-        <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitFormToReload1"/>
+        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron1"/>
+        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron2"/>
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
 
         <!-- 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"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct1.custom_attributes[url_key]$$)}}" stepKey="goToFirstProductPageOnStorefront"/>
+        <waitForPageLoad stepKey="waitForFirstProductPageLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="MFTF automation!" stepKey="seeFirstDescription"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct2.custom_attributes[url_key]$$)}}" stepKey="goToSecondProductPageOnStorefront"/>
+        <waitForPageLoad stepKey="waitForSecondProductPageLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="MFTF automation!" stepKey="seeSecondDescription"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct3.custom_attributes[url_key]$$)}}" stepKey="goToThirdProductPageOnStorefront"/>
+        <waitForPageLoad stepKey="waitForThirdProductPageLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="MFTF automation!" stepKey="seeThirdDescription"/>
     </test>
 
     <test name="AdminConfigurableProductRemoveAnOptionTest">
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
index 925e7a890cead..9796c14f5519a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
@@ -129,6 +129,9 @@
         <!-- Save product -->
         <actionGroup ref="saveConfigurableProductAddToCurrentAttributeSet" stepKey="saveProduct"/>
 
+        <!--Run re-index task-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <!-- Assert configurable product in category -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml
index c303e4d19db81..0370280309272 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml
@@ -80,6 +80,8 @@
         <after>
             <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
             <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
+            <deleteData createDataKey="childProductHandle1" stepKey="deleteChildProduct1" before="delete"/>
+            <deleteData createDataKey="childProductHandle2" stepKey="deleteChildProduct2" before="delete"/>
         </after>
     </test>
     <test name="AdvanceCatalogSearchConfigurableBySkuTest" extends="AdvanceCatalogSearchSimpleProductBySkuTest">
@@ -104,7 +106,7 @@
             </createData>
 
             <!-- TODO: Move configurable product creation to an actionGroup when MQE-697 is fixed -->
-            <createData entity="ApiConfigurableProductWithDescription" stepKey="product"/>
+            <createData entity="ApiConfigurableProductWithDescriptionUnderscoredSku" stepKey="product"/>
 
             <createData entity="productDropDownAttribute" stepKey="productAttributeHandle"/>
 
@@ -154,6 +156,8 @@
         <after>
             <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
             <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
+            <deleteData createDataKey="childProductHandle1" stepKey="deleteChildProduct1" before="delete"/>
+            <deleteData createDataKey="childProductHandle2" stepKey="deleteChildProduct2" before="delete"/>
         </after>
     </test>
     <test name="AdvanceCatalogSearchConfigurableByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
@@ -228,6 +232,8 @@
         <after>
             <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
             <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
+            <deleteData createDataKey="childProductHandle1" stepKey="deleteChildProduct1" before="delete"/>
+            <deleteData createDataKey="childProductHandle2" stepKey="deleteChildProduct2" before="delete"/>
         </after>
     </test>
     <test name="AdvanceCatalogSearchConfigurableByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
@@ -302,6 +308,8 @@
         <after>
             <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1" before="deleteSimple2"/>
             <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2" before="delete"/>
+            <deleteData createDataKey="childProductHandle1" stepKey="deleteChildProduct1" before="delete"/>
+            <deleteData createDataKey="childProductHandle2" stepKey="deleteChildProduct2" before="delete"/>
         </after>
     </test>
 </tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index 47ee09e4b2086..04687a2314dc6 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -217,4 +217,213 @@
         <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>
+    <test name="EndToEndB2CGuestUserMysqlTest">
+        <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/NoErrorForMiniCartItemEditTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoErrorForMiniCartItemEditTest.xml
new file mode 100644
index 0000000000000..2d0c4a05c1dec
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoErrorForMiniCartItemEditTest.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="NoErrorForMiniCartItemEditTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <title value="No error for minicart item edit test"/>
+            <description value="Already selected configurable option should be selected when configurable product is edited from minicart"/>
+            <severity value="MAJOR"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <!-- Create Configurable product -->
+            <actionGroup ref="createConfigurableProduct" stepKey="createProduct">
+                <argument name="product" value="_defaultProduct"/>
+                <argument name="category" value="$$createCategory$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!-- Delete the first simple product -->
+            <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true"
+                              stepKey="clickClearFilters"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Go To Created Product Page -->
+        <amOnPage stepKey="goToCreatedProductPage" url="{{_defaultProduct.urlKey}}.html"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+
+        <!-- Add Product to Cart -->
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}"
+                    stepKey="checkDropDownProductOption"/>
+        <selectOption userInput="{{colorProductAttribute1.name}}"
+                      selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}"
+                      stepKey="selectOption1"/>
+        <selectOption userInput="{{colorProductAttribute2.name}}"
+                      selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}"
+                      stepKey="selectOption2"/>
+        <click selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}"
+               stepKey="clickDropDownProductOption"/>
+        <selectOption userInput="{{colorProductAttribute1.name}}"
+                      selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}"
+                      stepKey="selectOptionForAddingToCart"/>
+        <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart"/>
+        <waitForPageLoad stepKey="waitForMiniCart"/>
+
+        <!-- Edit Item in Cart -->
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniCart"/>
+        <click selector="{{StorefrontMinicartSection.editMiniCartItem}}" stepKey="clickEditCartItem"/>
+
+        <!-- Check if Product Configuration is still selected -->
+        <see selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}"
+             userInput="{{colorProductAttribute1.name}}" stepKey="seeConfigurationSelected"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
new file mode 100644
index 0000000000000..fd607d2203c66
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="NoOptionAvailableToConfigureDisabledProductTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Admin order configurable product"/>
+            <title value="Disabled variation of configurable product can't be added to shopping cart via admin"/>
+            <description value="Disabled variation of configurable product can't be added to shopping cart via admin"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-17373"/>
+            <useCaseId value="MAGETWO-72172"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <!--Create category-->
+            <comment userInput="Create category" stepKey="commentCreateCategory"/>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <!-- Create the configurable product based on the data in the data folder -->
+            <comment userInput="Create the configurable product based on the data in the data folder" stepKey="createConfigurableProduct"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Create the configurable product with two options based on the default attribute set -->
+            <comment userInput="Create the configurable product with two options based on the default attribute set" stepKey="configurableProductWithTwoOptions"/>
+            <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>
+            <!-- Create the 3 children that will be a part of the configurable product -->
+            <comment userInput="Create the 3 children that will be a part of the configurable product" stepKey="createTwoChildrenProducts"/>
+            <createData entity="ApiSimpleProductWithPrice50" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithPrice60" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithPrice70" stepKey="createConfigChildProduct3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
+            </createData>
+            <!-- Assign 3 products to the configurable product -->
+            <comment userInput="Assign 3 products to the configurable product" stepKey="assignToConfigurableProduct"/>
+            <createData entity="ConfigurableProductTwoOptions" 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>
+            <!-- Create Customer -->
+            <comment userInput="Create customer" stepKey="commentCreateCustomer"/>
+            <createData entity="Simple_US_Customer_CA" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <!-- Delete created data -->
+            <comment userInput="Delete created data" stepKey="deleteData"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory2"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigChildProduct3" stepKey="deleteConfigChildProduct3"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCreatedCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Disable child product -->
+        <comment userInput="Disable child product" stepKey="disableChildProduct"/>
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct1.id$$)}}" stepKey="goToEditPage"/>
+        <waitForPageLoad stepKey="waitForChildProductPageLoad"/>
+        <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="disableProduct"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
+        <!-- Set the second product out of stock -->
+        <comment userInput="Set the second product out of stock" stepKey="outOfStockChildProduct"/>
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigChildProduct2.id$$)}}" stepKey="goToSecondProductEditPage"/>
+        <waitForPageLoad stepKey="waitForSecondChildProductPageLoad"/>
+        <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="Out of Stock" stepKey="outOfStockStatus"/>
+        <actionGroup ref="saveProductForm" stepKey="saveSecondProductForm"/>
+        <!-- Go to created customer page -->
+        <comment userInput="Go to created customer page" stepKey="goToCreatedCustomerPage"/>
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="createNewOrder">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickToAddProduct"/>
+        <waitForPageLoad stepKey="waitForProductsOpened"/>
+        <!-- Find created configurable product and click on "Configure" link -->
+        <comment userInput="Find created configurable product and click on Configure link" stepKey="goToConfigurableLink"/>
+        <click selector="{{AdminOrderFormConfigureProductSection.configure($$createConfigProduct.id$$)}}" stepKey="clickOnConfigure"/>
+        <!-- Click on attribute drop-down and check no option 1 is available -->
+        <comment userInput="Click on attribute drop-down and check no option 1 is available" stepKey="commentNoOptionIsAvailable"/>
+        <waitForElement selector="{{AdminOrderFormConfigureProductSection.selectOption}}" stepKey="waitForShippingSectionLoaded"/>
+        <click selector="{{AdminOrderFormConfigureProductSection.selectOption}}" stepKey="clickToSelectOption"/>
+        <dontSee userInput="$$createConfigProductAttributeOption1.option[store_labels][1][label]$$" stepKey="dontSeeOption1"/>
+        <!-- Go to created customer page again -->
+        <comment userInput="Go to created customer page again" stepKey="goToCreatedCustomerPageAgain"/>
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="createNewOrderAgain">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickToAddProductAgain"/>
+        <waitForPageLoad stepKey="waitForProductsOpenedAgain"/>
+        <fillField selector="{{AdminOrderFormItemsSection.idFilter}}" userInput="$$createConfigChildProduct2.id$$" stepKey="idFilter"/>
+        <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearch"/>
+        <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectConfigurableProduct"/>
+        <!-- Add product to order -->
+        <comment userInput="Add product to order" stepKey="addProductToOrder"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickToAddProductToOrder"/>
+        <waitForPageLoad stepKey="waitForNewOrderPageLoad"/>
+        <see userInput="This product is out of stock." stepKey="seeTheErrorMessageDisplayed"/>
+        <!-- Select shipping method -->
+        <comment userInput="Select shipping method" stepKey="selectShippingMethod"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethods"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
+        <waitForPageLoad stepKey="waitForSuccess"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchConfigurableBySkuWithHyphenTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchConfigurableBySkuWithHyphenTest.xml
new file mode 100644
index 0000000000000..a8e982475253f
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchConfigurableBySkuWithHyphenTest.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="StorefrontAdvanceCatalogSearchConfigurableBySkuWithHyphenTest" 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 that contains hyphen"/>
+            <description value="Guest customer should be able to advance search configurable product with product sku that contains hyphen"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-20389"/>
+            <group value="ConfigurableProduct"/>
+            <group value="SearchEngineMysql"/>
+        </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"/>
+            <deleteData createDataKey="childProductHandle1" stepKey="deleteChildProduct1" before="delete"/>
+            <deleteData createDataKey="childProductHandle2" stepKey="deleteChildProduct2" before="delete"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
index c60b4d46f7fec..16400fa837b1c 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
@@ -17,6 +17,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-249"/>
             <group value="ConfigurableProduct"/>
+            <group value="SearchEngineMysql"/>
         </annotations>
         <before>
             <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest.xml
index f75e30907a1f4..2f5ee036b1420 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductDetailsTest.xml
@@ -31,6 +31,10 @@
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsGridFilters"/>
             <actionGroup ref="logout" stepKey="adminLogout"/>
         </after>
 
@@ -72,6 +76,10 @@
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsGridFilters"/>
             <actionGroup ref="logout" stepKey="adminLogout"/>
         </after>
 
@@ -113,6 +121,10 @@
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsGridFilters"/>
             <actionGroup ref="logout" stepKey="adminLogout"/>
         </after>
 
@@ -151,6 +163,10 @@
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsGridFilters"/>
             <actionGroup ref="logout" stepKey="adminLogout"/>
         </after>
 
@@ -162,4 +178,108 @@
         <click selector="{{StorefrontProductInfoMainSection.AddToCart}}" stepKey="clickAddToCart" />
         <see userInput="This is a required field" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsError}}" stepKey="seeError"/>
     </test>
+
+    <test name="StorefrontConfigurableProductVariationsTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Configurable Product"/>
+            <title value="Customer should get the right options list"/>
+            <description value="Customer should get the right options list for each variation of configurable product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-23027"/>
+            <useCaseId value="MC-22732"/>
+            <group value="configurable_product"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <!-- Add first attribute with options -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createFirstAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createFirstAttributeFirstOption">
+                <requiredEntity createDataKey="createFirstAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createFirstAttributeSecondOption">
+                <requiredEntity createDataKey="createFirstAttribute"/>
+            </createData>
+            <!-- Add second attribute with options -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createSecondAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createSecondAttributeFirstOption">
+                <requiredEntity createDataKey="createSecondAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createSecondAttributeSecondOption">
+                <requiredEntity createDataKey="createSecondAttribute"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteProduct">
+                <argument name="sku" value="{{BaseConfigurableProduct.sku}}"/>
+            </actionGroup>
+            <deleteData createDataKey="createFirstAttribute" stepKey="deleteFirstAttribute"/>
+            <deleteData createDataKey="createSecondAttribute" stepKey="deleteSecondAttribute"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearProductsGridFilters"/>
+            <actionGroup ref="logout" stepKey="adminLogout"/>
+        </after>
+
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductIndexPage"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="navigateToCreateProductPage">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <actionGroup ref="SetCategoryByName" stepKey="addCategoryToProduct">
+            <argument name="categoryName" value="$createCategory.name$"/>
+        </actionGroup>
+        <actionGroup ref="SetProductUrlKeyByString" stepKey="fillUrlKey">
+            <argument name="urlKey" value="{{BaseConfigurableProduct.urlKey}}"/>
+        </actionGroup>
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnCreateConfigurations"/>
+        <actionGroup ref="AdminSelectAttributeInConfigurableAttributesGrid" stepKey="checkFirstAttribute">
+            <argument name="attributeCode" value="$createFirstAttribute.attribute_code$"/>
+        </actionGroup>
+        <actionGroup ref="AdminSelectAttributeInConfigurableAttributesGrid" stepKey="checkSecondAttribute">
+            <argument name="attributeCode" value="$createSecondAttribute.attribute_code$"/>
+        </actionGroup>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton"/>
+        <waitForPageLoad stepKey="waitForStepLoad"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute($createFirstAttribute.default_frontend_label$)}}" stepKey="clickFirstAttributeSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute($createSecondAttribute.default_frontend_label$)}}" stepKey="clickSecondAttributeSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickSecondNextStep"/>
+        <waitForElement selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="waitThirdNextButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickThirdStep"/>
+        <waitForElement selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="waitGenerateConfigurationsButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickToGenerateConfigurations"/>
+
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.variationsGrid}}" stepKey="waitForVariationsGrid"/>
+        <actionGroup ref="AdminChangeConfigurableProductVariationQty" stepKey="setFirstVariationQuantity">
+            <argument name="rowIndex" value="0"/>
+            <argument name="quantity" value="0"/>
+        </actionGroup>
+        <actionGroup ref="AdminChangeConfigurableProductVariationQty" stepKey="setSecondVariationQuantity">
+            <argument name="rowIndex" value="1"/>
+            <argument name="quantity" value="1"/>
+        </actionGroup>
+        <actionGroup ref="AdminChangeConfigurableProductVariationQty" stepKey="setThirdVariationQuantity">
+            <argument name="rowIndex" value="2"/>
+            <argument name="quantity" value="1"/>
+        </actionGroup>
+        <actionGroup ref="AdminChangeConfigurableProductVariationQty" stepKey="setFourthVariationQuantity">
+            <argument name="rowIndex" value="3"/>
+            <argument name="quantity" value="1"/>
+        </actionGroup>
+        <actionGroup ref="saveConfigurableProduct" stepKey="saveConfigurableProduct">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSectionHeader"/>
+        <grabValueFrom selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="grabUrlKey"/>
+        <amOnPage url="{$grabUrlKey}.html" stepKey="amOnConfigurableProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.productOptionSelect($createFirstAttribute.default_frontend_label$)}}" stepKey="waitForFirstSelect"/>
+        <selectOption userInput="$createFirstAttributeFirstOption.option[store_labels][0][label]$" selector="{{StorefrontProductInfoMainSection.productOptionSelect($createFirstAttribute.default_frontend_label$)}}" stepKey="selectFirstAttributeFirstOption"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.productOptionSelect($createSecondAttribute.default_frontend_label$)}}" stepKey="waitForSecondSelect"/>
+        <selectOption userInput="$createSecondAttributeSecondOption.option[store_labels][0][label]$" selector="{{StorefrontProductInfoMainSection.productOptionSelect($createSecondAttribute.default_frontend_label$)}}" stepKey="selectSecondAttributeSecondOption"/>
+    </test>
 </tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml
index 0ade410714a25..65e1d3a74f060 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest.xml
@@ -22,16 +22,21 @@
         <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>
+            <!-- TODO: REMOVE AFTER FIX MC-21717 -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush eav" stepKey="flushCache"/>
         </before>
 
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup stepKey="deleteProduct" ref="deleteProductBySku">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
             <actionGroup ref="logout" stepKey="adminLogout"/>
         </after>
 
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml
index bb69122dc0be9..182c8c069ab23 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml
@@ -135,6 +135,9 @@
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
+        <!--Run re-index task-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <!--Open Category in Store Front and select product attribute option from sidebar -->
         <actionGroup ref="SelectStorefrontSideBarAttributeOption" stepKey="selectStorefrontProductAttributeOption">
             <argument name="categoryName" value="$$createCategory.name$$"/>
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 c5c2368720b98..36fda4ef3245c 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
@@ -233,9 +233,7 @@ public function cacheKeyProvider(): array
     public function testGetCacheKeyInfo(array $expected, string $priceCurrency = null, string $customerGroupId = null)
     {
         $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-            ->setMethods([
-                'getCurrentCurrency',
-            ])
+            ->setMethods(['getCurrentCurrency'])
             ->getMockForAbstractClass();
         $storeMock->expects($this->any())
             ->method('getCode')
@@ -270,9 +268,7 @@ public function testGetJsonConfig()
         $amountMock = $this->getAmountMock($amount);
 
         $priceMock = $this->getMockBuilder(\Magento\Framework\Pricing\Price\PriceInterface::class)
-            ->setMethods([
-                'getAmount',
-            ])
+            ->setMethods(['getAmount'])
             ->getMockForAbstractClass();
         $priceMock->expects($this->any())->method('getAmount')->willReturn($amountMock);
         $tierPriceMock = $this->getTierPriceMock($amountMock, $priceQty, $percentage);
@@ -287,22 +283,25 @@ public function testGetJsonConfig()
             ->getMock();
         $priceInfoMock->expects($this->any())
             ->method('getPrice')
-            ->willReturnMap([
-                ['regular_price', $priceMock],
-                ['final_price', $priceMock],
-                ['tier_price', $tierPriceMock],
-            ]);
+            ->willReturnMap(
+                [
+                    ['regular_price', $priceMock],
+                    ['final_price', $priceMock],
+                    ['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('getStatus')
+            ->willReturn(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED);
 
         $this->helper->expects($this->any())
             ->method('getOptions')
             ->with($productMock, [$productMock])
             ->willReturn([]);
-        $this->product->expects($this->any())->method('getSkipSaleableCheck')->willReturn(true);
 
         $attributesData = [
             'attributes' => [],
@@ -421,9 +420,7 @@ private function getProductTypeMock(\PHPUnit_Framework_MockObject_MockObject $pr
             ->willReturn('%s');
 
         $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-            ->setMethods([
-                'getCurrentCurrency',
-            ])
+            ->setMethods(['getCurrentCurrency'])
             ->getMockForAbstractClass();
         $storeMock->expects($this->any())
             ->method('getCurrentCurrency')
@@ -475,10 +472,7 @@ protected function mockContextObject()
     protected function getAmountMock($amount): \PHPUnit_Framework_MockObject_MockObject
     {
         $amountMock = $this->getMockBuilder(\Magento\Framework\Pricing\Amount\AmountInterface::class)
-            ->setMethods([
-                'getValue',
-                'getBaseAmount',
-            ])
+            ->setMethods(['getValue', 'getBaseAmount'])
             ->getMockForAbstractClass();
         $amountMock->expects($this->any())
             ->method('getValue')
@@ -506,10 +500,7 @@ protected function getTierPriceMock(\PHPUnit_Framework_MockObject_MockObject $am
         ];
 
         $tierPriceMock = $this->getMockBuilder(\Magento\Catalog\Pricing\Price\TierPriceInterface::class)
-            ->setMethods([
-                'getTierPriceList',
-                'getSavePercent',
-            ])
+            ->setMethods(['getTierPriceList', 'getSavePercent'])
             ->getMockForAbstractClass();
         $tierPriceMock->expects($this->any())
             ->method('getTierPriceList')
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php
index 80979148c4959..bebbb04405c4b 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php
@@ -176,14 +176,16 @@ private function createProductMock(): \PHPUnit_Framework_MockObject_MockObject
     {
         $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->disableOriginalConstructor()
-            ->setMethods([
-                'getAttribute',
-                'getId',
-                'setQuoteItemQty',
-                'setQuoteItemPrice',
-                'getTypeId',
-                'hasData',
-            ])
+            ->setMethods(
+                [
+                    'getAttribute',
+                    'getId',
+                    'setQuoteItemQty',
+                    'setQuoteItemPrice',
+                    'getTypeId',
+                    'hasData',
+                ]
+            )
             ->getMock();
         $productMock
             ->expects($this->any())
@@ -223,4 +225,38 @@ public function testChildIsNotUsedForValidation()
 
         $this->validatorPlugin->beforeValidate($this->validator, $item);
     }
+
+    /**
+     * Test for Configurable product in invalid state with no children does not raise error
+     */
+    public function testChildIsNotUsedForValidationWhenConfigurableProductIsMissingChildren()
+    {
+        $configurableProductMock = $this->createProductMock();
+        $configurableProductMock
+            ->expects($this->any())
+            ->method('getTypeId')
+            ->willReturn(Configurable::TYPE_CODE);
+
+        $configurableProductMock
+            ->expects($this->any())
+            ->method('hasData')
+            ->with($this->equalTo('special_price'))
+            ->willReturn(false);
+
+        /* @var AbstractItem|\PHPUnit_Framework_MockObject_MockObject $item */
+        $item = $this->getMockBuilder(AbstractItem::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setProduct', 'getProduct', 'getChildren'])
+            ->getMockForAbstractClass();
+        $item->expects($this->any())
+            ->method('getProduct')
+            ->willReturn($configurableProductMock);
+        $item->expects($this->any())
+            ->method('getChildren')
+            ->willReturn([]);
+
+        $this->validator->setAttribute('special_price');
+
+        $this->validatorPlugin->beforeValidate($this->validator, $item);
+    }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurableQty.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurableQty.php
index 055891ff79c69..ade56edeb3dfc 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurableQty.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurableQty.php
@@ -8,7 +8,6 @@
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
-use Magento\Catalog\Model\Locator\LocatorInterface;
 
 /**
  * Data provider for quantity in the Configurable products
@@ -18,21 +17,6 @@ class ConfigurableQty extends AbstractModifier
     const CODE_QUANTITY = 'qty';
     const CODE_QTY_CONTAINER = 'quantity_and_stock_status_qty';
 
-    /**
-     * @var LocatorInterface
-     */
-    private $locator;
-
-    /**
-     * ConfigurableQty constructor
-     *
-     * @param LocatorInterface $locator
-     */
-    public function __construct(LocatorInterface $locator)
-    {
-        $this->locator = $locator;
-    }
-
     /**
      * @inheritdoc
      */
@@ -48,8 +32,7 @@ public function modifyMeta(array $meta)
     {
         if ($groupCode = $this->getGroupCodeByField($meta, self::CODE_QTY_CONTAINER)) {
             $parentChildren = &$meta[$groupCode]['children'];
-            $isConfigurable = $this->locator->getProduct()->getTypeId() === 'configurable';
-            if (!empty($parentChildren[self::CODE_QTY_CONTAINER]) && $isConfigurable) {
+            if (!empty($parentChildren[self::CODE_QTY_CONTAINER])) {
                 $parentChildren[self::CODE_QTY_CONTAINER] = array_replace_recursive(
                     $parentChildren[self::CODE_QTY_CONTAINER],
                     [
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 4bde97fa8022a..ec69baeb92cb9 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
@@ -215,6 +215,7 @@ public function getConfigurableAttributesData()
                 'code' => $attribute['code'],
                 'label' => $attribute['label'],
                 'position' => $attribute['position'],
+                '__disableTmpl' => true
             ];
 
             foreach ($attribute['chosen'] as $chosenOption) {
@@ -234,7 +235,7 @@ public function getConfigurableAttributesData()
      * @return void
      * @throws \Zend_Currency_Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * phpcs:disable Generic.Metrics.NestingLevel
+     * phpcs:disable Generic.Metrics.NestingLevel.TooHigh
      */
     protected function prepareVariations()
     {
@@ -265,6 +266,7 @@ protected function prepareVariations()
                                 'id' => $attribute->getAttributeId(),
                                 'position' => $configurableAttributes[$attribute->getAttributeId()]['position'],
                                 'chosen' => [],
+                                '__disableTmpl' => true
                             ];
                             $options = $attribute->usesSource() ? $attribute->getSource()->getAllOptions() : [];
                             foreach ($options as $option) {
@@ -275,6 +277,7 @@ protected function prepareVariations()
                                         'id' => $option['value'],
                                         'label' => $option['label'],
                                         'value' => $option['value'],
+                                        '__disableTmpl' => true
                                     ];
                                 }
                             }
@@ -286,6 +289,7 @@ protected function prepareVariations()
                             'id' => $optionId,
                             'label' => $variation[$attribute->getId()]['label'],
                             'value' => $optionId,
+                            '__disableTmpl' => true
                         ];
                         $variationOptions[] = $variationOption;
                         $attributes[$attribute->getAttributeId()]['chosen'][$optionId] = $variationOption;
@@ -311,6 +315,7 @@ protected function prepareVariations()
                         'newProduct' => 0,
                         'attributes' => $this->getTextAttributes($variationOptions),
                         'thumbnail_image' => $this->imageHelper->init($product, 'product_thumbnail_image')->getUrl(),
+                        '__disableTmpl' => true
                     ];
                     $productIds[] = $product->getId();
                 }
@@ -321,6 +326,7 @@ protected function prepareVariations()
         $this->productIds = $productIds;
         $this->productAttributes = array_values($attributes);
     }
+    //phpcs: enable
 
     /**
      * Get JSON string that contains attribute code and value
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
index 1166adca97255..844422b2a2d7a 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
@@ -17,7 +17,7 @@
     </legend>
     <div class="product-options fieldset admin__fieldset">
         <?php foreach ($_attributes as $_attribute) : ?>
-            <div class="field admin__field _required required">
+            <div class="field admin__field required">
                 <label class="label admin__field-label"><?=
                     $block->escapeHtml($_attribute->getProductAttribute()->getStoreLabel($_product->getStoreId()));
                 ?></label>
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 6c790c634ee93..16dbf9ec23cd6 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
@@ -106,6 +106,8 @@ define([
                 errorOption,
                 allOptions = [];
 
+            newOption.label = $.trim(newOption.label);
+
             if (_.isEmpty(newOption.label)) {
                 return false;
             }
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 00bf1feff7fb5..eed887037bc96 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
@@ -237,12 +237,21 @@ define([
         getImageProperty: function (node) {
             var types = node.find('[data-role=gallery]').productGallery('option').types,
                 images = _.map(node.find('[data-role=image]'), function (image) {
-                    var imageData = $(image).data('imageData');
+                    var imageData = $(image).data('imageData'),
+                        positionElement;
 
                     imageData.galleryTypes = _.pluck(_.filter(types, function (type) {
                         return type.value === imageData.file;
                     }), 'code');
 
+                    //jscs:disable requireCamelCaseOrUpperCaseIdentifiers
+                    positionElement =
+                        $(image).find('[name="product[media_gallery][images][' + imageData.file_id + '][position]"]');
+                    //jscs:enable requireCamelCaseOrUpperCaseIdentifiers
+                    if (!_.isEmpty(positionElement.val())) {
+                        imageData.position = positionElement.val();
+                    }
+
                     return imageData;
                 });
 
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 ae564610e4b0b..faacbd03f20b0 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
@@ -443,6 +443,10 @@ define([
                 }
 
                 for (i = 0; i < options.length; i++) {
+                    if (prevConfig && typeof allowedProductsByOption[i] === 'undefined') {
+                        continue; //jscs:ignore disallowKeywords
+                    }
+
                     allowedProducts = prevConfig ? allowedProductsByOption[i] : options[i].products.slice(0);
                     optionPriceDiff = 0;
 
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php
index 3e07fecb2ebe7..f28bf97adf930 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php
@@ -18,6 +18,7 @@
 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\Products\Query\FieldSelection;
 
 /**
  * @inheritdoc
@@ -49,25 +50,33 @@ class ConfigurableVariant implements ResolverInterface
      */
     private $metadataPool;
 
+    /**
+     * @var FieldSelection
+     */
+    private $fieldSelection;
+
     /**
      * @param Collection $variantCollection
      * @param OptionCollection $optionCollection
      * @param ValueFactory $valueFactory
      * @param AttributeCollection $attributeCollection
      * @param MetadataPool $metadataPool
+     * @param FieldSelection $fieldSelection
      */
     public function __construct(
         Collection $variantCollection,
         OptionCollection $optionCollection,
         ValueFactory $valueFactory,
         AttributeCollection $attributeCollection,
-        MetadataPool $metadataPool
+        MetadataPool $metadataPool,
+        FieldSelection $fieldSelection
     ) {
         $this->variantCollection = $variantCollection;
         $this->optionCollection = $optionCollection;
         $this->valueFactory = $valueFactory;
         $this->attributeCollection = $attributeCollection;
         $this->metadataPool = $metadataPool;
+        $this->fieldSelection = $fieldSelection;
     }
 
     /**
@@ -84,9 +93,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         }
 
         $this->variantCollection->addParentProduct($value['model']);
-        $fields = $this->getProductFields($info);
-        $matchedFields = $this->attributeCollection->getRequestAttributes($fields);
-        $this->variantCollection->addEavAttributes($matchedFields);
+        $fields = $this->fieldSelection->getProductsFieldSelection($info);
+        $this->variantCollection->addEavAttributes($fields);
         $this->optionCollection->addProductId((int)$value[$linkField]);
 
         $result = function () use ($value, $linkField) {
@@ -103,26 +111,4 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         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/Variant/Attributes.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php
index dd2b84e1da539..faf666144422c 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php
@@ -44,7 +44,10 @@ public function resolve(
         }
 
         $data = [];
-        foreach ($value['options'] as $option) {
+        foreach ($value['options'] as $optionId => $option) {
+            if (!isset($option['attribute_code'])) {
+                continue;
+            }
             $code = $option['attribute_code'];
             /** @var Product|null $model */
             $model = $value['product']['model'] ?? null;
@@ -52,18 +55,54 @@ public function resolve(
                 continue;
             }
 
-            foreach ($option['values'] as $optionValue) {
-                if ($optionValue['value_index'] != $model->getData($code)) {
-                    continue;
+            if (isset($option['options_map'])) {
+                $optionsFromMap = $this->getOptionsFromMap(
+                    $option['options_map'] ?? [],
+                    $code,
+                    (int) $optionId,
+                    (int) $model->getData($code)
+                );
+                if (!empty($optionsFromMap)) {
+                    $data[] = $optionsFromMap;
                 }
-                $data[] = [
-                    'label' => $optionValue['label'],
-                    'code' => $code,
-                    'use_default_value' => $optionValue['use_default_value'],
-                    'value_index' => $optionValue['value_index']
-                ];
             }
         }
         return $data;
     }
+
+    /**
+     * Get options by index mapping
+     *
+     * @param array $optionMap
+     * @param string $code
+     * @param int $optionId
+     * @param int $attributeCodeId
+     * @return array
+     */
+    private function getOptionsFromMap(array $optionMap, string $code, int $optionId, int $attributeCodeId): array
+    {
+        $data = [];
+        if (isset($optionMap[$optionId . ':' . $attributeCodeId])) {
+            $optionValue = $optionMap[$optionId . ':' . $attributeCodeId];
+            $data = $this->getOptionsArray($optionValue, $code);
+        }
+        return $data;
+    }
+
+    /**
+     * Get options formatted as array
+     *
+     * @param array $optionValue
+     * @param string $code
+     * @return array
+     */
+    private function getOptionsArray(array $optionValue, string $code): array
+    {
+        return [
+            'label' => $optionValue['label'] ??  null,
+            'code' => $code,
+            'use_default_value' => $optionValue['use_default_value'] ?? null,
+            'value_index' => $optionValue['value_index'] ?? null,
+        ];
+    }
 }
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
index d517c9aa29bd3..6c4371b23927e 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
@@ -14,6 +14,7 @@
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionPostProcessor;
 
 /**
  * Collection for fetching configurable child product data.
@@ -55,22 +56,30 @@ class Collection
      */
     private $collectionProcessor;
 
+    /**
+     * @var CollectionPostProcessor
+     */
+    private $collectionPostProcessor;
+
     /**
      * @param CollectionFactory $childCollectionFactory
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param MetadataPool $metadataPool
      * @param CollectionProcessorInterface $collectionProcessor
+     * @param CollectionPostProcessor $collectionPostProcessor
      */
     public function __construct(
         CollectionFactory $childCollectionFactory,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         MetadataPool $metadataPool,
-        CollectionProcessorInterface $collectionProcessor
+        CollectionProcessorInterface $collectionProcessor,
+        CollectionPostProcessor $collectionPostProcessor
     ) {
         $this->childCollectionFactory = $childCollectionFactory;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->metadataPool = $metadataPool;
         $this->collectionProcessor = $collectionProcessor;
+        $this->collectionPostProcessor = $collectionPostProcessor;
     }
 
     /**
@@ -126,7 +135,6 @@ public function getChildProductsByParentId(int $id) : array
      * Fetch all children products from parent id's.
      *
      * @return array
-     * @throws \Exception
      */
     private function fetch() : array
     {
@@ -144,9 +152,11 @@ private function fetch() : array
                 $this->searchCriteriaBuilder->create(),
                 $attributeData
             );
+            $childCollection->load();
+            $this->collectionPostProcessor->process($childCollection, $attributeData);
 
             /** @var Product $childProduct */
-            foreach ($childCollection->getItems() as $childProduct) {
+            foreach ($childCollection as $childProduct) {
                 $formattedChild = ['model' => $childProduct, 'sku' => $childProduct->getSku()];
                 $parentId = (int)$childProduct->getParentId();
                 if (!isset($this->childrenMap[$parentId])) {
@@ -168,7 +178,7 @@ private function fetch() : array
      */
     private function getAttributesCodes(Product $currentProduct): array
     {
-        $attributeCodes = [];
+        $attributeCodes = $this->attributeCodes;
         $allowAttributes = $currentProduct->getTypeInstance()->getConfigurableAttributes($currentProduct);
         foreach ($allowAttributes as $attribute) {
             $productAttribute = $attribute->getProductAttribute();
diff --git a/app/code/Magento/Contact/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Contact/Test/Unit/Model/ConfigTest.php
new file mode 100644
index 0000000000000..9456ea4b48105
--- /dev/null
+++ b/app/code/Magento/Contact/Test/Unit/Model/ConfigTest.php
@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Contact\Test\Unit\Model;
+
+use Magento\Contact\Model\Config;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit test for Magento\Contact\Model\Config
+ */
+class ConfigTest extends TestCase
+{
+    /**
+     * @var Config
+     */
+    private $model;
+
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->setMethods(['getValue', 'isSetFlag'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            Config::class,
+            [
+                'scopeConfig' => $this->scopeConfigMock
+            ]
+        );
+    }
+
+    /**
+     * Test isEnabled()
+     *
+     * @return void
+     * @dataProvider isEnabledDataProvider
+     */
+    public function testIsEnabled($isSetFlag, $result): void
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('isSetFlag')
+            ->with(config::XML_PATH_ENABLED, ScopeInterface::SCOPE_STORE)
+            ->willReturn($isSetFlag);
+
+        $this->assertEquals($result, $this->model->isEnabled());
+    }
+
+    /**
+     * Data provider for isEnabled()
+     *
+     * @return array
+     */
+    public function isEnabledDataProvider(): array
+    {
+        return [
+            [true, true],
+            [false, false]
+        ];
+    }
+
+    /**
+     * Test emailTemplate()
+     *
+     * @return void
+     */
+    public function testEmailTemplate(): void
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with(config::XML_PATH_EMAIL_TEMPLATE, ScopeInterface::SCOPE_STORE)
+            ->willReturn('contact_email_email_template');
+
+        $this->assertEquals('contact_email_email_template', $this->model->emailTemplate());
+    }
+
+    /**
+     * Test emailSender()
+     *
+     * @return void
+     */
+    public function testEmailSender(): void
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with(config::XML_PATH_EMAIL_SENDER, ScopeInterface::SCOPE_STORE)
+            ->willReturn('custom2');
+
+        $this->assertEquals('custom2', $this->model->emailSender());
+    }
+
+    /**
+     * Test emailRecipient()
+     *
+     * @return void
+     */
+    public function testEmailRecipient(): void
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with(config::XML_PATH_EMAIL_RECIPIENT, ScopeInterface::SCOPE_STORE)
+            ->willReturn('hello@example.com');
+
+        $this->assertEquals('hello@example.com', $this->model->emailRecipient());
+    }
+}
diff --git a/app/code/Magento/Contact/ViewModel/UserDataProvider.php b/app/code/Magento/Contact/ViewModel/UserDataProvider.php
new file mode 100644
index 0000000000000..678f4349b0e88
--- /dev/null
+++ b/app/code/Magento/Contact/ViewModel/UserDataProvider.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Contact\ViewModel;
+
+use Magento\Contact\Helper\Data;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * Provides the user data to fill the form.
+ */
+class UserDataProvider implements ArgumentInterface
+{
+
+    /**
+     * @var Data
+     */
+    private $helper;
+
+    /**
+     * UserDataProvider constructor.
+     * @param Data $helper
+     */
+    public function __construct(
+        Data $helper
+    ) {
+        $this->helper = $helper;
+    }
+
+    /**
+     * Get user name
+     *
+     * @return string
+     */
+    public function getUserName()
+    {
+        return $this->helper->getPostValue('name') ?: $this->helper->getUserName();
+    }
+
+    /**
+     * Get user email
+     *
+     * @return string
+     */
+    public function getUserEmail()
+    {
+        return $this->helper->getPostValue('email') ?: $this->helper->getUserEmail();
+    }
+
+    /**
+     * Get user telephone
+     *
+     * @return string
+     */
+    public function getUserTelephone()
+    {
+        return $this->helper->getPostValue('telephone');
+    }
+
+    /**
+     * Get user comment
+     *
+     * @return string
+     */
+    public function getUserComment()
+    {
+        return $this->helper->getPostValue('comment');
+    }
+}
diff --git a/app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml b/app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml
index 078c1a4ff5621..c7009831d4642 100644
--- a/app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml
+++ b/app/code/Magento/Contact/view/frontend/layout/contact_index_index.xml
@@ -13,6 +13,9 @@
         <referenceContainer name="content">
             <block class="Magento\Contact\Block\ContactForm" name="contactForm" template="Magento_Contact::form.phtml">
                 <container name="form.additional.info" label="Form Additional Info"/>
+                <arguments>
+                    <argument name="view_model" xsi:type="object">Magento\Contact\ViewModel\UserDataProvider</argument>
+                </arguments>
             </block>
         </referenceContainer>
     </body>
diff --git a/app/code/Magento/Contact/view/frontend/templates/form.phtml b/app/code/Magento/Contact/view/frontend/templates/form.phtml
index 673bdc73840dc..3a7c4c8b6d865 100644
--- a/app/code/Magento/Contact/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Contact/view/frontend/templates/form.phtml
@@ -5,6 +5,9 @@
  */
 
 /** @var \Magento\Contact\Block\ContactForm $block */
+/** @var \Magento\Contact\ViewModel\UserDataProvider $viewModel */
+
+$viewModel = $block->getViewModel();
 ?>
 <form class="form contact"
       action="<?= $block->escapeUrl($block->getFormAction()) ?>"
@@ -14,29 +17,57 @@
       data-mage-init='{"validation":{}}'>
     <fieldset class="fieldset">
         <legend class="legend"><span><?= $block->escapeHtml(__('Write Us')) ?></span></legend><br />
-        <div class="field note no-label"><?= $block->escapeHtml(__('Jot us a note and we’ll get back to you as quickly as possible.')) ?></div>
+        <div class="field note no-label">
+            <?= $block->escapeHtml(__('Jot us a note and we’ll get back to you as quickly as possible.')) ?>
+        </div>
         <div class="field name required">
             <label class="label" for="name"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
             <div class="control">
-                <input name="name" id="name" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" value="<?= $block->escapeHtmlAttr($this->helper(\Magento\Contact\Helper\Data::class)->getPostValue('name') ?: $this->helper(\Magento\Contact\Helper\Data::class)->getUserName()) ?>" class="input-text" type="text" data-validate="{required:true}"/>
+                <input name="name" 
+                       id="name" 
+                       title="<?= $block->escapeHtmlAttr(__('Name')) ?>" 
+                       value="<?= $block->escapeHtmlAttr($viewModel->getUserName()) ?>" 
+                       class="input-text" 
+                       type="text" 
+                       data-validate="{required:true}"/>
             </div>
         </div>
         <div class="field email required">
             <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input name="email" id="email" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" value="<?= $block->escapeHtmlAttr($this->helper(\Magento\Contact\Helper\Data::class)->getPostValue('email') ?: $this->helper(\Magento\Contact\Helper\Data::class)->getUserEmail()) ?>" class="input-text" type="email" data-validate="{required:true, 'validate-email':true}"/>
+                <input name="email" 
+                       id="email" 
+                       title="<?= $block->escapeHtmlAttr(__('Email')) ?>" 
+                       value="<?= $block->escapeHtmlAttr($viewModel->getUserEmail()) ?>" 
+                       class="input-text" 
+                       type="email" 
+                       data-validate="{required:true, 'validate-email':true}"/>
             </div>
         </div>
         <div class="field telephone">
             <label class="label" for="telephone"><span><?= $block->escapeHtml(__('Phone Number')) ?></span></label>
             <div class="control">
-                <input name="telephone" id="telephone" title="<?= $block->escapeHtmlAttr(__('Phone Number')) ?>" value="<?= $block->escapeHtmlAttr($this->helper(\Magento\Contact\Helper\Data::class)->getPostValue('telephone')) ?>" class="input-text" type="text" />
+                <input name="telephone" 
+                       id="telephone" 
+                       title="<?= $block->escapeHtmlAttr(__('Phone Number')) ?>" 
+                       value="<?= $block->escapeHtmlAttr($viewModel->getUserTelephone()) ?>" 
+                       class="input-text" 
+                       type="text" />
             </div>
         </div>
         <div class="field comment required">
-            <label class="label" for="comment"><span><?= $block->escapeHtml(__('What’s on your mind?')) ?></span></label>
+            <label class="label" for="comment">
+                <span><?= $block->escapeHtml(__('What’s on your mind?')) ?></span>
+            </label>
             <div class="control">
-                <textarea name="comment" id="comment" title="<?= $block->escapeHtmlAttr(__('What’s on your mind?')) ?>" class="input-text" cols="5" rows="3" data-validate="{required:true}"><?= $block->escapeHtml($this->helper(\Magento\Contact\Helper\Data::class)->getPostValue('comment')) ?></textarea>
+                <textarea name="comment" 
+                          id="comment" 
+                          title="<?= $block->escapeHtmlAttr(__('What’s on your mind?')) ?>" 
+                          class="input-text" 
+                          cols="5" 
+                          rows="3" 
+                          data-validate="{required:true}"><?= $block->escapeHtml($viewModel->getUserComment()) ?>
+                </textarea>
             </div>
         </div>
         <?= $block->getChildHtml('form.additional.info') ?>
diff --git a/app/code/Magento/Cookie/Block/DataProviders/SessionConfig.php b/app/code/Magento/Cookie/Block/DataProviders/SessionConfig.php
new file mode 100644
index 0000000000000..9d8ae5b19be9c
--- /dev/null
+++ b/app/code/Magento/Cookie/Block/DataProviders/SessionConfig.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cookie\Block\DataProviders;
+
+use Magento\Framework\Session\Config\ConfigInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * Provide cookie configuration
+ */
+class SessionConfig implements ArgumentInterface
+{
+    /**
+     * Session config
+     *
+     * @var ConfigInterface
+     */
+    private $sessionConfig;
+
+    /**
+     * Constructor
+     *
+     * @param ConfigInterface $sessionConfig
+     */
+    public function __construct(
+        ConfigInterface $sessionConfig
+    ) {
+        $this->sessionConfig = $sessionConfig;
+    }
+    /**
+     * Get session.cookie_secure
+     *
+     * @return bool
+     * @SuppressWarnings(PHPMD.BooleanGetMethodName)
+     */
+    public function getCookieSecure()
+    {
+        return $this->sessionConfig->getCookieSecure();
+    }
+}
diff --git a/app/code/Magento/Cookie/Block/RequireCookie.php b/app/code/Magento/Cookie/Block/RequireCookie.php
index 0a836e5441540..a9c2310b2dfc1 100644
--- a/app/code/Magento/Cookie/Block/RequireCookie.php
+++ b/app/code/Magento/Cookie/Block/RequireCookie.php
@@ -3,15 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
+declare(strict_types=1);
 /**
  * Frontend form key content block
  */
 namespace Magento\Cookie\Block;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
 /**
+ * Block Require Cookie
+ *
  * @api
  * @since 100.0.2
+ *
+ * Class \Magento\Cookie\Block\RequireCookie
  */
 class RequireCookie extends \Magento\Framework\View\Element\Template
 {
@@ -22,9 +29,11 @@ class RequireCookie extends \Magento\Framework\View\Element\Template
      */
     public function getScriptOptions()
     {
+        $isRedirectCmsPage = (boolean)$this->_scopeConfig->getValue('web/browser_capabilities/cookies');
         $params = [
             'noCookieUrl' => $this->escapeUrl($this->getUrl('cookie/index/noCookies/')),
-            'triggers' => $this->escapeHtml($this->getTriggers())
+            'triggers' => $this->escapeHtml($this->getTriggers()),
+            'isRedirectCmsPage' => $isRedirectCmsPage
         ];
         return json_encode($params);
     }
diff --git a/app/code/Magento/Cookie/Test/Unit/Block/RequireCookieTest.php b/app/code/Magento/Cookie/Test/Unit/Block/RequireCookieTest.php
new file mode 100644
index 0000000000000..5208f0740a610
--- /dev/null
+++ b/app/code/Magento/Cookie/Test/Unit/Block/RequireCookieTest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cookie\Test\Unit\Block;
+
+use Magento\Cookie\Block\RequireCookie;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\View\Element\Template\Context;
+
+/**
+ * Class \Magento\Cookie\Test\Unit\Block\RequireCookieTest
+ */
+class RequireCookieTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|RequireCookie
+     */
+    private $block;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Context
+     */
+    private $context;
+
+    /**
+     * Setup Environment
+     */
+    protected function setUp()
+    {
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getValue'])
+            ->getMockForAbstractClass();
+        $this->context = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->any())->method('getScopeConfig')
+            ->willReturn($this->scopeConfig);
+        $this->block = $this->getMockBuilder(RequireCookie::class)
+            ->setMethods(['escapeHtml', 'escapeUrl', 'getUrl', 'getTriggers'])
+            ->setConstructorArgs(
+                [
+                    'context' => $this->context
+                ]
+            )->getMock();
+    }
+
+    /**
+     * Test getScriptOptions() when the settings "Redirect to CMS-page if Cookies are Disabled" is "Yes"
+     */
+    public function testGetScriptOptionsWhenRedirectToCmsIsYes()
+    {
+        $this->scopeConfig->expects($this->any())->method('getValue')
+            ->with('web/browser_capabilities/cookies')
+            ->willReturn('1');
+
+        $this->block->expects($this->any())->method('getUrl')
+            ->with('cookie/index/noCookies/')
+            ->willReturn('http://magento.com/cookie/index/noCookies/');
+        $this->block->expects($this->any())->method('getTriggers')
+            ->willReturn('test');
+        $this->block->expects($this->any())->method('escapeUrl')
+            ->with('http://magento.com/cookie/index/noCookies/')
+            ->willReturn('http://magento.com/cookie/index/noCookies/');
+        $this->block->expects($this->any())->method('escapeHtml')
+            ->with('test')
+            ->willReturn('test');
+
+        $this->assertEquals(
+            '{"noCookieUrl":"http:\/\/magento.com\/cookie\/index\/noCookies\/",' .
+            '"triggers":"test","isRedirectCmsPage":true}',
+            $this->block->getScriptOptions()
+        );
+    }
+
+    /**
+     * Test getScriptOptions() when the settings "Redirect to CMS-page if Cookies are Disabled" is "No"
+     */
+    public function testGetScriptOptionsWhenRedirectToCmsIsNo()
+    {
+        $this->scopeConfig->expects($this->any())->method('getValue')
+            ->with('web/browser_capabilities/cookies')
+            ->willReturn('0');
+
+        $this->block->expects($this->any())->method('getUrl')
+            ->with('cookie/index/noCookies/')
+            ->willReturn('http://magento.com/cookie/index/noCookies/');
+        $this->block->expects($this->any())->method('getTriggers')
+            ->willReturn('test');
+        $this->block->expects($this->any())->method('escapeUrl')
+            ->with('http://magento.com/cookie/index/noCookies/')
+            ->willReturn('http://magento.com/cookie/index/noCookies/');
+        $this->block->expects($this->any())->method('escapeHtml')
+            ->with('test')
+            ->willReturn('test');
+
+        $this->assertEquals(
+            '{"noCookieUrl":"http:\/\/magento.com\/cookie\/index\/noCookies\/",' .
+            '"triggers":"test","isRedirectCmsPage":false}',
+            $this->block->getScriptOptions()
+        );
+    }
+}
diff --git a/app/code/Magento/Cookie/i18n/en_US.csv b/app/code/Magento/Cookie/i18n/en_US.csv
index 09424c22833fe..7fc98c0ad4c58 100644
--- a/app/code/Magento/Cookie/i18n/en_US.csv
+++ b/app/code/Magento/Cookie/i18n/en_US.csv
@@ -11,3 +11,5 @@
 "Cookie Domain","Cookie Domain"
 "Use HTTP Only","Use HTTP Only"
 "Cookie Restriction Mode","Cookie Restriction Mode"
+"Cookies are disabled in your browser.","Cookies are disabled in your browser."
+
diff --git a/app/code/Magento/Cookie/view/adminhtml/layout/default.xml b/app/code/Magento/Cookie/view/adminhtml/layout/default.xml
new file mode 100644
index 0000000000000..2862cf917856d
--- /dev/null
+++ b/app/code/Magento/Cookie/view/adminhtml/layout/default.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="after.body.start">
+            <block class="Magento\Framework\View\Element\Js\Cookie" name="cookie_config" template="Magento_Cookie::html/cookie.phtml">
+                <arguments>
+                    <argument name="session_config" xsi:type="object">Magento\Cookie\Block\DataProviders\SessionConfig</argument>
+                </arguments>
+            </block>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/Cookie/view/base/requirejs-config.js b/app/code/Magento/Cookie/view/base/requirejs-config.js
new file mode 100644
index 0000000000000..b4362ffd80cb6
--- /dev/null
+++ b/app/code/Magento/Cookie/view/base/requirejs-config.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    paths: {
+        'jquery/jquery-storageapi': 'Magento_Cookie/js/jquery.storageapi.extended'
+    }
+};
diff --git a/app/code/Magento/Cookie/view/base/templates/html/cookie.phtml b/app/code/Magento/Cookie/view/base/templates/html/cookie.phtml
new file mode 100644
index 0000000000000..b05c53db02abf
--- /dev/null
+++ b/app/code/Magento/Cookie/view/base/templates/html/cookie.phtml
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Cookie settings initialization script
+ *
+ * @var $block \Magento\Framework\View\Element\Js\Cookie
+ */
+?>
+
+<script>
+    window.cookiesConfig = window.cookiesConfig || {};
+    window.cookiesConfig.secure = <?= /* @noEscape */ $block->getSessionConfig()->getCookieSecure() ? 'true' : 'false' ?>;
+</script>
diff --git a/app/code/Magento/Cookie/view/base/web/js/jquery.storageapi.extended.js b/app/code/Magento/Cookie/view/base/web/js/jquery.storageapi.extended.js
new file mode 100644
index 0000000000000..c026b205f0374
--- /dev/null
+++ b/app/code/Magento/Cookie/view/base/web/js/jquery.storageapi.extended.js
@@ -0,0 +1,69 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'jquery/jquery.cookie',
+    'jquery/jquery.storageapi.min'
+], function ($) {
+    'use strict';
+
+    /**
+     *
+     * @param {Object} storage
+     * @private
+     */
+    function _extend(storage) {
+        $.extend(storage, {
+            _secure: window.cookiesConfig ? window.cookiesConfig.secure : false,
+
+            /**
+             * Set value under name
+             * @param {String} name
+             * @param {String} value
+             * @param {Object} [options]
+             */
+            setItem: function (name, value, options) {
+                var _default = {
+                    expires: this._expires,
+                    path: this._path,
+                    domain: this._domain,
+                    secure: this._secure
+                };
+
+                $.cookie(this._prefix + name, value, $.extend(_default, options || {}));
+            },
+
+            /**
+             * Set default options
+             * @param {Object} c
+             * @returns {storage}
+             */
+            setConf: function (c) {
+                if (c.path) {
+                    this._path = c.path;
+                }
+
+                if (c.domain) {
+                    this._domain = c.domain;
+                }
+
+                if (c.expires) {
+                    this._expires = c.expires;
+                }
+
+                if (typeof c.secure !== 'undefined') {
+                    this._secure = c.secure;
+                }
+
+                return this;
+            }
+        });
+    }
+
+    if (window.cookieStorage) {
+        _extend(window.cookieStorage);
+    }
+});
diff --git a/app/code/Magento/Cookie/view/frontend/layout/default.xml b/app/code/Magento/Cookie/view/frontend/layout/default.xml
index 8b6b86e81c51a..5202c624fefe1 100644
--- a/app/code/Magento/Cookie/view/frontend/layout/default.xml
+++ b/app/code/Magento/Cookie/view/frontend/layout/default.xml
@@ -9,6 +9,11 @@
     <body>
         <referenceContainer name="after.body.start">
             <block class="Magento\Cookie\Block\Html\Notices" name="cookie_notices" template="Magento_Cookie::html/notices.phtml"/>
+            <block class="Magento\Framework\View\Element\Js\Cookie" name="cookie_config" template="Magento_Cookie::html/cookie.phtml">
+                <arguments>
+                    <argument name="session_config" xsi:type="object">Magento\Cookie\Block\DataProviders\SessionConfig</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Cookie/view/frontend/web/js/require-cookie.js b/app/code/Magento/Cookie/view/frontend/web/js/require-cookie.js
index 0a175136f034e..e82d7f2af29ca 100644
--- a/app/code/Magento/Cookie/view/frontend/web/js/require-cookie.js
+++ b/app/code/Magento/Cookie/view/frontend/web/js/require-cookie.js
@@ -8,15 +8,19 @@
  */
 define([
     'jquery',
-    'jquery-ui-modules/widget'
-], function ($) {
+    'Magento_Ui/js/modal/alert',
+    'jquery-ui-modules/widget',
+    'mage/mage',
+    'mage/translate'
+], function ($, alert) {
     'use strict';
 
     $.widget('mage.requireCookie', {
         options: {
             event: 'click',
             noCookieUrl: 'enable-cookies',
-            triggers: ['.action.login', '.action.submit']
+            triggers: ['.action.login', '.action.submit'],
+            isRedirectCmsPage: true
         },
 
         /**
@@ -49,8 +53,16 @@ define([
             if (navigator.cookieEnabled) {
                 return;
             }
+
             event.preventDefault();
-            window.location = this.options.noCookieUrl;
+
+            if (this.options.isRedirectCmsPage) {
+                window.location = this.options.noCookieUrl;
+            } else {
+                alert({
+                    content: $.mage.__('Cookies are disabled in your browser.')
+                });
+            }
         }
     });
 
diff --git a/app/code/Magento/Cron/Model/Schedule.php b/app/code/Magento/Cron/Model/Schedule.php
index 582c7c811b71f..365d110421664 100644
--- a/app/code/Magento/Cron/Model/Schedule.php
+++ b/app/code/Magento/Cron/Model/Schedule.php
@@ -97,7 +97,7 @@ public function _construct()
     public function setCronExpr($expr)
     {
         $e = preg_split('#\s+#', $expr, null, PREG_SPLIT_NO_EMPTY);
-        if (sizeof($e) < 5 || sizeof($e) > 6) {
+        if (count($e) < 5 || count($e) > 6) {
             throw new CronException(__('Invalid cron expression: %1', $expr));
         }
 
@@ -168,7 +168,7 @@ public function matchCronExpression($expr, $num)
         // handle modulus
         if (strpos($expr, '/') !== false) {
             $e = explode('/', $expr);
-            if (sizeof($e) !== 2) {
+            if (count($e) !== 2) {
                 throw new CronException(__('Invalid cron expression, expecting \'match/modulus\': %1', $expr));
             }
             if (!is_numeric($e[1])) {
@@ -187,7 +187,7 @@ public function matchCronExpression($expr, $num)
         } elseif (strpos($expr, '-') !== false) {
             // handle range
             $e = explode('-', $expr);
-            if (sizeof($e) !== 2) {
+            if (count($e) !== 2) {
                 throw new CronException(__('Invalid cron expression, expecting \'from-to\' structure: %1', $expr));
             }
 
diff --git a/app/code/Magento/Csp/Api/CspRendererInterface.php b/app/code/Magento/Csp/Api/CspRendererInterface.php
new file mode 100644
index 0000000000000..696d2e147f054
--- /dev/null
+++ b/app/code/Magento/Csp/Api/CspRendererInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Api;
+
+use Magento\Framework\App\Response\HttpInterface as HttpResponse;
+
+/**
+ * Renders configured CSPs
+ */
+interface CspRendererInterface
+{
+    /**
+     * Render configured CSP for the given HTTP response.
+     *
+     * @param HttpResponse $response
+     * @return void
+     */
+    public function render(HttpResponse $response): void;
+}
diff --git a/app/code/Magento/Csp/Api/Data/ModeConfiguredInterface.php b/app/code/Magento/Csp/Api/Data/ModeConfiguredInterface.php
new file mode 100644
index 0000000000000..5779bbd052792
--- /dev/null
+++ b/app/code/Magento/Csp/Api/Data/ModeConfiguredInterface.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Api\Data;
+
+/**
+ * CSP mode.
+ */
+interface ModeConfiguredInterface
+{
+    /**
+     * Report only mode flag.
+     *
+     * In "report-only" mode browsers only report violation but do not restrict them.
+     *
+     * @return bool
+     */
+    public function isReportOnly(): bool;
+
+    /**
+     * URI of endpoint logging reported violations.
+     *
+     * Even in "restrict" mode violations can be logged.
+     *
+     * @return string|null
+     */
+    public function getReportUri(): ?string;
+}
diff --git a/app/code/Magento/Csp/Api/Data/PolicyInterface.php b/app/code/Magento/Csp/Api/Data/PolicyInterface.php
new file mode 100644
index 0000000000000..c713c4b61417f
--- /dev/null
+++ b/app/code/Magento/Csp/Api/Data/PolicyInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Api\Data;
+
+/**
+ * Defined Content Security Policy.
+ *
+ * Different policies will have different types of data but they all will have identifiers and string representations.
+ */
+interface PolicyInterface
+{
+    /**
+     * Policy unique name (ID).
+     *
+     * @return string
+     */
+    public function getId(): string;
+
+    /**
+     * Value of the policy.
+     *
+     * @return string
+     */
+    public function getValue(): string;
+}
diff --git a/app/code/Magento/Csp/Api/ModeConfigManagerInterface.php b/app/code/Magento/Csp/Api/ModeConfigManagerInterface.php
new file mode 100644
index 0000000000000..79aff996bbf5c
--- /dev/null
+++ b/app/code/Magento/Csp/Api/ModeConfigManagerInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Api;
+
+use Magento\Csp\Api\Data\ModeConfiguredInterface;
+
+/**
+ * CSP mode config manager.
+ *
+ * Responsible for CSP mode configurations like report-only/restrict modes, report URL etc.
+ */
+interface ModeConfigManagerInterface
+{
+    /**
+     * Load CSP mode config.
+     *
+     * @return ModeConfiguredInterface
+     * @throws \RuntimeException When failed to retrieve configurations.
+     */
+    public function getConfigured(): ModeConfiguredInterface;
+}
diff --git a/app/code/Magento/Csp/Api/PolicyCollectorInterface.php b/app/code/Magento/Csp/Api/PolicyCollectorInterface.php
new file mode 100644
index 0000000000000..139dec77e040b
--- /dev/null
+++ b/app/code/Magento/Csp/Api/PolicyCollectorInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Api;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+
+/**
+ * Collects CSPs from a source.
+ */
+interface PolicyCollectorInterface
+{
+    /**
+     * Collect all configured policies.
+     *
+     * Collector finds CSPs from configurations and returns a list.
+     * The resulting list will be used to render policies as is so it is a collector's responsibility to include
+     * previously found policies from $defaultPolicies or redefine them.
+     *
+     * @param PolicyInterface[] $defaultPolicies Default policies/policies found previously.
+     * @return PolicyInterface[]
+     */
+    public function collect(array $defaultPolicies = []): array;
+}
diff --git a/app/code/Magento/Csp/Api/PolicyRendererInterface.php b/app/code/Magento/Csp/Api/PolicyRendererInterface.php
new file mode 100644
index 0000000000000..db761598291d4
--- /dev/null
+++ b/app/code/Magento/Csp/Api/PolicyRendererInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Api;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+use Magento\Framework\App\Response\HttpInterface as HttpResponse;
+
+/**
+ * Renders one policy at a time.
+ *
+ * Different type of CSPs may require specific renderers due to being represented by different headers.
+ */
+interface PolicyRendererInterface
+{
+    /**
+     * Render a policy for a response.
+     *
+     * @param PolicyInterface $policy
+     * @param HttpResponse $response
+     * @return void
+     */
+    public function render(PolicyInterface $policy, HttpResponse $response): void;
+
+    /**
+     * Would this renderer work for given policy?
+     *
+     * @param PolicyInterface $policy
+     * @return bool
+     */
+    public function canRender(PolicyInterface $policy): bool;
+}
diff --git a/app/code/Magento/Csp/LICENSE.txt b/app/code/Magento/Csp/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Csp/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/Csp/LICENSE_AFL.txt b/app/code/Magento/Csp/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/Csp/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/Csp/Model/Collector/Config/FetchPolicyReader.php b/app/code/Magento/Csp/Model/Collector/Config/FetchPolicyReader.php
new file mode 100644
index 0000000000000..8699d9588b909
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/Config/FetchPolicyReader.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector\Config;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+use Magento\Csp\Model\Policy\FetchPolicy;
+
+/**
+ * Reads fetch directives.
+ */
+class FetchPolicyReader implements PolicyReaderInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function read(string $id, $value): PolicyInterface
+    {
+        return new FetchPolicy(
+            $id,
+            !empty($value['none']),
+            !empty($value['hosts']) ? array_values($value['hosts']) : [],
+            !empty($value['schemes']) ? array_values($value['schemes']) : [],
+            !empty($value['self']),
+            !empty($value['inline']),
+            !empty($value['eval']),
+            [],
+            [],
+            !empty($value['dynamic']),
+            !empty($value['event_handlers'])
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canRead(string $id): bool
+    {
+        return in_array($id, FetchPolicy::POLICIES, true);
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/Config/FlagPolicyReader.php b/app/code/Magento/Csp/Model/Collector/Config/FlagPolicyReader.php
new file mode 100644
index 0000000000000..f8d1ea962308f
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/Config/FlagPolicyReader.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector\Config;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+use Magento\Csp\Model\Policy\FlagPolicy;
+
+/**
+ * @inheritDoc
+ */
+class FlagPolicyReader implements PolicyReaderInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function read(string $id, $value): PolicyInterface
+    {
+        return new FlagPolicy($id);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canRead(string $id): bool
+    {
+        return in_array($id, FlagPolicy::POLICIES, true);
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/Config/PluginTypesPolicyReader.php b/app/code/Magento/Csp/Model/Collector/Config/PluginTypesPolicyReader.php
new file mode 100644
index 0000000000000..7214e6da62273
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/Config/PluginTypesPolicyReader.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector\Config;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+use Magento\Csp\Model\Policy\PluginTypesPolicy;
+
+/**
+ * @inheritDoc
+ */
+class PluginTypesPolicyReader implements PolicyReaderInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function read(string $id, $value): PolicyInterface
+    {
+        return new PluginTypesPolicy(array_values($value['types']));
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canRead(string $id): bool
+    {
+        return $id === 'plugin-types';
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/Config/PolicyReaderInterface.php b/app/code/Magento/Csp/Model/Collector/Config/PolicyReaderInterface.php
new file mode 100644
index 0000000000000..2ebac992222d9
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/Config/PolicyReaderInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector\Config;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+
+/**
+ * Initiates a policy DTO based on a value found in Magento config.
+ */
+interface PolicyReaderInterface
+{
+    /**
+     * Read a policy from a config value.
+     *
+     * @param string $id
+     * @param string|array|bool $value
+     * @return PolicyInterface
+     */
+    public function read(string $id, $value): PolicyInterface;
+
+    /**
+     * Can given policy be read by this reader?
+     *
+     * @param string $id
+     * @return bool
+     */
+    public function canRead(string $id): bool;
+}
diff --git a/app/code/Magento/Csp/Model/Collector/Config/PolicyReaderPool.php b/app/code/Magento/Csp/Model/Collector/Config/PolicyReaderPool.php
new file mode 100644
index 0000000000000..0fc6fe03e05fa
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/Config/PolicyReaderPool.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector\Config;
+
+/**
+ * Pool of readers.
+ */
+class PolicyReaderPool
+{
+    /**
+     * @var PolicyReaderInterface[]
+     */
+    private $readers;
+
+    /**
+     * @param PolicyReaderInterface[] $readers
+     */
+    public function __construct(array $readers)
+    {
+        $this->readers = $readers;
+    }
+
+    /**
+     * Find a reader for the policy.
+     *
+     * @param string $id
+     * @return PolicyReaderInterface
+     * @throws \RuntimeException When failed to find a reader for given policy.
+     */
+    public function getReader(string $id): PolicyReaderInterface
+    {
+        foreach ($this->readers as $reader) {
+            if ($reader->canRead($id)) {
+                return $reader;
+            }
+        }
+
+        throw new \RuntimeException(sprintf('Failed to find a config reader for policy #%s', $id));
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/Config/SandboxPolicyReader.php b/app/code/Magento/Csp/Model/Collector/Config/SandboxPolicyReader.php
new file mode 100644
index 0000000000000..2699b8d57c037
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/Config/SandboxPolicyReader.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector\Config;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+use Magento\Csp\Model\Policy\SandboxPolicy;
+
+/**
+ * @inheritDoc
+ */
+class SandboxPolicyReader implements PolicyReaderInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function read(string $id, $value): PolicyInterface
+    {
+        return new SandboxPolicy(
+            !empty($value['forms']),
+            !empty($value['modals']),
+            !empty($value['orientation']),
+            !empty($value['pointer']),
+            !empty($value['popup']),
+            !empty($value['popups_to_escape']),
+            !empty($value['presentation']),
+            !empty($value['same_origin']),
+            !empty($value['scripts']),
+            !empty($value['navigation']),
+            !empty($value['navigation_by_user'])
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canRead(string $id): bool
+    {
+        return $id === 'sandbox';
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/ConfigCollector.php b/app/code/Magento/Csp/Model/Collector/ConfigCollector.php
new file mode 100644
index 0000000000000..34711fe5d8a22
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/ConfigCollector.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector;
+
+use Magento\Csp\Api\PolicyCollectorInterface;
+use Magento\Csp\Model\Collector\Config\PolicyReaderPool;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\State;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Reads Magento config.
+ */
+class ConfigCollector implements PolicyCollectorInterface
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var PolicyReaderPool
+     */
+    private $readersPool;
+
+    /**
+     * @var State
+     */
+    private $state;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param ScopeConfigInterface $config
+     * @param PolicyReaderPool $readersPool
+     * @param State $state
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        ScopeConfigInterface $config,
+        PolicyReaderPool $readersPool,
+        State $state,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->config = $config;
+        $this->readersPool = $readersPool;
+        $this->state = $state;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function collect(array $defaultPolicies = []): array
+    {
+        $collected = $defaultPolicies;
+
+        $configArea = null;
+        $area = $this->state->getAreaCode();
+        if ($area === Area::AREA_ADMINHTML) {
+            $configArea = 'admin';
+        } elseif ($area === Area::AREA_FRONTEND) {
+            $configArea = 'storefront';
+        }
+
+        if ($configArea) {
+            $policiesConfig = $this->config->getValue(
+                'csp/policies/' . $configArea,
+                ScopeInterface::SCOPE_STORE,
+                $this->storeManager->getStore()
+            );
+            if (is_array($policiesConfig) && $policiesConfig) {
+                foreach ($policiesConfig as $policyConfig) {
+                    $collected[] = $this->readersPool->getReader($policyConfig['policy_id'])
+                        ->read($policyConfig['policy_id'], $policyConfig);
+                }
+            }
+        }
+
+        return $collected;
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Converter.php b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Converter.php
new file mode 100644
index 0000000000000..ab1ee8bb0befe
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/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\Csp\Model\Collector\CspWhitelistXml;
+
+use Magento\Framework\Config\ConverterInterface;
+
+/**
+ * Converts csp_whitelist.xml files' content into config data.
+ */
+class Converter implements ConverterInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function convert($source)
+    {
+        $policyConfig = [];
+
+        /** @var \DOMNodeList $policies */
+        $policies = $source->getElementsByTagName('policy');
+        /** @var \DOMElement $policy */
+        foreach ($policies as $policy) {
+            if ($policy->nodeType != XML_ELEMENT_NODE) {
+                continue;
+            }
+            $id = $policy->attributes->getNamedItem('id')->nodeValue;
+            if (!array_key_exists($id, $policyConfig)) {
+                $policyConfig[$id] = ['hosts' => [], 'hashes' => []];
+            }
+            /** @var \DOMElement $value */
+            foreach ($policy->getElementsByTagName('value') as $value) {
+                if ($value->attributes->getNamedItem('type')->nodeValue === 'host') {
+                    $policyConfig[$id]['hosts'][] = $value->nodeValue;
+                } else {
+                    $policyConfig[$id]['hashes'][$value->nodeValue]
+                        = $value->attributes->getNamedItem('algorithm')->nodeValue;
+                }
+            }
+            $policyConfig[$id]['hosts'] = array_unique($policyConfig[$id]['hosts']);
+            $policyConfig[$id]['hashes'] = array_unique($policyConfig[$id]['hashes']);
+        }
+
+        return $policyConfig;
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Reader.php b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Reader.php
new file mode 100644
index 0000000000000..63f570ceb7a71
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Reader.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector\CspWhitelistXml;
+
+use Magento\Framework\Config\Reader\Filesystem;
+
+/**
+ * Config reader for csp_whitelist.xml files.
+ */
+class Reader extends Filesystem
+{
+    /**
+     * List of id attributes for merge
+     *
+     * @var array
+     */
+    protected $_idAttributes = [
+        '/csp_whitelist/policies/policy' => ['id'],
+        '/csp_whitelist/policies/policy/values/value' => ['id']
+    ];
+}
diff --git a/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/SchemaLocator.php b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/SchemaLocator.php
new file mode 100644
index 0000000000000..285d37a1b6270
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/SchemaLocator.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector\CspWhitelistXml;
+
+use Magento\Framework\Module\Dir;
+use Magento\Framework\Config\SchemaLocatorInterface;
+use Magento\Framework\Module\Dir\Reader;
+
+/**
+ * CSP whitelist config schema locator.
+ */
+class SchemaLocator implements SchemaLocatorInterface
+{
+    /**
+     * Path to corresponding XSD file with validation rules for merged config and per file config.
+     *
+     * @var string
+     */
+    private $schema ;
+
+    /**
+     * @param Reader $moduleReader
+     */
+    public function __construct(Reader $moduleReader)
+    {
+        $this->schema = $moduleReader->getModuleDir(Dir::MODULE_ETC_DIR, 'Magento_Csp')
+            . '/csp_whitelist.xsd';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSchema()
+    {
+        return $this->schema;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getPerFileSchema()
+    {
+        return $this->schema;
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/CspWhitelistXmlCollector.php b/app/code/Magento/Csp/Model/Collector/CspWhitelistXmlCollector.php
new file mode 100644
index 0000000000000..9f19a5299c063
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/CspWhitelistXmlCollector.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector;
+
+use Magento\Csp\Api\PolicyCollectorInterface;
+use Magento\Csp\Model\Collector\CspWhitelistXml\Reader as ConfigReader;
+use Magento\Csp\Model\Policy\FetchPolicy;
+
+/**
+ * Collects policies defined in csp_whitelist.xml configs.
+ */
+class CspWhitelistXmlCollector implements PolicyCollectorInterface
+{
+    /**
+     * @var ConfigReader
+     */
+    private $configReader;
+
+    /**
+     * @param ConfigReader $configReader
+     */
+    public function __construct(ConfigReader $configReader)
+    {
+        $this->configReader = $configReader;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function collect(array $defaultPolicies = []): array
+    {
+        $policies = $defaultPolicies;
+        $config = $this->configReader->read();
+        foreach ($config as $policyId => $values) {
+            $policies[] = new FetchPolicy(
+                $policyId,
+                false,
+                $values['hosts'],
+                [],
+                false,
+                false,
+                false,
+                [],
+                $values['hashes'],
+                false,
+                false
+            );
+        }
+
+        return $policies;
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/FetchPolicyMerger.php b/app/code/Magento/Csp/Model/Collector/FetchPolicyMerger.php
new file mode 100644
index 0000000000000..2a8f6c278b078
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/FetchPolicyMerger.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+use Magento\Csp\Model\Policy\FetchPolicy;
+
+/**
+ * @inheritDoc
+ */
+class FetchPolicyMerger implements MergerInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function merge(PolicyInterface $policy1, PolicyInterface $policy2): PolicyInterface
+    {
+        /** @var FetchPolicy $policy1 */
+        /** @var FetchPolicy $policy2 */
+        return new FetchPolicy(
+            $policy1->getId(),
+            $policy1->isNoneAllowed() || $policy2->isNoneAllowed(),
+            array_unique(array_merge($policy1->getHostSources(), $policy2->getHostSources())),
+            array_unique(array_merge($policy1->getSchemeSources(), $policy2->getSchemeSources())),
+            $policy1->isSelfAllowed() || $policy2->isSelfAllowed(),
+            $policy1->isInlineAllowed() || $policy2->isInlineAllowed(),
+            $policy1->isEvalAllowed() || $policy2->isEvalAllowed(),
+            array_unique(array_merge($policy1->getNonceValues(), $policy2->getNonceValues())),
+            array_merge($policy1->getHashes(), $policy2->getHashes()),
+            $policy1->isDynamicAllowed() || $policy2->isDynamicAllowed(),
+            $policy1->areEventHandlersAllowed() || $policy2->areEventHandlersAllowed()
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canMerge(PolicyInterface $policy1, PolicyInterface $policy2): bool
+    {
+        return ($policy1 instanceof FetchPolicy) && ($policy2 instanceof FetchPolicy);
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/FlagPolicyMerger.php b/app/code/Magento/Csp/Model/Collector/FlagPolicyMerger.php
new file mode 100644
index 0000000000000..a734feeab1281
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/FlagPolicyMerger.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+use Magento\Csp\Model\Policy\FlagPolicy;
+
+/**
+ * @inheritDoc
+ */
+class FlagPolicyMerger implements MergerInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function merge(PolicyInterface $policy1, PolicyInterface $policy2): PolicyInterface
+    {
+        return $policy1;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canMerge(PolicyInterface $policy1, PolicyInterface $policy2): bool
+    {
+        return ($policy1 instanceof FlagPolicy) && ($policy2 instanceof FlagPolicy);
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/MergerInterface.php b/app/code/Magento/Csp/Model/Collector/MergerInterface.php
new file mode 100644
index 0000000000000..4a8d78e7b8f4b
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/MergerInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+
+/**
+ * Merges policies with the same ID in order to have only 1 policy DTO-per-policy.
+ */
+interface MergerInterface
+{
+    /**
+     * Merges 2 found policies into 1.
+     *
+     * @param PolicyInterface $policy1
+     * @param PolicyInterface $policy2
+     * @return PolicyInterface
+     */
+    public function merge(PolicyInterface $policy1, PolicyInterface $policy2): PolicyInterface;
+
+    /**
+     * Whether current merger can merge given 2 policies.
+     *
+     * @param PolicyInterface $policy1
+     * @param PolicyInterface $policy2
+     * @return bool
+     */
+    public function canMerge(PolicyInterface $policy1, PolicyInterface $policy2): bool;
+}
diff --git a/app/code/Magento/Csp/Model/Collector/PluginTypesPolicyMerger.php b/app/code/Magento/Csp/Model/Collector/PluginTypesPolicyMerger.php
new file mode 100644
index 0000000000000..58f2128657788
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/PluginTypesPolicyMerger.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+use Magento\Csp\Model\Policy\PluginTypesPolicy;
+
+/**
+ * @inheritDoc
+ */
+class PluginTypesPolicyMerger implements MergerInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function merge(PolicyInterface $policy1, PolicyInterface $policy2): PolicyInterface
+    {
+        /** @var PluginTypesPolicy $policy1 */
+        /** @var PluginTypesPolicy $policy2 */
+        return new PluginTypesPolicy(array_unique(array_merge($policy1->getTypes(), $policy2->getTypes())));
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canMerge(PolicyInterface $policy1, PolicyInterface $policy2): bool
+    {
+        return ($policy1 instanceof PluginTypesPolicy) && ($policy2 instanceof PluginTypesPolicy);
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/SandboxPolicyMerger.php b/app/code/Magento/Csp/Model/Collector/SandboxPolicyMerger.php
new file mode 100644
index 0000000000000..3e3f05b1bc845
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/SandboxPolicyMerger.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+use Magento\Csp\Model\Policy\SandboxPolicy;
+
+/**
+ * @inheritDoc
+ */
+class SandboxPolicyMerger implements MergerInterface
+{
+    /**
+     * @inheritDoc
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function merge(PolicyInterface $policy1, PolicyInterface $policy2): PolicyInterface
+    {
+        /** @var SandboxPolicy $policy1 */
+        /** @var SandboxPolicy $policy2 */
+        return new SandboxPolicy(
+            $policy1->isFormAllowed() || $policy2->isFormAllowed(),
+            $policy1->isModalsAllowed() || $policy2->isModalsAllowed(),
+            $policy1->isOrientationLockAllowed() || $policy2->isOrientationLockAllowed(),
+            $policy1->isPointerLockAllowed() || $policy2->isPointerLockAllowed(),
+            $policy1->isPopupsAllowed() || $policy2->isPopupsAllowed(),
+            $policy1->isPopupsToEscapeSandboxAllowed() || $policy2->isPopupsToEscapeSandboxAllowed(),
+            $policy1->isPresentationAllowed() || $policy2->isPresentationAllowed(),
+            $policy1->isSameOriginAllowed() || $policy2->isSameOriginAllowed(),
+            $policy1->isScriptsAllowed() || $policy2->isScriptsAllowed(),
+            $policy1->isTopNavigationAllowed() || $policy2->isTopNavigationAllowed(),
+            $policy1->isTopNavigationByUserActivationAllowed() || $policy2->isTopNavigationByUserActivationAllowed()
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canMerge(PolicyInterface $policy1, PolicyInterface $policy2): bool
+    {
+        return ($policy1 instanceof SandboxPolicy) && ($policy2 instanceof SandboxPolicy);
+    }
+}
diff --git a/app/code/Magento/Csp/Model/CompositePolicyCollector.php b/app/code/Magento/Csp/Model/CompositePolicyCollector.php
new file mode 100644
index 0000000000000..b775c91b4e1ef
--- /dev/null
+++ b/app/code/Magento/Csp/Model/CompositePolicyCollector.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+use Magento\Csp\Api\PolicyCollectorInterface;
+use Magento\Csp\Model\Collector\MergerInterface;
+
+/**
+ * Delegates collecting to multiple collectors.
+ */
+class CompositePolicyCollector implements PolicyCollectorInterface
+{
+    /**
+     * @var PolicyCollectorInterface[]
+     */
+    private $collectors;
+
+    /**
+     * @var MergerInterface[]
+     */
+    private $mergers;
+
+    /**
+     * @param PolicyCollectorInterface[] $collectors
+     * @param MergerInterface[] $mergers
+     */
+    public function __construct(array $collectors, array $mergers)
+    {
+        $this->collectors = $collectors;
+        $this->mergers = $mergers;
+    }
+
+    /**
+     * Merge 2 policies with the same ID.
+     *
+     * @param PolicyInterface $policy1
+     * @param PolicyInterface $policy2
+     * @return PolicyInterface
+     * @throws \RuntimeException When failed to merge.
+     */
+    private function merge(PolicyInterface $policy1, PolicyInterface $policy2): PolicyInterface
+    {
+        foreach ($this->mergers as $merger) {
+            if ($merger->canMerge($policy1, $policy2)) {
+                return $merger->merge($policy1, $policy2);
+            }
+        }
+
+        throw new \RuntimeException(sprintf('Merge for policies #%s was not found', $policy1->getId()));
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function collect(array $defaultPolicies = []): array
+    {
+        $collected = $defaultPolicies;
+        foreach ($this->collectors as $collector) {
+            $collected = $collector->collect($collected);
+        }
+        //Merging policies.
+        /** @var PolicyInterface[] $result */
+        $result = [];
+        foreach ($collected as $policy) {
+            if (array_key_exists($policy->getId(), $result)) {
+                $result[$policy->getId()] = $this->merge($result[$policy->getId()], $policy);
+            } else {
+                $result[$policy->getId()] = $policy;
+            }
+        }
+
+        return array_values($result);
+    }
+}
diff --git a/app/code/Magento/Csp/Model/CspRenderer.php b/app/code/Magento/Csp/Model/CspRenderer.php
new file mode 100644
index 0000000000000..a883820f6743a
--- /dev/null
+++ b/app/code/Magento/Csp/Model/CspRenderer.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model;
+
+use Magento\Csp\Api\CspRendererInterface;
+use Magento\Csp\Api\PolicyCollectorInterface;
+use Magento\Framework\App\Response\HttpInterface as HttpResponse;
+
+/**
+ * @inheritDoc
+ */
+class CspRenderer implements CspRendererInterface
+{
+    /**
+     * @var PolicyRendererPool
+     */
+    private $rendererPool;
+
+    /**
+     * @var PolicyCollectorInterface
+     */
+    private $collector;
+
+    /**
+     * @param PolicyRendererPool $rendererPool
+     * @param PolicyCollectorInterface $collector
+     */
+    public function __construct(PolicyRendererPool $rendererPool, PolicyCollectorInterface $collector)
+    {
+        $this->rendererPool = $rendererPool;
+        $this->collector = $collector;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function render(HttpResponse $response): void
+    {
+        $policies = $this->collector->collect();
+        foreach ($policies as $policy) {
+            $this->rendererPool->getRenderer($policy)->render($policy, $response);
+        }
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Mode/ConfigManager.php b/app/code/Magento/Csp/Model/Mode/ConfigManager.php
new file mode 100644
index 0000000000000..9f10154604d5f
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Mode/ConfigManager.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Mode;
+
+use Magento\Csp\Api\Data\ModeConfiguredInterface;
+use Magento\Csp\Api\ModeConfigManagerInterface;
+use Magento\Csp\Model\Mode\Data\ModeConfigured;
+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\Store;
+
+/**
+ * @inheritDoc
+ */
+class ConfigManager implements ModeConfigManagerInterface
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var Store
+     */
+    private $storeModel;
+
+    /**
+     * @var State
+     */
+    private $state;
+
+    /**
+     * @param ScopeConfigInterface $config
+     * @param Store $store
+     * @param State $state
+     */
+    public function __construct(ScopeConfigInterface $config, Store $store, State $state)
+    {
+        $this->config = $config;
+        $this->storeModel = $store;
+        $this->state = $state;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getConfigured(): ModeConfiguredInterface
+    {
+        $area = $this->state->getAreaCode();
+        if ($area === Area::AREA_ADMINHTML) {
+            $configArea = 'admin';
+        } elseif ($area === Area::AREA_FRONTEND) {
+            $configArea = 'storefront';
+        } else {
+            throw new \RuntimeException('CSP can only be configured for storefront or admin area');
+        }
+
+        $reportOnly = $this->config->isSetFlag(
+            'csp/mode/' . $configArea .'/report_only',
+            ScopeInterface::SCOPE_STORE,
+            $this->storeModel->getStore()
+        );
+        $reportUri = $this->config->getValue(
+            'csp/mode/' . $configArea .'/report_uri',
+            ScopeInterface::SCOPE_STORE,
+            $this->storeModel->getStore()
+        );
+
+        return new ModeConfigured($reportOnly, !empty($reportUri) ? $reportUri : null);
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Mode/Data/ModeConfigured.php b/app/code/Magento/Csp/Model/Mode/Data/ModeConfigured.php
new file mode 100644
index 0000000000000..db5e362f560a7
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Mode/Data/ModeConfigured.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Mode\Data;
+
+use Magento\Csp\Api\Data\ModeConfiguredInterface;
+
+/**
+ * @inheritDoc
+ */
+class ModeConfigured implements ModeConfiguredInterface
+{
+    /**
+     * @var bool
+     */
+    private $reportOnly;
+
+    /**
+     * @var string|null
+     */
+    private $reportUri;
+
+    /**
+     * @param bool $reportOnly
+     * @param string|null $reportUri
+     */
+    public function __construct(bool $reportOnly, ?string $reportUri)
+    {
+        $this->reportOnly = $reportOnly;
+        $this->reportUri = $reportUri;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isReportOnly(): bool
+    {
+        return $this->reportOnly;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getReportUri(): ?string
+    {
+        return $this->reportUri;
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Policy/FetchPolicy.php b/app/code/Magento/Csp/Model/Policy/FetchPolicy.php
new file mode 100644
index 0000000000000..7350cbe80aecb
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Policy/FetchPolicy.php
@@ -0,0 +1,283 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Policy;
+
+/**
+ * Represents a fetch directive.
+ */
+class FetchPolicy implements SimplePolicyInterface
+{
+    /**
+     * List of possible fetch directives.
+     */
+    public const POLICIES = [
+        'default-src',
+        'child-src',
+        'connect-src',
+        'font-src',
+        'frame-src',
+        'img-src',
+        'manifest-src',
+        'media-src',
+        'object-src',
+        'script-src',
+        'style-src',
+        'base-uri',
+        'form-action',
+        'frame-ancestors'
+    ];
+
+    /**
+     * @var string
+     */
+    private $id;
+
+    /**
+     * @var string[]
+     */
+    private $hostSources;
+
+    /**
+     * @var string[]
+     */
+    private $schemeSources;
+
+    /**
+     * @var bool
+     */
+    private $selfAllowed;
+
+    /**
+     * @var bool
+     */
+    private $inlineAllowed;
+
+    /**
+     * @var bool
+     */
+    private $evalAllowed;
+
+    /**
+     * @var bool
+     */
+    private $noneAllowed;
+
+    /**
+     * @var string[]
+     */
+    private $nonceValues;
+
+    /**
+     * @var string[]
+     */
+    private $hashes;
+
+    /**
+     * @var bool
+     */
+    private $dynamicAllowed;
+
+    /**
+     * @var bool
+     */
+    private $eventHandlersAllowed;
+
+    /**
+     * @param string $id
+     * @param bool $noneAllowed
+     * @param string[] $hostSources
+     * @param string[] $schemeSources
+     * @param bool $selfAllowed
+     * @param bool $inlineAllowed
+     * @param bool $evalAllowed
+     * @param string[] $nonceValues
+     * @param string[] $hashValues
+     * @param bool $dynamicAllowed
+     * @param bool $eventHandlersAllowed
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        string $id,
+        bool $noneAllowed = true,
+        array $hostSources = [],
+        array $schemeSources = [],
+        bool $selfAllowed = false,
+        bool $inlineAllowed = false,
+        bool $evalAllowed = false,
+        array $nonceValues = [],
+        array $hashValues = [],
+        bool $dynamicAllowed = false,
+        bool $eventHandlersAllowed = false
+    ) {
+        $this->id = $id;
+        $this->noneAllowed = $noneAllowed;
+        $this->hostSources = array_unique($hostSources);
+        $this->schemeSources = array_unique($schemeSources);
+        $this->selfAllowed = $selfAllowed;
+        $this->inlineAllowed = $inlineAllowed;
+        $this->evalAllowed = $evalAllowed;
+        $this->nonceValues = array_unique($nonceValues);
+        $this->hashes = $hashValues;
+        $this->dynamicAllowed = $dynamicAllowed;
+        $this->eventHandlersAllowed = $eventHandlersAllowed;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    /**
+     * Items can be loaded from given hosts.
+     *
+     * @return string[]
+     */
+    public function getHostSources(): array
+    {
+        return $this->hostSources;
+    }
+
+    /**
+     * Items can be loaded using following schemes.
+     *
+     * @return string[]
+     */
+    public function getSchemeSources(): array
+    {
+        return $this->schemeSources;
+    }
+
+    /**
+     * Items can be loaded from the same host/port as the HTML page.
+     *
+     * @return bool
+     */
+    public function isSelfAllowed(): bool
+    {
+        return $this->selfAllowed;
+    }
+
+    /**
+     * Items can be loaded from tags present on the original HTML page.
+     *
+     * @return bool
+     */
+    public function isInlineAllowed(): bool
+    {
+        return $this->inlineAllowed;
+    }
+
+    /**
+     * Allows creating items from strings.
+     *
+     * For example using "eval()" for JavaScript.
+     *
+     * @return bool
+     */
+    public function isEvalAllowed(): bool
+    {
+        return $this->evalAllowed;
+    }
+
+    /**
+     * Content type governed by this policy is disabled completely.
+     *
+     * @return bool
+     */
+    public function isNoneAllowed(): bool
+    {
+        return $this->noneAllowed;
+    }
+
+    /**
+     * @inheritDoc
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function getValue(): string
+    {
+        if ($this->isNoneAllowed()) {
+            return '\'none\'';
+        } else {
+            $sources = $this->getHostSources();
+            foreach ($this->getSchemeSources() as $schemeSource) {
+                $sources[] = $schemeSource .':';
+            }
+            if ($this->isSelfAllowed()) {
+                $sources[] = '\'self\'';
+            }
+            if ($this->isInlineAllowed()) {
+                $sources[] = '\'unsafe-inline\'';
+            }
+            if ($this->isEvalAllowed()) {
+                $sources[] = '\'unsafe-eval\'';
+            }
+            if ($this->isDynamicAllowed()) {
+                $sources[] = '\'strict-dynamic\'';
+            }
+            if ($this->areEventHandlersAllowed()) {
+                $sources[] = '\'unsafe-hashes\'';
+            }
+            foreach ($this->getNonceValues() as $nonce) {
+                $sources[] = '\'nonce-' .base64_encode($nonce) .'\'';
+            }
+            foreach ($this->getHashes() as $hash => $algorithm) {
+                $sources[]= "'$algorithm-$hash'";
+            }
+
+            return implode(' ', $sources);
+        }
+    }
+
+    /**
+     * Unique cryptographically random numbers marking inline items as trusted.
+     *
+     * Contains only numbers, not encoded.
+     *
+     * @return string[]
+     */
+    public function getNonceValues(): array
+    {
+        return $this->nonceValues;
+    }
+
+    /**
+     * Unique hashes generated based on inline items marking them as trusted.
+     *
+     * Contains only hashes themselves, encoded into base64. Keys are the hashes, values are algorithms used.
+     *
+     * @return string[]
+     */
+    public function getHashes(): array
+    {
+        return $this->hashes;
+    }
+
+    /**
+     * Is trust to inline items propagated to items loaded by root items.
+     *
+     * @return bool
+     */
+    public function isDynamicAllowed(): bool
+    {
+        return $this->dynamicAllowed;
+    }
+
+    /**
+     * Allows to whitelist event handlers (but not javascript: URLs) with hashes.
+     *
+     * @return bool
+     */
+    public function areEventHandlersAllowed(): bool
+    {
+        return $this->eventHandlersAllowed;
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Policy/FlagPolicy.php b/app/code/Magento/Csp/Model/Policy/FlagPolicy.php
new file mode 100644
index 0000000000000..041e1ca5d6229
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Policy/FlagPolicy.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Policy;
+
+/**
+ * Policies that are used as flags without a value.
+ */
+class FlagPolicy implements SimplePolicyInterface
+{
+    public const POLICIES = [
+        'upgrade-insecure-requests',
+        'block-all-mixed-content'
+    ];
+
+    /**
+     * @var string
+     */
+    private $id;
+
+    /**
+     * @param string $id
+     */
+    public function __construct(string $id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getValue(): string
+    {
+        return '';
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Policy/PluginTypesPolicy.php b/app/code/Magento/Csp/Model/Policy/PluginTypesPolicy.php
new file mode 100644
index 0000000000000..4f34f49bfffe7
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Policy/PluginTypesPolicy.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Policy;
+
+/**
+ * Governs allowed plugin mime-types.
+ */
+class PluginTypesPolicy implements SimplePolicyInterface
+{
+    /**
+     * @var string[]
+     */
+    private $types;
+
+    /**
+     * @param string[] $types
+     */
+    public function __construct(array $types)
+    {
+        if (!$types) {
+            throw new \RuntimeException('PluginTypePolicy must be given at least 1 type.');
+        }
+        $this->types = array_unique($types);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string
+    {
+        return 'plugin-types';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getValue(): string
+    {
+        return implode(' ', $this->getTypes());
+    }
+
+    /**
+     * Mime types of allowed plugins.
+     *
+     * Types like "application/x-shockwave-flash", "application/x-java-applet".
+     * Will only work if object-src directive != "none".
+     *
+     * @return string[]
+     */
+    public function getTypes(): array
+    {
+        return $this->types;
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRenderer.php b/app/code/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRenderer.php
new file mode 100644
index 0000000000000..14ae23eb3fe37
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRenderer.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Policy\Renderer;
+
+use Magento\Csp\Api\Data\ModeConfiguredInterface;
+use Magento\Csp\Api\Data\PolicyInterface;
+use Magento\Csp\Api\ModeConfigManagerInterface;
+use Magento\Csp\Api\PolicyRendererInterface;
+use Magento\Csp\Model\Policy\SimplePolicyInterface;
+use Magento\Framework\App\Response\HttpInterface as HttpResponse;
+
+/**
+ * Renders a simple policy as a "Content-Security-Policy" header.
+ */
+class SimplePolicyHeaderRenderer implements PolicyRendererInterface
+{
+    /**
+     * @var ModeConfigManagerInterface
+     */
+    private $modeConfig;
+
+    /**
+     * @param ModeConfigManagerInterface $modeConfig
+     */
+    public function __construct(ModeConfigManagerInterface $modeConfig)
+    {
+        $this->modeConfig = $modeConfig;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function render(PolicyInterface $policy, HttpResponse $response): void
+    {
+        /** @var SimplePolicyInterface $policy */
+        $config = $this->modeConfig->getConfigured();
+        if ($config->isReportOnly()) {
+            $header = 'Content-Security-Policy-Report-Only';
+        } else {
+            $header = 'Content-Security-Policy';
+        }
+        $value = $policy->getId() .' ' .$policy->getValue() .';';
+        if ($config->getReportUri()) {
+            $reportToData = [
+                'group' => 'report-endpoint',
+                'max_age' => 10886400,
+                'endpoints' => [
+                    ['url' => $config->getReportUri()]
+                ]
+            ];
+            $value .= ' report-uri ' .$config->getReportUri() .';';
+            $value .= ' report-to '. $reportToData['group'] .';';
+            $response->setHeader('Report-To', json_encode($reportToData), true);
+        }
+        $response->setHeader($header, $value, false);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canRender(PolicyInterface $policy): bool
+    {
+        return true;
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Policy/SandboxPolicy.php b/app/code/Magento/Csp/Model/Policy/SandboxPolicy.php
new file mode 100644
index 0000000000000..33e3b06f56aec
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Policy/SandboxPolicy.php
@@ -0,0 +1,278 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Policy;
+
+/**
+ * "sandbox" directive enables sandbox mode for requested pages limiting their functionality.
+ *
+ * Works the same as "sandbox" attribute for iframes but for the main document.
+ */
+class SandboxPolicy implements SimplePolicyInterface
+{
+    /**
+     * @var bool
+     */
+    private $formAllowed;
+
+    /**
+     * @var bool
+     */
+    private $modalsAllowed;
+
+    /**
+     * @var bool
+     */
+    private $orientationLockAllowed;
+
+    /**
+     * @var bool
+     */
+    private $pointerLockAllowed;
+
+    /**
+     * @var bool
+     */
+    private $popupsAllowed;
+
+    /**
+     * @var bool
+     */
+    private $popupsToEscapeSandboxAllowed;
+
+    /**
+     * @var bool
+     */
+    private $presentationAllowed;
+
+    /**
+     * @var bool
+     */
+    private $sameOriginAllowed;
+
+    /**
+     * @var bool
+     */
+    private $scriptsAllowed;
+
+    /**
+     * @var bool
+     */
+    private $topNavigationAllowed;
+
+    /**
+     * @var bool
+     */
+    private $topNavigationByUserActivationAllowed;
+
+    /**
+     * @param bool $formAllowed
+     * @param bool $modalsAllowed
+     * @param bool $orientationLockAllowed
+     * @param bool $pointerLockAllowed
+     * @param bool $popupsAllowed
+     * @param bool $popupsToEscapeSandboxAllowed
+     * @param bool $presentationAllowed
+     * @param bool $sameOriginAllowed
+     * @param bool $scriptsAllowed
+     * @param bool $topNavigationAllowed
+     * @param bool $topNavigationByUserActivationAllowed
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        bool $formAllowed,
+        bool $modalsAllowed,
+        bool $orientationLockAllowed,
+        bool $pointerLockAllowed,
+        bool $popupsAllowed,
+        bool $popupsToEscapeSandboxAllowed,
+        bool $presentationAllowed,
+        bool $sameOriginAllowed,
+        bool $scriptsAllowed,
+        bool $topNavigationAllowed,
+        bool $topNavigationByUserActivationAllowed
+    ) {
+        $this->formAllowed = $formAllowed;
+        $this->modalsAllowed = $modalsAllowed;
+        $this->orientationLockAllowed = $orientationLockAllowed;
+        $this->pointerLockAllowed = $pointerLockAllowed;
+        $this->popupsAllowed = $popupsAllowed;
+        $this->popupsToEscapeSandboxAllowed = $popupsToEscapeSandboxAllowed;
+        $this->presentationAllowed = $presentationAllowed;
+        $this->sameOriginAllowed = $sameOriginAllowed;
+        $this->scriptsAllowed = $scriptsAllowed;
+        $this->topNavigationAllowed = $topNavigationAllowed;
+        $this->topNavigationByUserActivationAllowed = $topNavigationByUserActivationAllowed;
+    }
+
+    /**
+     * Sandbox option.
+     *
+     * @return bool
+     */
+    public function isFormAllowed(): bool
+    {
+        return $this->formAllowed;
+    }
+
+    /**
+     * Sandbox option.
+     *
+     * @return bool
+     */
+    public function isModalsAllowed(): bool
+    {
+        return $this->modalsAllowed;
+    }
+
+    /**
+     * Sandbox option.
+     *
+     * @return bool
+     */
+    public function isOrientationLockAllowed(): bool
+    {
+        return $this->orientationLockAllowed;
+    }
+
+    /**
+     * Sandbox option.
+     *
+     * @return bool
+     */
+    public function isPointerLockAllowed(): bool
+    {
+        return $this->pointerLockAllowed;
+    }
+
+    /**
+     * Sandbox option.
+     *
+     * @return bool
+     */
+    public function isPopupsAllowed(): bool
+    {
+        return $this->popupsAllowed;
+    }
+
+    /**
+     * Sandbox option.
+     *
+     * @return bool
+     */
+    public function isPopupsToEscapeSandboxAllowed(): bool
+    {
+        return $this->popupsToEscapeSandboxAllowed;
+    }
+
+    /**
+     * Sandbox option.
+     *
+     * @return bool
+     */
+    public function isPresentationAllowed(): bool
+    {
+        return $this->presentationAllowed;
+    }
+
+    /**
+     * Sandbox option.
+     *
+     * @return bool
+     */
+    public function isSameOriginAllowed(): bool
+    {
+        return $this->sameOriginAllowed;
+    }
+
+    /**
+     * Sandbox option.
+     *
+     * @return bool
+     */
+    public function isScriptsAllowed(): bool
+    {
+        return $this->scriptsAllowed;
+    }
+
+    /**
+     * Sandbox option.
+     *
+     * @return bool
+     */
+    public function isTopNavigationAllowed(): bool
+    {
+        return $this->topNavigationAllowed;
+    }
+
+    /**
+     * Sandbox option.
+     *
+     * @return bool
+     */
+    public function isTopNavigationByUserActivationAllowed(): bool
+    {
+        return $this->topNavigationByUserActivationAllowed;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string
+    {
+        return 'sandbox';
+    }
+
+    /**
+     * @inheritDoc
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function getValue(): string
+    {
+        $allowed = [];
+
+        if ($this->isFormAllowed()) {
+            $allowed[] = 'allow-forms';
+        }
+        if ($this->isModalsAllowed()) {
+            $allowed[] = 'allow-modals';
+        }
+        if ($this->isOrientationLockAllowed()) {
+            $allowed[] = 'allow-orientation-lock';
+        }
+        if ($this->isPointerLockAllowed()) {
+            $allowed[] = 'allow-pointer-lock';
+        }
+        if ($this->isPopupsAllowed()) {
+            $allowed[] = 'allow-popups';
+        }
+        if ($this->isPopupsToEscapeSandboxAllowed()) {
+            $allowed[] = 'allow-popups-to-escape-sandbox';
+        }
+        if ($this->isPresentationAllowed()) {
+            $allowed[] = 'allow-presentation';
+        }
+        if ($this->isSameOriginAllowed()) {
+            $allowed[] = 'allow-same-origin';
+        }
+        if ($this->isScriptsAllowed()) {
+            $allowed[] = 'allow-scripts';
+        }
+        if ($this->isTopNavigationAllowed()) {
+            $allowed[] = 'allow-top-navigation';
+        }
+        if ($this->isTopNavigationByUserActivationAllowed()) {
+            $allowed[] = 'allow-top-navigation-by-user-activation';
+        }
+
+        if (!$allowed) {
+            throw new \RuntimeException('At least 1 option must be selected');
+        }
+        return implode(' ', $allowed);
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Policy/SimplePolicyInterface.php b/app/code/Magento/Csp/Model/Policy/SimplePolicyInterface.php
new file mode 100644
index 0000000000000..aea28a1469de5
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Policy/SimplePolicyInterface.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Policy;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+
+/**
+ * Simple policy that is represented by the default prefix and an ID - string value combination.
+ */
+interface SimplePolicyInterface extends PolicyInterface
+{
+
+}
diff --git a/app/code/Magento/Csp/Model/PolicyRendererPool.php b/app/code/Magento/Csp/Model/PolicyRendererPool.php
new file mode 100644
index 0000000000000..5bce191e3a878
--- /dev/null
+++ b/app/code/Magento/Csp/Model/PolicyRendererPool.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+use Magento\Csp\Api\PolicyRendererInterface;
+
+/**
+ * Pool of policy renderers.
+ */
+class PolicyRendererPool
+{
+    /**
+     * @var PolicyRendererInterface[]
+     */
+    private $renderers;
+
+    /**
+     * @param PolicyRendererInterface[] $renderers
+     */
+    public function __construct(array $renderers)
+    {
+        $this->renderers = $renderers;
+    }
+
+    /**
+     * Get renderer for the given policy.
+     *
+     * @param PolicyInterface $forPolicy
+     * @return PolicyRendererInterface
+     * @throws \RuntimeException When it's impossible to find a proper renderer.
+     */
+    public function getRenderer(PolicyInterface $forPolicy): PolicyRendererInterface
+    {
+        foreach ($this->renderers as $renderer) {
+            if ($renderer->canRender($forPolicy)) {
+                return $renderer;
+            }
+        }
+
+        throw new \RuntimeException(sprintf('Failed to find a renderer for policy #%s', $forPolicy->getId()));
+    }
+}
diff --git a/app/code/Magento/Csp/Observer/Render.php b/app/code/Magento/Csp/Observer/Render.php
new file mode 100644
index 0000000000000..2b88d685f3fe4
--- /dev/null
+++ b/app/code/Magento/Csp/Observer/Render.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Observer;
+
+use Magento\Csp\Api\CspRendererInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\App\Response\HttpInterface as HttpResponse;
+
+/**
+ * Adds CSP rendering after HTTP response is generated.
+ */
+class Render implements ObserverInterface
+{
+    /**
+     * @var CspRendererInterface
+     */
+    private $cspRenderer;
+
+    /**
+     * @param CspRendererInterface $cspRenderer
+     */
+    public function __construct(CspRendererInterface $cspRenderer)
+    {
+        $this->cspRenderer = $cspRenderer;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute(Observer $observer)
+    {
+        /** @var HttpResponse $response */
+        $response = $observer->getEvent()->getData('response');
+
+        $this->cspRenderer->render($response);
+    }
+}
diff --git a/app/code/Magento/Csp/README.md b/app/code/Magento/Csp/README.md
new file mode 100644
index 0000000000000..47f0f196becd5
--- /dev/null
+++ b/app/code/Magento/Csp/README.md
@@ -0,0 +1,2 @@
+Magento_Csp implements Content Security Policies for Magento. Allows CSP configuration for Merchants,
+provides a way for extension and theme developers to configure CSP headers for their extensions.
diff --git a/app/code/Magento/Csp/composer.json b/app/code/Magento/Csp/composer.json
new file mode 100644
index 0000000000000..cd8a47a92159d
--- /dev/null
+++ b/app/code/Magento/Csp/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "magento/module-csp",
+    "description": "CSP module enables Content Security Policies for Magento",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "magento/framework": "*",
+        "magento/module-store": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\Csp\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/Csp/etc/adminhtml/events.xml b/app/code/Magento/Csp/etc/adminhtml/events.xml
new file mode 100644
index 0000000000000..f81031d2a779a
--- /dev/null
+++ b/app/code/Magento/Csp/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="controller_front_send_response_before">
+        <observer name="csp_render" instance="Magento\Csp\Observer\Render" />
+    </event>
+</config>
diff --git a/app/code/Magento/Csp/etc/config.xml b/app/code/Magento/Csp/etc/config.xml
new file mode 100644
index 0000000000000..e45f6b223ed22
--- /dev/null
+++ b/app/code/Magento/Csp/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>
+        <csp>
+            <mode>
+                <storefront>
+                    <report_only>1</report_only>
+                </storefront>
+                <admin>
+                    <report_only>1</report_only>
+                </admin>
+            </mode>
+        </csp>
+    </default>
+</config>
diff --git a/app/code/Magento/Csp/etc/csp_whitelist.xsd b/app/code/Magento/Csp/etc/csp_whitelist.xsd
new file mode 100644
index 0000000000000..e68e596e21c79
--- /dev/null
+++ b/app/code/Magento/Csp/etc/csp_whitelist.xsd
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Structure description for csp_whitelist.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="csp_whitelist" type="cspWhitelistType" />
+
+    <xs:complexType name="cspWhitelistType">
+        <xs:sequence>
+            <xs:element name="policies" type="policiesType" minOccurs="1" maxOccurs="1"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="policiesType">
+        <xs:sequence>
+            <xs:element name="policy" type="policyType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="policyType">
+        <xs:sequence>
+            <xs:element name="values" type="valuesType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:string" use="required" />
+    </xs:complexType>
+
+    <xs:complexType name="valuesType">
+        <xs:sequence>
+            <xs:element name="value" type="valueType" minOccurs="1" maxOccurs="unbounded" />
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="valueType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute type="xs:string" name="id" use="required" />
+                <xs:attribute type="cspValueType" name="type" use="required" />
+                <xs:attribute type="xs:string" name="algorithm" use="optional" />
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:simpleType name="cspValueType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="host" />
+            <xs:enumeration value="hash" />
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/app/code/Magento/Csp/etc/di.xml b/app/code/Magento/Csp/etc/di.xml
new file mode 100644
index 0000000000000..0804f6d579137
--- /dev/null
+++ b/app/code/Magento/Csp/etc/di.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:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\Csp\Api\CspRendererInterface" type="Magento\Csp\Model\CspRenderer" />
+    <type name="Magento\Csp\Model\PolicyRendererPool">
+        <arguments>
+            <argument name="renderers" xsi:type="array">
+                <item name="header" xsi:type="object">Magento\Csp\Model\Policy\Renderer\SimplePolicyHeaderRenderer</item>
+            </argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Csp\Api\PolicyCollectorInterface" type="Magento\Csp\Model\CompositePolicyCollector" />
+    <type name="Magento\Csp\Model\CompositePolicyCollector">
+        <arguments>
+            <argument name="collectors" xsi:type="array">
+                <item name="config" xsi:type="object">Magento\Csp\Model\Collector\ConfigCollector</item>
+                <item name="csp_whitelist" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXmlCollector</item>
+            </argument>
+            <argument name="mergers" xsi:type="array">
+                <item name="fetch" xsi:type="object">Magento\Csp\Model\Collector\FetchPolicyMerger</item>
+                <item name="flag" xsi:type="object">Magento\Csp\Model\Collector\FlagPolicyMerger</item>
+                <item name="plugins" xsi:type="object">Magento\Csp\Model\Collector\PluginTypesPolicyMerger</item>
+                <item name="sandbox" xsi:type="object">Magento\Csp\Model\Collector\SandboxPolicyMerger</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Csp\Model\Collector\Config\PolicyReaderPool">
+        <arguments>
+            <argument name="readers" xsi:type="array">
+                <item name="fetch" xsi:type="object">Magento\Csp\Model\Collector\Config\FetchPolicyReader</item>
+                <item name="plugin_types" xsi:type="object">Magento\Csp\Model\Collector\Config\PluginTypesPolicyReader</item>
+                <item name="sandbox" xsi:type="object">Magento\Csp\Model\Collector\Config\SandboxPolicyReader</item>
+                <item name="flag" xsi:type="object">Magento\Csp\Model\Collector\Config\FlagPolicyReader</item>
+            </argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Csp\Api\ModeConfigManagerInterface" type="Magento\Csp\Model\Mode\ConfigManager" />
+    <type name="Magento\Csp\Model\Collector\CspWhitelistXml\Reader">
+        <arguments>
+            <argument name="converter" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\Converter</argument>
+            <argument name="schemaLocator" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\SchemaLocator</argument>
+            <argument name="fileName" xsi:type="string">csp_whitelist.xml</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/Csp/etc/frontend/events.xml b/app/code/Magento/Csp/etc/frontend/events.xml
new file mode 100644
index 0000000000000..f81031d2a779a
--- /dev/null
+++ b/app/code/Magento/Csp/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="controller_front_send_response_before">
+        <observer name="csp_render" instance="Magento\Csp\Observer\Render" />
+    </event>
+</config>
diff --git a/app/code/Magento/Csp/etc/module.xml b/app/code/Magento/Csp/etc/module.xml
new file mode 100644
index 0000000000000..e99608ef13f15
--- /dev/null
+++ b/app/code/Magento/Csp/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_Csp" />
+</config>
diff --git a/app/code/Magento/Csp/registration.php b/app/code/Magento/Csp/registration.php
new file mode 100644
index 0000000000000..90f4a25452858
--- /dev/null
+++ b/app/code/Magento/Csp/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_Csp', __DIR__);
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 e20054a5a8084..ee94195a29cc7 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
@@ -11,6 +11,9 @@
  */
 namespace Magento\CurrencySymbol\Block\Adminhtml\System\Currency\Rate;
 
+/**
+ * Manage currency block
+ */
 class Matrix extends \Magento\Backend\Block\Template
 {
     /**
@@ -105,7 +108,7 @@ protected function _prepareRates($array)
         foreach ($array as $key => $rate) {
             foreach ($rate as $code => $value) {
                 $parts = explode('.', $value);
-                if (sizeof($parts) == 2) {
+                if (count($parts) == 2) {
                     $parts[1] = str_pad(rtrim($parts[1], 0), 4, '0', STR_PAD_RIGHT);
                     $array[$key][$code] = join('.', $parts);
                 } elseif ($value > 0) {
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 a6e29db1e1c40..9140807121b83 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
@@ -3,29 +3,73 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Backend\Model\Session as BackendSession;
+use Magento\CurrencySymbol\Controller\Adminhtml\System\Currency as CurrencyAction;
+use Magento\Directory\Model\Currency\Import\Factory as CurrencyImportFactory;
+use Magento\Directory\Model\Currency\Import\ImportInterface as CurrencyImport;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Escaper;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\CurrencySymbol\Controller\Adminhtml\System\Currency as CurrencyAction;
+use Magento\Framework\Registry;
+use Exception;
 
 /**
- * Class FetchRates
+ * Fetch rates controller.
  */
 class FetchRates extends CurrencyAction implements HttpGetActionInterface, HttpPostActionInterface
 {
+    /**
+     * @var BackendSession
+     */
+    private $backendSession;
+
+    /**
+     * @var CurrencyImportFactory
+     */
+    private $currencyImportFactory;
+
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param BackendSession|null $backendSession
+     * @param CurrencyImportFactory|null $currencyImportFactory
+     * @param Escaper|null $escaper
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        ?BackendSession $backendSession = null,
+        ?CurrencyImportFactory $currencyImportFactory = null,
+        ?Escaper $escaper = null
+    ) {
+        parent::__construct($context, $coreRegistry);
+        $this->backendSession = $backendSession ?: ObjectManager::getInstance()->get(BackendSession::class);
+        $this->currencyImportFactory = $currencyImportFactory ?: ObjectManager::getInstance()
+            ->get(CurrencyImportFactory::class);
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
+    }
+
     /**
      * Fetch rates action
      *
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return Redirect
      */
     public function execute()
     {
-        /** @var \Magento\Backend\Model\Session $backendSession */
-        $backendSession = $this->_objectManager->get(\Magento\Backend\Model\Session::class);
         try {
             $service = $this->getRequest()->getParam('rate_services');
             $this->_getSession()->setCurrencyRateService($service);
@@ -33,10 +77,9 @@ public function execute()
                 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) {
+                /** @var CurrencyImport $importModel */
+                $importModel = $this->currencyImportFactory->create($service);
+            } catch (Exception $e) {
                 throw new LocalizedException(
                     __("The import model can't be initialized. Verify the model and try again.")
                 );
@@ -45,7 +88,8 @@ public function execute()
             $errors = $importModel->getMessages();
             if (count($errors) > 0) {
                 foreach ($errors as $error) {
-                    $this->messageManager->addWarningMessage($error);
+                    $escapedError = $this->escaper->escapeHtml($error);
+                    $this->messageManager->addWarningMessage($escapedError);
                 }
                 $this->messageManager->addWarningMessage(
                     __('Click "Save" to apply the rates we found.')
@@ -54,12 +98,12 @@ public function execute()
                 $this->messageManager->addSuccessMessage(__('Click "Save" to apply the rates we found.'));
             }
 
-            $backendSession->setRates($rates);
-        } catch (\Exception $e) {
+            $this->backendSession->setRates($rates);
+        } catch (Exception $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
         }
 
-        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         return $resultRedirect->setPath('adminhtml/*/');
     }
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 f77976cc9e2f2..07c7c553ac792 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/Save.php
@@ -5,37 +5,68 @@
  */
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol;
 
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Backend\App\Action;
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol as CurrencysymbolController;
+use Magento\CurrencySymbol\Model\System\CurrencysymbolFactory;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Filter\FilterManager;
 
 /**
- * Class Save
+ * Controller to save currency symbol
  */
-class Save extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol implements HttpPostActionInterface
+class Save extends CurrencysymbolController implements HttpPostActionInterface
 {
+    /**
+     * @var FilterManager
+     */
+    private $filterManager;
+
+    /**
+     * @var CurrencysymbolFactory
+     */
+    private $currencySymbolFactory;
+
+    /**
+     * @param Action\Context $context
+     * @param FilterManager $filterManager
+     * @param CurrencysymbolFactory $currencySymbolFactory
+     */
+    public function __construct(
+        Action\Context $context,
+        FilterManager $filterManager,
+        CurrencysymbolFactory $currencySymbolFactory
+    ) {
+        parent::__construct($context);
+        $this->filterManager = $filterManager;
+        $this->currencySymbolFactory = $currencySymbolFactory;
+    }
+
     /**
      * Save custom Currency symbol
      *
-     * @return void
+     * @return ResultInterface
      */
     public function execute()
     {
+        /** @var Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
         $symbolsDataArray = $this->getRequest()->getParam('custom_currency_symbol', null);
         if (is_array($symbolsDataArray)) {
             foreach ($symbolsDataArray as &$symbolsData) {
-                /** @var $filterManager \Magento\Framework\Filter\FilterManager */
-                $filterManager = $this->_objectManager->get(\Magento\Framework\Filter\FilterManager::class);
-                $symbolsData = $filterManager->stripTags($symbolsData);
+                $symbolsData = $this->filterManager->stripTags($symbolsData);
             }
         }
 
         try {
-            $this->_objectManager->create(\Magento\CurrencySymbol\Model\System\Currencysymbol::class)
-                ->setCurrencySymbolsData($symbolsDataArray);
+            $currencySymbol = $this->currencySymbolFactory->create();
+            $currencySymbol->setCurrencySymbolsData($symbolsDataArray);
             $this->messageManager->addSuccessMessage(__('You applied the custom currency symbols.'));
         } catch (\Exception $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
         }
 
-        $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
+        return $resultRedirect->setPath('*');
     }
 }
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminCurrencyRatesActionGroup.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminCurrencyRatesActionGroup.xml
new file mode 100644
index 0000000000000..a2e25cf858a6e
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminCurrencyRatesActionGroup.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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminImportCurrencyRatesActionGroup">
+        <arguments>
+            <argument name="rateService" type="string" defaultValue="Fixer.io"/>
+        </arguments>
+        <selectOption selector="{{AdminCurrencyRatesSection.rateService}}" userInput="{{rateService}}" stepKey="selectRateService"/>
+        <click selector="{{AdminCurrencyRatesSection.import}}" stepKey="clickImport"/>
+        <waitForElementVisible selector="{{AdminCurrencyRatesSection.oldRate}}" stepKey="waitForOldRateVisible"/>
+    </actionGroup>
+    <actionGroup name="AdminSaveCurrencyRatesActionGroup">
+        <click selector="{{AdminCurrencyRatesSection.saveCurrencyRates}}" stepKey="clickSaveCurrencyRates"/>
+        <waitForPageLoad stepKey="waitForSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="All valid rates have been saved." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+    <actionGroup name="AdminSetCurrencyRatesActionGroup">
+        <arguments>
+            <argument name="firstCurrency" type="string" defaultValue="USD"/>
+            <argument name="secondCurrency" type="string" defaultValue="EUR"/>
+            <argument name="rate" type="string" defaultValue="0.5"/>
+        </arguments>
+        <fillField selector="{{AdminCurrencyRatesSection.currencyRate(firstCurrency, secondCurrency)}}" userInput="{{rate}}" stepKey="setCurrencyRate"/>
+        <click selector="{{AdminCurrencyRatesSection.saveCurrencyRates}}" stepKey="clickSaveCurrencyRates"/>
+        <waitForPageLoad stepKey="waitForSave"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="{{AdminSaveCurrencyRatesMessageData.success}}" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/StorefrontCurrencyRatesActionGroup.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/StorefrontCurrencyRatesActionGroup.xml
new file mode 100644
index 0000000000000..02cf23c323a8a
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/StorefrontCurrencyRatesActionGroup.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="StorefrontSwitchCurrencyActionGroup">
+        <arguments>
+            <argument name="currency" type="string" defaultValue="EUR"/>
+        </arguments>
+        <click selector="{{StorefrontSwitchCurrencyRatesSection.currencyToggle}}" stepKey="openToggle"/>
+        <waitForElementVisible selector="{{StorefrontSwitchCurrencyRatesSection.currency(currency)}}" stepKey="waitForCurrency"/>
+        <click selector="{{StorefrontSwitchCurrencyRatesSection.currency(currency)}}" stepKey="chooseCurrency"/>
+        <see selector="{{StorefrontSwitchCurrencyRatesSection.selectedCurrency}}" userInput="{{currency}}" stepKey="seeSelectedCurrency"/>
+    </actionGroup>
+    <actionGroup name="StorefrontSwitchCurrency">
+        <arguments>
+            <argument name="currency" type="string" defaultValue="EUR"/>
+        </arguments>
+        <click selector="{{StorefrontSwitchCurrencyRatesSection.currencyTrigger}}" stepKey="openTrigger"/>
+        <waitForElementVisible selector="{{StorefrontSwitchCurrencyRatesSection.currency(currency)}}" stepKey="waitForCurrency"/>
+        <click selector="{{StorefrontSwitchCurrencyRatesSection.currency(currency)}}" stepKey="chooseCurrency"/>
+        <see selector="{{StorefrontSwitchCurrencyRatesSection.selectedCurrency}}" userInput="{{currency}}" stepKey="seeSelectedCurrency"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Data/AdminCurrencyRatesMessageData.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Data/AdminCurrencyRatesMessageData.xml
new file mode 100644
index 0000000000000..90d22b06fcb80
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Data/AdminCurrencyRatesMessageData.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="AdminSaveCurrencyRatesMessageData">
+        <data key="success">All valid rates have been saved.</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Data/CurrencyRatesConfigData.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Data/CurrencyRatesConfigData.xml
new file mode 100644
index 0000000000000..6194287dd058b
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Data/CurrencyRatesConfigData.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="SetCurrencyUSDBaseConfig">
+        <data key="path">currency/options/base</data>
+        <data key="value">USD</data>
+        <data key="scope">websites</data>
+        <data key="scope_code">base</data>
+    </entity>
+    <entity name="SetCurrencyEURBaseConfig">
+        <data key="path">currency/options/base</data>
+        <data key="value">EUR</data>
+        <data key="scope">websites</data>
+        <data key="scope_code">base</data>
+    </entity>
+    <entity name="SetAllowedCurrenciesConfigForUSD">
+        <data key="path">currency/options/allow</data>
+        <data key="value">USD</data>
+        <data key="scope">websites</data>
+        <data key="scope_code">base</data>
+    </entity>
+    <entity name="SetAllowedCurrenciesConfigForEUR">
+        <data key="path">currency/options/allow</data>
+        <data key="value">EUR</data>
+        <data key="scope">websites</data>
+        <data key="scope_code">base</data>
+    </entity>
+    <entity name="SetAllowedCurrenciesConfigForRUB">
+        <data key="path">currency/options/allow</data>
+        <data key="value">RUB</data>
+        <data key="scope">websites</data>
+        <data key="scope_code">base</data>
+    </entity>
+    <entity name="SetDefaultCurrencyEURConfig">
+        <data key="path">currency/options/default</data>
+        <data key="value">EUR</data>
+        <data key="scope">websites</data>
+        <data key="scope_code">base</data>
+    </entity>
+    <entity name="SetDefaultCurrencyUSDConfig">
+        <data key="path">currency/options/default</data>
+        <data key="value">USD</data>
+        <data key="scope">websites</data>
+        <data key="scope_code">base</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Page/AdminCurrencyRatesPage.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Page/AdminCurrencyRatesPage.xml
new file mode 100644
index 0000000000000..d31dd71d474bb
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Page/AdminCurrencyRatesPage.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="AdminCurrencyRatesPage" url="admin/system_currency/" area="admin" module="CurrencySymbol">
+        <section name="AdminCurrencyRatesSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/AdminCurrencyRatesSection.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/AdminCurrencyRatesSection.xml
new file mode 100644
index 0000000000000..bc80a51c41c47
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/AdminCurrencyRatesSection.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="AdminCurrencyRatesSection">
+        <element name="import" type="button" selector="//button[@title='Import']"/>
+        <element name="saveCurrencyRates" type="button" selector="//button[@title='Save Currency Rates']"/>
+        <element name="oldRate" type="text" selector="//div[contains(@class, 'admin__field-note') and contains(text(), 'Old rate:')]/strong"/>
+        <element name="rateService" type="select" selector="#rate_services"/>
+        <element name="currencyRate" type="input" selector="input[name='rate[{{fistCurrency}}][{{secondCurrency}}]']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/StorefrontSwitchCurrencyRatesSection.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/StorefrontSwitchCurrencyRatesSection.xml
new file mode 100644
index 0000000000000..ff922421e5db7
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/StorefrontSwitchCurrencyRatesSection.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="StorefrontSwitchCurrencyRatesSection">
+        <element name="currencyToggle" type="select" selector="#switcher-currency-trigger" timeout="30"/>
+        <element name="currencyTrigger" type="select" selector="#switcher-currency-trigger" timeout="30"/>
+        <element name="currency" type="button" selector="//div[@id='switcher-currency-trigger']/following-sibling::ul//a[contains(text(), '{{currency}}')]" parameterized="true" timeout="10"/>
+        <element name="selectedCurrency" type="text" selector="#switcher-currency-trigger span"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminCurrencyConverterAPIConfigurationTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminCurrencyConverterAPIConfigurationTest.xml
new file mode 100644
index 0000000000000..6232f59bb839a
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminCurrencyConverterAPIConfigurationTest.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="AdminCurrencyConverterAPIConfigurationTest">
+        <annotations>
+            <features value="CurrencySymbol"/>
+            <stories value="Currency Rates"/>
+            <title value="Currency Converter API configuration"/>
+            <description value="Currency Converter API configuration"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-19272"/>
+            <useCaseId value="MAGETWO-94919"/>
+            <group value="currency"/>
+            <skip>
+                <issueId value="MQE-1578"/>
+            </skip>
+        </annotations>
+        <before>
+            <!--Set currency allow config-->
+            <magentoCLI command="config:set currency/options/allow RHD,CHW,CHE,AMD,EUR,USD" stepKey="setCurrencyAllow"/>
+            <!--TODO: Add Api key-->
+            <magentoCLI command="cache:flush" stepKey="clearCache"/>
+            <!--Create product-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!--Set currency allow previous config-->
+            <magentoCLI command="config:set currency/options/allow EUR,USD" stepKey="setCurrencyAllow"/>
+            <!--Delete created data-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Import rates from Currency Converter API-->
+        <amOnPage url="{{AdminCurrencyRatesPage.url}}" stepKey="onCurrencyRatePage"/>
+        <actionGroup ref="AdminImportCurrencyRatesActionGroup" stepKey="importCurrencyRates">
+            <argument name="rateService" value="Currency Converter API"/>
+        </actionGroup>
+        <see selector="{{AdminMessagesSection.warningMessage}}" userInput='Click "Save" to apply the rates we found.' stepKey="seeImportMessage"/>
+        <see selector="{{AdminMessagesSection.warningMessage}}" userInput="We can't retrieve a rate from https://free.currconv.com for CHE." stepKey="seeWarningMessageForCHE"/>
+        <see selector="{{AdminMessagesSection.warningMessage}}" userInput="We can't retrieve a rate from https://free.currconv.com for RHD." stepKey="seeWarningMessageForRHD"/>
+        <see selector="{{AdminMessagesSection.warningMessage}}" userInput="We can't retrieve a rate from https://free.currconv.com for CHW." stepKey="seeWarningMessageForCHW"/>
+        <actionGroup ref="AdminSaveCurrencyRatesActionGroup" stepKey="saveCurrencyRates"/>
+        <see selector="{{AdminMessagesSection.warningMessage}}" userInput='Please correct the input data for "USD => CHE" rate' stepKey="seeCHEMessageAfterSave"/>
+        <see selector="{{AdminMessagesSection.warningMessage}}" userInput='Please correct the input data for "USD => RHD" rate' stepKey="seeRHDMessageAfterSave"/>
+        <see selector="{{AdminMessagesSection.warningMessage}}" userInput='Please correct the input data for "USD => CHW" rate' stepKey="seeCHWMessageAfterSave"/>
+        <!--Go to the Storefront and check currency rates-->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <actionGroup ref="StorefrontSwitchCurrencyActionGroup" stepKey="switchAMDCurrency">
+            <argument name="currency" value="AMD"/>
+        </actionGroup>
+        <see selector="{{StorefrontCategoryMainSection.productPrice}}" userInput="AMD" stepKey="seeAMDInPrice"/>
+        <actionGroup ref="StorefrontSwitchCurrencyActionGroup" stepKey="switchEURCurrency">
+            <argument name="currency" value="EUR"/>
+        </actionGroup>
+        <see selector="{{StorefrontCategoryMainSection.productPrice}}" userInput="€" stepKey="seeEURInPrice"/>
+        <!--Set allowed currencies greater then 10-->
+        <magentoCLI command="config:set currency/options/allow RHD,CHW,YER,ZMK,CHE,EUR,USD,AMD,RUB,DZD,ARS,AWG" stepKey="setCurrencyAllow"/>
+        <magentoCLI command="cache:flush" stepKey="clearCache"/>
+        <!--Import rates from Currency Converter API with currencies greater then 10-->
+        <amOnPage url="{{AdminCurrencyRatesPage.url}}" stepKey="onCurrencyRatePageSecondTime"/>
+        <actionGroup ref="AdminImportCurrencyRatesActionGroup" stepKey="importCurrencyRatesGreaterThen10">
+            <argument name="rateService" value="Currency Converter API"/>
+        </actionGroup>
+        <see selector="{{AdminMessagesSection.warningMessage}}" userInput="Too many pairs. Maximum of 10 is supported for the free version." stepKey="seeTooManyPairsMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayWhenChooseThreeAllowedCurrenciesTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayWhenChooseThreeAllowedCurrenciesTest.xml
new file mode 100644
index 0000000000000..26fbfd394be68
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayWhenChooseThreeAllowedCurrenciesTest.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="AdminOrderRateDisplayWhenChooseThreeAllowedCurrenciesTest" extends="AdminOrderRateDisplayedInOneLineTest">
+        <annotations>
+            <features value="CurrencySymbol"/>
+            <stories value="Currency rates order page"/>
+            <title value="Order rate converting currency for 'Base Currency' and 'Default Display Currency' displayed correct"/>
+            <description value="Order rate converting currency for 'Base Currency' and 'Default Display Currency' displayed correct"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-17255" />
+            <useCaseId value="MAGETWO-67450"/>
+            <group value="currency"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create product-->
+            <createData entity="SimpleProduct2" stepKey="createNewProduct"/>
+            <!--Set Currency options for Website-->
+            <magentoCLI command="config:set --scope={{SetCurrencyUSDBaseConfig.scope}} --scope-code={{SetCurrencyUSDBaseConfig.scope_code}} {{SetCurrencyUSDBaseConfig.path}} {{SetCurrencyUSDBaseConfig.value}}" stepKey="setCurrencyBaseUSDWebsites"/>
+            <magentoCLI command="config:set --scope={{SetAllowedCurrenciesConfigForUSD.scope}} --scope-code={{SetAllowedCurrenciesConfigForUSD.scope_code}} {{SetAllowedCurrenciesConfigForUSD.path}} {{SetAllowedCurrenciesConfigForUSD.value}},{{SetAllowedCurrenciesConfigForEUR.value}},{{SetAllowedCurrenciesConfigForRUB.value}}" stepKey="setAllowedCurrencyWebsitesEURandRUBandUSD"/>
+            <magentoCLI command="config:set --scope={{SetDefaultCurrencyEURConfig.scope}} --scope-code={{SetDefaultCurrencyEURConfig.scope_code}} {{SetDefaultCurrencyEURConfig.path}} {{SetDefaultCurrencyEURConfig.value}}" stepKey="setCurrencyDefaultEURWebsites"/>
+        </before>
+        <after>
+            <!--Delete created product-->
+            <comment userInput="Delete created product" stepKey="commentDeleteCreatedProduct"/>
+            <deleteData createDataKey="createNewProduct" stepKey="deleteNewProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Set currency rates-->
+        <amOnPage url="{{AdminCurrencyRatesPage.url}}" stepKey="gotToCurrencyRatesPageSecondTime"/>
+        <waitForPageLoad stepKey="waitForLoadRatesPageSecondTime"/>
+        <actionGroup ref="AdminSetCurrencyRatesActionGroup" stepKey="setCurrencyRates">
+            <argument name="firstCurrency" value="USD"/>
+            <argument name="secondCurrency" value="RUB"/>
+            <argument name="rate" value="0.8"/>
+        </actionGroup>
+        <!--Open created product on Storefront and place for order-->
+        <amOnPage url="{{StorefrontProductPage.url($$createNewProduct.custom_attributes[url_key]$$)}}" stepKey="goToNewProductPage"/>
+        <waitForPageLoad stepKey="waitForNewProductPagePageLoad"/>
+        <actionGroup ref="StorefrontSwitchCurrency" stepKey="switchCurrency">
+            <argument name="currency" value="RUB"/>
+        </actionGroup>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontNewProductPage">
+            <argument name="productName" value="$$createNewProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutNewProductFromMinicart" />
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutNewFillingShippingSection">
+        </actionGroup>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="guestSelectNewCheckMoneyOrderPayment" />
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceNewOrder">
+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage" />
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabNewOrderNumber"/>
+        <!--Open order and check rates display in one line-->
+        <actionGroup ref="OpenOrderById" stepKey="openNewOrderById">
+            <argument name="orderId" value="$grabNewOrderNumber"/>
+        </actionGroup>
+        <see selector="{{AdminOrderDetailsInformationSection.orderInformationTable}}" userInput="EUR / USD rate" stepKey="seeUSDandEURRate"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderInformationTable}}" userInput="RUB / USD rate:" stepKey="seeRUBandEURRate"/>
+        <grabMultiple selector="{{AdminOrderDetailsInformationSection.rate}}" stepKey="grabRates" />
+        <assertEquals stepKey="assertRates">
+            <actualResult type="variable">grabRates</actualResult>
+            <expectedResult type="array">['EUR / USD rate:', 'RUB / USD rate:']</expectedResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayedInOneLineTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayedInOneLineTest.xml
new file mode 100644
index 0000000000000..dc6bdf3db542e
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayedInOneLineTest.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="AdminOrderRateDisplayedInOneLineTest">
+        <annotations>
+            <features value="CurrencySymbol"/>
+            <stories value="Currency rates order page"/>
+            <title value="Order rate converting currency for 'Base Currency' and 'Default Display Currency' displayed correct once"/>
+            <description value="Order rate converting currency for 'Base Currency' and 'Default Display Currency' displayed correct once"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-17255" />
+            <useCaseId value="MAGETWO-67450"/>
+            <group value="currency"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create product-->
+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
+            <!--Set price scope website-->
+            <magentoCLI command="config:set {{CatalogPriceScopeWebsiteConfigData.path}} {{CatalogPriceScopeWebsiteConfigData.value}}" stepKey="setCatalogPriceScopeWebsite"/>
+            <!--Set Currency options for Default Config-->
+            <magentoCLI command="config:set {{SetCurrencyEURBaseConfig.path}} {{SetCurrencyEURBaseConfig.value}}" stepKey="setCurrencyBaseEUR"/>
+            <magentoCLI command="config:set {{SetAllowedCurrenciesConfigForUSD.path}} {{SetAllowedCurrenciesConfigForUSD.value}},{{SetAllowedCurrenciesConfigForEUR.value}}" stepKey="setAllowedCurrencyEURandUSD"/>
+            <magentoCLI command="config:set {{SetDefaultCurrencyEURConfig.path}} {{SetDefaultCurrencyEURConfig.value}}" stepKey="setCurrencyDefaultEUR"/>
+            <!--Set Currency options for Website-->
+            <magentoCLI command="config:set --scope={{SetCurrencyUSDBaseConfig.scope}} --scope-code={{SetCurrencyUSDBaseConfig.scope_code}} {{SetCurrencyUSDBaseConfig.path}} {{SetCurrencyUSDBaseConfig.value}}" stepKey="setCurrencyBaseEURWebsites"/>
+            <magentoCLI command="config:set --scope={{SetAllowedCurrenciesConfigForUSD.scope}} --scope-code={{SetAllowedCurrenciesConfigForUSD.scope_code}} {{SetAllowedCurrenciesConfigForUSD.path}} {{SetAllowedCurrenciesConfigForUSD.value}},{{SetAllowedCurrenciesConfigForEUR.value}}" stepKey="setAllowedCurrencyWebsitesForEURandUSD"/>
+            <magentoCLI command="config:set --scope={{SetDefaultCurrencyEURConfig.scope}} --scope-code={{SetDefaultCurrencyEURConfig.scope_code}} {{SetDefaultCurrencyEURConfig.path}} {{SetDefaultCurrencyEURConfig.value}}" stepKey="setCurrencyDefaultEURWebsites"/>
+        </before>
+        <after>
+            <!--Delete created product-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <!--Reset configurations-->
+            <magentoCLI command="config:set {{CatalogPriceScopeGlobalConfigData.path}} {{CatalogPriceScopeGlobalConfigData.value}}" stepKey="setCatalogPriceScopeGlobal"/>
+            <magentoCLI command="config:set {{SetCurrencyUSDBaseConfig.path}} {{SetCurrencyUSDBaseConfig.value}}" stepKey="setCurrencyBaseUSD"/>
+            <magentoCLI command="config:set {{SetDefaultCurrencyUSDConfig.path}} {{SetDefaultCurrencyUSDConfig.value}}" stepKey="setCurrencyDefaultUSD"/>
+            <magentoCLI command="config:set {{SetAllowedCurrenciesConfigForUSD.path}} {{SetAllowedCurrenciesConfigForUSD.value}}" stepKey="setAllowedCurrencyUSD"/>
+            <!--Set Currency options for Website-->
+            <magentoCLI command="config:set --scope={{SetCurrencyUSDBaseConfig.scope}} --scope-code={{SetCurrencyUSDBaseConfig.scope_code}} {{SetCurrencyUSDBaseConfig.path}} {{SetCurrencyUSDBaseConfig.value}}" stepKey="setCurrencyBaseUSDWebsites"/>
+            <magentoCLI command="config:set --scope={{SetDefaultCurrencyUSDConfig.scope}} --scope-code={{SetDefaultCurrencyUSDConfig.scope_code}} {{SetDefaultCurrencyUSDConfig.path}} {{SetDefaultCurrencyUSDConfig.value}}" stepKey="setCurrencyDefaultUSDWebsites"/>
+            <magentoCLI command="config:set --scope={{SetAllowedCurrenciesConfigForUSD.scope}} --scope-code={{SetAllowedCurrenciesConfigForUSD.scope_code}} {{SetAllowedCurrenciesConfigForUSD.path}} {{SetAllowedCurrenciesConfigForUSD.value}}" stepKey="setAllowedCurrencyUSDWebsites"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Open created product on Storefront and place for order-->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPagePageLoad"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="guestGoToCheckoutFromMinicart" />
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
+        </actionGroup>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="guestSelectCheckMoneyOrderPayment" />
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceOrder">
+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage" />
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
+        <!--Open order and check rates display in one line-->
+        <actionGroup ref="OpenOrderById" stepKey="openOrderById">
+            <argument name="orderId" value="$grabOrderNumber"/>
+        </actionGroup>
+        <see selector="{{AdminOrderDetailsInformationSection.orderInformationTable}}" userInput="EUR / USD rate" stepKey="seeEURandUSDRate"/>
+        <grabMultiple selector="{{AdminOrderDetailsInformationSection.rate}}" stepKey="grabRate" />
+        <assertEquals stepKey="assertSelectedCategories">
+            <actualResult type="variable">grabRate</actualResult>
+            <expectedResult type="array">[EUR / USD rate:]</expectedResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/SaveTest.php b/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
index 06f4294ce6397..b3c69c352ac7d 100644
--- a/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
+++ b/app/code/Magento/CurrencySymbol/Test/Unit/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
@@ -5,132 +5,136 @@
  */
 namespace Magento\CurrencySymbol\Test\Unit\Controller\Adminhtml\System\Currencysymbol;
 
+use Magento\Backend\Helper\Data;
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Backend\Model\View\Result\RedirectFactory;
+use Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol\Save;
+use Magento\CurrencySymbol\Model\System\Currencysymbol;
+use Magento\CurrencySymbol\Model\System\CurrencysymbolFactory;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Filter\FilterManager;
+use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
- * Class SaveTest
+ * Test ot to save currency symbol controller
  */
-class SaveTest extends \PHPUnit\Framework\TestCase
+class SaveTest extends TestCase
 {
     /**
-     * @var \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol\Save
+     * @var Save
      */
     protected $action;
 
     /**
-     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RedirectFactory|MockObject
+     */
+    private $resultRedirectFactory;
+
+    /**
+     * @var RequestInterface|MockObject
      */
     protected $requestMock;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResponseInterface|MockObject
      */
     protected $responseMock;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ManagerInterface|MockObject
      */
-    protected $objectManagerMock;
+    protected $messageManagerMock;
 
     /**
-     * @var \Magento\CurrencySymbol\Model\System\Currencysymbol|\PHPUnit_Framework_MockObject_MockObject
+     * @var RedirectInterface|MockObject
      */
-    protected $currencySymbolMock;
+    protected $redirectMock;
 
     /**
-     * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var Data|MockObject
      */
-    protected $messageManagerMock;
+    protected $helperMock;
 
     /**
-     * @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var FilterManager|MockObject
      */
-    protected $redirectMock;
+    private $filterManager;
 
     /**
-     * @var \Magento\Backend\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var CurrencysymbolFactory|MockObject
      */
-    protected $helperMock;
+    private $currencySymbolFactory;
 
     /**
-     * @var \Magento\Framework\Filter\FilterManager|\PHPUnit_Framework_MockObject_MockObject
+     * @inheritdoc
      */
-    protected $filterManagerMock;
-
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
-
-        $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
-
-        $this->helperMock = $this->createMock(\Magento\Backend\Helper\Data::class);
-
-        $this->redirectMock = $this->createMock(\Magento\Framework\App\Response\RedirectInterface::class);
-
+        $this->requestMock = $this->createMock(RequestInterface::class);
+        $this->helperMock = $this->createMock(Data::class);
+        $this->redirectMock = $this->createMock(RedirectInterface::class);
         $this->responseMock = $this->createPartialMock(
-            \Magento\Framework\App\ResponseInterface::class,
+            ResponseInterface::class,
             ['setRedirect', 'sendResponse']
         );
-
-        $this->currencySymbolMock = $this->createMock(\Magento\CurrencySymbol\Model\System\Currencysymbol::class);
-
-        $this->filterManagerMock = $this->createPartialMock(
-            \Magento\Framework\Filter\FilterManager::class,
+        $this->messageManagerMock = $this->createMock(ManagerInterface::class);
+        $this->resultRedirectFactory = $this->createMock(RedirectFactory::class);
+        $this->filterManager = $this->createPartialMock(
+            FilterManager::class,
             ['stripTags']
         );
+        $this->currencySymbolFactory = $this->createMock(CurrencysymbolFactory::class);
 
-        $this->objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-
-        $this->messageManagerMock = $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
         $this->action = $objectManager->getObject(
-            \Magento\CurrencySymbol\Controller\Adminhtml\System\Currencysymbol\Save::class,
+            Save::class,
             [
                 'request' => $this->requestMock,
                 'response' => $this->responseMock,
-                'objectManager' => $this->objectManagerMock,
                 'redirect' => $this->redirectMock,
                 'helper' => $this->helperMock,
-                'messageManager' => $this->messageManagerMock
+                'messageManager' => $this->messageManagerMock,
+                'resultRedirectFactory' => $this->resultRedirectFactory,
+                'filterManager' => $this->filterManager,
+                'currencySymbolFactory' => $this->currencySymbolFactory,
             ]
         );
     }
 
+    /**
+     * Test to Save custom Currency symbol
+     */
     public function testExecute()
     {
         $firstElement = 'firstElement';
         $symbolsDataArray = [$firstElement];
-        $redirectUrl = 'redirectUrl';
 
         $this->requestMock->expects($this->once())
             ->method('getParam')
             ->with('custom_currency_symbol')
             ->willReturn($symbolsDataArray);
 
-        $this->helperMock->expects($this->once())->method('getUrl')->with('*');
-        $this->redirectMock->expects($this->once())->method('getRedirectUrl')->willReturn($redirectUrl);
-
-        $this->currencySymbolMock->expects($this->once())->method('setCurrencySymbolsData')->with($symbolsDataArray);
-        $this->responseMock->expects($this->once())->method('setRedirect');
-
-        $this->filterManagerMock->expects($this->once())
+        $currencySymbol = $this->createMock(Currencysymbol::class);
+        $currencySymbol->expects($this->once())->method('setCurrencySymbolsData')->with($symbolsDataArray);
+        $this->currencySymbolFactory->method('create')->willReturn($currencySymbol);
+        $this->filterManager->expects($this->once())
             ->method('stripTags')
             ->with($firstElement)
             ->willReturn($firstElement);
 
-        $this->objectManagerMock->expects($this->once())
-            ->method('create')
-            ->with(\Magento\CurrencySymbol\Model\System\Currencysymbol::class)
-            ->willReturn($this->currencySymbolMock);
-
-        $this->objectManagerMock->expects($this->once())
-            ->method('get')
-            ->with(\Magento\Framework\Filter\FilterManager::class)
-            ->willReturn($this->filterManagerMock);
-
         $this->messageManagerMock->expects($this->once())
             ->method('addSuccessMessage')
             ->with(__('You applied the custom currency symbols.'));
 
-        $this->action->execute();
+        $redirect = $this->createMock(Redirect::class);
+        $redirect->expects($this->once())->method('setPath')->with('*')->willReturnSelf();
+        $this->resultRedirectFactory->method('create')->willReturn($redirect);
+
+        $this->assertEquals($redirect, $this->action->execute());
     }
 }
diff --git a/app/code/Magento/Customer/Block/Account/Dashboard.php b/app/code/Magento/Customer/Block/Account/Dashboard.php
index 8e0f79d45770a..547074d0bcd81 100644
--- a/app/code/Magento/Customer/Block/Account/Dashboard.php
+++ b/app/code/Magento/Customer/Block/Account/Dashboard.php
@@ -7,6 +7,14 @@
 
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Session;
+use Magento\Framework\Phrase;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Newsletter\Model\Subscriber;
+use Magento\Newsletter\Model\SubscriberFactory;
 
 /**
  * Customer dashboard block
@@ -14,20 +22,20 @@
  * @api
  * @since 100.0.2
  */
-class Dashboard extends \Magento\Framework\View\Element\Template
+class Dashboard extends Template
 {
     /**
-     * @var \Magento\Newsletter\Model\Subscriber
+     * @var Subscriber
      */
     protected $subscription;
 
     /**
-     * @var \Magento\Customer\Model\Session
+     * @var Session
      */
     protected $customerSession;
 
     /**
-     * @var \Magento\Newsletter\Model\SubscriberFactory
+     * @var SubscriberFactory
      */
     protected $subscriberFactory;
 
@@ -42,19 +50,17 @@ class Dashboard extends \Magento\Framework\View\Element\Template
     protected $customerAccountManagement;
 
     /**
-     * Constructor
-     *
-     * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
+     * @param Context $context
+     * @param Session $customerSession
+     * @param SubscriberFactory $subscriberFactory
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $customerAccountManagement
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Customer\Model\Session $customerSession,
-        \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory,
+        Context $context,
+        Session $customerSession,
+        SubscriberFactory $subscriberFactory,
         CustomerRepositoryInterface $customerRepository,
         AccountManagementInterface $customerAccountManagement,
         array $data = []
@@ -69,7 +75,7 @@ public function __construct(
     /**
      * Return the Customer given the customer Id stored in the session.
      *
-     * @return \Magento\Customer\Api\Data\CustomerInterface
+     * @return CustomerInterface
      */
     public function getCustomer()
     {
@@ -99,7 +105,7 @@ public function getAddressesUrl()
     /**
      * Retrieve the Url for editing the specified address.
      *
-     * @param \Magento\Customer\Api\Data\AddressInterface $address
+     * @param AddressInterface $address
      * @return string
      */
     public function getAddressEditUrl($address)
@@ -146,13 +152,14 @@ public function getWishlistUrl()
     /**
      * Retrieve the subscription object (i.e. the subscriber).
      *
-     * @return \Magento\Newsletter\Model\Subscriber
+     * @return Subscriber
      */
     public function getSubscriptionObject()
     {
         if ($this->subscription === null) {
-            $this->subscription =
-                $this->_createSubscriber()->loadByCustomerId($this->customerSession->getCustomerId());
+            $websiteId = (int)$this->_storeManager->getWebsite()->getId();
+            $this->subscription = $this->_createSubscriber();
+            $this->subscription->loadByCustomer((int)$this->getCustomer()->getId(), $websiteId);
         }
 
         return $this->subscription;
@@ -171,7 +178,7 @@ public function getManageNewsletterUrl()
     /**
      * Retrieve subscription text, either subscribed or not.
      *
-     * @return \Magento\Framework\Phrase
+     * @return Phrase
      */
     public function getSubscriptionText()
     {
@@ -185,7 +192,7 @@ public function getSubscriptionText()
     /**
      * Retrieve the customer's primary addresses (i.e. default billing and shipping).
      *
-     * @return \Magento\Customer\Api\Data\AddressInterface[]|bool
+     * @return AddressInterface[]|bool
      */
     public function getPrimaryAddresses()
     {
@@ -230,7 +237,7 @@ public function getBackUrl()
     /**
      * Create an instance of a subscriber.
      *
-     * @return \Magento\Newsletter\Model\Subscriber
+     * @return Subscriber
      */
     protected function _createSubscriber()
     {
diff --git a/app/code/Magento/Customer/Block/Account/Dashboard/Info.php b/app/code/Magento/Customer/Block/Account/Dashboard/Info.php
index 87132c3afb8bc..a48c706124c92 100644
--- a/app/code/Magento/Customer/Block/Account/Dashboard/Info.php
+++ b/app/code/Magento/Customer/Block/Account/Dashboard/Info.php
@@ -5,7 +5,15 @@
  */
 namespace Magento\Customer\Block\Account\Dashboard;
 
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Block\Form\Register;
+use Magento\Customer\Helper\Session\CurrentCustomer;
+use Magento\Customer\Helper\View;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Newsletter\Model\Subscriber;
+use Magento\Newsletter\Model\SubscriberFactory;
 
 /**
  * Dashboard Customer Info
@@ -13,44 +21,44 @@
  * @api
  * @since 100.0.2
  */
-class Info extends \Magento\Framework\View\Element\Template
+class Info extends Template
 {
     /**
      * Cached subscription object
      *
-     * @var \Magento\Newsletter\Model\Subscriber
+     * @var Subscriber
      */
     protected $_subscription;
 
     /**
-     * @var \Magento\Newsletter\Model\SubscriberFactory
+     * @var SubscriberFactory
      */
     protected $_subscriberFactory;
 
     /**
-     * @var \Magento\Customer\Helper\View
+     * @var View
      */
     protected $_helperView;
 
     /**
-     * @var \Magento\Customer\Helper\Session\CurrentCustomer
+     * @var CurrentCustomer
      */
     protected $currentCustomer;
 
     /**
      * Constructor
      *
-     * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
-     * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
-     * @param \Magento\Customer\Helper\View $helperView
+     * @param Context $context
+     * @param CurrentCustomer $currentCustomer
+     * @param SubscriberFactory $subscriberFactory
+     * @param View $helperView
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
-        \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory,
-        \Magento\Customer\Helper\View $helperView,
+        Context $context,
+        CurrentCustomer $currentCustomer,
+        SubscriberFactory $subscriberFactory,
+        View $helperView,
         array $data = []
     ) {
         $this->currentCustomer = $currentCustomer;
@@ -62,7 +70,7 @@ public function __construct(
     /**
      * Returns the Magento Customer Model for this block
      *
-     * @return \Magento\Customer\Api\Data\CustomerInterface|null
+     * @return CustomerInterface|null
      */
     public function getCustomer()
     {
@@ -84,6 +92,8 @@ public function getName()
     }
 
     /**
+     * Get the url to change password
+     *
      * @return string
      */
     public function getChangePasswordUrl()
@@ -94,7 +104,7 @@ public function getChangePasswordUrl()
     /**
      * Get Customer Subscription Object Information
      *
-     * @return \Magento\Newsletter\Model\Subscriber
+     * @return Subscriber
      */
     public function getSubscriptionObject()
     {
@@ -102,7 +112,8 @@ public function getSubscriptionObject()
             $this->_subscription = $this->_createSubscriber();
             $customer = $this->getCustomer();
             if ($customer) {
-                $this->_subscription->loadByCustomerId($customer->getId());
+                $websiteId = (int)$this->_storeManager->getWebsite()->getId();
+                $this->_subscription->loadByCustomer((int)$customer->getId(), $websiteId);
             }
         }
         return $this->_subscription;
@@ -128,12 +139,14 @@ public function getIsSubscribed()
     public function isNewsletterEnabled()
     {
         return $this->getLayout()
-            ->getBlockSingleton(\Magento\Customer\Block\Form\Register::class)
+            ->getBlockSingleton(Register::class)
             ->isNewsletterEnabled();
     }
 
     /**
-     * @return \Magento\Newsletter\Model\Subscriber
+     * Create new instance of Subscriber
+     *
+     * @return Subscriber
      */
     protected function _createSubscriber()
     {
@@ -141,7 +154,7 @@ protected function _createSubscriber()
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     protected function _toHtml()
     {
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 46a8dcfb28f1b..0d94a01698b31 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
@@ -5,14 +5,30 @@
  */
 namespace Magento\Customer\Block\Adminhtml\Edit\Tab;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Block\Widget\Form\Generic;
 use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Block\Adminhtml\Form\Element\Newsletter\Subscriptions as SubscriptionsElement;
 use Magento\Customer\Controller\RegistryConstants;
+use Magento\Customer\Model\Config\Share;
+use Magento\Framework\Data\Form;
+use Magento\Framework\Data\Form\Element\Fieldset;
+use Magento\Framework\Data\FormFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\Newsletter\Model\Subscriber;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Store\Model\System\Store as SystemStore;
 use Magento\Ui\Component\Layout\Tabs\TabInterface;
 
 /**
  * Customer account form block
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Newsletter extends \Magento\Backend\Block\Widget\Form\Generic implements TabInterface
+class Newsletter extends Generic implements TabInterface
 {
     /**
      * @var string
@@ -20,7 +36,7 @@ class Newsletter extends \Magento\Backend\Block\Widget\Form\Generic implements T
     protected $_template = 'Magento_Customer::tab/newsletter.phtml';
 
     /**
-     * @var \Magento\Newsletter\Model\SubscriberFactory
+     * @var SubscriberFactory
      */
     protected $_subscriberFactory;
 
@@ -32,37 +48,57 @@ class Newsletter extends \Magento\Backend\Block\Widget\Form\Generic implements T
     /**
      * Core registry
      *
-     * @var \Magento\Framework\Registry
+     * @var Registry
      */
     protected $_coreRegistry = null;
 
     /**
-     * Constructor
-     *
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Data\FormFactory $formFactory
-     * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
+     * @var SystemStore
+     */
+    private $systemStore;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var Share
+     */
+    private $shareConfig;
+
+    /**
+     * @param Context $context
+     * @param Registry $registry
+     * @param FormFactory $formFactory
+     * @param SubscriberFactory $subscriberFactory
      * @param AccountManagementInterface $customerAccountManagement
+     * @param SystemStore $systemStore
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param Share $shareConfig
      * @param array $data
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Framework\Registry $registry,
-        \Magento\Framework\Data\FormFactory $formFactory,
-        \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory,
+        Context $context,
+        Registry $registry,
+        FormFactory $formFactory,
+        SubscriberFactory $subscriberFactory,
         AccountManagementInterface $customerAccountManagement,
+        SystemStore $systemStore,
+        CustomerRepositoryInterface $customerRepository,
+        Share $shareConfig,
         array $data = []
     ) {
         $this->_subscriberFactory = $subscriberFactory;
         $this->customerAccountManagement = $customerAccountManagement;
         parent::__construct($context, $registry, $formFactory, $data);
+        $this->systemStore = $systemStore;
+        $this->customerRepository = $customerRepository;
+        $this->shareConfig = $shareConfig;
     }
 
     /**
-     * Return Tab label
-     *
-     * @return \Magento\Framework\Phrase
+     * @inheritdoc
      */
     public function getTabLabel()
     {
@@ -70,9 +106,7 @@ public function getTabLabel()
     }
 
     /**
-     * Return Tab title
-     *
-     * @return \Magento\Framework\Phrase
+     * @inheritdoc
      */
     public function getTabTitle()
     {
@@ -80,9 +114,7 @@ public function getTabTitle()
     }
 
     /**
-     * Tab class getter
-     *
-     * @return string
+     * @inheritdoc
      */
     public function getTabClass()
     {
@@ -90,9 +122,7 @@ public function getTabClass()
     }
 
     /**
-     * Return URL link to Tab content
-     *
-     * @return string
+     * @inheritdoc
      */
     public function getTabUrl()
     {
@@ -100,9 +130,7 @@ public function getTabUrl()
     }
 
     /**
-     * Tab should be loaded trough Ajax call
-     *
-     * @return bool
+     * @inheritdoc
      */
     public function isAjaxLoaded()
     {
@@ -110,19 +138,15 @@ public function isAjaxLoaded()
     }
 
     /**
-     * Can show tab in tabs
-     *
-     * @return boolean
+     * @inheritdoc
      */
     public function canShowTab()
     {
-        return $this->_coreRegistry->registry(RegistryConstants::CURRENT_CUSTOMER_ID);
+        return (bool)$this->getCurrentCustomerId();
     }
 
     /**
-     * Tab is hidden
-     *
-     * @return boolean
+     * @inheritdoc
      */
     public function isHidden()
     {
@@ -130,77 +154,256 @@ public function isHidden()
     }
 
     /**
-     * Initialize the form.
+     * @inheritdoc
+     */
+    protected function _prepareForm()
+    {
+        $this->initForm();
+
+        return $this;
+    }
+
+    /**
+     * Init form values
      *
      * @return $this
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function initForm()
     {
         if (!$this->canShowTab()) {
             return $this;
         }
-        /**@var \Magento\Framework\Data\Form $form */
+
         $form = $this->_formFactory->create();
         $form->setHtmlIdPrefix('_newsletter');
-        $customerId = $this->_coreRegistry->registry(RegistryConstants::CURRENT_CUSTOMER_ID);
-        $subscriber = $this->_subscriberFactory->create()->loadByCustomerId($customerId);
-        $this->_coreRegistry->register('subscriber', $subscriber, true);
+        $this->setForm($form);
+        $fieldset = $form->addFieldset(
+            'base_fieldset',
+            [
+                'legend' => __('Newsletter Information'),
+                'class' => 'customer-newsletter-fieldset' . (!$this->isSingleWebsiteMode() ? ' multi-website' : ''),
+            ]
+        );
 
-        $fieldset = $form->addFieldset('base_fieldset', ['legend' => __('Newsletter Information')]);
+        $customerSubscriptions = $this->getCustomerSubscriptionsOnWebsites();
+        if (empty($customerSubscriptions)) {
+            return $this;
+        }
 
-        $fieldset->addField(
-            'subscription',
+        if ($this->isSingleWebsiteMode()) {
+            $this->prepareFormSingleWebsite($fieldset, $customerSubscriptions);
+            $this->updateFromSession($form, $this->getCurrentCustomerId());
+        } else {
+            $this->prepareFormMultiplyWebsite($fieldset, $customerSubscriptions);
+        }
+
+        if ($this->customerAccountManagement->isReadonly($this->getCurrentCustomerId())) {
+            $fieldset->setReadonly(true, true);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Prepare form fields for single website mode
+     *
+     * @param Fieldset $fieldset
+     * @param array $subscriptions
+     * @return void
+     */
+    private function prepareFormSingleWebsite(Fieldset $fieldset, array $subscriptions): void
+    {
+        $customer = $this->getCurrentCustomer();
+        $websiteId = (int)$this->_storeManager->getStore($customer->getStoreId())->getWebsiteId();
+        $customerSubscription = $subscriptions[$websiteId] ?? $this->retrieveSubscriberData($customer, $websiteId);
+
+        $checkboxElement = $fieldset->addField(
+            'subscription_status_' . $websiteId,
             'checkbox',
             [
                 'label' => __('Subscribed to Newsletter'),
-                'name' => 'subscription',
+                'name' => "subscription_status[$websiteId]",
                 'data-form-part' => $this->getData('target_form'),
-                'onchange' => 'this.value = this.checked;'
+                'value' => $customerSubscription['status'],
+                'onchange' => 'this.value = this.checked;',
             ]
         );
-
-        if ($this->customerAccountManagement->isReadonly($customerId)) {
-            $form->getElement('subscription')->setReadonly(true, true);
+        $checkboxElement->setIsChecked($customerSubscription['status']);
+        if (!$this->isSingleStoreMode()) {
+            $fieldset->addField(
+                'subscription_store_' . $websiteId,
+                'select',
+                [
+                    'label' => __('Subscribed on Store View'),
+                    'name' => "subscription_store[$websiteId]",
+                    'data-form-part' => $this->getData('target_form'),
+                    'values' => $customerSubscription['store_options'],
+                    'value' => $customerSubscription['store_id'] ?? null,
+                ]
+            );
         }
-        $isSubscribed = $subscriber->isSubscribed();
-        $form->setValues(['subscription' => $isSubscribed ? 'true' : 'false']);
-        $form->getElement('subscription')->setIsChecked($isSubscribed);
-
-        $this->updateFromSession($form, $customerId);
-
-        $changedDate = $this->getStatusChangedDate();
-        if ($changedDate) {
+        if (!empty($customerSubscription['last_updated'])) {
+            $text = $customerSubscription['status'] ? __('Last Date Subscribed') : __('Last Date Unsubscribed');
             $fieldset->addField(
-                'change_status_date',
+                'change_status_date_' . $websiteId,
                 'label',
                 [
-                    'label' => $isSubscribed ? __('Last Date Subscribed') : __('Last Date Unsubscribed'),
-                    'value' => $changedDate,
+                    'label' => $text,
+                    'value' => $customerSubscription['last_updated'],
                     'bold' => true
                 ]
             );
         }
+    }
 
-        $this->setForm($form);
-        return $this;
+    /**
+     * Prepare form fields for multiply website mode
+     *
+     * @param Fieldset $fieldset
+     * @param array $subscriptions
+     * @return void
+     */
+    private function prepareFormMultiplyWebsite(Fieldset $fieldset, array $subscriptions): void
+    {
+        $fieldset->addType('customer_subscription', SubscriptionsElement::class);
+        $fieldset->addField(
+            'subscription',
+            'customer_subscription',
+            [
+                'label' => __('Subscribed to Newsletter'),
+                'name' => 'subscription',
+                'subscriptions' => $subscriptions,
+                'target_form' => $this->getData('target_form'),
+                'class' => 'newsletter-subscriptions',
+                'customer_id' => $this->getCurrentCustomerId(),
+            ]
+        );
+    }
+
+    /**
+     * Get current customer id
+     *
+     * @return int
+     */
+    private function getCurrentCustomerId(): int
+    {
+        return (int)$this->_coreRegistry->registry(RegistryConstants::CURRENT_CUSTOMER_ID);
+    }
+
+    /**
+     * Get current customer model
+     *
+     * @return CustomerInterface|null
+     */
+    private function getCurrentCustomer(): ?CustomerInterface
+    {
+        $customerId = $this->getCurrentCustomerId();
+        try {
+            $customer = $this->customerRepository->getById($customerId);
+        } catch (NoSuchEntityException $e) {
+            return null;
+        }
+
+        return $customer;
+    }
+
+    /**
+     * Get Customer Subscriptions on Websites
+     *
+     * @return array
+     */
+    private function getCustomerSubscriptionsOnWebsites(): array
+    {
+        $customer = $this->getCurrentCustomer();
+        if ($customer === null) {
+            return [];
+        }
+
+        $subscriptions = [];
+        foreach ($this->_storeManager->getWebsites() as $website) {
+            /** Skip websites without stores */
+            if ($website->getStoresCount() === 0) {
+                continue;
+            }
+            $websiteId = (int)$website->getId();
+            $subscriptions[$websiteId] = $this->retrieveSubscriberData($customer, $websiteId);
+        }
+
+        return $subscriptions;
+    }
+
+    /**
+     * Retrieve subscriber data
+     *
+     * @param CustomerInterface $customer
+     * @param int $websiteId
+     * @return array
+     */
+    private function retrieveSubscriberData(CustomerInterface $customer, int $websiteId): array
+    {
+        $subscriber = $this->_subscriberFactory->create()->loadByCustomer((int)$customer->getId(), $websiteId);
+        $storeOptions = $this->systemStore->getStoreOptionsTree(false, [], [], [$websiteId]);
+        $subscriberData = $subscriber->getData();
+        $subscriberData['last_updated'] = $this->getSubscriberStatusChangeDate($subscriber);
+        $subscriberData['website_id'] = $websiteId;
+        $subscriberData['website_name'] = $this->systemStore->getWebsiteName($websiteId);
+        $subscriberData['status'] = $subscriber->isSubscribed();
+        $subscriberData['store_options'] = $storeOptions;
+
+        return $subscriberData;
+    }
+
+    /**
+     * Is single systemStore mode
+     *
+     * @return bool
+     */
+    private function isSingleStoreMode(): bool
+    {
+        return $this->_storeManager->isSingleStoreMode();
+    }
+
+    /**
+     * Is single website mode
+     *
+     * @return bool
+     */
+    private function isSingleWebsiteMode(): bool
+    {
+        return $this->isSingleStoreMode()
+            || !$this->shareConfig->isGlobalScope()
+            || count($this->_storeManager->getWebsites()) === 1;
     }
 
     /**
      * Update form elements from session data
      *
-     * @param \Magento\Framework\Data\Form $form
+     * @param Form $form
      * @param int $customerId
      * @return void
      */
-    protected function updateFromSession(\Magento\Framework\Data\Form $form, $customerId)
+    protected function updateFromSession(Form $form, $customerId)
     {
+        if (!$this->isSingleWebsiteMode()) {
+            return;
+        }
         $data = $this->_backendSession->getCustomerFormData();
-        if (!empty($data)) {
-            $dataCustomerId = isset($data['customer']['entity_id']) ? $data['customer']['entity_id'] : null;
-            if (isset($data['subscription']) && $dataCustomerId == $customerId) {
-                $form->getElement('subscription')->setIsChecked($data['subscription']);
-            }
+        $sessionCustomerId = $data['customer']['entity_id'] ?? null;
+        if ($sessionCustomerId === null || (int)$sessionCustomerId !== (int)$customerId) {
+            return;
+        }
+
+        $websiteId = (int)$this->getCurrentCustomer()->getWebsiteId();
+        $statusSessionValue = $data['subscription_status'][$websiteId] ?? null;
+        if ($statusSessionValue !== null) {
+            $subscribeElement = $form->getElement('subscription_status_' . $websiteId);
+            $subscribeElement->setValue($statusSessionValue);
+            $subscribeElement->setChecked($statusSessionValue);
+        }
+        $storeSessionValue = $data['subscription_store'][$websiteId] ?? null;
+        $storeElement = $form->getElement('subscription_store_' . $websiteId);
+        if ($storeSessionValue !== null && $storeElement !== null) {
+            $storeElement->setValue($storeSessionValue);
         }
     }
 
@@ -211,28 +414,32 @@ protected function updateFromSession(\Magento\Framework\Data\Form $form, $custom
      */
     public function getStatusChangedDate()
     {
-        $subscriber = $this->_coreRegistry->registry('subscriber');
-        if ($subscriber->getChangeStatusAt()) {
-            return $this->formatDate(
-                $subscriber->getChangeStatusAt(),
-                \IntlDateFormatter::MEDIUM,
-                true
-            );
+        $customer = $this->getCurrentCustomerId();
+        if ($customer === null) {
+            return '';
         }
+        $customerId = (int)$customer->getId();
+        $subscriber = $this->_subscriberFactory->create()->loadByCustomer($customerId, (int)$customer->getWebsiteId());
 
-        return null;
+        return $this->getSubscriberStatusChangeDate($subscriber);
     }
 
     /**
+     * Retrieve the date when the subscriber status changed
+     *
+     * @param Subscriber $subscriber
      * @return string
      */
-    protected function _toHtml()
+    private function getSubscriberStatusChangeDate(Subscriber $subscriber): string
     {
-        if ($this->canShowTab()) {
-            $this->initForm();
-            return parent::_toHtml();
-        } else {
+        if (empty($subscriber->getChangeStatusAt())) {
             return '';
         }
+
+        return $this->formatDate(
+            $subscriber->getChangeStatusAt(),
+            \IntlDateFormatter::MEDIUM,
+            true
+        );
     }
 }
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid.php
index 4f49c3ba1db9b..97582fbdb19b2 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid.php
@@ -5,47 +5,75 @@
  */
 namespace Magento\Customer\Block\Adminhtml\Edit\Tab\Newsletter;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Block\Widget\Grid\Extended;
+use Magento\Backend\Helper\Data;
+use Magento\Customer\Block\Adminhtml\Edit\Tab\Newsletter\Grid\Renderer\Action;
+use Magento\Customer\Block\Adminhtml\Edit\Tab\Newsletter\Grid\Renderer\Status;
+use Magento\Customer\Controller\RegistryConstants;
+use Magento\Customer\Model\Config\Share;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Registry;
+use Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory;
+use Magento\Store\Model\System\Store as SystemStore;
+
 /**
  * Adminhtml newsletter queue grid block
  *
  * @api
  * @since 100.0.2
  */
-class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
+class Grid extends Extended
 {
     /**
      * Core registry
      *
-     * @var \Magento\Framework\Registry|null
+     * @var Registry|null
      */
     protected $_coreRegistry = null;
 
     /**
-     * @var \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory
+     * @var CollectionFactory
      */
     protected $_collectionFactory;
 
     /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Backend\Helper\Data $backendHelper
-     * @param \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory $collectionFactory
-     * @param \Magento\Framework\Registry $coreRegistry
+     * @var Share
+     */
+    private $shareConfig;
+
+    /**
+     * @var SystemStore
+     */
+    private $systemStore;
+
+    /**
+     * @param Context $context
+     * @param Data $backendHelper
+     * @param CollectionFactory $collectionFactory
+     * @param Registry $coreRegistry
      * @param array $data
+     * @param Share|null $shareConfig
+     * @param SystemStore|null $systemStore
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Backend\Helper\Data $backendHelper,
-        \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory $collectionFactory,
-        \Magento\Framework\Registry $coreRegistry,
-        array $data = []
+        Context $context,
+        Data $backendHelper,
+        CollectionFactory $collectionFactory,
+        Registry $coreRegistry,
+        array $data = [],
+        Share $shareConfig = null,
+        SystemStore $systemStore = null
     ) {
         $this->_coreRegistry = $coreRegistry;
         $this->_collectionFactory = $collectionFactory;
         parent::__construct($context, $backendHelper, $data);
+        $this->shareConfig = $shareConfig ?? ObjectManager::getInstance()->get(Share::class);
+        $this->systemStore = $systemStore ?? ObjectManager::getInstance()->get(SystemStore::class);
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -60,7 +88,7 @@ protected function _construct()
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     public function getGridUrl()
     {
@@ -68,22 +96,19 @@ public function getGridUrl()
     }
 
     /**
-     * @return $this
+     * @inheritdoc
      */
     protected function _prepareCollection()
     {
-        /** @var $collection \Magento\Newsletter\Model\ResourceModel\Queue\Collection */
-        $collection = $this->_collectionFactory->create()->addTemplateInfo()->addSubscriberFilter(
-            $this->_coreRegistry->registry('subscriber')->getId()
-        );
-
+        $customerId = $this->getCurrentCustomerId();
+        $collection = $this->_collectionFactory->create()->addTemplateInfo()->addCustomerFilter($customerId);
         $this->setCollection($collection);
 
         return parent::_prepareCollection();
     }
 
     /**
-     * @return $this
+     * @inheritdoc
      */
     protected function _prepareColumns()
     {
@@ -132,6 +157,19 @@ protected function _prepareColumns()
             ['header' => __('Subject'), 'align' => 'center', 'index' => 'template_subject']
         );
 
+        if ($this->isMultiplyWebsiteMode()) {
+            $this->addColumn(
+                'store_view',
+                [
+                    'header' => __('Store View'),
+                    'align' => 'center',
+                    'index' => 'subscriber_store_id',
+                    'type' => 'options',
+                    'option_groups' => $this->systemStore->getStoreValuesForForm(),
+                ]
+            );
+        }
+
         $this->addColumn(
             'status',
             [
@@ -139,7 +177,7 @@ protected function _prepareColumns()
                 'align' => 'center',
                 'filter' => \Magento\Customer\Block\Adminhtml\Edit\Tab\Newsletter\Grid\Filter\Status::class,
                 'index' => 'queue_status',
-                'renderer' => \Magento\Customer\Block\Adminhtml\Edit\Tab\Newsletter\Grid\Renderer\Status::class
+                'renderer' => Status::class
             ]
         );
 
@@ -150,10 +188,31 @@ protected function _prepareColumns()
                 'align' => 'center',
                 'filter' => false,
                 'sortable' => false,
-                'renderer' => \Magento\Customer\Block\Adminhtml\Edit\Tab\Newsletter\Grid\Renderer\Action::class
+                'renderer' => Action::class
             ]
         );
 
         return parent::_prepareColumns();
     }
+
+    /**
+     * Get current customer id
+     *
+     * @return int
+     */
+    private function getCurrentCustomerId(): int
+    {
+        return (int)$this->_coreRegistry->registry(RegistryConstants::CURRENT_CUSTOMER_ID);
+    }
+
+    /**
+     * Is multiply website mode
+     *
+     * @return bool
+     */
+    private function isMultiplyWebsiteMode(): bool
+    {
+        return $this->shareConfig->isGlobalScope()
+            && count($this->_storeManager->getWebsites()) > 1;
+    }
 }
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Newsletter/Subscriptions.php b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Newsletter/Subscriptions.php
new file mode 100644
index 0000000000000..e9686daa3e3ab
--- /dev/null
+++ b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Newsletter/Subscriptions.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Block\Adminhtml\Form\Element\Newsletter;
+
+use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\CollectionFactory;
+use Magento\Framework\Data\Form\Element\Factory;
+use Magento\Framework\Escaper;
+
+/**
+ * Customer Newsletter Subscriptions Element
+ */
+class Subscriptions extends AbstractElement
+{
+    /**
+     * @var DataPersistorInterface
+     */
+    private $dataPersistor;
+
+    /**
+     * @param Factory $factoryElement
+     * @param CollectionFactory $factoryCollection
+     * @param Escaper $escaper
+     * @param DataPersistorInterface $dataPersistor
+     * @param array $data
+     */
+    public function __construct(
+        Factory $factoryElement,
+        CollectionFactory $factoryCollection,
+        Escaper $escaper,
+        DataPersistorInterface $dataPersistor,
+        $data = []
+    ) {
+        $this->dataPersistor = $dataPersistor;
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getElementHtml()
+    {
+        $websiteHeader = $this->_escape(__('Website'));
+        $subscribedHeader = $this->_escape(__('Subscribed'));
+        $storeHeader = $this->_escape(__('Store View'));
+        $lastUpdatedHeader = $this->_escape(__('Last Updated At'));
+        $bodyHtml = '';
+        foreach ($this->getData('subscriptions') as $subscriptions) {
+            $storeId = !empty($subscriptions['store_id']) ? (int)$subscriptions['store_id'] : null;
+            $websiteId = (int)$subscriptions['website_id'];
+            $websiteName = $this->_escape($subscriptions['website_name']);
+            $subscribed = (bool)$subscriptions['status'];
+            $options = (array)$subscriptions['store_options'];
+            $statusElement = $this->getSubscriptionStatusElementHtml($websiteId, $subscribed);
+            $storeSelectElement = $this->getStoreSelectElementHtml($websiteId, $options, $storeId);
+            $lastUpdated = !empty($subscriptions['last_updated']) ? $subscriptions['last_updated'] : '';
+
+            $bodyHtml .= "<tr><td>{$websiteName}</td><td class=\"subscriber-status\">$statusElement</td>"
+                . "<td>$storeSelectElement</td><td>$lastUpdated</td></tr>";
+        }
+        $html = '<table class="admin__table-secondary">'
+            . "<tr><th>{$websiteHeader}</th><th class=\"subscriber-status\">{$subscribedHeader}</th>"
+            . "<th>{$storeHeader}</th><th>{$lastUpdatedHeader}</th></tr>"
+            . $bodyHtml
+            . '</table>';
+
+        return $html;
+    }
+
+    /**
+     * Get store select element html
+     *
+     * @param int $websiteId
+     * @param array $options
+     * @param int|null $value
+     * @return string
+     */
+    private function getStoreSelectElementHtml(int $websiteId, array $options, ?int $value): string
+    {
+        $name = $this->getData('name');
+        $value = $this->getSessionFormValue("{$name}_store", $websiteId) ?? $value;
+        $elementId = $name . '_store_' . $websiteId;
+        $element = $this->_factoryElement->create(
+            'select',
+            [
+                'data' => [
+                    'name' => "{$name}_store[$websiteId]",
+                    'data-form-part' => $this->getData('target_form'),
+                    'values' => $options,
+                    'value' => $value,
+                    'required' => true,
+                ],
+            ]
+        );
+        $element->setId($elementId);
+        $element->setForm($this->getForm());
+        if ($this->getReadonly()) {
+            $element->setReadonly($this->getReadonly(), $this->getDisabled());
+        }
+
+        return $element->toHtml();
+    }
+
+    /**
+     * Get subscription status element html
+     *
+     * @param int $websiteId
+     * @param bool $value
+     * @return string
+     */
+    private function getSubscriptionStatusElementHtml(int $websiteId, bool $value): string
+    {
+        $name = $this->getData('name');
+        $value = $this->getSessionFormValue("{$name}_status", $websiteId) ?? $value;
+        $elementId = $name . '_status_' . $websiteId;
+        $element = $this->_factoryElement->create(
+            'checkbox',
+            [
+                'data' => [
+                    'name' => "{$name}_status[$websiteId]",
+                    'data-form-part' => $this->getData('target_form'),
+                    'value' => $value,
+                    'onchange' => 'this.value = this.checked;',
+                ],
+            ]
+        );
+        $element->setId($elementId);
+        $element->setForm($this->getForm());
+        $element->setIsChecked($value);
+        if ($this->getReadonly()) {
+            $element->setReadonly($this->getReadonly(), $this->getDisabled());
+        }
+
+        return $element->toHtml();
+    }
+
+    /**
+     * Get form data value from current session
+     *
+     * @param string $name
+     * @param int $arrayKey
+     * @return string|null
+     */
+    private function getSessionFormValue(string $name, int $arrayKey): ?string
+    {
+        $data = $this->dataPersistor->get('customer_form');
+        $currentCustomerId = $this->getData('customer_id');
+        $sessionCustomerId = $data['customer']['entity_id'] ?? null;
+        if ($sessionCustomerId === null || $currentCustomerId !== (int)$sessionCustomerId) {
+            return null;
+        }
+
+        return $data[$name][$arrayKey] ?? null;
+    }
+}
diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
index be16046d69075..46d1088e37d0f 100644
--- a/app/code/Magento/Customer/Block/Form/Register.php
+++ b/app/code/Magento/Customer/Block/Form/Register.php
@@ -24,7 +24,7 @@ class Register extends \Magento\Directory\Block\Data
     protected $_customerSession;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $_moduleManager;
 
@@ -47,7 +47,7 @@ class Register extends \Magento\Directory\Block\Data
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
      * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollectionFactory
      * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollectionFactory
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param array $data
@@ -62,7 +62,7 @@ public function __construct(
         \Magento\Framework\App\Cache\Type\Config $configCacheType,
         \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollectionFactory,
         \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollectionFactory,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\Url $customerUrl,
         array $data = [],
diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
index d822be853f184..e020de79a3a60 100644
--- a/app/code/Magento/Customer/Block/Widget/Dob.php
+++ b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -267,6 +267,8 @@ public function getHtmlExtraParams()
         $validators['validate-date'] = [
             'dateFormat' => $this->getDateFormat()
         ];
+        $validators['validate-dob'] = true;
+
         return 'data-validate="' . $this->_escaper->escapeHtml(json_encode($validators)) . '"';
     }
 
diff --git a/app/code/Magento/Customer/Controller/Account/Confirm.php b/app/code/Magento/Customer/Controller/Account/Confirm.php
index adca90c5e5f24..3aa08cfbf847e 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirm.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirm.php
@@ -168,7 +168,7 @@ public function execute()
                 $metadata->setPath('/');
                 $this->getCookieManager()->deleteCookie('mage-cache-sessid', $metadata);
             }
-            $this->messageManager->addSuccess($this->getSuccessMessage());
+            $this->messageManager->addSuccessMessage($this->getSuccessMessage());
             $resultRedirect->setUrl($this->getSuccessRedirect());
             return $resultRedirect;
         } catch (StateException $e) {
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php
index a2be0f68b56cb..e2a7c085a0b44 100644
--- a/app/code/Magento/Customer/Controller/Account/CreatePost.php
+++ b/app/code/Magento/Customer/Controller/Account/CreatePost.php
@@ -21,6 +21,7 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Phrase;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\AccountManagementInterface;
@@ -118,6 +119,11 @@ class CreatePost extends AbstractAccount implements CsrfAwareActionInterface, Ht
      */
     protected $session;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    protected $storeManager;
+
     /**
      * @var AccountRedirect
      */
@@ -321,7 +327,7 @@ public function validateForCsrf(RequestInterface $request): ?bool
     /**
      * Create customer account action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -365,20 +371,17 @@ public function execute()
             );
             $confirmationStatus = $this->accountManagement->getConfirmationStatus($customer->getId());
             if ($confirmationStatus === AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED) {
-                $email = $this->customerUrl->getEmailConfirmationUrl($customer->getEmail());
-                // @codingStandardsIgnoreStart
-                $this->messageManager->addSuccess(
-                    __(
-                        'You must confirm your account. Please check your email for the confirmation link or <a href="%1">click here</a> for a new link.',
-                        $email
-                    )
+                $this->messageManager->addComplexSuccessMessage(
+                    'confirmAccountSuccessMessage',
+                    [
+                        'url' => $this->customerUrl->getEmailConfirmationUrl($customer->getEmail()),
+                    ]
                 );
-                // @codingStandardsIgnoreEnd
                 $url = $this->urlModel->getUrl('*/*/index', ['_secure' => true]);
                 $resultRedirect->setUrl($this->_redirect->success($url));
             } else {
                 $this->session->setCustomerDataAsLoggedIn($customer);
-                $this->messageManager->addSuccess($this->getSuccessMessage());
+                $this->messageManager->addMessage($this->getMessageManagerSuccessMessage());
                 $requestedRedirect = $this->accountRedirect->getRedirectCookie();
                 if (!$this->scopeConfig->getValue('customer/startup/redirect_dashboard') && $requestedRedirect) {
                     $resultRedirect->setUrl($this->_redirect->success($requestedRedirect));
@@ -395,23 +398,21 @@ public function execute()
 
             return $resultRedirect;
         } catch (StateException $e) {
-            $url = $this->urlModel->getUrl('customer/account/forgotpassword');
-            // @codingStandardsIgnoreStart
-            $message = __(
-                'There is already an account with this email address. If you are sure that it is your email address, <a href="%1">click here</a> to get your password and access your account.',
-                $url
+            $this->messageManager->addComplexErrorMessage(
+                'customerAlreadyExistsErrorMessage',
+                [
+                    'url' => $this->urlModel->getUrl('customer/account/forgotpassword'),
+                ]
             );
-            // @codingStandardsIgnoreEnd
-            $this->messageManager->addError($message);
         } catch (InputException $e) {
-            $this->messageManager->addError($this->escaper->escapeHtml($e->getMessage()));
+            $this->messageManager->addErrorMessage($e->getMessage());
             foreach ($e->getErrors() as $error) {
-                $this->messageManager->addError($this->escaper->escapeHtml($error->getMessage()));
+                $this->messageManager->addErrorMessage($error->getMessage());
             }
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($this->escaper->escapeHtml($e->getMessage()));
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t save the customer.'));
+            $this->messageManager->addExceptionMessage($e, __('We can\'t save the customer.'));
         }
 
         $this->session->setCustomerFormData($this->getRequest()->getPostValue());
@@ -437,6 +438,8 @@ protected function checkPasswordConfirmation($password, $confirmation)
     /**
      * Retrieve success message
      *
+     * @deprecated
+     * @see getMessageManagerSuccessMessage()
      * @return string
      */
     protected function getSuccessMessage()
@@ -462,4 +465,37 @@ protected function getSuccessMessage()
         }
         return $message;
     }
+
+    /**
+     * Retrieve success message manager message
+     *
+     * @return MessageInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getMessageManagerSuccessMessage(): MessageInterface
+    {
+        if ($this->addressHelper->isVatValidationEnabled()) {
+            if ($this->addressHelper->getTaxCalculationAddressType() == Address::TYPE_SHIPPING) {
+                $identifier = 'customerVatShippingAddressSuccessMessage';
+            } else {
+                $identifier = 'customerVatBillingAddressSuccessMessage';
+            }
+
+            $message = $this->messageManager
+                ->createMessage(MessageInterface::TYPE_SUCCESS, $identifier)
+                ->setData(
+                    [
+                        'url' => $this->urlModel->getUrl('customer/address/edit'),
+                    ]
+                );
+        } else {
+            $message = $this->messageManager
+                ->createMessage(MessageInterface::TYPE_SUCCESS)
+                ->setText(
+                    __('Thank you for registering with %1.', $this->storeManager->getStore()->getFrontendName())
+                );
+        }
+
+        return $message;
+    }
 }
diff --git a/app/code/Magento/Customer/Controller/Account/EditPost.php b/app/code/Magento/Customer/Controller/Account/EditPost.php
index 4eb41cedea29a..04b5b72ae776b 100644
--- a/app/code/Magento/Customer/Controller/Account/EditPost.php
+++ b/app/code/Magento/Customer/Controller/Account/EditPost.php
@@ -216,7 +216,7 @@ public function execute()
                     $isPasswordChanged
                 );
                 $this->dispatchSuccessEvent($customerCandidateDataObject);
-                $this->messageManager->addSuccess(__('You saved the account information.'));
+                $this->messageManager->addSuccessMessage(__('You saved the account information.'));
                 return $resultRedirect->setPath('customer/account');
             } catch (InvalidEmailOrPasswordException $e) {
                 $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
@@ -227,7 +227,7 @@ public function execute()
                 );
                 $this->session->logout();
                 $this->session->start();
-                $this->messageManager->addError($message);
+                $this->messageManager->addErrorMessage($message);
                 return $resultRedirect->setPath('customer/account/login');
             } catch (InputException $e) {
                 $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
@@ -235,7 +235,7 @@ public function execute()
                     $this->messageManager->addErrorMessage($this->escaper->escapeHtml($error->getMessage()));
                 }
             } 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 save the customer.'));
             }
diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
index 04051fbbf366b..36d04e949923f 100644
--- a/app/code/Magento/Customer/Controller/Account/LoginPost.php
+++ b/app/code/Magento/Customer/Controller/Account/LoginPost.php
@@ -26,6 +26,8 @@
 use Magento\Framework\Phrase;
 
 /**
+ * Post login customer action.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class LoginPost extends AbstractAccount implements CsrfAwareActionInterface, HttpPostActionInterface
@@ -183,7 +185,6 @@ public function execute()
                 try {
                     $customer = $this->customerAccountManagement->authenticate($login['username'], $login['password']);
                     $this->session->setCustomerDataAsLoggedIn($customer);
-                    $this->session->regenerateId();
                     if ($this->getCookieManager()->getCookie('mage-cache-sessid')) {
                         $metadata = $this->getCookieMetadataFactory()->createCookieMetadata();
                         $metadata->setPath('/');
@@ -203,11 +204,6 @@ public function execute()
                         'This account is not confirmed. <a href="%1">Click here</a> to resend confirmation email.',
                         $value
                     );
-                } catch (UserLockedException $e) {
-                    $message = __(
-                        'The account sign-in was incorrect or your account is disabled temporarily. '
-                        . 'Please wait and try again later.'
-                    );
                 } catch (AuthenticationException $e) {
                     $message = __(
                         'The account sign-in was incorrect or your account is disabled temporarily. '
@@ -217,17 +213,17 @@ public function execute()
                     $message = $e->getMessage();
                 } catch (\Exception $e) {
                     // PA DSS violation: throwing or logging an exception here can disclose customer password
-                    $this->messageManager->addError(
+                    $this->messageManager->addErrorMessage(
                         __('An unspecified error occurred. Please contact us for assistance.')
                     );
                 } finally {
                     if (isset($message)) {
-                        $this->messageManager->addError($message);
+                        $this->messageManager->addErrorMessage($message);
                         $this->session->setUsername($login['username']);
                     }
                 }
             } else {
-                $this->messageManager->addError(__('A login and a password are required.'));
+                $this->messageManager->addErrorMessage(__('A login and a password are required.'));
             }
         }
 
diff --git a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
index 27a00f86dd95d..a127f2acf538f 100644
--- a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
+++ b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
@@ -73,13 +73,13 @@ public function execute()
         $passwordConfirmation = (string)$this->getRequest()->getPost('password_confirmation');
 
         if ($password !== $passwordConfirmation) {
-            $this->messageManager->addError(__("New Password and Confirm New Password values didn't match."));
+            $this->messageManager->addErrorMessage(__("New Password and Confirm New Password values didn't match."));
             $resultRedirect->setPath('*/*/createPassword', ['token' => $resetPasswordToken]);
 
             return $resultRedirect;
         }
         if (iconv_strlen($password) <= 0) {
-            $this->messageManager->addError(__('Please enter a new password.'));
+            $this->messageManager->addErrorMessage(__('Please enter a new password.'));
             $resultRedirect->setPath('*/*/createPassword', ['token' => $resetPasswordToken]);
 
             return $resultRedirect;
@@ -92,17 +92,17 @@ public function execute()
                 $password
             );
             $this->session->unsRpToken();
-            $this->messageManager->addSuccess(__('You updated your password.'));
+            $this->messageManager->addSuccessMessage(__('You updated your password.'));
             $resultRedirect->setPath('*/*/login');
 
             return $resultRedirect;
         } 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 $exception) {
-            $this->messageManager->addError(__('Something went wrong while saving the new password.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong while saving the new password.'));
         }
         $resultRedirect->setPath('*/*/createPassword', ['token' => $resetPasswordToken]);
 
diff --git a/app/code/Magento/Customer/Controller/Address/Delete.php b/app/code/Magento/Customer/Controller/Address/Delete.php
index a30e15db4b3f8..2024b2c58b8ef 100644
--- a/app/code/Magento/Customer/Controller/Address/Delete.php
+++ b/app/code/Magento/Customer/Controller/Address/Delete.php
@@ -27,9 +27,9 @@ public function execute()
                 $address = $this->_addressRepository->getById($addressId);
                 if ($address->getCustomerId() === $this->_getSession()->getCustomerId()) {
                     $this->_addressRepository->deleteById($addressId);
-                    $this->messageManager->addSuccess(__('You deleted the address.'));
+                    $this->messageManager->addSuccessMessage(__('You deleted the address.'));
                 } else {
-                    $this->messageManager->addError(__('We can\'t delete the address right now.'));
+                    $this->messageManager->addErrorMessage(__('We can\'t delete the address right now.'));
                 }
             } catch (\Exception $other) {
                 $this->messageManager->addException($other, __('We can\'t delete the address right now.'));
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php b/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php
index b69410ecbfce7..7747d80595cdc 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php
@@ -139,14 +139,14 @@ public function execute()
         if ($customerId = $this->getRequest()->getParam('customer_id')) {
             try {
                 $this->tokenService->revokeCustomerAccessToken($customerId);
-                $this->messageManager->addSuccess(__('You have revoked the customer\'s tokens.'));
+                $this->messageManager->addSuccessMessage(__('You have revoked the customer\'s tokens.'));
                 $resultRedirect->setPath('customer/index/edit', ['id' => $customerId, '_current' => true]);
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $resultRedirect->setPath('customer/index/edit', ['id' => $customerId, '_current' => true]);
             }
         } else {
-            $this->messageManager->addError(__('We can\'t find a customer to revoke.'));
+            $this->messageManager->addErrorMessage(__('We can\'t find a customer to revoke.'));
             $resultRedirect->setPath('customer/index/index');
         }
         return $resultRedirect;
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
index ab32ea08a44aa..661ef1cace69b 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Delete.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,6 +8,9 @@
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 
+/**
+ * Class Delete
+ */
 class Delete extends \Magento\Customer\Controller\Adminhtml\Group implements HttpPostActionInterface
 {
     /**
@@ -24,12 +26,12 @@ public function execute()
         if ($id) {
             try {
                 $this->groupRepository->deleteById($id);
-                $this->messageManager->addSuccess(__('You deleted the customer group.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the customer group.'));
             } catch (NoSuchEntityException $e) {
-                $this->messageManager->addError(__('The customer group no longer exists.'));
+                $this->messageManager->addErrorMessage(__('The customer group no longer exists.'));
                 return $resultRedirect->setPath('customer/*/');
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 return $resultRedirect->setPath('customer/group/edit', ['id' => $id]);
             }
         }
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
index 5ffce4cbcd989..64c94fa230fb1 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
@@ -93,10 +93,10 @@ public function execute()
 
                 $this->groupRepository->save($customerGroup);
 
-                $this->messageManager->addSuccess(__('You saved the customer group.'));
+                $this->messageManager->addSuccessMessage(__('You saved the customer group.'));
                 $resultRedirect->setPath('customer/group');
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 if ($customerGroup != null) {
                     $this->storeCustomerGroupDataToSession(
                         $this->dataObjectProcessor->buildOutputDataArray(
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
index e26b49aaebe7a..e2bde42351d45 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
@@ -64,7 +64,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);
@@ -73,6 +73,7 @@ public function execute()
 
     /**
      * Return component referer url
+     *
      * 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 ab39ca098162f..4b2f2614948cf 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Delete.php
@@ -31,7 +31,7 @@ public function execute()
         $formKeyIsValid = $this->_formKeyValidator->validate($this->getRequest());
         $isPost = $this->getRequest()->isPost();
         if (!$formKeyIsValid || !$isPost) {
-            $this->messageManager->addError(__('Customer could not be deleted.'));
+            $this->messageManager->addErrorMessage(__('Customer could not be deleted.'));
             return $resultRedirect->setPath('customer/index');
         }
 
@@ -39,9 +39,9 @@ public function execute()
         if (!empty($customerId)) {
             try {
                 $this->_customerRepository->deleteById($customerId);
-                $this->messageManager->addSuccess(__('You deleted the customer.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the customer.'));
             } catch (\Exception $exception) {
-                $this->messageManager->addError($exception->getMessage());
+                $this->messageManager->addErrorMessage($exception->getMessage());
             }
         }
 
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
index 7220de0356817..eff812a65a3bb 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
@@ -70,6 +70,11 @@ class InlineEdit extends \Magento\Backend\App\Action implements HttpPostActionIn
      */
     private $addressRegistry;
 
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * @param Action\Context $context
      * @param CustomerRepositoryInterface $customerRepository
@@ -78,6 +83,7 @@ class InlineEdit extends \Magento\Backend\App\Action implements HttpPostActionIn
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Psr\Log\LoggerInterface $logger
      * @param AddressRegistry|null $addressRegistry
+     * @param \Magento\Framework\Escaper $escaper
      */
     public function __construct(
         Action\Context $context,
@@ -86,7 +92,8 @@ public function __construct(
         \Magento\Customer\Model\Customer\Mapper $customerMapper,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         \Psr\Log\LoggerInterface $logger,
-        AddressRegistry $addressRegistry = null
+        AddressRegistry $addressRegistry = null,
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->customerRepository = $customerRepository;
         $this->resultJsonFactory = $resultJsonFactory;
@@ -94,6 +101,7 @@ public function __construct(
         $this->dataObjectHelper = $dataObjectHelper;
         $this->logger = $logger;
         $this->addressRegistry = $addressRegistry ?: ObjectManager::getInstance()->get(AddressRegistry::class);
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(\Magento\Framework\Escaper::class);
         parent::__construct($context);
     }
 
@@ -128,10 +136,14 @@ public function execute()
 
         $postItems = $this->getRequest()->getParam('items', []);
         if (!($this->getRequest()->getParam('isAjax') && count($postItems))) {
-            return $resultJson->setData([
-                'messages' => [__('Please correct the data sent.')],
-                'error' => true,
-            ]);
+            return $resultJson->setData(
+                [
+                    'messages' => [
+                        __('Please correct the data sent.')
+                    ],
+                    'error' => true,
+                ]
+            );
         }
 
         foreach (array_keys($postItems) as $customerId) {
@@ -147,10 +159,12 @@ public function execute()
             $this->getEmailNotification()->credentialsChanged($this->getCustomer(), $currentCustomer->getEmail());
         }
 
-        return $resultJson->setData([
-            'messages' => $this->getErrorMessages(),
-            'error' => $this->isErrorExists()
-        ]);
+        return $resultJson->setData(
+            [
+                'messages' => $this->getErrorMessages(),
+                'error' => $this->isErrorExists()
+            ]
+        );
     }
 
     /**
@@ -234,13 +248,16 @@ protected function saveCustomer(CustomerInterface $customer)
             $this->disableAddressValidation($customer);
             $this->customerRepository->save($customer);
         } catch (\Magento\Framework\Exception\InputException $e) {
-            $this->getMessageManager()->addError($this->getErrorWithCustomerId($e->getMessage()));
+            $this->getMessageManager()
+                ->addError($this->getErrorWithCustomerId($this->escaper->escapeHtml($e->getMessage())));
             $this->logger->critical($e);
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->getMessageManager()->addError($this->getErrorWithCustomerId($e->getMessage()));
+            $this->getMessageManager()
+                ->addError($this->getErrorWithCustomerId($this->escaper->escapeHtml($e->getMessage())));
             $this->logger->critical($e);
         } catch (\Exception $e) {
-            $this->getMessageManager()->addError($this->getErrorWithCustomerId('We can\'t save the customer.'));
+            $this->getMessageManager()
+                ->addError($this->getErrorWithCustomerId('We can\'t save the customer.'));
             $this->logger->critical($e);
         }
     }
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassSubscribe.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassSubscribe.php
index 29a66bf1ff933..453035ad3151b 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassSubscribe.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassSubscribe.php
@@ -7,15 +7,15 @@
 
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Newsletter\Model\SubscriptionManagerInterface;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 use Magento\Framework\Controller\ResultFactory;
 
 /**
- * Class MassSubscribe
+ * Class to mass subscribe customers by ids
  */
 class MassSubscribe extends AbstractMassAction implements HttpPostActionInterface
 {
@@ -25,27 +25,27 @@ class MassSubscribe extends AbstractMassAction implements HttpPostActionInterfac
     protected $customerRepository;
 
     /**
-     * @var SubscriberFactory
+     * @var SubscriptionManagerInterface
      */
-    protected $subscriberFactory;
+    private $subscriptionManager;
 
     /**
      * @param Context $context
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
      * @param CustomerRepositoryInterface $customerRepository
-     * @param SubscriberFactory $subscriberFactory
+     * @param SubscriptionManagerInterface $subscriptionManager
      */
     public function __construct(
         Context $context,
         Filter $filter,
         CollectionFactory $collectionFactory,
         CustomerRepositoryInterface $customerRepository,
-        SubscriberFactory $subscriberFactory
+        SubscriptionManagerInterface $subscriptionManager
     ) {
         parent::__construct($context, $filter, $collectionFactory);
         $this->customerRepository = $customerRepository;
-        $this->subscriberFactory = $subscriberFactory;
+        $this->subscriptionManager = $subscriptionManager;
     }
 
     /**
@@ -58,9 +58,9 @@ protected function massAction(AbstractCollection $collection)
     {
         $customersUpdated = 0;
         foreach ($collection->getAllIds() as $customerId) {
-            // Verify customer exists
-            $this->customerRepository->getById($customerId);
-            $this->subscriberFactory->create()->subscribeCustomerById($customerId);
+            $customer = $this->customerRepository->getById($customerId);
+            $storeId = (int)$customer->getStoreId();
+            $this->subscriptionManager->subscribeCustomer($customerId, $storeId);
             $customersUpdated++;
         }
 
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassUnsubscribe.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassUnsubscribe.php
index fddf18489b9a5..245e06699e6b0 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassUnsubscribe.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassUnsubscribe.php
@@ -5,17 +5,21 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Backend\Model\View\Result\Redirect;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Config\Share;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
-use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Newsletter\Model\SubscriptionManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 
 /**
- * Class MassUnsubscribe
+ * Class to mass unsubscribe customers by ids
  */
 class MassUnsubscribe extends AbstractMassAction implements HttpPostActionInterface
 {
@@ -25,52 +29,90 @@ class MassUnsubscribe extends AbstractMassAction implements HttpPostActionInterf
     protected $customerRepository;
 
     /**
-     * @var SubscriberFactory
+     * @var SubscriptionManagerInterface
      */
-    protected $subscriberFactory;
+    private $subscriptionManager;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var Share
+     */
+    private $shareConfig;
 
     /**
      * @param Context $context
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
      * @param CustomerRepositoryInterface $customerRepository
-     * @param SubscriberFactory $subscriberFactory
+     * @param SubscriptionManagerInterface $subscriptionManager
+     * @param StoreManagerInterface $storeManager
+     * @param Share $shareConfig
      */
     public function __construct(
         Context $context,
         Filter $filter,
         CollectionFactory $collectionFactory,
         CustomerRepositoryInterface $customerRepository,
-        SubscriberFactory $subscriberFactory
+        SubscriptionManagerInterface $subscriptionManager,
+        StoreManagerInterface $storeManager,
+        Share $shareConfig
     ) {
         parent::__construct($context, $filter, $collectionFactory);
         $this->customerRepository = $customerRepository;
-        $this->subscriberFactory = $subscriberFactory;
+        $this->subscriptionManager = $subscriptionManager;
+        $this->storeManager = $storeManager;
+        $this->shareConfig = $shareConfig;
     }
 
     /**
      * Customer mass unsubscribe action
      *
      * @param AbstractCollection $collection
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return Redirect
      */
     protected function massAction(AbstractCollection $collection)
     {
         $customersUpdated = 0;
         foreach ($collection->getAllIds() as $customerId) {
-            // Verify customer exists
-            $this->customerRepository->getById($customerId);
-            $this->subscriberFactory->create()->unsubscribeCustomerById($customerId);
+            // Verify that customer exists
+            $customer = $this->customerRepository->getById($customerId);
+            foreach ($this->getUnsubscribeStoreIds($customer) as $storeId) {
+                $this->subscriptionManager->unsubscribeCustomer((int)$customerId, $storeId);
+            }
             $customersUpdated++;
         }
 
         if ($customersUpdated) {
             $this->messageManager->addSuccessMessage(__('A total of %1 record(s) were updated.', $customersUpdated));
         }
-        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setPath($this->getComponentRefererUrl());
 
         return $resultRedirect;
     }
+
+    /**
+     * Get store ids to unsubscribe customer
+     *
+     * @param CustomerInterface $customer
+     * @return array
+     */
+    private function getUnsubscribeStoreIds(CustomerInterface $customer): array
+    {
+        $storeIds = [];
+        if ($this->shareConfig->isGlobalScope()) {
+            foreach ($this->storeManager->getStores() as $store) {
+                $storeIds[(int)$store->getWebsiteId()] = (int)$store->getId();
+            }
+        } else {
+            $storeIds = [(int)$customer->getStoreId()];
+        }
+
+        return $storeIds;
+    }
 }
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
index 3ee33af9ec073..b85b735ea9c4f 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
@@ -5,25 +5,45 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\ForwardFactory;
+use Magento\Backend\Model\View\Result\Redirect;
 use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Model\Address\Mapper;
-use Magento\Customer\Model\AddressRegistry;
-use Magento\Framework\Api\DataObjectHelper;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
-use Magento\Customer\Api\Data\CustomerInterfaceFactory;
-use Magento\Framework\DataObjectFactory as ObjectFactory;
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-use Magento\Customer\Api\AddressMetadataInterface;
-use Magento\Customer\Api\CustomerMetadataInterface;
+use Magento\Customer\Api\Data\AttributeMetadataInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Customer\Controller\RegistryConstants;
+use Magento\Customer\Helper\View;
+use Magento\Customer\Model\Address\Mapper;
+use Magento\Customer\Model\AddressFactory;
+use Magento\Customer\Model\AddressRegistry;
+use Magento\Customer\Model\CustomerFactory;
 use Magento\Customer\Model\EmailNotificationInterface;
 use Magento\Customer\Model\Metadata\Form;
+use Magento\Customer\Model\Metadata\FormFactory;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\Api\ExtensibleDataObjectConverter;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\DataObject;
+use Magento\Framework\DataObjectFactory as ObjectFactory;
+use Magento\Framework\Exception\AbstractAggregateException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
+use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Framework\Registry;
+use Magento\Framework\View\Result\LayoutFactory;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Newsletter\Model\SubscriptionManagerInterface;
 
 /**
  * Save customer action.
@@ -37,6 +57,11 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index implements HttpP
      */
     private $emailNotification;
 
+    /**
+     * @var SubscriptionManagerInterface
+     */
+    private $subscriptionManager;
+
     /**
      * @var AddressRegistry
      */
@@ -45,60 +70,62 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index implements HttpP
     /**
      * Constructor
      *
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @param \Magento\Customer\Model\CustomerFactory $customerFactory
-     * @param \Magento\Customer\Model\AddressFactory $addressFactory
-     * @param \Magento\Customer\Model\Metadata\FormFactory $formFactory
-     * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
-     * @param \Magento\Customer\Helper\View $viewHelper
-     * @param \Magento\Framework\Math\Random $random
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param FileFactory $fileFactory
+     * @param CustomerFactory $customerFactory
+     * @param AddressFactory $addressFactory
+     * @param FormFactory $formFactory
+     * @param SubscriberFactory $subscriberFactory
+     * @param View $viewHelper
+     * @param Random $random
      * @param CustomerRepositoryInterface $customerRepository
-     * @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
+     * @param ExtensibleDataObjectConverter $extensibleDataObjectConverter
      * @param Mapper $addressMapper
      * @param AccountManagementInterface $customerAccountManagement
      * @param AddressRepositoryInterface $addressRepository
      * @param CustomerInterfaceFactory $customerDataFactory
      * @param AddressInterfaceFactory $addressDataFactory
      * @param \Magento\Customer\Model\Customer\Mapper $customerMapper
-     * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
+     * @param DataObjectProcessor $dataObjectProcessor
      * @param DataObjectHelper $dataObjectHelper
      * @param ObjectFactory $objectFactory
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
-     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
-     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
-     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param LayoutFactory $resultLayoutFactory
+     * @param PageFactory $resultPageFactory
+     * @param ForwardFactory $resultForwardFactory
+     * @param JsonFactory $resultJsonFactory
+     * @param SubscriptionManagerInterface $subscriptionManager
      * @param AddressRegistry|null $addressRegistry
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
-        \Magento\Customer\Model\CustomerFactory $customerFactory,
-        \Magento\Customer\Model\AddressFactory $addressFactory,
-        \Magento\Customer\Model\Metadata\FormFactory $formFactory,
-        \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory,
-        \Magento\Customer\Helper\View $viewHelper,
-        \Magento\Framework\Math\Random $random,
+        Context $context,
+        Registry $coreRegistry,
+        FileFactory $fileFactory,
+        CustomerFactory $customerFactory,
+        AddressFactory $addressFactory,
+        FormFactory $formFactory,
+        SubscriberFactory $subscriberFactory,
+        View $viewHelper,
+        Random $random,
         CustomerRepositoryInterface $customerRepository,
-        \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter,
+        ExtensibleDataObjectConverter $extensibleDataObjectConverter,
         Mapper $addressMapper,
         AccountManagementInterface $customerAccountManagement,
         AddressRepositoryInterface $addressRepository,
         CustomerInterfaceFactory $customerDataFactory,
         AddressInterfaceFactory $addressDataFactory,
         \Magento\Customer\Model\Customer\Mapper $customerMapper,
-        \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor,
+        DataObjectProcessor $dataObjectProcessor,
         DataObjectHelper $dataObjectHelper,
         ObjectFactory $objectFactory,
         \Magento\Framework\View\LayoutFactory $layoutFactory,
-        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
-        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
-        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
+        LayoutFactory $resultLayoutFactory,
+        PageFactory $resultPageFactory,
+        ForwardFactory $resultForwardFactory,
+        JsonFactory $resultJsonFactory,
+        SubscriptionManagerInterface $subscriptionManager,
         AddressRegistry $addressRegistry = null
     ) {
         parent::__construct(
@@ -128,6 +155,7 @@ public function __construct(
             $resultForwardFactory,
             $resultJsonFactory
         );
+        $this->subscriptionManager = $subscriptionManager;
         $this->addressRegistry = $addressRegistry ?: ObjectManager::getInstance()->get(AddressRegistry::class);
     }
 
@@ -186,7 +214,7 @@ protected function _extractData(
         $formData = $metadataForm->compactData($formData);
 
         // Initialize additional attributes
-        /** @var \Magento\Framework\DataObject $object */
+        /** @var DataObject $object */
         $object = $this->_objectFactory->create(['data' => $this->getRequest()->getPostValue()]);
         $requestData = $object->getData($scope);
         foreach ($additionalAttributes as $attributeCode) {
@@ -196,7 +224,7 @@ protected function _extractData(
         // Unset unused attributes
         $formAttributes = $metadataForm->getAttributes();
         foreach ($formAttributes as $attribute) {
-            /** @var \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute */
+            /** @var AttributeMetadataInterface $attribute */
             $attributeCode = $attribute->getAttributeCode();
             if ($attribute->getFrontendInput() != 'boolean'
                 && $formData[$attributeCode] === false
@@ -281,7 +309,7 @@ protected function _extractCustomerAddressData(array & $extractedCustomerData)
     /**
      * Save customer action
      *
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -312,7 +340,7 @@ public function execute()
                 $this->dataObjectHelper->populateWithArray(
                     $customer,
                     $customerData,
-                    \Magento\Customer\Api\Data\CustomerInterface::class
+                    CustomerInterface::class
                 );
 
                 $this->_eventManager->dispatch(
@@ -334,17 +362,7 @@ public function execute()
                     $customerId = $customer->getId();
                 }
 
-                $isSubscribed = null;
-                if ($this->_authorization->isAllowed(null)) {
-                    $isSubscribed = $this->getRequest()->getPost('subscription');
-                }
-                if ($isSubscribed !== null) {
-                    if ($isSubscribed !== '0') {
-                        $this->_subscriberFactory->create()->subscribeCustomerById($customerId);
-                    } else {
-                        $this->_subscriberFactory->create()->unsubscribeCustomerById($customerId);
-                    }
-                }
+                $this->updateSubscriptions($customer);
 
                 // After save
                 $this->_eventManager->dispatch(
@@ -364,7 +382,7 @@ public function execute()
                 $this->_addSessionErrorMessages($messages);
                 $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData());
                 $returnToEdit = true;
-            } catch (\Magento\Framework\Exception\AbstractAggregateException $exception) {
+            } catch (AbstractAggregateException $exception) {
                 $errors = $exception->getErrors();
                 $messages = [];
                 foreach ($errors as $error) {
@@ -406,6 +424,34 @@ public function execute()
         return $resultRedirect;
     }
 
+    /**
+     * Update customer website subscriptions
+     *
+     * @param CustomerInterface $customer
+     * @return void
+     */
+    private function updateSubscriptions(CustomerInterface $customer): void
+    {
+        if (!$this->_authorization->isAllowed(null)) {
+            return;
+        }
+
+        $subscriptionStatus = (array)$this->getRequest()->getParam('subscription_status');
+        $subscriptionStore = (array)$this->getRequest()->getParam('subscription_store');
+        if (empty($subscriptionStatus)) {
+            return;
+        }
+
+        foreach ($subscriptionStatus as $websiteId => $status) {
+            $storeId = $subscriptionStore[$websiteId] ?? $customer->getStoreId();
+            if ($status) {
+                $this->subscriptionManager->subscribeCustomer((int)$customer->getId(), $storeId);
+            } else {
+                $this->subscriptionManager->unsubscribeCustomer((int)$customer->getId(), $storeId);
+            }
+        }
+    }
+
     /**
      * Get email notification
      *
@@ -415,7 +461,7 @@ public function execute()
     private function getEmailNotification()
     {
         if (!($this->emailNotification instanceof EmailNotificationInterface)) {
-            return \Magento\Framework\App\ObjectManager::getInstance()->get(
+            return ObjectManager::getInstance()->get(
                 EmailNotificationInterface::class
             );
         } else {
diff --git a/app/code/Magento/Customer/Controller/Ajax/Login.php b/app/code/Magento/Customer/Controller/Ajax/Login.php
index 5049c83e60f35..1215c47ab9902 100644
--- a/app/code/Magento/Customer/Controller/Ajax/Login.php
+++ b/app/code/Magento/Customer/Controller/Ajax/Login.php
@@ -191,7 +191,6 @@ public function execute()
                 $credentials['password']
             );
             $this->customerSession->setCustomerDataAsLoggedIn($customer);
-            $this->customerSession->regenerateId();
             $redirectRoute = $this->getAccountRedirect()->getRedirectCookie();
             if ($this->cookieManager->getCookie('mage-cache-sessid')) {
                 $metadata = $this->cookieMetadataFactory->createCookieMetadata();
diff --git a/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php b/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php
index 5cd09aca9f873..d48ff5918c3f3 100644
--- a/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php
+++ b/app/code/Magento/Customer/Helper/Session/CurrentCustomer.php
@@ -10,7 +10,7 @@
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ViewInterface;
-use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
+use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Framework\View\LayoutInterface;
 
 /**
@@ -45,7 +45,7 @@ class CurrentCustomer
     protected $request;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index 7be8699495bf5..985cfe0621bf8 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -978,6 +978,7 @@ protected function sendEmailConfirmation(CustomerInterface $customer, $redirectU
                 $templateType = self::NEW_ACCOUNT_EMAIL_REGISTERED_NO_PASSWORD;
             }
             $this->getEmailNotification()->newAccount($customer, $templateType, $redirectUrl, $customer->getStoreId());
+            $customer->setConfirmation(null);
         } catch (MailException $e) {
             // If we are not able to send a new account email, this should be ignored
             $this->logger->critical($e);
diff --git a/app/code/Magento/Customer/Model/Address/Validator/General.php b/app/code/Magento/Customer/Model/Address/Validator/General.php
index 679f288712b4b..7cbb6ef1ab623 100644
--- a/app/code/Magento/Customer/Model/Address/Validator/General.php
+++ b/app/code/Magento/Customer/Model/Address/Validator/General.php
@@ -41,7 +41,7 @@ public function __construct(
     public function validate(AbstractAddress $address)
     {
         $errors = array_merge(
-            $this->checkRequredFields($address),
+            $this->checkRequiredFields($address),
             $this->checkOptionalFields($address)
         );
 
@@ -55,7 +55,7 @@ public function validate(AbstractAddress $address)
      * @return array
      * @throws \Zend_Validate_Exception
      */
-    private function checkRequredFields(AbstractAddress $address)
+    private function checkRequiredFields(AbstractAddress $address)
     {
         $errors = [];
         if (!\Zend_Validate::is($address->getFirstname(), 'NotEmpty')) {
diff --git a/app/code/Magento/Customer/Model/Attribute.php b/app/code/Magento/Customer/Model/Attribute.php
index d05bf14fbc97d..98a97872f15f4 100644
--- a/app/code/Magento/Customer/Model/Attribute.php
+++ b/app/code/Magento/Customer/Model/Attribute.php
@@ -202,9 +202,6 @@ public function canBeFilterableInGrid()
 
     /**
      * @inheritdoc
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -217,9 +214,6 @@ public function __sleep()
 
     /**
      * @inheritdoc
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/app/code/Magento/Customer/Model/AttributeMetadataResolver.php b/app/code/Magento/Customer/Model/AttributeMetadataResolver.php
index d548ef826a2e9..c936de1bd0230 100644
--- a/app/code/Magento/Customer/Model/AttributeMetadataResolver.php
+++ b/app/code/Magento/Customer/Model/AttributeMetadataResolver.php
@@ -114,7 +114,12 @@ public function getAttributesMeta(
         // 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 ($metaName === 'label') {
+                $meta['arguments']['data']['config'][$metaName] = __($value);
+                $meta['arguments']['data']['config']['__disableTmpl'] = [$metaName => true];
+            } else {
+                $meta['arguments']['data']['config'][$metaName] = $value;
+            }
             if ('frontend_input' === $origName) {
                 $meta['arguments']['data']['config']['formElement'] = self::$formElement[$value] ?? $value;
             }
@@ -125,7 +130,14 @@ public function getAttributesMeta(
                 $meta['arguments']['data']['config']['options'] = $this->countryWithWebsiteSource
                     ->getAllOptions();
             } else {
-                $meta['arguments']['data']['config']['options'] = $attribute->getSource()->getAllOptions();
+                $options = $attribute->getSource()->getAllOptions();
+                array_walk(
+                    $options,
+                    function (&$item) {
+                        $item['__disableTmpl'] = ['label' => true];
+                    }
+                );
+                $meta['arguments']['data']['config']['options'] = $options;
             }
         }
 
@@ -145,7 +157,6 @@ public function getAttributesMeta(
             $attribute,
             $meta['arguments']['data']['config']
         );
-
         return $meta;
     }
 
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index 1f8f7d90f6d0d..2692d1edf0143 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -20,6 +20,7 @@
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
 
 /**
  * Customer model
@@ -180,7 +181,7 @@ class Customer extends \Magento\Framework\Model\AbstractModel
     protected $_encryptor;
 
     /**
-     * @var \Magento\Framework\Math\Random
+     * @var Random
      */
     protected $mathRandom;
 
@@ -248,6 +249,7 @@ class Customer extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      * @param AccountConfirmation|null $accountConfirmation
+     * @param Random|null $mathRandom
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -272,7 +274,8 @@ public function __construct(
         \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        AccountConfirmation $accountConfirmation = null
+        AccountConfirmation $accountConfirmation = null,
+        Random $mathRandom = null
     ) {
         $this->metadataService = $metadataService;
         $this->_scopeConfig = $scopeConfig;
@@ -291,6 +294,7 @@ public function __construct(
         $this->indexerRegistry = $indexerRegistry;
         $this->accountConfirmation = $accountConfirmation ?: ObjectManager::getInstance()
             ->get(AccountConfirmation::class);
+        $this->mathRandom = $mathRandom ?: ObjectManager::getInstance()->get(Random::class);
         parent::__construct(
             $context,
             $registry,
@@ -815,8 +819,7 @@ public function isConfirmationRequired()
      */
     public function getRandomConfirmationKey()
     {
-        // phpcs:ignore Magento2.Security.InsecureFunction
-        return md5(uniqid());
+        return $this->mathRandom->getRandomString(32);
     }
 
     /**
diff --git a/app/code/Magento/Customer/Model/Customer/Source/Group.php b/app/code/Magento/Customer/Model/Customer/Source/Group.php
index efcc7d0fe93a4..1064152b20fd5 100644
--- a/app/code/Magento/Customer/Model/Customer/Source/Group.php
+++ b/app/code/Magento/Customer/Model/Customer/Source/Group.php
@@ -6,7 +6,7 @@
 namespace Magento\Customer\Model\Customer\Source;
 
 use Magento\Customer\Api\Data\GroupSearchResultsInterface;
-use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
+use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
diff --git a/app/code/Magento/Customer/Model/Plugin/CustomerNotification.php b/app/code/Magento/Customer/Model/Plugin/CustomerNotification.php
index 517aef5690ee6..577c97a19268a 100644
--- a/app/code/Magento/Customer/Model/Plugin/CustomerNotification.php
+++ b/app/code/Magento/Customer/Model/Plugin/CustomerNotification.php
@@ -15,6 +15,11 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Psr\Log\LoggerInterface;
 
+/**
+ * Plugin before \Magento\Framework\App\Action\AbstractAction::dispatch.
+ *
+ * Plugin to remove notifications from cache.
+ */
 class CustomerNotification
 {
     /**
@@ -66,6 +71,8 @@ public function __construct(
     }
 
     /**
+     * Removes notifications from cache.
+     *
      * @param AbstractAction $subject
      * @param RequestInterface $request
      * @return void
@@ -82,10 +89,10 @@ public function beforeDispatch(AbstractAction $subject, RequestInterface $reques
             )
         ) {
             try {
+                $this->session->regenerateId();
                 $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/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index 529b0e806972a..03cf4b1bdddec 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -7,24 +7,25 @@
 namespace Magento\Customer\Model\ResourceModel;
 
 use Magento\Customer\Api\CustomerMetadataInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 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\Customer as CustomerModel;
+use Magento\Customer\Model\Customer\NotificationStorage;
 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\Customer\Model\Delegation\Storage as DelegatedStorage;
 use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\Api\ExtensibleDataObjectConverter;
+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Framework\Api\ImageProcessorInterface;
+use Magento\Framework\Api\Search\FilterGroup;
 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\Framework\Event\ManagerInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -203,7 +204,7 @@ public function save(CustomerInterface $customer, $passwordHash = null)
         $customer->setAddresses([]);
         $customerData = $this->extensibleDataObjectConverter->toNestedArray($customer, [], CustomerInterface::class);
         $customer->setAddresses($origAddresses);
-        /** @var Customer $customerModel */
+        /** @var CustomerModel $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());
diff --git a/app/code/Magento/Customer/Model/Session.php b/app/code/Magento/Customer/Model/Session.php
index 047327a0b6c29..e9dc7700ec090 100644
--- a/app/code/Magento/Customer/Model/Session.php
+++ b/app/code/Magento/Customer/Model/Session.php
@@ -370,7 +370,9 @@ public function setCustomerGroupId($id)
     }
 
     /**
-     * Get customer group id. If customer is not logged in system, 'not logged in' group id will be returned.
+     * Get customer group id.
+     *
+     * If customer is not logged in system, 'not logged in' group id will be returned.
      *
      * @return int
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -431,21 +433,22 @@ public function checkCustomerId($customerId)
      */
     public function setCustomerAsLoggedIn($customer)
     {
+        $this->regenerateId();
         $this->setCustomer($customer);
         $this->_eventManager->dispatch('customer_login', ['customer' => $customer]);
         $this->_eventManager->dispatch('customer_data_object_login', ['customer' => $this->getCustomerDataObject()]);
-        $this->regenerateId();
         return $this;
     }
 
     /**
-     * Sets customer data as logged in
+     * Sets customer as logged in
      *
      * @param CustomerData $customer
      * @return $this
      */
     public function setCustomerDataAsLoggedIn($customer)
     {
+        $this->regenerateId();
         $this->_httpContext->setValue(Context::CONTEXT_AUTH, true, false);
         $this->setCustomerData($customer);
 
@@ -590,7 +593,7 @@ public function regenerateId()
     }
 
     /**
-     * Creates URL factory
+     * Creates URL object
      *
      * @return \Magento\Framework\UrlInterface
      */
diff --git a/app/code/Magento/Customer/Model/Visitor.php b/app/code/Magento/Customer/Model/Visitor.php
index 4f129f05aa82c..6935b9dca7f28 100644
--- a/app/code/Magento/Customer/Model/Visitor.php
+++ b/app/code/Magento/Customer/Model/Visitor.php
@@ -169,6 +169,11 @@ public function initByRequest($observer)
 
         $this->setLastVisitAt((new \DateTime())->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT));
 
+        // prevent saving Visitor for safe methods, e.g. GET request
+        if ($this->requestSafety->isSafeMethod()) {
+            return $this;
+        }
+        
         if (!$this->getId()) {
             $this->setSessionId($this->session->getSessionId());
             $this->save();
@@ -260,7 +265,7 @@ public function bindCustomerLogout($observer)
      * Create binding of checkout quote
      *
      * @param \Magento\Framework\Event\Observer $observer
-     * @return  \Magento\Customer\Model\Visitor
+     * @return \Magento\Customer\Model\Visitor
      */
     public function bindQuoteCreate($observer)
     {
@@ -278,7 +283,7 @@ public function bindQuoteCreate($observer)
      * Destroy binding of checkout quote
      *
      * @param \Magento\Framework\Event\Observer $observer
-     * @return  \Magento\Customer\Model\Visitor
+     * @return \Magento\Customer\Model\Visitor
      */
     public function bindQuoteDestroy($observer)
     {
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerSubscribeNewsletterActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerSubscribeNewsletterActionGroup.xml
new file mode 100644
index 0000000000000..49373bb7bebf9
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerSubscribeNewsletterActionGroup.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="AdminAssertCustomerIsSubscribedToNewsletters">
+        <annotations>
+            <description>Verify that check box "Newsletter subscribed" is checked on "Newsletter" tab on customer edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="websiteId" type="string" defaultValue="1"/>
+        </arguments>
+
+        <click selector="{{AdminEditCustomerInformationSection.newsLetter}}" stepKey="clickToNewsletterTabHeader"/>
+        <waitForPageLoad stepKey="waitForShowNewsletterTab"/>
+        <seeCheckboxIsChecked selector="{{AdminEditCustomerNewsletterSection.subscribedStatus(websiteId)}}" stepKey="assertSubscribedToNewsletter"/>
+    </actionGroup>
+
+    <actionGroup name="AdminAssertCustomerIsSubscribedToNewslettersAndSelectedStoreView" extends="AdminAssertCustomerIsSubscribedToNewsletters">
+        <annotations>
+            <description>Verify that check box "Newsletter subscribed" is checked and Store View is selected on "Newsletter" tab on customer edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="storeView"/>
+        </arguments>
+
+        <seeOptionIsSelected selector="{{AdminEditCustomerNewsletterSection.subscribedStore(websiteId)}}" userInput="{{storeView.name}}" stepKey="assertSubscribedStoreView" after="assertSubscribedToNewsletter"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertDefaultValueDisableAutoGroupInCustomerFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertDefaultValueDisableAutoGroupInCustomerFormActionGroup.xml
new file mode 100644
index 0000000000000..8271cdec46df9
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertDefaultValueDisableAutoGroupInCustomerFormActionGroup.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">
+    <!-- Check Default Value for Disable Automatic Group Changes Based on VAT ID in Customer Form -->
+    <actionGroup name="AdminAssertDefaultValueDisableAutoGroupInCustomerFormActionGroup">
+        <annotations>
+            <description>Check Default Value for Disable Automatic Group Changes Based on VAT ID in Create Customer form.</description>
+        </annotations>
+        <arguments>
+            <argument name="isChecked" type="string"/>
+        </arguments>
+
+        <grabValueFrom selector="{{AdminCustomerAccountInformationSection.disableAutomaticGroupChange}}" stepKey="grabDisableAutomaticGroupChange"/>
+        <assertEquals stepKey="assertDisableAutomaticGroupChangeNo" message="pass">
+            <expectedResult type="string">{{isChecked}}</expectedResult>
+            <actualResult type="variable">grabDisableAutomaticGroupChange</actualResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertErrorMessageCustomerGroupAlreadyExistsActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertErrorMessageCustomerGroupAlreadyExistsActionGroup.xml
index 5eb52630d906b..36b41b155b2b3 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertErrorMessageCustomerGroupAlreadyExistsActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertErrorMessageCustomerGroupAlreadyExistsActionGroup.xml
@@ -9,7 +9,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminAssertErrorMessageCustomerGroupAlreadyExists" extends="AdminCreateCustomerGroupActionGroup">
         <remove keyForRemoval="seeCustomerGroupSaveMessage"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.errorMessage}}" stepKey="waitForElementVisible"/>
-        <see selector="{{AdminMessagesSection.errorMessage}}" userInput="Customer Group already exists." stepKey="seeErrorMessage"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.error}}" stepKey="waitForElementVisible"/>
+        <see selector="{{AdminMessagesSection.error}}" userInput="Customer Group already exists." stepKey="seeErrorMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerSubscribeNewsletterActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerSubscribeNewsletterActionGroup.xml
new file mode 100644
index 0000000000000..49ea772569cc0
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerSubscribeNewsletterActionGroup.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="AdminSubscribeCustomerToNewsletters">
+        <annotations>
+            <description>Set checkbox "Newsletter subscribed" on "Newsletter" tab on customer edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="websiteId" type="string" defaultValue="1"/>
+        </arguments>
+
+        <click selector="{{AdminEditCustomerInformationSection.newsLetter}}" stepKey="clickToNewsletterTabHeader"/>
+        <waitForPageLoad stepKey="waitForShowNewsletterTab"/>
+        <checkOption selector="{{AdminEditCustomerNewsletterSection.subscribedStatus(websiteId)}}" stepKey="subscribeToNewsletter"/>
+        <click selector="{{AdminCustomerMainActionsSection.saveAndContinue}}" stepKey="saveAndContinue"/>
+        <waitForPageLoad stepKey="waitForSaving"/>
+        <see userInput="You saved the customer." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+
+    <actionGroup name="AdminSubscribeCustomerToNewslettersAndSelectStoreView" extends="AdminSubscribeCustomerToNewsletters">
+        <annotations>
+            <description>Set checkbox "Newsletter subscribed" and select Store View on "Newsletter" tab on customer edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="storeView"/>
+        </arguments>
+        <selectOption selector="{{AdminEditCustomerNewsletterSection.subscribedStore(websiteId)}}" userInput="{{storeView.name}}" stepKey="selectSubscribeStoreView" after="subscribeToNewsletter"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerGroupActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerGroupActionGroup.xml
index ab5ae53fd4caa..8171b97258157 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerGroupActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerGroupActionGroup.xml
@@ -15,7 +15,7 @@
         <arguments>
             <argument name="customerGroupName" type="string"/>
         </arguments>
-        
+
         <amOnPage url="{{AdminCustomerGroupsIndexPage.url}}" stepKey="goToAdminCustomerGroupIndexPage"/>
         <waitForPageLoad time="30" stepKey="waitForCustomerGroupIndexPageLoad"/>
         <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerGroupIndexPage"/>
@@ -24,6 +24,8 @@
         <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
         <click selector="{{AdminCustomerGroupGridActionsSection.selectButton(customerGroupName)}}" stepKey="clickSelectButton"/>
         <click selector="{{AdminCustomerGroupGridActionsSection.deleteAction(customerGroupName)}}" stepKey="clickOnDeleteItem"/>
+        <waitForElementVisible selector="{{AdminGridConfirmActionSection.message}}" stepKey="waitForConfirmModal"/>
+        <see selector="{{AdminGridConfirmActionSection.message}}" userInput="Are you sure you want to delete a {{customerGroupName}} record?" stepKey="seeRemoveMessage"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDeleteCustomerGroup"/>
         <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage"/>
     </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminNavigateNewCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminNavigateNewCustomerActionGroup.xml
new file mode 100644
index 0000000000000..81c788fc4445a
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminNavigateNewCustomerActionGroup.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="AdminNavigateNewCustomerActionGroup">
+        <annotations>
+            <description>Goes to the New Customer page.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToCustomers"/>
+        <waitForPageLoad stepKey="waitForLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSaveCustomerAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSaveCustomerAddressActionGroup.xml
index e47aa8809f080..62c35dd230f10 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSaveCustomerAddressActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSaveCustomerAddressActionGroup.xml
@@ -9,6 +9,6 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminSaveCustomerAddressActionGroup">
         <click selector="{{StorefrontCustomerAddressFormSection.saveAddress}}" stepKey="saveCustomerAddress"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You saved the address." stepKey="seeSuccessMessage"/>
+        <see selector="{{StorefrontMessagesSection.success}}" userInput="You saved the address." stepKey="seeSuccessMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGenderInCustomersGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGenderInCustomersGridActionGroup.xml
new file mode 100644
index 0000000000000..0b51140471ab7
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGenderInCustomersGridActionGroup.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="AdminUpdateCustomerGenderInCustomersGridActionGroup">
+        <annotations>
+            <description>Update customer gender attribute value on customers grid page</description>
+        </annotations>
+        <arguments>
+            <argument name="customerEmail" defaultValue="{{Simple_US_Customer.email}}" type="string"/>
+            <argument name="genderValue" defaultValue="{{Gender.empty}}" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminDataGridTableSection.rowTemplate(customerEmail)}}" stepKey="clickCustomersGridRow"/>
+        <waitForElementVisible selector="{{AdminCustomerGridInlineEditorSection.customerGenderEditor}}" stepKey="waitForGenderElementAppears"/>
+        <selectOption userInput="{{genderValue}}" selector="{{AdminCustomerGridInlineEditorSection.customerGenderEditor}}" stepKey="selectGenderValue"/>
+        <click selector="{{AdminCustomerGridInlineEditorSection.saveInGrid}}" stepKey="saveCustomer"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAdminCustomerGenderInCustomersGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAdminCustomerGenderInCustomersGridActionGroup.xml
new file mode 100644
index 0000000000000..8b73a9c3307e3
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAdminCustomerGenderInCustomersGridActionGroup.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="AssertAdminCustomerGenderInCustomersGridActionGroup">
+        <annotations>
+            <description>Assert customer "Gender" attribute value on customer grid page</description>
+        </annotations>
+        <arguments>
+            <argument name="customerEmail" defaultValue="{{Simple_US_Customer.email}}" type="string"/>
+            <argument name="expectedGenderValue" defaultValue="{{Gender.empty}}" type="string"/>
+        </arguments>
+
+        <see userInput="{{expectedGenderValue}}" selector="{{AdminCustomerGridSection.customerGenderByEmail(customerEmail)}}" stepKey="assertGenderValue"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAdminCustomerGenderOnCustomerFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAdminCustomerGenderOnCustomerFormActionGroup.xml
new file mode 100644
index 0000000000000..b21b0054b0c78
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertAdminCustomerGenderOnCustomerFormActionGroup.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="AssertAdminCustomerGenderOnCustomerFormActionGroup">
+        <annotations>
+            <description>Validates that the provided Customer Gender is selected on the Admin Customer edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="customerGender" defaultValue="{{Gender.empty}}" type="string"/>
+        </arguments>
+
+        <conditionalClick selector="{{AdminCustomerAccountInformationSection.accountInformationTab}}" dependentSelector="{{AdminCustomerAccountInformationSection.gender}}" visible="false" stepKey="clickOnAccountInfoTab"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeOptionIsSelected userInput="{{customerGender}}" selector="{{AdminCustomerAccountInformationSection.gender}}" stepKey="verifyNeededCustomerGenderSelected"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerCreateAccountPasswordComplexityActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerCreateAccountPasswordComplexityActionGroup.xml
new file mode 100644
index 0000000000000..b62f5435275a3
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertMessageCustomerCreateAccountPasswordComplexityActionGroup.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="AssertMessageCustomerCreateAccountPasswordComplexityActionGroup">
+        <annotations>
+            <description>Assert is shown an error about their password during new user form filling.</description>
+        </annotations>
+        <arguments>
+            <argument name="message" type="string"/>
+        </arguments>
+        <see userInput="{{message}}" selector="{{StorefrontCustomerCreateFormSection.passwordErrorMessages}}" stepKey="verifyMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
index 60a8a49954bab..e338d1ae4bbd0 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
@@ -15,7 +15,7 @@
         <arguments>
             <argument name="customer"/>
         </arguments>
-        
+
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
@@ -26,7 +26,7 @@
         <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEdit"/>
         <waitForPageLoad stepKey="waitForPageLoad3"/>
     </actionGroup>
-    
+
     <actionGroup name="OpenEditCustomerAddressFromAdminActionGroup">
         <annotations>
             <description>Filters the Admin Customers Addresses based on the provided Address. Clicks on Edit.</description>
@@ -34,7 +34,7 @@
         <arguments>
             <argument name="address"/>
         </arguments>
-        
+
         <click selector="{{AdminCustomerAccountInformationSection.addressesButton}}" stepKey="openAddressesTab"/>
         <waitForElementVisible selector="{{AdminCustomerAddressFiltersSection.filtersButton}}" stepKey="waitForComponentLoad"/>
         <click selector="{{AdminCustomerAddressFiltersSection.filtersButton}}" stepKey="openAddressesFilter"/>
@@ -67,7 +67,7 @@
         <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"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="A total of 1 record(s) were deleted" stepKey="seeSuccess"/>
     </actionGroup>
 
     <actionGroup name="AdminClearCustomersFiltersActionGroup">
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerElementNotVisibleActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerElementNotVisibleActionGroup.xml
new file mode 100644
index 0000000000000..12a0b8f47c5fa
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerElementNotVisibleActionGroup.xml
@@ -0,0 +1,13 @@
+<?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="StorefrontCustomerReorderButtonNotVisibleActionGroup">
+        <dontSeeElement selector="{{StorefrontCustomerOrderViewSection.reorder}}" stepKey="assertNotVisibleElement"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontNavigateToCustomerOrdersHistoryPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontNavigateToCustomerOrdersHistoryPageActionGroup.xml
new file mode 100644
index 0000000000000..40a79b87b01a9
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontNavigateToCustomerOrdersHistoryPageActionGroup.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="StorefrontNavigateToCustomerOrdersHistoryPageActionGroup">
+        <amOnPage url="{{StorefrontCustomerOrdersHistoryPage.url}}" stepKey="amOnTheCustomerPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index f96da1357846d..08e13885d10d4 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -254,6 +254,21 @@
         <data key="state">Côtes-d'Armor</data>
         <data key="postcode">12345</data>
     </entity>
+    <entity name="updateCustomerChinaAddress" type="address">
+        <data key="firstname">Xian</data>
+        <data key="lastname">Shai</data>
+        <data key="company">Hunan Fenmian</data>
+        <data key="telephone">+86 851 8410 4337</data>
+        <array key="street">
+            <item>Nanyuan Rd, Wudang</item>
+            <item>Hunan Fenmian</item>
+        </array>
+        <data key="country_id">CN</data>
+        <data key="country">China</data>
+        <data key="city">Guiyang</data>
+        <data key="state">Guizhou Sheng</data>
+        <data key="postcode">550002</data>
+    </entity>
     <entity name="updateCustomerNoXSSInjection" type="address">
         <data key="firstname">Jany</data>
         <data key="lastname">Doe</data>
@@ -277,7 +292,7 @@
             <item>Piwowarska 6</item>
         </array>
         <data key="city">Bielsko-Biała</data>
-        <data key="state"> Bielsko</data>
+        <data key="state">śląskie</data>
         <data key="country_id">PL</data>
         <data key="country">Poland</data>
         <data key="postcode">43-310</data>
@@ -327,4 +342,37 @@
         <data key="postcode">90230</data>
         <data key="telephone">555-55-555-55</data>
     </entity>
+    <entity name="US_Address_AE" 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">Armed Forces Europe</data>
+        <data key="country_id">US</data>
+        <data key="country">United States</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">RegionAE</requiredEntity>
+    </entity>
+    <entity name="updateCustomerBelgiumAddress" type="address">
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="company">Magento</data>
+        <array key="street">
+            <item>Chaussee de Wavre</item>
+            <item>318</item>
+        </array>
+        <data key="city">Bihain</data>
+        <data key="state">Hainaut</data>
+        <data key="country_id">BE</data>
+        <data key="country">Belgium</data>
+        <data key="postcode">6690</data>
+        <data key="telephone">0477-58-77867</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AdminGeneralStoreInfomationConfigData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AdminGeneralStoreInfomationConfigData.xml
new file mode 100644
index 0000000000000..e4c020cc449fb
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AdminGeneralStoreInfomationConfigData.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="AdminGeneralSetVatNumberConfigData">
+        <data key="path">general/store_information/merchant_vat_number</data>
+        <data key="value">111607872</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
index ab4307082595d..3eb14604220e9 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
@@ -51,4 +51,14 @@
         <data key="label">5</data>
         <data key="value">5</data>
     </entity>
+    <entity name="CustomerAccountShareWebsiteConfigData">
+        <data key="path">customer/account_share/scope</data>
+        <data key="label">Per Website</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="CustomerAccountShareGlobalConfigData">
+        <data key="path">customer/account_share/scope</data>
+        <data key="label">Global</data>
+        <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
index 96233a8978603..b9227505871cf 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -300,6 +300,24 @@
         <requiredEntity type="address">US_Address_TX</requiredEntity>
         <requiredEntity type="address">US_Address_NY_Not_Default_Address</requiredEntity>
     </entity>
+    <entity name="Simple_Customer_With_Password_Length_Is_Below_Eight_Characters" type="customer">
+        <data key="group_id">1</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">123123</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+    </entity>
+    <entity name="Simple_Customer_With_Not_Secure_Password" type="customer">
+        <data key="group_id">1</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">123123qa</data>
+    </entity>
     <entity name="Simple_US_Customer_Incorrect_Email" type="customer">
         <data key="group_id">0</data>
         <data key="default_billing">true</data>
@@ -323,4 +341,17 @@
         <data key="store_id">0</data>
         <data key="website_id">0</data>
     </entity>
+    <entity name="Simple_US_Customer_ArmedForcesEurope" 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_AE</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
index 28305d37cf77b..68e4090d64910 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerGroupData.xml
@@ -30,7 +30,7 @@
         </array>
     </entity>
     <entity name="CustomCustomerGroup" type="customerGroup">
-        <data key="code" unique="suffix">Group </data>
+        <data key="code" unique="suffix">Group-</data>
         <data key="tax_class_id">3</data>
         <data key="tax_class_name">Retail Customer</data>
     </entity>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/GenderData.xml b/app/code/Magento/Customer/Test/Mftf/Data/GenderData.xml
new file mode 100644
index 0000000000000..68dee0ffa31d0
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Data/GenderData.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="Gender" type="gender">
+        <data key="empty"/>
+        <data key="male">Male</data>
+        <data key="female">Female</data>
+        <data key="not_specified">Not Specified</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
index 280bae7de411a..0a956f16767be 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/RegionData.xml
@@ -32,4 +32,9 @@
         <data key="region_code">UT</data>
         <data key="region_id">58</data>
     </entity>
+    <entity name="RegionAE" type="region">
+        <data key="region">Armed Forces Europe</data>
+        <data key="region_code">AFE</data>
+        <data key="region_id">9</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerPage.xml
index 114c737e361ed..d77dc15840e4c 100644
--- a/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerPage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerPage.xml
@@ -13,5 +13,6 @@
         <section name="AdminCustomerMessagesSection"/>
         <section name="AdminCustomerGridSection"/>
         <section name="AdminCustomerFiltersSection"/>
+        <section name="AdminCustomerGridInlineEditorSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
index 4b36486f0bd17..2c9e66c15bbab 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
@@ -17,6 +17,7 @@
         <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="disableAutomaticGroupChange" type="input" selector="input[name='customer[disable_auto_group_change]']"/>
         <element name="group" type="select" selector="[name='customer[group_id]']"/>
         <element name="groupIdValue" type="text" selector="//*[@name='customer[group_id]']/option"/>
         <element name="groupValue" type="button" selector="//span[text()='{{groupValue}}']" parameterized="true"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml
index e743c4af66d9f..3ecbf5ff450c8 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml
@@ -17,5 +17,6 @@
         <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']" timeout="30"/>
         <element name="headerRow" type="text" selector=".admin__data-grid-header-row.row.row-gutter"/>
+        <element name="clearFilter" type="button" selector=".admin__data-grid-header .admin__data-grid-filters-current button.action-clear" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerCreateNewOrderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerCreateNewOrderSection.xml
index a01687990999e..6b0cafe8dc00b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerCreateNewOrderSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerCreateNewOrderSection.xml
@@ -12,7 +12,7 @@
         <element name="updateChangesBtn" type="button" selector=".order-sidebar .actions .action-default.scalable" timeout="30"/>
         <element name="productName" type="text" selector="#order-items_grid  span[id*=order_item]"/>
         <element name="productPrice" type="text" selector=".even td[class=col-price] span[class=price]"/>
-        <element name="productQty" type="input" selector="td[class=col-qty] input"/>
+        <element name="productQty" type="input" selector="td[class=col-qty] .input-text.item-qty.admin__control-text"/>
         <element name="gridCell" type="text" selector="//div[contains(@id, 'order-items_grid')]//tbody[{{row}}]//td[count(//table[contains(@class, 'order-tables')]//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridInlineEditorSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridInlineEditorSection.xml
new file mode 100644
index 0000000000000..d010844cfffcf
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridInlineEditorSection.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="AdminCustomerGridInlineEditorSection">
+        <element name="customerGenderEditor" type="select" selector="tr.data-grid-editable-row:not([style*='display: none']) [name='gender']"/>
+        <element name="saveInGrid" type="button" selector="tr.data-grid-editable-row-actions button.action-primary" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
index 91363c614c1f8..9562a902b26da 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
@@ -16,5 +16,7 @@
         <element name="customerCheckboxByEmail" type="checkbox" selector="//tr[@class='data-row' and //div[text()='{{customerEmail}}']]//input[@type='checkbox']" parameterized="true" timeout="30"/>
         <element name="customerEditLinkByEmail" type="text" selector="//tr[@class='data-row' and //div[text()='{{customerEmail}}']]//a[@class='action-menu-item']" parameterized="true" timeout="30"/>
         <element name="customerGroupByEmail" type="text" selector="//tr[@class='data-row' and //div[text()='{{customerEmail}}']]//div[text()='{{customerGroup}}']" parameterized="true"/>
+        <element name="customerGenderByEmail" type="text" selector="//tr[@class='data-row']//div[text()='{{customerEmail}}']/ancestor::tr/td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Gender')]/preceding-sibling::th) +1]" parameterized="true"/>
     </section>
 </sections>
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerNewsletterSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerNewsletterSection.xml
index 51b4b54c5c8b6..e6bdf2819e2a5 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerNewsletterSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerNewsletterSection.xml
@@ -9,6 +9,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEditCustomerNewsletterSection">
-        <element name="subscribedToNewsletter" type="checkbox" selector="//div[@class='admin__field-control control']/input[@name='subscription']"/>
+        <element name="subscribedStatus" type="checkbox" selector="//div[@class='admin__field-control control']//input[@name='subscription_status[{{websiteId}}]']" parameterized="true"/>
+        <element name="subscribedStore" type="select" selector="//div[@class='admin__field-control control']//select[@name='subscription_store[{{websiteId}}]']" parameterized="true"/>
+        <element name="subscribedLastUpdatedDate" type="text" selector="//div[@class='admin__field-control control']//div[@class='field-change_status_date_{{websiteId}}']//div[@class='control-value']" parameterized="true"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
index ba1f10a480745..9fc26a03b04ee 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
@@ -17,6 +17,7 @@
         <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"/>
+        <element name="passwordErrorMessages" type="text" selector="#password-error"/>
     </section>
     <section name="StoreFrontCustomerAdvancedAttributesSection">
         <element name="textFieldAttribute" type="input" selector="//input[@id='{{var}}']" parameterized="true" />
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeCustomerGenderInCustomersGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeCustomerGenderInCustomersGridTest.xml
new file mode 100644
index 0000000000000..7ca9a6993f2fc
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeCustomerGenderInCustomersGridTest.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="AdminChangeCustomerGenderInCustomersGridTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Update Customer"/>
+            <title value="Gender attribute blank value is saved in direct edits from customer grid"/>
+            <description value="Check that gender attribute blank value can be saved on customers grid"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-22025"/>
+            <useCaseId value="MC-17259"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <!-- Reset customer grid filter -->
+            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersGridPage"/>
+            <waitForPageLoad stepKey="waitForCustomersGrid"/>
+            <actionGroup ref="AdminResetFilterInCustomerGrid" stepKey="resetFilter"/>
+
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Open customers grid page, filter by created customer-->
+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCustomerGridByEmail">
+            <argument name="email" value="$createCustomer.email$"/>
+        </actionGroup>
+        <!-- Check customer is in grid-->
+        <actionGroup ref="AdminAssertCustomerInCustomersGrid" stepKey="assertCustomerInCustomersGrid">
+            <argument name="text" value="$createCustomer.email$"/>
+            <argument name="row" value="1"/>
+        </actionGroup>
+        <!--Check customer Gender value in grid-->
+        <actionGroup ref="AssertAdminCustomerGenderInCustomersGridActionGroup" stepKey="assertCustomerGenderInCustomersGrid">
+            <argument name="customerEmail" value="$createCustomer.email$"/>
+        </actionGroup>
+        <!--Update customer Gender to Male-->
+        <actionGroup ref="AdminUpdateCustomerGenderInCustomersGridActionGroup" stepKey="updateCustomerGenderWithMaleValueInCustomersGrid">
+            <argument name="customerEmail" value="$createCustomer.email$"/>
+            <argument name="genderValue" value="{{Gender.male}}"/>
+        </actionGroup>
+        <!--Check customer Gender value in grid-->
+        <actionGroup ref="AssertAdminCustomerGenderInCustomersGridActionGroup" stepKey="assertCustomerGenderMaleInCustomersGrid">
+            <argument name="customerEmail" value="$createCustomer.email$"/>
+            <argument name="expectedGenderValue" value="{{Gender.male}}"/>
+        </actionGroup>
+        <!--Open customer edit page and check Gender value-->
+        <actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPageWithMaleGender">
+            <argument name="customerId" value="$createCustomer.id$"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminCustomerGenderOnCustomerFormActionGroup" stepKey="assertCustomerGenderValueIsMaleOnCustomerForm">
+            <argument name="customerGender" value="{{Gender.male}}"/>
+        </actionGroup>
+        <!--Filter customers grid by email-->
+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCustomerByEmailToUpdateWithEmptyGender">
+            <argument name="email" value="$createCustomer.email$"/>
+        </actionGroup>
+        <!--Update customer Gender to empty value-->
+        <actionGroup ref="AdminUpdateCustomerGenderInCustomersGridActionGroup" stepKey="updateCustomerGenderWithEmptyValueInCustomersGrid">
+            <argument name="customerEmail" value="$createCustomer.email$"/>
+        </actionGroup>
+        <!--Check customer Gender value in grid-->
+        <actionGroup ref="AssertAdminCustomerGenderInCustomersGridActionGroup" stepKey="assertCustomerGenderEmptyInCustomersGrid">
+            <argument name="customerEmail" value="$createCustomer.email$"/>
+        </actionGroup>
+        <!--Open customer edit page and check Gender value-->
+        <actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPageWithEmptyGender">
+            <argument name="customerId" value="$createCustomer.id$"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminCustomerGenderOnCustomerFormActionGroup" stepKey="assertCustomerGenderValueIsEmptyOnCustomerForm"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDefaultValueDisableAutoGroupChangeIsNoTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDefaultValueDisableAutoGroupChangeIsNoTest.xml
new file mode 100644
index 0000000000000..be96765920bf5
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDefaultValueDisableAutoGroupChangeIsNoTest.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="AdminCheckDefaultValueDisableAutoGroupChangeIsNoTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Default Value for Disable Automatic Group Changes Based on VAT ID"/>
+            <title value="Check settings Default Value for Disable Automatic Group Changes Based on VAT ID is No"/>
+            <description value="Check settings Default Value for Disable Automatic Group Changes Based on VAT ID is No"/>
+            <severity value="MAJOR"/>
+            <group value="customer"/>
+            <group value="create"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set customer/create_account/viv_disable_auto_group_assign_default 0" stepKey="setConfigDefaultIsNo"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="adminLogout"/>
+        </after>
+
+        <actionGroup ref="AdminNavigateNewCustomerActionGroup" stepKey="navigateToNewCustomer"/>
+
+        <actionGroup ref="AdminAssertDefaultValueDisableAutoGroupInCustomerFormActionGroup" stepKey="seeDefaultValueInForm">
+            <argument name="isChecked" value="0"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDefaultValueDisableAutoGroupChangeIsYesTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDefaultValueDisableAutoGroupChangeIsYesTest.xml
new file mode 100644
index 0000000000000..87cba0c10dbc1
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDefaultValueDisableAutoGroupChangeIsYesTest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCheckDefaultValueDisableAutoGroupChangeIsYesTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Default Value for Disable Automatic Group Changes Based on VAT ID"/>
+            <title value="Check settings Default Value for Disable Automatic Group Changes Based on VAT ID is Yes"/>
+            <description value="Check settings Default Value for Disable Automatic Group Changes Based on VAT ID is Yes"/>
+            <severity value="MAJOR"/>
+            <group value="customer"/>
+            <group value="create"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set customer/create_account/viv_disable_auto_group_assign_default 1" stepKey="setConfigDefaultIsYes"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set customer/create_account/viv_disable_auto_group_assign_default 0" stepKey="setConfigDefaultIsNo"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="logout" stepKey="adminLogout"/>
+        </after>
+
+        <actionGroup ref="AdminNavigateNewCustomerActionGroup" stepKey="navigateToNewCustomer"/>
+
+        <actionGroup ref="AdminAssertDefaultValueDisableAutoGroupInCustomerFormActionGroup" stepKey="seeDefaultValueInForm">
+            <argument name="isChecked" value="1"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml
index cbc8b89d3f242..d2435a093046a 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml
@@ -34,7 +34,7 @@
         <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton"/>
         <waitForPageLoad stepKey="waitForCustomerEditPageToLoad"/>
 
-        <!--Add the Address -->
+        <!-- Add the Address -->
         <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="selectAddress"/>
         <waitForPageLoad stepKey="waitForAddressPageToLoad"/>
         <click selector="{{AdminEditCustomerAddressesSection.addNewAddress}}" stepKey="ClickOnAddNewAddressButton"/>
@@ -44,6 +44,7 @@
         <fillField selector="{{AdminEditCustomerAddressesSection.city}}" userInput="{{PolandAddress.city}}" stepKey="fillCity"/>
         <scrollTo selector="{{AdminEditCustomerAddressesSection.phone}}" x="0" y="-80" stepKey="scrollToPhone"/>
         <selectOption selector="{{AdminEditCustomerAddressesSection.country}}" userInput="{{PolandAddress.country}}" stepKey="fillCountry"/>
+        <selectOption selector="{{AdminEditCustomerAddressesSection.state}}" userInput="{{PolandAddress.state}}" stepKey="fillState"/>
         <fillField selector="{{AdminEditCustomerAddressesSection.zipCode}}" userInput="{{PolandAddress.postcode}}" stepKey="fillPostCode"/>
         <fillField selector="{{AdminEditCustomerAddressesSection.phone}}" userInput="{{PolandAddress.telephone}}" stepKey="fillPhoneNumber"/>
         <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
@@ -60,6 +61,7 @@
         <see userInput="$$createCustomer.firstname$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertFirstName"/>
         <see userInput="$$createCustomer.lastname$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertLastName"/>
         <see userInput="$$createCustomer.email$$" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
+        <see userInput="{{PolandAddress.state}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertState"/>
         <see userInput="{{PolandAddress.country}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertCountry"/>
         <see userInput="{{PolandAddress.postcode}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPostCode"/>
         <see userInput="{{PolandAddress.telephone}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPhoneNumber"/>
@@ -86,6 +88,7 @@
         <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.street}}" stepKey="seeStreetAddress"/>
         <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.city}}" stepKey="seeCity"/>
         <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.country}}" stepKey="seeCountry"/>
+        <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.state}}" stepKey="seeState"/>
         <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.postcode}}" stepKey="seePostCode"/>
         <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{PolandAddress.telephone}}" stepKey="seePhoneNumber"/>
     </test>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml
index 43f2aa7f8de95..a487571c43534 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml
@@ -85,6 +85,7 @@
         <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{US_Address_CA.telephone}}" stepKey="seePhoneNumberInDefaultAddressSection"/>
 
         <!--Assert Customer Address Grid -->
+        <conditionalClick selector="{{AdminCustomerAddressesGridActionsSection.clearFilter}}" dependentSelector="{{AdminCustomerAddressesGridActionsSection.clearFilter}}" visible="true" stepKey="clearAddressesGridFilter"/>
         <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.street}}" stepKey="seeStreetAddress"/>
         <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.city}}" stepKey="seeCity"/>
         <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.country}}" stepKey="seeCountry"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml
index 22ad60ff5de34..5d09f819bcbc0 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml
@@ -49,6 +49,6 @@
         <waitForPageLoad stepKey="waitForEditLinkLoad"/>
         <click selector="{{AdminEditCustomerInformationSection.newsLetter}}" stepKey="clickNewsLetter"/>
         <waitForPageLoad stepKey="waitForNewsletterTabToOpen"/>
-        <seeCheckboxIsChecked selector="{{AdminEditCustomerNewsletterSection.subscribedToNewsletter}}" stepKey="seeAssertSubscribedToNewsletterCheckboxIsChecked"/>
+        <seeCheckboxIsChecked selector="{{AdminEditCustomerNewsletterSection.subscribedStatus('1')}}" stepKey="seeAssertSubscribedToNewsletterCheckboxIsChecked"/>
     </test>
 </tests>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomerSubscribeNewsletterPerWebsiteTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomerSubscribeNewsletterPerWebsiteTest.xml
new file mode 100644
index 0000000000000..6c1a27c395917
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomerSubscribeNewsletterPerWebsiteTest.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="AdminCustomerSubscribeNewsletterPerWebsiteTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Customer Subscriptions"/>
+            <title value="Newsletter subscriptions per website"/>
+            <description value="Admin should be able to subscribe customer to newsletters on each website separately"/>
+            <testCaseId value="MC-22173"/>
+            <severity value="MAJOR"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <createData entity="CustomerAccountSharingGlobal" stepKey="setConfigCustomerAccountToGlobal"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
+                <argument name="customStore" value="NewStoreViewData"/>
+            </actionGroup>
+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="{{secondCustomWebsite.name}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <createData entity="CustomerAccountSharingDefault" stepKey="setConfigCustomerAccountDefault"/>
+        </after>
+
+        <!-- Create a new Store View -->
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
+            <argument name="customStore" value="NewStoreViewData"/>
+        </actionGroup>
+        <!-- Switch to the new Store View on storefront -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnHomePage"/>
+        <waitForPageLoad stepKey="waitForNavigateHomePage"/>
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchToCustomStoreView">
+            <argument name="storeView" value="NewStoreViewData"/>
+        </actionGroup>
+        <!-- Create a new customer and sign up newsletter on the new Store View -->
+        <actionGroup ref="StorefrontCreateCustomerSignedUpNewsletterActionGroup" stepKey="createCustomer">
+            <argument name="customer" value="CustomerEntityOne" />
+        </actionGroup>
+        <!-- Go to the customer edit page on admin area -->
+        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCustomerGrid">
+            <argument name="email" value="{{CustomerEntityOne.email}}"/>
+        </actionGroup>
+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickToEditCustomerPage"/>
+        <waitForPageLoad stepKey="waitForOpenCustomerPage"/>
+        <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabCustomerId"/>
+        <!-- Assert that created customer is subscribed to newsletter on the new Store View -->
+        <actionGroup ref="AdminAssertCustomerIsSubscribedToNewslettersAndSelectedStoreView" stepKey="assertSubscribedToNewsletter">
+            <argument name="storeView" value="NewStoreViewData"/>
+        </actionGroup>
+        <!-- Create second website -->
+        <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createSecondWebsite">
+            <argument name="newWebsiteName" value="{{secondCustomWebsite.name}}"/>
+            <argument name="websiteCode" value="{{secondCustomWebsite.code}}"/>
+        </actionGroup>
+        <!-- Create second store -->
+        <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createSecondStoreGroup">
+            <argument name="website" value="{{secondCustomWebsite.name}}"/>
+            <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
+            <argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
+        </actionGroup>
+        <!-- Create second store view -->
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
+            <argument name="StoreGroup" value="SecondStoreGroupUnique"/>
+            <argument name="customStore" value="SecondStoreUnique"/>
+        </actionGroup>
+        <!-- Grab second website id into $grabFromCurrentUrlGetSecondWebsiteId -->
+        <actionGroup ref="AdminGetWebsiteIdActionGroup" stepKey="getSecondWebsiteId">
+            <argument name="website" value="secondCustomWebsite"/>
+        </actionGroup>
+        <!-- Go to the customer edit page on admin area -->
+        <actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
+            <argument name="customerId" value="$grabCustomerId"/>
+        </actionGroup>
+        <!-- Assert that customer still subscribed to newsletter on default website -->
+        <actionGroup ref="AdminAssertCustomerIsSubscribedToNewsletters" stepKey="assertStillSubscribedToNewsletter"/>
+        <!-- Subscribe to newsletters customer on the second website -->
+        <actionGroup ref="AdminSubscribeCustomerToNewslettersAndSelectStoreView" stepKey="subscribeToNewsletterSecondWebsite">
+            <argument name="websiteId" value="$grabFromCurrentUrlGetSecondWebsiteId"/>
+            <argument name="storeView" value="SecondStoreUnique"/>
+        </actionGroup>
+        <!-- Assert that created customer is subscribed to newsletter on second website -->
+        <actionGroup ref="AdminAssertCustomerIsSubscribedToNewslettersAndSelectedStoreView" stepKey="assertSubscribedToNewsletterSecondWebsite">
+            <argument name="websiteId" value="$grabFromCurrentUrlGetSecondWebsiteId"/>
+            <argument name="storeView" value="SecondStoreUnique"/>
+        </actionGroup>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminProductBackRedirectNavigateFromCustomerViewCartProduct.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminProductBackRedirectNavigateFromCustomerViewCartProduct.xml
index 9de2339f2e217..b5db354d54371 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminProductBackRedirectNavigateFromCustomerViewCartProduct.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminProductBackRedirectNavigateFromCustomerViewCartProduct.xml
@@ -11,6 +11,7 @@
     <test name="AdminProductBackRedirectNavigateFromCustomerViewCartProduct">
         <annotations>
             <features value="Customer"/>
+            <stories value="Product Back Button"/>
             <title value="Product back redirect navigate from customer view cart product"/>
             <description value="Back button on product page is redirecting to customer page if opened form shopping cart"/>
             <severity value="MINOR"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontClearAllCompareProductsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontClearAllCompareProductsTest.xml
index ada3adbfeb83b..40b05153f1a74 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontClearAllCompareProductsTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontClearAllCompareProductsTest.xml
@@ -20,6 +20,7 @@
         </annotations>
         
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <!-- Create Simple Customer -->
             <createData entity="Simple_US_Customer_CA" stepKey="createSimpleCustomer1"/>
 
@@ -108,6 +109,7 @@
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <!-- Logout -->
             <actionGroup ref="logout" stepKey="logoutOfAdmin1"/>
 
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressBelgiumTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressBelgiumTest.xml
new file mode 100644
index 0000000000000..d36d640c5ad17
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressBelgiumTest.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="StorefrontUpdateCustomerAddressBelgiumTest">
+        <annotations>
+            <stories value="Update Regions list for Belgium country"/>
+            <title value="Update customer address on storefront with Belgium address"/>
+            <description value="Update customer address on storefront with Belgium address and verify you can select a region"/>
+            <testCaseId value="MC-20234"/>
+            <severity value="AVERAGE"/>
+            <group value="customer"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+                <argument name="Customer" value="CustomerEntityOne"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteNewUser">
+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Update customer address Belgium in storefront-->
+        <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddress">
+            <argument name="Address" value="updateCustomerBelgiumAddress"/>
+        </actionGroup>
+        <!--Verify customer address save success message-->
+        <see selector="{{AdminCustomerMessagesSection.successMessage}}" userInput="You saved the address." stepKey="seeAssertCustomerAddressSuccessSaveMessage"/>
+
+        <!--Verify customer default billing address-->
+        <actionGroup ref="VerifyCustomerBillingAddressWithState" stepKey="verifyBillingAddress">
+            <argument name="address" value="updateCustomerBelgiumAddress"/>
+        </actionGroup>
+
+        <!--Verify customer default shipping address-->
+        <actionGroup ref="VerifyCustomerShippingAddressWithState" stepKey="verifyShippingAddress">
+            <argument name="address" value="updateCustomerBelgiumAddress"/>
+        </actionGroup>
+
+        <!-- Verify country Belgium can be saved without state as state not required -->
+        <actionGroup ref="StoreFrontClickEditDefaultShippingAddressActionGroup" stepKey="clickOnDefaultShippingAddress"/>
+        <selectOption selector="{{StorefrontCustomerAddressFormSection.country}}" userInput="Belgium" stepKey="selectCountry"/>
+        <selectOption selector="{{StorefrontCustomerAddressFormSection.state}}" userInput="Please select a region, state or province." stepKey="selectState"/>
+        <actionGroup ref="AdminSaveCustomerAddressActionGroup" stepKey="saveAddress"/>
+        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="Belgium" stepKey="seeAssertCustomerDefaultShippingAddressCountry"/>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressChinaTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressChinaTest.xml
new file mode 100644
index 0000000000000..285de8d777b48
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressChinaTest.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="StorefrontUpdateCustomerAddressChinaTest">
+        <annotations>
+            <stories value="Update Regions list for China country"/>
+            <title value="Update customer address on storefront with china address"/>
+            <description value="Update customer address on storefront with china address and verify you can select a region"/>
+            <testCaseId value="MC-20234"/>
+            <severity value="AVERAGE"/>
+            <group value="customer"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="SignUpNewUserFromStorefrontActionGroup" stepKey="SignUpNewUser">
+                <argument name="Customer" value="CustomerEntityOne"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteNewUser">
+                <argument name="email" value="{{CustomerEntityOne.email}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Update customer address in storefront-->
+        <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddress">
+            <argument name="Address" value="updateCustomerChinaAddress"/>
+        </actionGroup>
+        <!--Verify customer address save success message-->
+        <see selector="{{AdminCustomerMessagesSection.successMessage}}" userInput="You saved the address." stepKey="seeAssertCustomerAddressSuccessSaveMessage"/>
+
+        <!--Verify customer default billing address-->
+        <actionGroup ref="VerifyCustomerBillingAddressWithState" stepKey="verifyBillingAddress">
+            <argument name="address" value="updateCustomerChinaAddress"/>
+        </actionGroup>
+
+        <!--Verify customer default shipping address-->
+        <actionGroup ref="VerifyCustomerShippingAddressWithState" stepKey="verifyShippingAddress">
+            <argument name="address" value="updateCustomerChinaAddress"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php b/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php
new file mode 100644
index 0000000000000..e8c7bd886ab01
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Test\Unit\Block\Account;
+
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Customer\Block\Account\Navigation;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Wishlist\Block\Link as WishListLink;
+use Magento\Customer\Block\Account\Link as CustomerAccountLink;
+
+class NavigationTest extends TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Navigation
+     */
+    private $navigation;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var LayoutInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $layoutMock;
+
+    /**
+     * Setup environment for test
+     */
+    protected function setUp()
+    {
+        $this->contextMock = $this->createMock(Context::class);
+        $this->layoutMock = $this->createMock(LayoutInterface::class);
+        $this->contextMock->expects($this->any())
+            ->method('getLayout')
+            ->willReturn($this->layoutMock);
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->navigation = $this->objectManagerHelper->getObject(
+            Navigation::class,
+            [
+                'context' => $this->contextMock
+            ]
+        );
+    }
+
+    /**
+     * Test get links with block customer account link and wish list link
+     *
+     * @return void
+     */
+    public function testGetLinksWithCustomerAndWishList()
+    {
+        $wishListLinkMock = $this->getMockBuilder(WishListLink::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getSortOrder'])
+            ->getMock();
+
+        $customerAccountLinkMock = $this->getMockBuilder(CustomerAccountLink::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getSortOrder'])
+            ->getMock();
+
+        $wishListLinkMock->expects($this->any())
+            ->method('getSortOrder')
+            ->willReturn(100);
+
+        $customerAccountLinkMock->expects($this->any())
+            ->method('getSortOrder')
+            ->willReturn(20);
+
+        $nameInLayout = 'top.links';
+
+        $blockChildren = [
+            'wishListLink' => $wishListLinkMock,
+            'customerAccountLink' => $customerAccountLinkMock
+        ];
+
+        $this->navigation->setNameInLayout($nameInLayout);
+        $this->layoutMock->expects($this->any())
+            ->method('getChildBlocks')
+            ->with($nameInLayout)
+            ->willReturn($blockChildren);
+
+        /* Assertion */
+        $this->assertEquals(
+            [
+                0 => $wishListLinkMock,
+                1 => $customerAccountLinkMock
+            ],
+            $this->navigation->getLinks()
+        );
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/NewsletterTest.php b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/NewsletterTest.php
index 1c252bfc75a53..d0ea012a11e1e 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/NewsletterTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/NewsletterTest.php
@@ -3,192 +3,322 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Customer\Test\Unit\Block\Adminhtml\Edit\Tab;
 
+use Magento\Backend\Block\Template\Context;
 use Magento\Backend\Model\Session;
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Block\Adminhtml\Edit\Tab\Newsletter;
 use Magento\Customer\Controller\RegistryConstants;
+use Magento\Customer\Model\Config\Share;
+use Magento\Framework\Data\Form;
+use Magento\Framework\Data\Form\Element\Checkbox;
+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\Framework\UrlInterface;
+use Magento\Newsletter\Model\Subscriber;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\System\Store as SystemStore;
+use Magento\Store\Model\Website;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
+ * Test Customer account form block
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class NewsletterTest extends \PHPUnit\Framework\TestCase
+class NewsletterTest extends TestCase
 {
     /**
-     * @var \Magento\Customer\Block\Adminhtml\Edit\Tab\Newsletter
+     * @var Newsletter
+     */
+    private $model;
+
+    /**
+     * @var Context|MockObject
+     */
+    private $contextMock;
+
+    /**
+     * Store manager
+     *
+     * @var StoreManagerInterface|MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var Registry|MockObject
      */
-    protected $model;
+    private $registryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var FormFactory|MockObject
      */
-    protected $contextMock;
+    private $formFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var SubscriberFactory|MockObject
      */
-    protected $registryMock;
+    private $subscriberFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var AccountManagementInterface|MockObject
      */
-    protected $formFactoryMock;
+    private $accountManagementMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var UrlInterface|MockObject
      */
-    protected $subscriberFactoryMock;
+    private $urlBuilderMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var Session|MockObject
      */
-    protected $accountManagementMock;
+    private $backendSessionMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var SystemStore|MockObject
      */
-    protected $urlBuilderMock;
+    private $systemStore;
 
     /**
-     * @var Session|\PHPUnit_Framework_MockObject_MockObject
+     * @var CustomerRepositoryInterface|MockObject
      */
-    protected $backendSessionMock;
+    private $customerRepository;
 
+    /**
+     * @var Share|MockObject
+     */
+    private $shareConfig;
+
+    /**
+     * @inheritdoc
+     */
     public function setUp()
     {
-        $this->contextMock = $this->createMock(\Magento\Backend\Block\Template\Context::class);
-        $this->registryMock = $this->createMock(\Magento\Framework\Registry::class);
-        $this->formFactoryMock = $this->createMock(\Magento\Framework\Data\FormFactory::class);
+        $this->contextMock = $this->createMock(Context::class);
+        $this->registryMock = $this->createMock(Registry::class);
+        $this->formFactoryMock = $this->createMock(FormFactory::class);
         $this->subscriberFactoryMock = $this->createPartialMock(
-            \Magento\Newsletter\Model\SubscriberFactory::class,
+            SubscriberFactory::class,
             ['create']
         );
-        $this->accountManagementMock = $this->createMock(\Magento\Customer\Api\AccountManagementInterface::class);
-        $this->urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class);
-        $this->backendSessionMock = $this->getMockBuilder(\Magento\Backend\Model\Session::class)
+        $this->accountManagementMock = $this->createMock(AccountManagementInterface::class);
+        $this->urlBuilderMock = $this->createMock(UrlInterface::class);
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
+        $this->backendSessionMock = $this->getMockBuilder(Session::class)
             ->setMethods(['getCustomerFormData'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->contextMock->expects($this->once())->method('getUrlBuilder')->willReturn($this->urlBuilderMock);
-        $this->contextMock->expects($this->once())->method('getBackendSession')->willReturn($this->backendSessionMock);
-
-        $this->model = new \Magento\Customer\Block\Adminhtml\Edit\Tab\Newsletter(
-            $this->contextMock,
-            $this->registryMock,
-            $this->formFactoryMock,
-            $this->subscriberFactoryMock,
-            $this->accountManagementMock
+        $this->contextMock->expects($this->once())
+            ->method('getUrlBuilder')
+            ->willReturn($this->urlBuilderMock);
+        $this->contextMock->expects($this->once())
+            ->method('getBackendSession')
+            ->willReturn($this->backendSessionMock);
+        $this->contextMock->method('getStoreManager')
+            ->willReturn($this->storeManager);
+        $this->systemStore = $this->createMock(SystemStore::class);
+        $this->customerRepository = $this->createMock(CustomerRepositoryInterface::class);
+        $this->shareConfig = $this->createMock(Share::class);
+
+        $objectManager = new ObjectManager($this);
+        $this->model = $objectManager->getObject(
+            Newsletter::class,
+            [
+                'context' => $this->contextMock,
+                'registry' => $this->registryMock,
+                'formFactory' => $this->formFactoryMock,
+                'subscriberFactory' => $this->subscriberFactoryMock,
+                'customerAccountManagement' => $this->accountManagementMock,
+                'systemStore' => $this->systemStore,
+                'customerRepository' => $this->customerRepository,
+                'shareConfig' => $this->shareConfig,
+            ]
         );
     }
 
+    /**
+     * Test to initialize the form without current customer
+     */
     public function testInitFormCanNotShowTab()
     {
-        $this->registryMock->expects($this->once())->method('registry')->with(RegistryConstants::CURRENT_CUSTOMER_ID)
+        $this->registryMock->expects($this->once())
+            ->method('registry')
+            ->with(RegistryConstants::CURRENT_CUSTOMER_ID)
             ->willReturn(false);
+
         $this->assertSame($this->model, $this->model->initForm());
     }
 
+    /**
+     * Test to initialize the form
+     */
     public function testInitForm()
     {
         $customerId = 1;
+        $websiteId = 1;
+        $storeId = 2;
+        $websiteName = 'Website Name';
+        $isSubscribed = true;
 
-        $subscriberMock = $this->createMock(\Magento\Newsletter\Model\Subscriber::class);
-        $fieldsetMock = $this->createMock(\Magento\Framework\Data\Form\Element\Fieldset::class);
-        $elementMock = $this->createPartialMock(\Magento\Framework\Data\Form\Element\Checkbox::class, ['setIsChecked']);
-        $formMock = $this->createPartialMock(
-            \Magento\Framework\Data\Form::class,
-            ['setHtmlIdPrefix', 'addFieldset', 'setValues', 'getElement', 'setForm', 'setParent', 'setBaseUrl']
-        );
-        $this->registryMock->expects($this->exactly(3))
-            ->method('registry')
-            ->willReturnMap(
-                [
-                    [RegistryConstants::CURRENT_CUSTOMER_ID, $customerId],
-                    ['subscriber', $subscriberMock],
-                ]
-            );
-        $this->formFactoryMock->expects($this->once())->method('create')->willReturn($formMock);
-        $formMock->expects($this->once())->method('setHtmlIdPrefix')->with('_newsletter');
+        $this->registryMock->method('registry')->with(RegistryConstants::CURRENT_CUSTOMER_ID)
+            ->willReturn($customerId);
+
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->method('getWebsiteId')->willReturn($websiteId);
+        $customer->method('getStoreId')->willReturn($storeId);
+        $customer->method('getId')->willReturn($customerId);
+        $this->customerRepository->method('getById')->with($customerId)->willReturn($customer);
+        $subscriberMock = $this->createMock(Subscriber::class);
+        $subscriberMock->method('loadByCustomer')->with($customerId, $websiteId)->willReturnSelf();
+        $subscriberMock->method('isSubscribed')->willReturn($isSubscribed);
+        $subscriberMock->method('getData')->willReturn([]);
         $this->subscriberFactoryMock->expects($this->once())->method('create')->willReturn($subscriberMock);
-        $subscriberMock->expects($this->once())->method('loadByCustomerId')->with($customerId)->willReturnSelf();
-        $this->registryMock->expects($this->once())->method('register')->with('subscriber', $subscriberMock);
-        $formMock->expects($this->once())->method('addFieldset')->willReturn($fieldsetMock);
-        $fieldsetMock->expects($this->once())->method('addField')->willReturn($elementMock);
-        $this->accountManagementMock->expects($this->once())->method('isReadOnly')->with($customerId)
-            ->willReturn(false);
-        $subscriberMock->expects($this->once())->method('isSubscribed')->willReturn(true);
-        $this->urlBuilderMock->expects($this->once())->method('getBaseUrl')->willReturn('domain.com');
 
-        $this->backendSessionMock->expects($this->once())->method('getCustomerFormData')->willReturn(null);
+        $website = $this->createMock(Website::class);
+        $website->method('getStoresCount')->willReturn(1);
+        $website->method('getId')->willReturn($websiteId);
+        $store = $this->createMock(Store::class);
+        $store->method('getWebsiteId')->willReturn($websiteId);
+        $this->storeManager->method('getStore')->with($storeId)->willReturn($store);
+        $this->storeManager->method('getWebsites')->willReturn([$website]);
+        $this->storeManager->method('isSingleStoreMode')->willReturn(true);
+        $this->systemStore->method('getStoreOptionsTree')->willReturn([]);
+        $this->systemStore->method('getWebsiteName')->with($websiteId)->willReturn($websiteName);
 
-        $formMock->expects($this->once())
-            ->method('getElement')
-            ->willReturnMap(
+        $statusElementMock = $this->createMock(Checkbox::class);
+        $statusElementMock->expects($this->once())
+            ->method('setIsChecked')
+            ->with($isSubscribed);
+        $fieldsetMock = $this->createMock(Fieldset::class);
+        $fieldsetMock->expects($this->once())
+            ->method('addField')
+            ->with(
+                'subscription_status_' . $websiteId,
+                'checkbox',
                 [
-                    ['subscription', $elementMock],
+                    'label' => __('Subscribed to Newsletter'),
+                    'name' => "subscription_status[$websiteId]",
+                    'data-form-part' => null,
+                    'value' => $isSubscribed,
+                    'onchange' => 'this.value = this.checked;'
                 ]
-            );
-
-        $elementMock->expects($this->once())
-            ->method('setIsChecked')
-            ->with(true);
+            )
+            ->willReturn($statusElementMock);
+        $fieldsetMock->expects($this->once())->method('setReadonly')->with(true, true);
+        $formMock = $this->createPartialMock(
+            Form::class,
+            ['setHtmlIdPrefix', 'addFieldset', 'setValues', 'getElement', 'setForm', 'setParent', 'setBaseUrl']
+        );
+        $formMock->expects($this->once())->method('setHtmlIdPrefix')->with('_newsletter');
+        $formMock->expects($this->once())->method('addFieldset')->willReturn($fieldsetMock);
+        $this->formFactoryMock->expects($this->once())->method('create')->willReturn($formMock);
+        $this->accountManagementMock->expects($this->once())
+            ->method('isReadOnly')
+            ->with($customerId)
+            ->willReturn(true);
+        $this->backendSessionMock->expects($this->once())
+            ->method('getCustomerFormData')
+            ->willReturn(null);
 
         $this->assertSame($this->model, $this->model->initForm());
     }
 
+    /**
+     * Test to initialize the form with session form data
+     */
     public function testInitFormWithCustomerFormData()
     {
         $customerId = 1;
+        $websiteId = 1;
+        $storeId = 2;
+        $websiteName = 'Website Name';
+        $isSubscribed = true;
+        $isSubscribedCustomerSession = false;
 
-        $subscriberMock = $this->createMock(\Magento\Newsletter\Model\Subscriber::class);
-        $fieldsetMock = $this->createMock(\Magento\Framework\Data\Form\Element\Fieldset::class);
-        $elementMock = $this->createPartialMock(\Magento\Framework\Data\Form\Element\Checkbox::class, ['setIsChecked']);
+        $this->registryMock->method('registry')->with(RegistryConstants::CURRENT_CUSTOMER_ID)
+            ->willReturn($customerId);
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->method('getWebsiteId')->willReturn($websiteId);
+        $customer->method('getStoreId')->willReturn($storeId);
+        $customer->method('getId')->willReturn($customerId);
+        $this->customerRepository->method('getById')->with($customerId)->willReturn($customer);
+        $subscriberMock = $this->createMock(Subscriber::class);
+        $subscriberMock->method('loadByCustomer')->with($customerId, $websiteId)->willReturnSelf();
+        $subscriberMock->method('isSubscribed')->willReturn($isSubscribed);
+        $subscriberMock->method('getData')->willReturn([]);
+        $this->subscriberFactoryMock->expects($this->once())->method('create')->willReturn($subscriberMock);
+        $website = $this->createMock(Website::class);
+        $website->method('getStoresCount')->willReturn(1);
+        $website->method('getId')->willReturn($websiteId);
+        $store = $this->createMock(Store::class);
+        $store->method('getWebsiteId')->willReturn($websiteId);
+        $this->storeManager->method('getStore')->with($storeId)->willReturn($store);
+        $this->storeManager->method('getWebsites')->willReturn([$website]);
+        $this->storeManager->method('isSingleStoreMode')->willReturn(true);
+        $this->systemStore->method('getStoreOptionsTree')->willReturn([]);
+        $this->systemStore->method('getWebsiteName')->with($websiteId)->willReturn($websiteName);
+        $statusElementMock = $this->createMock(Checkbox::class);
+        $statusElementMock->expects($this->once())
+            ->method('setIsChecked')
+            ->with($isSubscribed);
+        $fieldsetMock = $this->createMock(Fieldset::class);
+        $fieldsetMock->expects($this->once())
+            ->method('addField')
+            ->with(
+                'subscription_status_' . $websiteId,
+                'checkbox',
+                [
+                    'label' => __('Subscribed to Newsletter'),
+                    'name' => "subscription_status[$websiteId]",
+                    'data-form-part' => null,
+                    'value' => $isSubscribed,
+                    'onchange' => 'this.value = this.checked;'
+                ]
+            )
+            ->willReturn($statusElementMock);
+        $fieldsetMock->expects($this->once())->method('setReadonly')->with(true, true);
+        $statusElementForm = $this->createPartialMock(Checkbox::class, ['setChecked', 'setValue']);
+        $statusElementForm->method('setValue')
+            ->with($isSubscribedCustomerSession);
+        $statusElementForm->method('setChecked')
+            ->with($isSubscribedCustomerSession);
+        $storeElementForm = $this->createPartialMock(Select::class, ['setValue']);
+        $storeElementForm->method('setValue')
+            ->with(Store::DEFAULT_STORE_ID);
         $formMock = $this->createPartialMock(
-            \Magento\Framework\Data\Form::class,
+            Form::class,
             ['setHtmlIdPrefix', 'addFieldset', 'setValues', 'getElement', 'setForm', 'setParent', 'setBaseUrl']
         );
-        $this->registryMock->expects($this->exactly(3))
-            ->method('registry')
+        $formMock->expects($this->once())->method('setHtmlIdPrefix')->with('_newsletter');
+        $formMock->expects($this->once())->method('addFieldset')->willReturn($fieldsetMock);
+        $formMock->method('getElement')
             ->willReturnMap(
                 [
-                    [RegistryConstants::CURRENT_CUSTOMER_ID, $customerId],
-                    ['subscriber', $subscriberMock],
+                    ['subscription_status_' . $websiteId, $statusElementForm],
+                    ['subscription_store_' . $websiteId, $storeElementForm],
                 ]
             );
         $this->formFactoryMock->expects($this->once())->method('create')->willReturn($formMock);
-        $formMock->expects($this->once())->method('setHtmlIdPrefix')->with('_newsletter');
-        $this->subscriberFactoryMock->expects($this->once())->method('create')->willReturn($subscriberMock);
-        $subscriberMock->expects($this->once())->method('loadByCustomerId')->with($customerId)->willReturnSelf();
-        $formMock->expects($this->once())->method('addFieldset')->willReturn($fieldsetMock);
-        $fieldsetMock->expects($this->once())->method('addField')->willReturn($elementMock);
-        $this->accountManagementMock->expects($this->once())->method('isReadOnly')->with($customerId)
-            ->willReturn(false);
-        $subscriberMock->expects($this->once())->method('isSubscribed')->willReturn(false);
-        $this->urlBuilderMock->expects($this->once())->method('getBaseUrl')->willReturn('domain.com');
-
+        $this->accountManagementMock->expects($this->once())
+            ->method('isReadOnly')
+            ->with($customerId)
+            ->willReturn(true);
         $this->backendSessionMock->expects($this->once())
             ->method('getCustomerFormData')
-            ->willReturn([
-                'customer' => [
-                    'entity_id' => $customerId,
-                ],
-                'subscription' => true,
-            ]);
-
-        $formMock->expects($this->exactly(2))
-            ->method('getElement')
-            ->willReturnMap(
-                [
-                    ['subscription', $elementMock],
-                ]
-            );
-
-        $elementMock->expects($this->exactly(2))
-            ->method('setIsChecked')
-            ->willReturnMap(
+            ->willReturn(
                 [
-                    [false],
-                    [true],
+                    'customer' => ['entity_id' => $customerId],
+                    'subscription_status' => [$websiteId => $isSubscribedCustomerSession]
                 ]
             );
 
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/From/Element/Newsletter/SubscriptionsTest.php b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/From/Element/Newsletter/SubscriptionsTest.php
new file mode 100644
index 0000000000000..f6d6777654c5b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/From/Element/Newsletter/SubscriptionsTest.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Test\Unit\Block\Adminhtml\From\Element\Newsletter;
+
+use Magento\Customer\Block\Adminhtml\Form\Element\Newsletter\Subscriptions;
+use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\CollectionFactory;
+use Magento\Framework\Data\Form\Element\Factory;
+use Magento\Framework\Escaper;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for Customer Newsletter Subscriptions Element
+ */
+class SubscriptionsTest extends TestCase
+{
+    /**
+     * @var Factory|MockObject
+     */
+    private $factoryElement;
+
+    /**
+     * @var CollectionFactory|MockObject
+     */
+    private $factoryCollection;
+
+    /**
+     * @var Escaper|MockObject
+     */
+    private $escaper;
+
+    /**
+     * @var DataPersistorInterface|MockObject
+     */
+    private $dataPersistor;
+
+    /**
+     * @var Subscriptions
+     */
+    private $element;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp()
+    {
+        $this->factoryElement = $this->createMock(Factory::class);
+        $this->factoryCollection = $this->createMock(CollectionFactory::class);
+        $this->escaper = $this->createMock(Escaper::class);
+        $this->dataPersistor = $this->createMock(DataPersistorInterface::class);
+
+        $objectManager = new ObjectManager($this);
+        $this->element = $objectManager->getObject(
+            Subscriptions::class,
+            [
+                'factoryElement' => $this->factoryElement,
+                'factoryCollection' => $this->factoryCollection,
+                'escaper' => $this->escaper,
+                'dataPersistor' => $this->dataPersistor,
+                'data' => []
+            ]
+        );
+    }
+
+    /**
+     * Test to Get the Html for the element
+     *
+     * @param array $data
+     * @param array $elementsHtml
+     * @param string $expectedHtml
+     * @return void
+     * @dataProvider getElementHtmlDataProvider
+     */
+    public function testGetElementHtml(array $data, array $elementsHtml, string $expectedHtml): void
+    {
+        $this->escaper->method('escapeHtml')->withAnyParameters()->willReturnArgument(0);
+        $selectElementId = $data['name'] . '_store_' . $data['subscriptions'][0]['website_id'];
+        $selectElement = $this->createMock(AbstractElement::class);
+        $selectElement->expects($this->once())->method('setId')->with($selectElementId);
+        $selectElement->expects($this->once())->method('setForm')->willReturnSelf();
+        $selectElement->method('toHtml')->willReturn($elementsHtml['store']);
+        $statusElementId = $data['name'] . '_status_' . $data['subscriptions'][0]['website_id'];
+        $statusElement = $this->createMock(AbstractElement::class);
+        $statusElement->expects($this->once())->method('setId')->with($statusElementId);
+        $statusElement->expects($this->once())->method('setForm')->willReturnSelf();
+        $statusElement->method('toHtml')->willReturn($elementsHtml['status']);
+        $this->factoryElement->method('create')->willReturnMap(
+            [
+                [
+                    'select',
+                    [
+                        'data' => [
+                            'name' => "{$data['name']}_store[{$data['subscriptions'][0]['website_id']}]",
+                            'data-form-part' => $data['target_form'],
+                            'values' => $data['subscriptions'][0]['store_options'],
+                            'value' => $data['subscriptions'][0]['store_id'],
+                            'required' => true,
+                        ]
+                    ],
+                    $selectElement
+                ],
+                [
+                    'checkbox',
+                    [
+                        'data' => [
+                            'name' => "{$data['name']}_status[{$data['subscriptions'][0]['website_id']}]",
+                            'data-form-part' => $data['target_form'],
+                            'value' => $data['subscriptions'][0]['status'],
+                            'onchange' => 'this.value = this.checked;',
+                        ]
+                    ],
+                    $statusElement
+                ]
+            ]
+        );
+        $this->dataPersistor->method('get')->willReturn([]);
+        $this->element->setData($data);
+
+        $this->assertEquals($expectedHtml, $this->element->getElementHtml());
+    }
+
+    /**
+     * Data provider for test to get the html
+     *
+     * @return array
+     */
+    public function getElementHtmlDataProvider(): array
+    {
+        $customerId = 33;
+        $elementName = 'element_name';
+        $targetForm = 'target_form';
+        $websiteId = 1;
+        $websiteName = 'Website 1';
+        $storeId = 2;
+        $status = true;
+        $storeOptions = ['array_of_store_options'];
+        $lastUpdated = 'last updated';
+        $storeElementHtml = 'storeElementHtml';
+        $statusElementHtml = 'statusElementHtml';
+        $outputHtmlTemplate = "<table class=\"admin__table-secondary\">"
+            . "<tr><th>%s</th><th class=\"subscriber-status\">%s</th><th>%s</th><th>%s</th></tr>"
+            . "<tr><td>%s</td><td class=\"subscriber-status\">%s</td><td>%s</td><td>%s</td></tr></table>";
+
+        return [
+            [
+                'data' => [
+                    'customer_id' => $customerId,
+                    'name' => $elementName,
+                    'target_form' => $targetForm,
+                    'subscriptions' => [
+                        [
+                            'store_id' => $storeId,
+                            'website_id' => $websiteId,
+                            'website_name' => $websiteName,
+                            'status' => $status,
+                            'store_options' => $storeOptions,
+                            'last_updated' => $lastUpdated,
+                        ],
+                    ],
+                ],
+                'elementsHtml' => [
+                    'status' => $statusElementHtml,
+                    'store' => $storeElementHtml,
+                ],
+                'expectedHtml' => sprintf(
+                    $outputHtmlTemplate,
+                    'Website',
+                    'Subscribed',
+                    'Store View',
+                    'Last Updated At',
+                    $websiteName,
+                    $statusElementHtml,
+                    $storeElementHtml,
+                    $lastUpdated
+                )
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Form/RegisterTest.php b/app/code/Magento/Customer/Test/Unit/Block/Form/RegisterTest.php
index 3022177ffb9e1..5ec2ad56560d2 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Form/RegisterTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Form/RegisterTest.php
@@ -39,7 +39,7 @@ class RegisterTest extends \PHPUnit\Framework\TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Customer\Model\Session */
     private $_customerSession;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Module\ModuleManagerInterface */
+    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Module\Manager */
     private $_moduleManager;
 
     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Customer\Model\Url */
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 2e8ee7af37cef..1fd7fc340e542 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
@@ -9,13 +9,13 @@
 use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
 use Magento\Customer\Api\Data\ValidationRuleInterface;
+use Magento\Customer\Block\Widget\Dob;
 use Magento\Customer\Helper\Address;
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\Cache\FrontendInterface;
 use Magento\Framework\Data\Form\FilterFactory;
 use Magento\Framework\Escaper;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Customer\Block\Widget\Dob;
 use Magento\Framework\Locale\Resolver;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Stdlib\DateTime\Timezone;
@@ -354,7 +354,15 @@ public function testGetDateFormat(string $locale, string $expectedFormat)
     public function getDateFormatDataProvider(): array
     {
         return [
-            ['ar_SA', 'd/M/y'],
+            [
+                'ar_SA',
+                preg_replace(
+                    '/[^MmDdYy\/\.\-]/',
+                    '',
+                    (new \IntlDateFormatter('ar_SA', \IntlDateFormatter::SHORT, \IntlDateFormatter::NONE))
+                        ->getPattern()
+                )
+            ],
             [Resolver::DEFAULT_LOCALE, self::DATE_FORMAT],
         ];
     }
@@ -536,8 +544,8 @@ 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"}}'));
+            ->with('{"validate-date":{"dateFormat":"M\/d\/Y"},"validate-dob":true}')
+            ->will($this->returnValue('{"validate-date":{"dateFormat":"M\/d\/Y"},"validate-dob":true}'));
 
         $this->attribute->expects($this->once())
             ->method("isRequired")
@@ -545,7 +553,7 @@ public function testGetHtmlExtraParamsWithoutRequiredOption()
 
         $this->assertEquals(
             $this->_block->getHtmlExtraParams(),
-            'data-validate="{"validate-date":{"dateFormat":"M\/d\/Y"}}"'
+            'data-validate="{"validate-date":{"dateFormat":"M\/d\/Y"},"validate-dob":true}"'
         );
     }
 
@@ -559,13 +567,17 @@ public function testGetHtmlExtraParamsWithRequiredOption()
             ->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"}}'));
+            ->with('{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"},"validate-dob":true}')
+            ->will(
+                $this->returnValue(
+                    '{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"},"validate-dob":true}'
+                )
+            );
 
         $this->context->expects($this->any())->method('getEscaper')->will($this->returnValue($this->escaper));
 
         $this->assertEquals(
-            'data-validate="{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"}}"',
+            'data-validate="{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"},"validate-dob":true}"',
             $this->_block->getHtmlExtraParams()
         );
     }
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php
index 28f897adf9176..5565a807b8135 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php
@@ -282,7 +282,7 @@ public function testSuccessMessage($customerId, $key, $vatValidationEnabled, $ad
             ->willReturnSelf();
 
         $this->messageManagerMock->expects($this->any())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with($this->stringContains($successMessage))
             ->willReturnSelf();
 
@@ -402,7 +402,7 @@ public function testSuccessRedirect(
             ->willReturnSelf();
 
         $this->messageManagerMock->expects($this->any())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with($this->stringContains($successMessage))
             ->willReturnSelf();
 
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 f8f47eedba3ef..faf55347dba78 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php
@@ -346,11 +346,13 @@ public function testSuccessMessage(
 
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->willReturnMap([
-                ['password', null, $password],
-                ['password_confirmation', null, $password],
-                ['is_subscribed', false, true],
-            ]);
+            ->willReturnMap(
+                [
+                    ['password', null, $password],
+                    ['password_confirmation', null, $password],
+                    ['is_subscribed', false, true],
+                ]
+            );
 
         $this->customerMock->expects($this->once())
             ->method('setAddresses')
@@ -371,7 +373,7 @@ public function testSuccessMessage(
             ->with($this->equalTo($customerId));
 
         $this->messageManagerMock->expects($this->any())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with($this->stringContains($successMessage))
             ->will($this->returnSelf());
 
@@ -477,11 +479,13 @@ public function testSuccessRedirect(
 
         $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->willReturnMap([
-                ['password', null, $password],
-                ['password_confirmation', null, $password],
-                ['is_subscribed', false, true],
-            ]);
+            ->willReturnMap(
+                [
+                    ['password', null, $password],
+                    ['password_confirmation', null, $password],
+                    ['is_subscribed', false, true],
+                ]
+            );
 
         $this->customerMock->expects($this->once())
             ->method('setAddresses')
@@ -502,16 +506,18 @@ public function testSuccessRedirect(
             ->with($this->equalTo($customerId));
 
         $this->messageManagerMock->expects($this->any())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with($this->stringContains($successMessage))
             ->will($this->returnSelf());
 
         $this->urlMock->expects($this->any())
             ->method('getUrl')
-            ->willReturnMap([
-                ['*/*/index', ['_secure' => true], $successUrl],
-                ['*/*/create', ['_secure' => true], $successUrl],
-            ]);
+            ->willReturnMap(
+                [
+                    ['*/*/index', ['_secure' => true], $successUrl],
+                    ['*/*/create', ['_secure' => true], $successUrl],
+                ]
+            );
         $this->redirectMock->expects($this->once())
             ->method('success')
             ->with($this->equalTo($successUrl))
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 762c76b695dee..05a8b6448af99 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php
@@ -93,13 +93,14 @@ protected function setUp()
 
         $this->session = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
             ->disableOriginalConstructor()
-            ->setMethods([
-                'isLoggedIn',
-                'setCustomerDataAsLoggedIn',
-                'regenerateId',
-                'setUsername',
-            ])
-            ->getMock();
+            ->setMethods(
+                [
+                    'isLoggedIn',
+                    'setCustomerDataAsLoggedIn',
+                    'regenerateId',
+                    'setUsername',
+                ]
+            )->getMock();
 
         $this->accountManagement = $this->getMockBuilder(\Magento\Customer\Api\AccountManagementInterface::class)
             ->getMockForAbstractClass();
@@ -222,7 +223,7 @@ public function testExecuteEmptyLoginData()
             ->willReturn([]);
 
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('A login and a password are required.'))
             ->willReturnSelf();
 
@@ -253,10 +254,12 @@ public function testExecuteSuccessCustomRedirect()
         $this->request->expects($this->once())
             ->method('getPost')
             ->with('login')
-            ->willReturn([
-                'username' => $username,
-                'password' => $password,
-            ]);
+            ->willReturn(
+                [
+                    'username' => $username,
+                    'password' => $password,
+                ]
+            );
 
         $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
             ->getMockForAbstractClass();
@@ -292,9 +295,8 @@ public function testExecuteSuccessCustomRedirect()
             ->method('setCustomerDataAsLoggedIn')
             ->with($customerMock)
             ->willReturnSelf();
-        $this->session->expects($this->once())
-            ->method('regenerateId')
-            ->willReturnSelf();
+        $this->session->expects($this->never())
+            ->method('regenerateId');
 
         $this->accountRedirect->expects($this->never())
             ->method('getRedirect')
@@ -335,10 +337,12 @@ public function testExecuteSuccess()
         $this->request->expects($this->once())
             ->method('getPost')
             ->with('login')
-            ->willReturn([
-                'username' => $username,
-                'password' => $password,
-            ]);
+            ->willReturn(
+                [
+                    'username' => $username,
+                    'password' => $password,
+                ]
+            );
 
         $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
             ->getMockForAbstractClass();
@@ -357,9 +361,8 @@ public function testExecuteSuccess()
             ->method('setCustomerDataAsLoggedIn')
             ->with($customerMock)
             ->willReturnSelf();
-        $this->session->expects($this->once())
-            ->method('regenerateId')
-            ->willReturnSelf();
+        $this->session->expects($this->never())
+            ->method('regenerateId');
 
         $this->accountRedirect->expects($this->once())
             ->method('getRedirect')
@@ -426,10 +429,12 @@ public function testExecuteWithException(
         $this->request->expects($this->once())
             ->method('getPost')
             ->with('login')
-            ->willReturn([
-                'username' => $username,
-                'password' => $password,
-            ]);
+            ->willReturn(
+                [
+                    'username' => $username,
+                    'password' => $password,
+                ]
+            );
 
         $exception = new $exceptionData['exception'](__($exceptionData['message']));
 
@@ -488,11 +493,12 @@ protected function prepareContext()
 
         $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
             ->disableOriginalConstructor()
-            ->setMethods([
-                'isPost',
-                'getPost',
-            ])
-            ->getMock();
+            ->setMethods(
+                [
+                    'isPost',
+                    'getPost',
+                ]
+            )->getMock();
 
         $this->resultRedirect = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
             ->disableOriginalConstructor()
@@ -551,7 +557,7 @@ protected function mockExceptions($exception, $username)
                     $url
                 );
                 $this->messageManager->expects($this->once())
-                    ->method('addError')
+                    ->method('addErrorMessage')
                     ->with($message)
                     ->willReturnSelf();
 
@@ -563,7 +569,7 @@ protected function mockExceptions($exception, $username)
 
             case \Magento\Framework\Exception\AuthenticationException::class:
                 $this->messageManager->expects($this->once())
-                    ->method('addError')
+                    ->method('addErrorMessage')
                     ->with(
                         __(
                             'The account sign-in was incorrect or your account is disabled temporarily. '
@@ -580,7 +586,7 @@ protected function mockExceptions($exception, $username)
 
             case '\Exception':
                 $this->messageManager->expects($this->once())
-                    ->method('addError')
+                    ->method('addErrorMessage')
                     ->with(__('An unspecified error occurred. Please contact us for assistance.'))
                     ->willReturnSelf();
                 break;
@@ -591,7 +597,7 @@ protected function mockExceptions($exception, $username)
                     . 'Please wait and try again later.'
                 );
                 $this->messageManager->expects($this->once())
-                    ->method('addError')
+                    ->method('addErrorMessage')
                     ->with($message)
                     ->willReturnSelf();
                 $this->session->expects($this->once())
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Address/DeleteTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Address/DeleteTest.php
index 4064b8586257d..3af3cc60010bb 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Address/DeleteTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Address/DeleteTest.php
@@ -146,7 +146,7 @@ public function testExecute()
             ->method('deleteById')
             ->with($addressId);
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('You deleted the address.'));
         $this->resultRedirect->expects($this->once())
             ->method('setPath')
@@ -183,7 +183,7 @@ public function testExecuteWithException()
             ->willReturn(34);
         $exception = new \Exception('Exception');
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('We can\'t delete the address right now.'))
             ->willThrowException($exception);
         $this->messageManager->expects($this->once())
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php
index 5f7064d5b124b..c9f885315b0ef 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php
@@ -167,7 +167,7 @@ public function testExecuteWithTaxClassAndException()
             ->method('save')
             ->with($this->group);
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('You saved the customer group.'));
         $exception = new \Exception('Exception');
         $this->resultRedirect->expects($this->at(0))
@@ -175,7 +175,7 @@ public function testExecuteWithTaxClassAndException()
             ->with('customer/group')
             ->willThrowException($exception);
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Exception');
         $this->dataObjectProcessorMock->expects($this->once())
             ->method('buildOutputDataArray')
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 45e64f6557d51..8267624f7b006 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
@@ -9,6 +9,7 @@
 use Magento\Customer\Model\EmailNotificationInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\Escaper;
 
 /**
  * Unit tests for Inline customer edit
@@ -78,6 +79,9 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
     /** @var array */
     private $items;
 
+    /** @var \Magento\Framework\Escaper */
+    private $escaper;
+
     /**
      * Sets up mocks
      *
@@ -86,7 +90,7 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
+        $this->escaper = new Escaper();
         $this->request = $this->getMockForAbstractClass(
             \Magento\Framework\App\RequestInterface::class,
             [],
@@ -172,7 +176,8 @@ protected function setUp()
                 'addressDataFactory' => $this->addressDataFactory,
                 'addressRepository' => $this->addressRepository,
                 'logger' => $this->logger,
-                'addressRegistry' => $this->addressRegistry
+                'addressRegistry' => $this->addressRegistry,
+                'escaper' => $this->escaper,
             ]
         );
         $reflection = new \ReflectionClass(get_class($this->controller));
@@ -291,10 +296,14 @@ protected function prepareMocksForErrorMessagesProcessing()
             ->willReturn('Error text');
         $this->resultJson->expects($this->once())
             ->method('setData')
-            ->with([
-                'messages' => ['Error text'],
-                'error' => true,
-            ])
+            ->with(
+                [
+                    'messages' => [
+                        'Error text',
+                    ],
+                    'error' => true,
+                ]
+            )
             ->willReturnSelf();
     }
 
@@ -340,10 +349,14 @@ public function testExecuteWithoutItems()
         $this->resultJson
             ->expects($this->once())
             ->method('setData')
-            ->with([
-                'messages' => [__('Please correct the data sent.')],
-                'error' => true,
-            ])
+            ->with(
+                [
+                    'messages' => [
+                        __('Please correct the data sent.'),
+                    ],
+                    'error' => true,
+                ]
+            )
             ->willReturnSelf();
         $this->assertSame($this->resultJson, $this->controller->execute());
     }
@@ -365,6 +378,7 @@ public function testExecuteLocalizedException()
             ->method('save')
             ->with($this->customerData)
             ->willThrowException($exception);
+
         $this->messageManager->expects($this->once())
             ->method('addError')
             ->with('[Customer ID: 12] Exception message');
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php
index cb5ff88ab704a..4157359959ae4 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php
@@ -199,7 +199,7 @@ public function testExecuteWithException()
             ->willThrowException(new \Exception('Some message.'));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Some message.');
 
         $this->massAction->execute();
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassDeleteTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassDeleteTest.php
index 1f39e6306b996..b436b5b137c78 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassDeleteTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassDeleteTest.php
@@ -179,7 +179,7 @@ public function testExecuteWithException()
             ->willThrowException(new \Exception('Some message.'));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Some message.');
 
         $this->massAction->execute();
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassSubscribeTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassSubscribeTest.php
index 90bff0b61bcbf..d8b88bba2cdbe 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassSubscribeTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassSubscribeTest.php
@@ -6,119 +6,131 @@
 
 namespace Magento\Customer\Test\Unit\Controller\Adminhtml\Index;
 
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Backend\Model\View\Result\RedirectFactory;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Controller\Adminhtml\Index\MassSubscribe;
+use Magento\Customer\Model\ResourceModel\Customer\Collection;
+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Message\Manager;
+use Magento\Framework\ObjectManager\ObjectManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Newsletter\Model\SubscriptionManagerInterface;
+use Magento\Ui\Component\MassAction\Filter;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
- * Class MassSubscribeTest
+ * Class to test mass subscribe customers by ids
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class MassSubscribeTest extends \PHPUnit\Framework\TestCase
+class MassSubscribeTest extends TestCase
 {
     /**
-     * @var \Magento\Customer\Controller\Adminhtml\Index\MassSubscribe
+     * @var MassSubscribe
      */
     protected $massAction;
 
     /**
-     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     * @var Context|MockObject
      */
     protected $contextMock;
 
     /**
-     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+     * @var Redirect|MockObject
      */
     protected $resultRedirectMock;
 
     /**
-     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     * @var Http|MockObject
      */
     protected $requestMock;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResponseInterface|MockObject
      */
     protected $responseMock;
 
     /**
-     * @var \Magento\Framework\Message\Manager|\PHPUnit_Framework_MockObject_MockObject
+     * @var Manager|MockObject
      */
     protected $messageManagerMock;
 
     /**
-     * @var \Magento\Framework\ObjectManager\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
+     * @var ObjectManager|MockObject
      */
     protected $objectManagerMock;
 
     /**
-     * @var \Magento\Customer\Model\ResourceModel\Customer\Collection|\PHPUnit_Framework_MockObject_MockObject
+     * @var Collection|MockObject
      */
     protected $customerCollectionMock;
 
     /**
-     * @var \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CollectionFactory|MockObject
      */
     protected $customerCollectionFactoryMock;
 
     /**
-     * @var \Magento\Ui\Component\MassAction\Filter|\PHPUnit_Framework_MockObject_MockObject
+     * @var Filter|MockObject
      */
     protected $filterMock;
 
     /**
-     * @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CustomerRepositoryInterface|MockObject
      */
     protected $customerRepositoryMock;
 
     /**
-     * @var \Magento\Newsletter\Model\Subscriber|\PHPUnit_Framework_MockObject_MockObject
+     * @var SubscriptionManagerInterface|MockObject
      */
-    protected $subscriberMock;
+    private $subscriptionManager;
 
+    /**
+     * @inheritdoc
+     */
     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)
+        $resultRedirectFactory = $this->createMock(RedirectFactory::class);
+        $this->responseMock = $this->createMock(ResponseInterface::class);
+        $this->requestMock = $this->getMockBuilder(Http::class)
             ->disableOriginalConstructor()->getMock();
         $this->objectManagerMock = $this->createPartialMock(
-            \Magento\Framework\ObjectManager\ObjectManager::class,
+            ObjectManager::class,
             ['create']
         );
-        $this->messageManagerMock = $this->createMock(\Magento\Framework\Message\Manager::class);
+        $this->messageManagerMock = $this->createMock(Manager::class);
         $this->customerCollectionMock =
-            $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Customer\Collection::class)
+            $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->customerCollectionFactoryMock =
-            $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Customer\CollectionFactory::class)
+            $this->getMockBuilder(CollectionFactory::class)
                 ->disableOriginalConstructor()
                 ->setMethods(['create'])
                 ->getMock();
-        $redirectMock = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
+        $redirectMock = $this->getMockBuilder(Redirect::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
+        $resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
         $resultFactoryMock->expects($this->any())
             ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT)
+            ->with(ResultFactory::TYPE_REDIRECT)
             ->willReturn($redirectMock);
-        $this->subscriberMock = $this->createMock(\Magento\Newsletter\Model\Subscriber::class);
-        $subscriberFactoryMock = $this->getMockBuilder(\Magento\Newsletter\Model\SubscriberFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $subscriberFactoryMock->expects($this->any())
-            ->method('create')
-            ->willReturn($this->subscriberMock);
-
-        $this->resultRedirectMock = $this->createMock(\Magento\Backend\Model\View\Result\Redirect::class);
+        $this->subscriptionManager = $this->createMock(SubscriptionManagerInterface::class);
+        $this->resultRedirectMock = $this->createMock(Redirect::class);
         $resultRedirectFactory->expects($this->any())->method('create')->willReturn($this->resultRedirectMock);
 
         $this->contextMock->expects($this->once())->method('getMessageManager')->willReturn($this->messageManagerMock);
@@ -132,7 +144,7 @@ protected function setUp()
             ->method('getResultFactory')
             ->willReturn($resultFactoryMock);
 
-        $this->filterMock = $this->createMock(\Magento\Ui\Component\MassAction\Filter::class);
+        $this->filterMock = $this->createMock(Filter::class);
         $this->filterMock->expects($this->once())
             ->method('getCollection')
             ->with($this->customerCollectionMock)
@@ -140,35 +152,37 @@ protected function setUp()
         $this->customerCollectionFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($this->customerCollectionMock);
-        $this->customerRepositoryMock = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
+        $this->customerRepositoryMock = $this->getMockBuilder(CustomerRepositoryInterface::class)
             ->getMockForAbstractClass();
         $this->massAction = $objectManagerHelper->getObject(
-            \Magento\Customer\Controller\Adminhtml\Index\MassSubscribe::class,
+            MassSubscribe::class,
             [
                 'context' => $this->contextMock,
                 'filter' => $this->filterMock,
                 'collectionFactory' => $this->customerCollectionFactoryMock,
                 'customerRepository' => $this->customerRepositoryMock,
-                'subscriberFactory' => $subscriberFactoryMock,
+                'subscriptionManager' => $this->subscriptionManager,
             ]
         );
     }
 
+    /**
+     * Test to mass subscribe customers to newsletters
+     */
     public function testExecute()
     {
-        $customersIds = [10, 11, 12];
-
-        $this->customerCollectionMock->expects($this->any())
-            ->method('getAllIds')
-            ->willReturn($customersIds);
-
-        $this->customerRepositoryMock->expects($this->any())
-            ->method('getById')
-            ->willReturnMap([[10, true], [11, true], [12, true]]);
-
-        $this->subscriberMock->expects($this->any())
-            ->method('subscribeCustomerById')
-            ->willReturnMap([[10, true], [11, true], [12, true]]);
+        $storeId = 2;
+        $customerId = 10;
+        $customersIds = [$customerId, $customerId, $customerId];
+
+        $this->customerCollectionMock->method('getAllIds')->willReturn($customersIds);
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->method('getStoreId')->willReturn($storeId);
+        $customer->method('getId')->willReturn($customerId);
+        $this->customerRepositoryMock->method('getById')->with($customerId)->willReturn($customer);
+        $this->subscriptionManager->expects($this->exactly(3))
+            ->method('subscribeCustomer')
+            ->with($customerId, $storeId);
 
         $this->messageManagerMock->expects($this->once())
             ->method('addSuccessMessage')
@@ -182,6 +196,9 @@ public function testExecute()
         $this->massAction->execute();
     }
 
+    /**
+     * Test to mass subscribe customers to newsletters with throws exception
+     */
     public function testExecuteWithException()
     {
         $customersIds = [10, 11, 12];
@@ -195,7 +212,7 @@ public function testExecuteWithException()
             ->willThrowException(new \Exception('Some message.'));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Some message.');
 
         $this->massAction->execute();
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassUnsubscribeTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassUnsubscribeTest.php
index 1bffa836f5034..8220d50f418be 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassUnsubscribeTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassUnsubscribeTest.php
@@ -6,119 +6,131 @@
 
 namespace Magento\Customer\Test\Unit\Controller\Adminhtml\Index;
 
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Backend\Model\View\Result\RedirectFactory;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Controller\Adminhtml\Index\MassUnsubscribe;
+use Magento\Customer\Model\ResourceModel\Customer\Collection;
+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Message\Manager;
+use Magento\Framework\ObjectManager\ObjectManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Newsletter\Model\SubscriptionManagerInterface;
+use Magento\Ui\Component\MassAction\Filter;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
- * Class MassUnsubscribeTest
+ * Class to test mass unsubscribe customers by ids
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class MassUnsubscribeTest extends \PHPUnit\Framework\TestCase
+class MassUnsubscribeTest extends TestCase
 {
     /**
-     * @var \Magento\Customer\Controller\Adminhtml\Index\MassUnsubscribe
+     * @var MassUnsubscribe
      */
     protected $massAction;
 
     /**
-     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     * @var Context|MockObject
      */
     protected $contextMock;
 
     /**
-     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+     * @var Redirect|MockObject
      */
     protected $resultRedirectMock;
 
     /**
-     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     * @var Http|MockObject
      */
     protected $requestMock;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResponseInterface|MockObject
      */
     protected $responseMock;
 
     /**
-     * @var \Magento\Framework\Message\Manager|\PHPUnit_Framework_MockObject_MockObject
+     * @var Manager|MockObject
      */
     protected $messageManagerMock;
 
     /**
-     * @var \Magento\Framework\ObjectManager\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
+     * @var ObjectManager|MockObject
      */
     protected $objectManagerMock;
 
     /**
-     * @var \Magento\Customer\Model\ResourceModel\Customer\Collection|\PHPUnit_Framework_MockObject_MockObject
+     * @var Collection|MockObject
      */
     protected $customerCollectionMock;
 
     /**
-     * @var \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CollectionFactory|MockObject
      */
     protected $customerCollectionFactoryMock;
 
     /**
-     * @var \Magento\Ui\Component\MassAction\Filter|\PHPUnit_Framework_MockObject_MockObject
+     * @var Filter|MockObject
      */
     protected $filterMock;
 
     /**
-     * @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CustomerRepositoryInterface|MockObject
      */
     protected $customerRepositoryMock;
 
     /**
-     * @var \Magento\Newsletter\Model\Subscriber|\PHPUnit_Framework_MockObject_MockObject
+     * @var SubscriptionManagerInterface|MockObject
      */
-    protected $subscriberMock;
+    private $subscriptionManager;
 
+    /**
+     * @inheritdoc
+     */
     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)
+        $resultRedirectFactory = $this->createMock(RedirectFactory::class);
+        $this->responseMock = $this->createMock(ResponseInterface::class);
+        $this->requestMock = $this->getMockBuilder(Http::class)
             ->disableOriginalConstructor()->getMock();
         $this->objectManagerMock = $this->createPartialMock(
-            \Magento\Framework\ObjectManager\ObjectManager::class,
+            ObjectManager::class,
             ['create']
         );
-        $this->messageManagerMock = $this->createMock(\Magento\Framework\Message\Manager::class);
+        $this->messageManagerMock = $this->createMock(Manager::class);
         $this->customerCollectionMock =
-            $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Customer\Collection::class)
+            $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->customerCollectionFactoryMock =
-            $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Customer\CollectionFactory::class)
+            $this->getMockBuilder(CollectionFactory::class)
                 ->disableOriginalConstructor()
                 ->setMethods(['create'])
                 ->getMock();
-        $redirectMock = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class)
+        $redirectMock = $this->getMockBuilder(Redirect::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
+        $resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
         $resultFactoryMock->expects($this->any())
             ->method('create')
-            ->with(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT)
+            ->with(ResultFactory::TYPE_REDIRECT)
             ->willReturn($redirectMock);
-        $this->subscriberMock = $this->createMock(\Magento\Newsletter\Model\Subscriber::class);
-        $subscriberFactoryMock = $this->getMockBuilder(\Magento\Newsletter\Model\SubscriberFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $subscriberFactoryMock->expects($this->any())
-            ->method('create')
-            ->willReturn($this->subscriberMock);
-
-        $this->resultRedirectMock = $this->createMock(\Magento\Backend\Model\View\Result\Redirect::class);
+        $this->subscriptionManager = $this->createMock(SubscriptionManagerInterface::class);
+        $this->resultRedirectMock = $this->createMock(Redirect::class);
         $resultRedirectFactory->expects($this->any())->method('create')->willReturn($this->resultRedirectMock);
 
         $this->contextMock->expects($this->once())->method('getMessageManager')->willReturn($this->messageManagerMock);
@@ -132,7 +144,7 @@ protected function setUp()
             ->method('getResultFactory')
             ->willReturn($resultFactoryMock);
 
-        $this->filterMock = $this->createMock(\Magento\Ui\Component\MassAction\Filter::class);
+        $this->filterMock = $this->createMock(Filter::class);
         $this->filterMock->expects($this->once())
             ->method('getCollection')
             ->with($this->customerCollectionMock)
@@ -140,35 +152,37 @@ protected function setUp()
         $this->customerCollectionFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($this->customerCollectionMock);
-        $this->customerRepositoryMock = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
+        $this->customerRepositoryMock = $this->getMockBuilder(CustomerRepositoryInterface::class)
             ->getMockForAbstractClass();
         $this->massAction = $objectManagerHelper->getObject(
-            \Magento\Customer\Controller\Adminhtml\Index\MassUnsubscribe::class,
+            MassUnsubscribe::class,
             [
                 'context' => $this->contextMock,
                 'filter' => $this->filterMock,
                 'collectionFactory' => $this->customerCollectionFactoryMock,
                 'customerRepository' => $this->customerRepositoryMock,
-                'subscriberFactory' => $subscriberFactoryMock,
+                'subscriptionManager' => $this->subscriptionManager,
             ]
         );
     }
 
+    /**
+     * Test to mass unsubscribe customers from newsletters
+     */
     public function testExecute()
     {
-        $customersIds = [10, 11, 12];
-
-        $this->customerCollectionMock->expects($this->any())
-            ->method('getAllIds')
-            ->willReturn($customersIds);
-
-        $this->customerRepositoryMock->expects($this->any())
-            ->method('getById')
-            ->willReturnMap([[10, true], [11, true], [12, true]]);
-
-        $this->subscriberMock->expects($this->any())
-            ->method('unsubscribeCustomerById')
-            ->willReturnMap([[10, true], [11, true], [12, true]]);
+        $storeId = 2;
+        $customerId = 10;
+        $customersIds = [$customerId, $customerId, $customerId];
+
+        $this->customerCollectionMock->method('getAllIds')->willReturn($customersIds);
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->method('getStoreId')->willReturn($storeId);
+        $customer->method('getId')->willReturn($customerId);
+        $this->customerRepositoryMock->method('getById')->with($customerId)->willReturn($customer);
+        $this->subscriptionManager->expects($this->exactly(3))
+            ->method('unsubscribeCustomer')
+            ->with($customerId, $storeId);
 
         $this->messageManagerMock->expects($this->once())
             ->method('addSuccessMessage')
@@ -182,6 +196,9 @@ public function testExecute()
         $this->massAction->execute();
     }
 
+    /**
+     * Test to mass unsubscribe customers to newsletters with throws exception
+     */
     public function testExecuteWithException()
     {
         $customersIds = [10, 11, 12];
@@ -195,7 +212,7 @@ public function testExecuteWithException()
             ->willThrowException(new \Exception('Some message.'));
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Some message.');
 
         $this->massAction->execute();
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 9724ac13dde8c..2e729873961c0 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,13 +5,45 @@
  */
 namespace Magento\Customer\Test\Unit\Controller\Adminhtml\Index;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\Session;
+use Magento\Backend\Model\View\Result\Forward;
+use Magento\Backend\Model\View\Result\ForwardFactory;
+use Magento\Backend\Model\View\Result\RedirectFactory;
+use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\CustomerMetadataInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Controller\Adminhtml\Index\Save;
 use Magento\Customer\Controller\RegistryConstants;
+use Magento\Customer\Model\AccountManagement;
+use Magento\Customer\Model\Address\Mapper;
 use Magento\Customer\Model\EmailNotificationInterface;
 use Magento\Customer\Model\Metadata\Form;
+use Magento\Customer\Model\Metadata\FormFactory;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\DataObject;
+use Magento\Framework\DataObjectFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\Error;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Page\Config;
+use Magento\Framework\View\Page\Title;
+use Magento\Framework\View\Result\Page;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Newsletter\Model\SubscriptionManagerInterface;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Testing Save Customer use case from admin page
@@ -20,220 +52,226 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @covers \Magento\Customer\Controller\Adminhtml\Index\Save
  */
-class SaveTest extends \PHPUnit\Framework\TestCase
+class SaveTest extends TestCase
 {
     /**
-     * @var \Magento\Customer\Controller\Adminhtml\Index\Save
+     * @var Save
      */
     protected $model;
 
     /**
-     * @var \Magento\Backend\App\Action\Context
+     * @var Context
      */
     protected $context;
 
     /**
-     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RequestInterface|MockObject
      */
     protected $requestMock;
 
     /**
-     * @var \Magento\Backend\Model\View\Result\ForwardFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ForwardFactory|MockObject
      */
     protected $resultForwardFactoryMock;
 
     /**
-     * @var \Magento\Backend\Model\View\Result\Forward|\PHPUnit_Framework_MockObject_MockObject
+     * @var Forward|MockObject
      */
     protected $resultForwardMock;
 
     /**
-     * @var \Magento\Framework\View\Result\PageFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var PageFactory|MockObject
      */
     protected $resultPageFactoryMock;
 
     /**
-     * @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
+     * @var Page|MockObject
      */
     protected $resultPageMock;
 
     /**
-     * @var \Magento\Framework\View\Page\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var Config|MockObject
      */
     protected $pageConfigMock;
 
     /**
-     * @var \Magento\Framework\View\Page\Title|\PHPUnit_Framework_MockObject_MockObject
+     * @var Title|MockObject
      */
     protected $pageTitleMock;
 
     /**
-     * @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject
+     * @var Session|MockObject
      */
     protected $sessionMock;
 
     /**
-     * @var \Magento\Customer\Model\Metadata\FormFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var FormFactory|MockObject
      */
     protected $formFactoryMock;
 
     /**
-     * @var \Magento\Framework\DataObjectFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var DataObjectFactory|MockObject
      */
     protected $objectFactoryMock;
 
     /**
-     * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CustomerInterfaceFactory|MockObject
      */
     protected $customerDataFactoryMock;
 
     /**
-     * @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CustomerRepositoryInterface|MockObject
      */
     protected $customerRepositoryMock;
 
     /**
-     * @var \Magento\Customer\Model\Customer\Mapper|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Customer\Model\Customer\Mapper|MockObject
      */
     protected $customerMapperMock;
 
     /**
-     * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
+     * @var DataObjectHelper|MockObject
      */
     protected $dataHelperMock;
 
     /**
-     * @var \Magento\Framework\AuthorizationInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var AuthorizationInterface|MockObject
      */
     protected $authorizationMock;
 
     /**
-     * @var \Magento\Newsletter\Model\SubscriberFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var SubscriberFactory|MockObject
      */
     protected $subscriberFactoryMock;
 
     /**
-     * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
+     * @var Registry|MockObject
      */
     protected $registryMock;
 
     /**
-     * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ManagerInterface|MockObject
      */
     protected $messageManagerMock;
 
     /**
-     * @var \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var RedirectFactory|MockObject
      */
     protected $redirectFactoryMock;
 
     /**
-     * @var \Magento\Customer\Model\AccountManagement|\PHPUnit_Framework_MockObject_MockObject
+     * @var AccountManagement|MockObject
      */
     protected $managementMock;
 
     /**
-     * @var \Magento\Customer\Api\Data\AddressInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var AddressInterfaceFactory|MockObject
      */
     protected $addressDataFactoryMock;
 
     /**
-     * @var EmailNotificationInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var EmailNotificationInterface|MockObject
      */
     protected $emailNotificationMock;
 
     /**
-     * @var \Magento\Customer\Model\Address\Mapper|\PHPUnit_Framework_MockObject_MockObject
+     * @var Mapper|MockObject
      */
     protected $customerAddressMapperMock;
 
     /**
-     * @var \Magento\Customer\Api\AddressRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var AddressRepositoryInterface|MockObject
      */
     protected $customerAddressRepositoryMock;
 
+    /**
+     * @var SubscriptionManagerInterface|MockObject
+     */
+    private $subscriptionManager;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     protected function setUp()
     {
-        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
+        $this->requestMock = $this->getMockBuilder(Http::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->resultForwardFactoryMock = $this->getMockBuilder(
-            \Magento\Backend\Model\View\Result\ForwardFactory::class
+            ForwardFactory::class
         )->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->resultForwardMock = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Forward::class)
+        $this->resultForwardMock = $this->getMockBuilder(Forward::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->resultPageFactoryMock = $this->getMockBuilder(\Magento\Framework\View\Result\PageFactory::class)
+        $this->resultPageFactoryMock = $this->getMockBuilder(PageFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->resultPageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
+        $this->resultPageMock = $this->getMockBuilder(Page::class)
             ->disableOriginalConstructor()
             ->setMethods(['setActiveMenu', 'getConfig', 'addBreadcrumb'])
             ->getMock();
-        $this->pageConfigMock = $this->getMockBuilder(\Magento\Framework\View\Page\Config::class)
+        $this->pageConfigMock = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->pageTitleMock = $this->getMockBuilder(\Magento\Framework\View\Page\Title::class)
+        $this->pageTitleMock = $this->getMockBuilder(Title::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->sessionMock = $this->getMockBuilder(\Magento\Backend\Model\Session::class)
+        $this->sessionMock = $this->getMockBuilder(Session::class)
             ->disableOriginalConstructor()
             ->setMethods(['unsCustomerFormData', 'setCustomerFormData'])
             ->getMock();
-        $this->formFactoryMock = $this->getMockBuilder(\Magento\Customer\Model\Metadata\FormFactory::class)
+        $this->formFactoryMock = $this->getMockBuilder(FormFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->objectFactoryMock = $this->getMockBuilder(\Magento\Framework\DataObjectFactory::class)
+        $this->objectFactoryMock = $this->getMockBuilder(DataObjectFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
         $this->customerDataFactoryMock = $this->getMockBuilder(
-            \Magento\Customer\Api\Data\CustomerInterfaceFactory::class
+            CustomerInterfaceFactory::class
         )->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->customerRepositoryMock = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
+        $this->customerRepositoryMock = $this->getMockBuilder(CustomerRepositoryInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->customerAddressRepositoryMock = $this->getMockBuilder(
-            \Magento\Customer\Api\AddressRepositoryInterface::class
+            AddressRepositoryInterface::class
         )->disableOriginalConstructor()->getMock();
         $this->customerMapperMock = $this->getMockBuilder(
             \Magento\Customer\Model\Customer\Mapper::class
         )->disableOriginalConstructor()->getMock();
         $this->customerAddressMapperMock = $this->getMockBuilder(
-            \Magento\Customer\Model\Address\Mapper::class
+            Mapper::class
         )->disableOriginalConstructor()->getMock();
         $this->dataHelperMock = $this->getMockBuilder(
-            \Magento\Framework\Api\DataObjectHelper::class
+            DataObjectHelper::class
         )->disableOriginalConstructor()->getMock();
-        $this->authorizationMock = $this->getMockBuilder(\Magento\Framework\AuthorizationInterface::class)
+        $this->authorizationMock = $this->getMockBuilder(AuthorizationInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->subscriberFactoryMock = $this->getMockBuilder(\Magento\Newsletter\Model\SubscriberFactory::class)
+        $this->subscriberFactoryMock = $this->getMockBuilder(SubscriberFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->registryMock = $this->getMockBuilder(\Magento\Framework\Registry::class)
+        $this->subscriptionManager = $this->createMock(SubscriptionManagerInterface::class);
+        $this->registryMock = $this->getMockBuilder(Registry::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
+        $this->messageManagerMock = $this->getMockBuilder(ManagerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->redirectFactoryMock = $this->getMockBuilder(\Magento\Backend\Model\View\Result\RedirectFactory::class)
+        $this->redirectFactoryMock = $this->getMockBuilder(RedirectFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->managementMock = $this->getMockBuilder(\Magento\Customer\Model\AccountManagement::class)
+        $this->managementMock = $this->getMockBuilder(AccountManagement::class)
             ->disableOriginalConstructor()
             ->setMethods(['createAccount'])
             ->getMock();
-        $this->addressDataFactoryMock = $this->getMockBuilder(\Magento\Customer\Api\Data\AddressInterfaceFactory::class)
+        $this->addressDataFactoryMock = $this->getMockBuilder(AddressInterfaceFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -241,10 +279,10 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $objectManager = new ObjectManager($this);
 
         $this->model = $objectManager->getObject(
-            \Magento\Customer\Controller\Adminhtml\Index\Save::class,
+            Save::class,
             [
                 'resultForwardFactory' => $this->resultForwardFactoryMock,
                 'resultPageFactory' => $this->resultPageFactoryMock,
@@ -265,6 +303,7 @@ protected function setUp()
                 'resultRedirectFactory' => $this->redirectFactoryMock,
                 'addressRepository' => $this->customerAddressRepositoryMock,
                 'addressMapper' => $this->customerAddressMapperMock,
+                'subscriptionManager' => $this->subscriptionManager,
             ]
         );
 
@@ -282,7 +321,10 @@ protected function setUp()
     public function testExecuteWithExistentCustomer()
     {
         $customerId = 22;
-        $subscription = 'true';
+        $customerEmail = 'customer@email.com';
+        $subscriptionWebsite = 1;
+        $subscriptionStatus = true;
+        $subscriptionStore = 3;
         $postValue = [
             'customer' => [
                 'entity_id' => $customerId,
@@ -290,7 +332,8 @@ public function testExecuteWithExistentCustomer()
                 'coolness' => false,
                 'disable_auto_group_change' => 'false',
             ],
-            'subscription' => $subscription,
+            'subscription_status' => [$subscriptionWebsite => $subscriptionStatus],
+            'subscription_store' => [$subscriptionWebsite => $subscriptionStore],
         ];
         $extractedData = [
             'entity_id' => $customerId,
@@ -324,9 +367,9 @@ public function testExecuteWithExistentCustomer()
             'id' => $customerId,
         ];
 
-        /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
+        /** @var AttributeMetadataInterface|MockObject $customerFormMock */
         $attributeMock = $this->getMockBuilder(
-            \Magento\Customer\Api\Data\AttributeMetadataInterface::class
+            AttributeMetadataInterface::class
         )->disableOriginalConstructor()->getMock();
         $attributeMock->expects($this->atLeastOnce())
             ->method('getAttributeCode')
@@ -346,15 +389,20 @@ public function testExecuteWithExistentCustomer()
             );
         $this->requestMock->expects($this->atLeastOnce())
             ->method('getPost')
+            ->with('customer')
+            ->willReturn($postValue['customer']);
+        $this->requestMock->expects($this->atLeastOnce())
+            ->method('getParam')
             ->willReturnMap(
                 [
-                    ['customer', null, $postValue['customer']],
-                    ['subscription', null, $subscription],
+                    ['subscription_status', null, [$subscriptionWebsite => $subscriptionStatus]],
+                    ['subscription_store', null, [$subscriptionWebsite => $subscriptionStore]],
+                    ['back', false, true],
                 ]
             );
 
-        /** @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject $objectMock */
-        $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
+        /** @var DataObject|MockObject $objectMock */
+        $objectMock = $this->getMockBuilder(DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
         $objectMock->expects($this->atLeastOnce())
@@ -371,7 +419,7 @@ public function testExecuteWithExistentCustomer()
             ->willReturn($objectMock);
 
         $customerFormMock = $this->getMockBuilder(
-            \Magento\Customer\Model\Metadata\Form::class
+            Form::class
         )->disableOriginalConstructor()->getMock();
         $customerFormMock->expects($this->once())
             ->method('extractData')
@@ -400,32 +448,26 @@ public function testExecuteWithExistentCustomer()
                 ]
             );
 
-        /** @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customerMock */
-        $customerMock = $this->getMockBuilder(
-            \Magento\Customer\Api\Data\CustomerInterface::class
-        )->disableOriginalConstructor()->getMock();
-
+        /** @var CustomerInterface|MockObject $customerMock */
+        $customerMock = $this->createMock(CustomerInterface::class);
+        $customerMock->method('getId')->willReturn($customerId);
         $this->customerDataFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($customerMock);
-
-        $this->customerRepositoryMock->expects($this->exactly(2))
-            ->method('getById')
+        $this->customerRepositoryMock->method('getById')
             ->with($customerId)
             ->willReturn($customerMock);
-
         $this->customerMapperMock->expects($this->exactly(2))
             ->method('toFlatArray')
             ->with($customerMock)
             ->willReturn($savedData);
-
         $this->dataHelperMock->expects($this->atLeastOnce())
             ->method('populateWithArray')
             ->willReturnMap(
                 [
                     [
                         $customerMock,
-                        $mergedData, \Magento\Customer\Api\Data\CustomerInterface::class,
+                        $mergedData, CustomerInterface::class,
                         $this->dataHelperMock
                     ],
                 ]
@@ -435,10 +477,7 @@ public function testExecuteWithExistentCustomer()
             ->method('save')
             ->with($customerMock)
             ->willReturnSelf();
-
-        $customerEmail = 'customer@email.com';
         $customerMock->expects($this->once())->method('getEmail')->willReturn($customerEmail);
-
         $customerMock->expects($this->once())
             ->method('getAddresses')
             ->willReturn([]);
@@ -453,25 +492,12 @@ public function testExecuteWithExistentCustomer()
             ->with(null)
             ->willReturn(true);
 
-        /** @var \Magento\Newsletter\Model\Subscriber|\PHPUnit_Framework_MockObject_MockObject $subscriberMock */
-        $subscriberMock = $this->getMockBuilder(\Magento\Newsletter\Model\Subscriber::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->subscriberFactoryMock->expects($this->once())
-            ->method('create')
-            ->with()
-            ->willReturn($subscriberMock);
-
-        $subscriberMock->expects($this->once())
-            ->method('subscribeCustomerById')
-            ->with($customerId);
-        $subscriberMock->expects($this->never())
-            ->method('unsubscribeCustomerById');
+        $this->subscriptionManager->expects($this->once())
+            ->method($subscriptionStatus ? 'subscribeCustomer' : 'unsubscribeCustomer')
+            ->with($customerId, $subscriptionStore);
 
         $this->sessionMock->expects($this->once())
             ->method('unsCustomerFormData');
-
         $this->registryMock->expects($this->once())
             ->method('register')
             ->with(RegistryConstants::CURRENT_CUSTOMER_ID, $customerId);
@@ -481,13 +507,8 @@ public function testExecuteWithExistentCustomer()
             ->with(__('You saved the customer.'))
             ->willReturnSelf();
 
-        $this->requestMock->expects($this->once())
-            ->method('getParam')
-            ->with('back', false)
-            ->willReturn(true);
-
-        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
+        /** @var Redirect|MockObject $redirectMock */
+        $redirectMock = $this->getMockBuilder(Redirect::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -511,14 +532,17 @@ public function testExecuteWithExistentCustomer()
     public function testExecuteWithNewCustomer()
     {
         $customerId = 22;
+        $subscriptionWebsite = 1;
+        $subscriptionStatus = false;
+        $subscriptionStore = 3;
 
-        $subscription = '0';
         $postValue = [
             'customer' => [
                 'coolness' => false,
                 'disable_auto_group_change' => 'false',
             ],
-            'subscription' => $subscription,
+            'subscription_status' => [$subscriptionWebsite => $subscriptionStatus],
+            'subscription_store' => [$subscriptionWebsite => $subscriptionStore],
         ];
         $extractedData = [
             'coolness' => false,
@@ -530,9 +554,9 @@ public function testExecuteWithNewCustomer()
             CustomerInterface::DEFAULT_SHIPPING => null,
             'confirmation' => false,
         ];
-        /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
+        /** @var AttributeMetadataInterface|MockObject $customerFormMock */
         $attributeMock = $this->getMockBuilder(
-            \Magento\Customer\Api\Data\AttributeMetadataInterface::class
+            AttributeMetadataInterface::class
         )->disableOriginalConstructor()->getMock();
         $attributeMock->expects($this->atLeastOnce())
             ->method('getAttributeCode')
@@ -552,15 +576,20 @@ public function testExecuteWithNewCustomer()
             );
         $this->requestMock->expects($this->atLeastOnce())
             ->method('getPost')
+            ->with('customer')
+            ->willReturn($postValue['customer']);
+        $this->requestMock->expects($this->atLeastOnce())
+            ->method('getParam')
             ->willReturnMap(
                 [
-                    ['customer', null, $postValue['customer']],
-                    ['subscription', null, $subscription],
+                    ['subscription_status', null, [$subscriptionWebsite => $subscriptionStatus]],
+                    ['subscription_store', null, [$subscriptionWebsite => $subscriptionStore]],
+                    ['back', false, false],
                 ]
             );
 
-        /** @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject $objectMock */
-        $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
+        /** @var DataObject|MockObject $objectMock */
+        $objectMock = $this->getMockBuilder(DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
         $objectMock->expects($this->atLeastOnce())
@@ -577,7 +606,7 @@ public function testExecuteWithNewCustomer()
             ->willReturn($objectMock);
 
         $customerFormMock = $this->getMockBuilder(
-            \Magento\Customer\Model\Metadata\Form::class
+            Form::class
         )->disableOriginalConstructor()->getMock();
         $customerFormMock->expects($this->once())
             ->method('extractData')
@@ -607,60 +636,36 @@ public function testExecuteWithNewCustomer()
                 ]
             );
 
-        /** @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customerMock */
-        $customerMock = $this->getMockBuilder(
-            \Magento\Customer\Api\Data\CustomerInterface::class
-        )->disableOriginalConstructor()->getMock();
-
+        /** @var CustomerInterface|MockObject $customerMock */
+        $customerMock = $this->createMock(CustomerInterface::class);
+        $customerMock->method('getId')->willReturn($customerId);
         $this->customerDataFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($customerMock);
-
         $this->dataHelperMock->expects($this->atLeastOnce())
             ->method('populateWithArray')
             ->willReturnMap(
                 [
                     [
                         $customerMock,
-                        $mergedData, \Magento\Customer\Api\Data\CustomerInterface::class,
+                        $mergedData, CustomerInterface::class,
                         $this->dataHelperMock
                     ],
                 ]
             );
-
         $this->managementMock->expects($this->once())
             ->method('createAccount')
             ->with($customerMock, null, '')
             ->willReturn($customerMock);
-
-        $customerMock->expects($this->once())
-            ->method('getId')
-            ->willReturn($customerId);
-
         $this->authorizationMock->expects($this->once())
             ->method('isAllowed')
             ->with(null)
             ->willReturn(true);
-
-        /** @var \Magento\Newsletter\Model\Subscriber|\PHPUnit_Framework_MockObject_MockObject $subscriberMock */
-        $subscriberMock = $this->getMockBuilder(\Magento\Newsletter\Model\Subscriber::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->subscriberFactoryMock->expects($this->once())
-            ->method('create')
-            ->with()
-            ->willReturn($subscriberMock);
-
-        $subscriberMock->expects($this->once())
-            ->method('unsubscribeCustomerById')
-            ->with($customerId);
-        $subscriberMock->expects($this->never())
-            ->method('subscribeCustomerById');
-
+        $this->subscriptionManager->expects($this->once())
+            ->method($subscriptionStatus ? 'subscribeCustomer' : 'unsubscribeCustomer')
+            ->with($customerId, $subscriptionStore);
         $this->sessionMock->expects($this->once())
             ->method('unsCustomerFormData');
-
         $this->registryMock->expects($this->once())
             ->method('register')
             ->with(RegistryConstants::CURRENT_CUSTOMER_ID, $customerId);
@@ -670,13 +675,8 @@ public function testExecuteWithNewCustomer()
             ->with(__('You saved the customer.'))
             ->willReturnSelf();
 
-        $this->requestMock->expects($this->once())
-            ->method('getParam')
-            ->with('back', false)
-            ->willReturn(false);
-
-        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
+        /** @var Redirect|MockObject $redirectMock */
+        $redirectMock = $this->getMockBuilder(Redirect::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -713,9 +713,9 @@ public function testExecuteWithNewCustomerAndValidationException()
             'dob' => '1996-03-12',
         ];
 
-        /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
+        /** @var AttributeMetadataInterface|MockObject $customerFormMock */
         $attributeMock = $this->getMockBuilder(
-            \Magento\Customer\Api\Data\AttributeMetadataInterface::class
+            AttributeMetadataInterface::class
         )->disableOriginalConstructor()->getMock();
         $attributeMock->expects($this->exactly(2))
             ->method('getAttributeCode')
@@ -741,8 +741,8 @@ public function testExecuteWithNewCustomerAndValidationException()
                 ]
             );
 
-        /** @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject $objectMock */
-        $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
+        /** @var DataObject|MockObject $objectMock */
+        $objectMock = $this->getMockBuilder(DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
         $objectMock->expects($this->exactly(2))
@@ -756,7 +756,7 @@ public function testExecuteWithNewCustomerAndValidationException()
             ->willReturn($objectMock);
 
         $customerFormMock = $this->getMockBuilder(
-            \Magento\Customer\Model\Metadata\Form::class
+            Form::class
         )->disableOriginalConstructor()->getMock();
         $customerFormMock->expects($this->exactly(2))
             ->method('extractData')
@@ -780,9 +780,9 @@ public function testExecuteWithNewCustomerAndValidationException()
                 Form::DONT_IGNORE_INVISIBLE
             )->willReturn($customerFormMock);
 
-        /** @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customerMock */
+        /** @var CustomerInterface|MockObject $customerMock */
         $customerMock = $this->getMockBuilder(
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            CustomerInterface::class
         )->disableOriginalConstructor()->getMock();
 
         $this->customerDataFactoryMock->expects($this->once())
@@ -814,7 +814,7 @@ public function testExecuteWithNewCustomerAndValidationException()
 
         $this->messageManagerMock->expects($this->once())
             ->method('addMessage')
-            ->with(new \Magento\Framework\Message\Error('Validator Exception'));
+            ->with(new Error('Validator Exception'));
 
         $this->sessionMock->expects($this->once())
             ->method('setCustomerFormData')
@@ -825,8 +825,8 @@ public function testExecuteWithNewCustomerAndValidationException()
                 ]
             );
 
-        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
+        /** @var Redirect|MockObject $redirectMock */
+        $redirectMock = $this->getMockBuilder(Redirect::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -864,9 +864,9 @@ public function testExecuteWithNewCustomerAndLocalizedException()
             'dob' => '1996-03-12',
         ];
 
-        /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
+        /** @var AttributeMetadataInterface|MockObject $customerFormMock */
         $attributeMock = $this->getMockBuilder(
-            \Magento\Customer\Api\Data\AttributeMetadataInterface::class
+            AttributeMetadataInterface::class
         )->disableOriginalConstructor()->getMock();
         $attributeMock->expects($this->exactly(2))
             ->method('getAttributeCode')
@@ -892,8 +892,8 @@ public function testExecuteWithNewCustomerAndLocalizedException()
                 ]
             );
 
-        /** @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject $objectMock */
-        $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
+        /** @var DataObject|MockObject $objectMock */
+        $objectMock = $this->getMockBuilder(DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
         $objectMock->expects($this->exactly(2))
@@ -906,9 +906,9 @@ public function testExecuteWithNewCustomerAndLocalizedException()
             ->with(['data' => $postValue])
             ->willReturn($objectMock);
 
-        /** @var Form|\PHPUnit_Framework_MockObject_MockObject $formMock */
+        /** @var Form|MockObject $formMock */
         $customerFormMock = $this->getMockBuilder(
-            \Magento\Customer\Model\Metadata\Form::class
+            Form::class
         )->disableOriginalConstructor()->getMock();
         $customerFormMock->expects($this->exactly(2))
             ->method('extractData')
@@ -933,7 +933,7 @@ public function testExecuteWithNewCustomerAndLocalizedException()
             )->willReturn($customerFormMock);
 
         $customerMock = $this->getMockBuilder(
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            CustomerInterface::class
         )->disableOriginalConstructor()->getMock();
 
         $this->customerDataFactoryMock->expects($this->once())
@@ -943,7 +943,7 @@ public function testExecuteWithNewCustomerAndLocalizedException()
         $this->managementMock->expects($this->once())
             ->method('createAccount')
             ->with($customerMock, null, '')
-            ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('Localized Exception')));
+            ->willThrowException(new LocalizedException(__('Localized Exception')));
 
         $customerMock->expects($this->never())
             ->method('getId');
@@ -965,7 +965,7 @@ public function testExecuteWithNewCustomerAndLocalizedException()
 
         $this->messageManagerMock->expects($this->once())
             ->method('addMessage')
-            ->with(new \Magento\Framework\Message\Error('Localized Exception'));
+            ->with(new Error('Localized Exception'));
 
         $this->sessionMock->expects($this->once())
             ->method('setCustomerFormData')
@@ -976,8 +976,8 @@ public function testExecuteWithNewCustomerAndLocalizedException()
                 ]
             );
 
-        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
+        /** @var Redirect|MockObject $redirectMock */
+        $redirectMock = $this->getMockBuilder(Redirect::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -1015,9 +1015,9 @@ public function testExecuteWithNewCustomerAndException()
             'dob' => '1996-03-12',
         ];
 
-        /** @var AttributeMetadataInterface|\PHPUnit_Framework_MockObject_MockObject $customerFormMock */
+        /** @var AttributeMetadataInterface|MockObject $customerFormMock */
         $attributeMock = $this->getMockBuilder(
-            \Magento\Customer\Api\Data\AttributeMetadataInterface::class
+            AttributeMetadataInterface::class
         )->disableOriginalConstructor()->getMock();
         $attributeMock->expects($this->exactly(2))
             ->method('getAttributeCode')
@@ -1043,8 +1043,8 @@ public function testExecuteWithNewCustomerAndException()
                 ]
             );
 
-        /** @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject $objectMock */
-        $objectMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
+        /** @var DataObject|MockObject $objectMock */
+        $objectMock = $this->getMockBuilder(DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
         $objectMock->expects($this->exactly(2))
@@ -1058,7 +1058,7 @@ public function testExecuteWithNewCustomerAndException()
             ->willReturn($objectMock);
 
         $customerFormMock = $this->getMockBuilder(
-            \Magento\Customer\Model\Metadata\Form::class
+            Form::class
         )->disableOriginalConstructor()->getMock();
         $customerFormMock->expects($this->exactly(2))
             ->method('extractData')
@@ -1082,9 +1082,9 @@ public function testExecuteWithNewCustomerAndException()
                 Form::DONT_IGNORE_INVISIBLE
             )->willReturn($customerFormMock);
 
-        /** @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customerMock */
+        /** @var CustomerInterface|MockObject $customerMock */
         $customerMock = $this->getMockBuilder(
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            CustomerInterface::class
         )->disableOriginalConstructor()->getMock();
 
         $this->customerDataFactoryMock->expects($this->once())
@@ -1128,8 +1128,8 @@ public function testExecuteWithNewCustomerAndException()
                 ]
             );
 
-        /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $redirectMock */
-        $redirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
+        /** @var Redirect|MockObject $redirectMock */
+        $redirectMock = $this->getMockBuilder(Redirect::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Customer/Test/Unit/CustomerData/CustomerTest.php b/app/code/Magento/Customer/Test/Unit/CustomerData/CustomerTest.php
new file mode 100644
index 0000000000000..735c526878b6b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/CustomerData/CustomerTest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Customer\Test\Unit\CustomerData;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Customer\CustomerData\Customer as CustomerData;
+use Magento\Customer\Helper\Session\CurrentCustomer;
+use Magento\Customer\Helper\View;
+use Magento\Customer\Api\Data\CustomerInterface;
+use PHPUnit\Framework\TestCase;
+
+class CustomerTest extends TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var CustomerData
+     */
+    private $customerData;
+
+    /**
+     * @var CurrentCustomer
+     */
+    private $currentCustomerMock;
+
+    /**
+     * @var View
+     */
+    private $customerViewHelperMock;
+
+    /**
+     * Setup environment to test
+     */
+    protected function setUp()
+    {
+        $this->currentCustomerMock = $this->createMock(CurrentCustomer::class);
+        $this->customerViewHelperMock = $this->createMock(View::class);
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->customerData = $this->objectManagerHelper->getObject(
+            CustomerData::class,
+            [
+                'currentCustomer' => $this->currentCustomerMock,
+                'customerViewHelper' => $this->customerViewHelperMock
+            ]
+        );
+    }
+
+    /**
+     * Test getSectionData() without customer Id
+     */
+    public function testGetSectionDataWithoutCustomerId()
+    {
+        $this->currentCustomerMock->expects($this->any())->method('getCustomerId')->willReturn(null);
+        $this->assertEquals([], $this->customerData->getSectionData());
+    }
+
+    /**
+     * Test getSectionData() with customer
+     */
+    public function testGetSectionDataWithCustomer()
+    {
+        $this->currentCustomerMock->expects($this->any())->method('getCustomerId')->willReturn(1);
+        $customerMock = $this->createMock(CustomerInterface::class);
+        $customerMock->expects($this->any())->method('getFirstname')->willReturn('John');
+        $customerMock->expects($this->any())->method('getWebsiteId')->willReturn(1);
+        $this->currentCustomerMock->expects($this->any())->method('getCustomer')->willReturn($customerMock);
+        $this->customerViewHelperMock->expects($this->any())->method('getCustomerName')
+            ->with($customerMock)
+            ->willReturn('John Adam');
+
+        $this->assertEquals(
+            [
+                'fullname' => 'John Adam',
+                'firstname' => 'John',
+                'websiteId' => 1,
+            ],
+            $this->customerData->getSectionData()
+        );
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/CustomerData/JsLayoutDataProviderPoolTest.php b/app/code/Magento/Customer/Test/Unit/CustomerData/JsLayoutDataProviderPoolTest.php
new file mode 100644
index 0000000000000..7b7f6ec9f841b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/CustomerData/JsLayoutDataProviderPoolTest.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Customer\Test\Unit\CustomerData;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Tax\CustomerData\CheckoutTotalsJsLayoutDataProvider as CheckoutTotalsJs;
+use Magento\Customer\CustomerData\JsLayoutDataProviderPool;
+use PHPUnit\Framework\TestCase;
+
+class JsLayoutDataProviderPoolTest extends TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var CheckoutTotalsJs
+     */
+    private $checkoutTotalsJsLayoutDataProviderMock;
+
+    /**
+     * @var JsLayoutDataProviderPool
+     */
+    private $jsLayoutDataProviderPool;
+
+    /**
+     * Setup environment to test
+     */
+    protected function setUp()
+    {
+        $this->checkoutTotalsJsLayoutDataProviderMock = $this->createMock(CheckoutTotalsJs::class);
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->jsLayoutDataProviderPool = $this->objectManagerHelper->getObject(
+            JsLayoutDataProviderPool::class,
+            [
+                'jsLayoutDataProviders' => [
+                    'checkout_totals' => $this->checkoutTotalsJsLayoutDataProviderMock
+                ]
+            ]
+        );
+    }
+
+    /**
+     * Test getData() function
+     */
+    public function testGetData()
+    {
+        $checkoutTotalsJsData = [
+            'components' => [
+                'minicart_content' => [
+                    'children' => [
+                        'subtotal.container' => [
+                            'children' => [
+                                'subtotal' => [
+                                    'children' => [
+                                        'subtotal.totals' => [
+                                            'config' => [
+                                                'display_cart_subtotal_incl_tax' => 1,
+                                                'display_cart_subtotal_excl_tax' => 1
+                                            ]
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ]
+        ];
+        $this->checkoutTotalsJsLayoutDataProviderMock->expects($this->any())
+            ->method('getData')
+            ->willReturn($checkoutTotalsJsData);
+
+        $this->assertEquals($checkoutTotalsJsData, $this->jsLayoutDataProviderPool->getData());
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Helper/Session/CurrentCustomerTest.php b/app/code/Magento/Customer/Test/Unit/Helper/Session/CurrentCustomerTest.php
index 03158d05db8e4..15ced1ce66d06 100644
--- a/app/code/Magento/Customer/Test/Unit/Helper/Session/CurrentCustomerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Helper/Session/CurrentCustomerTest.php
@@ -47,7 +47,7 @@ class CurrentCustomerTest extends \PHPUnit\Framework\TestCase
     protected $requestMock;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $moduleManagerMock;
 
@@ -80,7 +80,7 @@ protected function setUp()
         $this->customerDataMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
         $this->customerRepositoryMock = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
         $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
-        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\ModuleManagerInterface::class);
+        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\Manager::class);
         $this->viewMock = $this->createMock(\Magento\Framework\App\View::class);
 
         $this->currentCustomer = new \Magento\Customer\Helper\Session\CurrentCustomer(
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/Source/GroupTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/Source/GroupTest.php
index 9128d7c675262..bc4c19bc23ac1 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/Source/GroupTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/Source/GroupTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Customer\Test\Unit\Model\Customer\Source;
 
 use Magento\Customer\Model\Customer\Source\Group;
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SearchCriteria;
@@ -23,7 +23,7 @@ class GroupTest extends \PHPUnit\Framework\TestCase
     private $model;
 
     /**
-     * @var ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var Manager|\PHPUnit_Framework_MockObject_MockObject
      */
     private $moduleManagerMock;
 
@@ -49,7 +49,7 @@ class GroupTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->moduleManagerMock = $this->getMockBuilder(ModuleManagerInterface::class)
+        $this->moduleManagerMock = $this->getMockBuilder(Manager::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->groupRepositoryMock = $this->getMockBuilder(GroupRepositoryInterface::class)
diff --git a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
index 65831069aa1fb..170cd001e5b9e 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
@@ -15,6 +15,7 @@
 use Magento\Customer\Model\AccountConfirmation;
 use Magento\Customer\Model\ResourceModel\Address\CollectionFactory as AddressCollectionFactory;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Framework\Math\Random;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -86,6 +87,14 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
      */
     private $dataObjectHelper;
 
+    /**
+     * @var Random|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mathRandom;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->_website = $this->createMock(\Magento\Store\Model\Website::class);
@@ -130,6 +139,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['populateWithArray'])
             ->getMock();
+        $this->mathRandom = $this->createMock(Random::class);
 
         $this->_model = $helper->getObject(
             \Magento\Customer\Model\Customer::class,
@@ -146,7 +156,8 @@ protected function setUp()
                 'accountConfirmation' => $this->accountConfirmation,
                 '_addressesFactory' => $this->addressesFactory,
                 'customerDataFactory' => $this->customerDataFactory,
-                'dataObjectHelper' => $this->dataObjectHelper
+                'dataObjectHelper' => $this->dataObjectHelper,
+                'mathRandom' => $this->mathRandom,
             ]
         );
     }
@@ -219,15 +230,17 @@ public function testSendNewAccountEmailWithoutStoreId()
             ->method('getTransport')
             ->will($this->returnValue($transportMock));
 
-        $this->_model->setData([
-            'website_id' => 1,
-            'store_id' => 1,
-            'email' => 'email@example.com',
-            'firstname' => 'FirstName',
-            'lastname' => 'LastName',
-            'middlename' => 'MiddleName',
-            'prefix' => 'Name Prefix',
-        ]);
+        $this->_model->setData(
+            [
+                'website_id' => 1,
+                'store_id' => 1,
+                'email' => 'email@example.com',
+                'firstname' => 'FirstName',
+                'lastname' => 'LastName',
+                'middlename' => 'MiddleName',
+                'prefix' => 'Name Prefix',
+            ]
+        );
         $this->_model->sendNewAccountEmail('registered');
     }
 
@@ -383,4 +396,20 @@ public function testGetDataModel()
         $this->_model->getDataModel();
         $this->assertEquals($customerDataObject, $this->_model->getDataModel());
     }
+
+    /**
+     * Check getRandomConfirmationKey use cryptographically secure function
+     *
+     * @return void
+     */
+    public function testGetRandomConfirmationKey() : void
+    {
+        $this->mathRandom
+            ->expects($this->once())
+            ->method('getRandomString')
+            ->with(32)
+            ->willReturn('random_string');
+
+        $this->_model->getRandomConfirmationKey();
+    }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ActionsTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ActionsTest.php
index 056c7e71e1827..4a16acd98d827 100644
--- a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ActionsTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ActionsTest.php
@@ -7,6 +7,9 @@
 
 use Magento\Customer\Ui\Component\Listing\Column\Actions;
 
+/**
+ * Class ActionsTest
+ */
 class ActionsTest extends \PHPUnit\Framework\TestCase
 {
     /** @var Actions */
@@ -64,7 +67,8 @@ public function testPrepareDataSource()
                             'edit' => [
                                 'href' => 'http://magento.com/customer/index/edit',
                                 'label' => new \Magento\Framework\Phrase('Edit'),
-                                'hidden' => false
+                                'hidden' => false,
+                                '__disableTmpl' => true,
                             ]
                         ]
                     ],
diff --git a/app/code/Magento/Customer/Ui/Component/Form/Field/DisableAutoGroupChange.php b/app/code/Magento/Customer/Ui/Component/Form/Field/DisableAutoGroupChange.php
new file mode 100644
index 0000000000000..3404a0e92230c
--- /dev/null
+++ b/app/code/Magento/Customer/Ui/Component/Form/Field/DisableAutoGroupChange.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Ui\Component\Form\Field;
+
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Customer\Helper\Address as AddressHelper;
+
+/**
+ * Process setting to set Default Value for Disable Automatic Group Changes Based on VAT ID
+ *
+ * Class \Magento\Customer\Ui\Component\Form\Field\DisableAutoGroupChange
+ */
+class DisableAutoGroupChange extends \Magento\Ui\Component\Form\Field
+{
+    /**
+     * Yes value for Default Value for Disable Automatic Group Changes Based on VAT ID
+     */
+    const DISABLE_AUTO_GROUP_CHANGE_YES = '1';
+
+    /**
+     * Address Helper
+     *
+     * @var AddressHelper
+     */
+    private $addressHelper;
+
+    /**
+     * Constructor
+     *
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param AddressHelper $addressHelper
+     * @param UiComponentInterface[] $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        AddressHelper $addressHelper,
+        array $components = [],
+        array $data = []
+    ) {
+        $this->addressHelper = $addressHelper;
+        parent::__construct($context, $uiComponentFactory, $components, $data);
+    }
+
+    /**
+     * Prepare component configuration
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function prepare()
+    {
+        parent::prepare();
+
+        if ($this->addressHelper->isDisableAutoGroupAssignDefaultValue()) {
+            $currentConfig = $this->getData('config');
+            $currentConfig['default'] = self::DISABLE_AUTO_GROUP_CHANGE_YES;
+            $this->setData('config', $currentConfig);
+        }
+    }
+}
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/Actions.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/Actions.php
index d6a4067ef3db6..9441beeb7dc61 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/Actions.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/Actions.php
@@ -60,6 +60,7 @@ public function prepareDataSource(array $dataSource)
                     ),
                     'label' => __('Edit'),
                     'hidden' => false,
+                    '__disableTmpl' => true
                 ];
             }
         }
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
index 6870bd1136d10..5d974088b0d54 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/GroupActions.php
@@ -79,6 +79,7 @@ public function prepareDataSource(array $dataSource)
                                 ]
                             ),
                             'label' => __('Edit'),
+                            '__disableTmpl' => true
                         ],
                     ];
 
@@ -96,13 +97,14 @@ public function prepareDataSource(array $dataSource)
                         ),
                         'label' => __('Delete'),
                         'confirm' => [
-                            'title' => __('Delete %1', $this->escaper->escapeJs($title)),
+                            'title' => __('Delete %1', $this->escaper->escapeHtml($title)),
                             'message' => __(
                                 'Are you sure you want to delete a %1 record?',
-                                $this->escaper->escapeJs($title)
+                                $this->escaper->escapeHtml($title)
                             )
                         ],
-                        'post' => true
+                        'post' => true,
+                        '__disableTmpl' => true
                     ];
                 }
             }
diff --git a/app/code/Magento/Customer/etc/di.xml b/app/code/Magento/Customer/etc/di.xml
index 6086a61157ddc..be219a81fd990 100644
--- a/app/code/Magento/Customer/etc/di.xml
+++ b/app/code/Magento/Customer/etc/di.xml
@@ -473,4 +473,58 @@
     <preference
             for="Magento\Customer\Api\AccountDelegationInterface"
             type="Magento\Customer\Model\Delegation\AccountDelegation" />
+    <type name="Magento\Eav\Model\Config">
+        <arguments>
+            <argument name="attributesForPreload" xsi:type="array">
+                <item name="customer" xsi:type="array">
+                    <item name="confirmation" xsi:type="string">customer</item>
+                    <item name="created_at" xsi:type="string">customer</item>
+                    <item name="created_in" xsi:type="string">customer</item>
+                    <item name="default_billing" xsi:type="string">customer</item>
+                    <item name="default_shipping" xsi:type="string">customer</item>
+                    <item name="disable_auto_group_change" xsi:type="string">customer</item>
+                    <item name="dob" xsi:type="string">customer</item>
+                    <item name="email" xsi:type="string">customer</item>
+                    <item name="failures_num" xsi:type="string">customer</item>
+                    <item name="firstname" xsi:type="string">customer</item>
+                    <item name="first_failure" xsi:type="string">customer</item>
+                    <item name="gender" xsi:type="string">customer</item>
+                    <item name="group_id" xsi:type="string">customer</item>
+                    <item name="lastname" xsi:type="string">customer</item>
+                    <item name="lock_expires" xsi:type="string">customer</item>
+                    <item name="middlename" xsi:type="string">customer</item>
+                    <item name="password_hash" xsi:type="string">customer</item>
+                    <item name="prefix" xsi:type="string">customer</item>
+                    <item name="rp_token" xsi:type="string">customer</item>
+                    <item name="rp_token_created_at" xsi:type="string">customer</item>
+                    <item name="store_id" xsi:type="string">customer</item>
+                    <item name="suffix" xsi:type="string">customer</item>
+                    <item name="taxvat" xsi:type="string">customer</item>
+                    <item name="updated_at" xsi:type="string">customer</item>
+                    <item name="website_id" xsi:type="string">customer</item>
+                </item>
+                <item name="customer_address" xsi:type="array">
+                    <item name="city" xsi:type="string">customer_address</item>
+                    <item name="company" xsi:type="string">customer_address</item>
+                    <item name="country_id" xsi:type="string">customer_address</item>
+                    <item name="fax" xsi:type="string">customer_address</item>
+                    <item name="firstname" xsi:type="string">customer_address</item>
+                    <item name="lastname" xsi:type="string">customer_address</item>
+                    <item name="middlename" xsi:type="string">customer_address</item>
+                    <item name="postcode" xsi:type="string">customer_address</item>
+                    <item name="prefix" xsi:type="string">customer_address</item>
+                    <item name="region" xsi:type="string">customer_address</item>
+                    <item name="region_id" xsi:type="string">customer_address</item>
+                    <item name="street" xsi:type="string">customer_address</item>
+                    <item name="suffix" xsi:type="string">customer_address</item>
+                    <item name="telephone" xsi:type="string">customer_address</item>
+                    <item name="vat_id" xsi:type="string">customer_address</item>
+                    <item name="vat_is_valid" xsi:type="string">customer_address</item>
+                    <item name="vat_request_date" xsi:type="string">customer_address</item>
+                    <item name="vat_request_id" xsi:type="string">customer_address</item>
+                    <item name="vat_request_success" xsi:type="string">customer_address</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Customer/etc/frontend/di.xml b/app/code/Magento/Customer/etc/frontend/di.xml
index c31742519e581..3b9675178c052 100644
--- a/app/code/Magento/Customer/etc/frontend/di.xml
+++ b/app/code/Magento/Customer/etc/frontend/di.xml
@@ -77,4 +77,34 @@
             </argument>
         </arguments>
     </type>
-</config>
\ No newline at end of file
+    <type name="Magento\Framework\View\Element\Message\MessageConfigurationsPool">
+        <arguments>
+            <argument name="configurationsMap" xsi:type="array">
+                <item name="customerAlreadyExistsErrorMessage" 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_Customer::messages/customerAlreadyExistsErrorMessage.phtml</item>
+                    </item>
+                </item>
+                <item name="confirmAccountSuccessMessage" 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_Customer::messages/confirmAccountSuccessMessage.phtml</item>
+                    </item>
+                </item>
+                <item name="customerVatShippingAddressSuccessMessage" 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_Customer::messages/customerVatShippingAddressSuccessMessage.phtml</item>
+                    </item>
+                </item>
+                <item name="customerVatBillingAddressSuccessMessage" 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_Customer::messages/customerVatBillingAddressSuccessMessage.phtml</item>
+                    </item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
index 3495feb925cb3..a70aa08dba735 100644
--- a/app/code/Magento/Customer/i18n/en_US.csv
+++ b/app/code/Magento/Customer/i18n/en_US.csv
@@ -539,3 +539,4 @@ Addresses,Addresses
 "Prefix","Prefix"
 "Middle Name/Initial","Middle Name/Initial"
 "Suffix","Suffix"
+"The Date of Birth should not be greater than today.","The Date of Birth should not be greater than today."
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml
index 12d4902fb1892..d8bcc59689fac 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
+<?php /** @var \Magento\Customer\Block\Adminhtml\Edit\Tab\Newsletter $block */ ?>
 <div class="entry-edit">
 <?= $block->getForm()->getHtml() ?>
 </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 5fb8b17dbb8c5..7caaeab4f39d6 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
@@ -152,8 +152,6 @@
             <argument name="data" xsi:type="array">
                 <item name="type" xsi:type="string">group</item>
                 <item name="config" xsi:type="array">
-                    <item name="label" xsi:type="string" translate="true">Group</item>
-                    <item name="required" xsi:type="boolean">true</item>
                     <item name="dataScope" xsi:type="boolean">false</item>
                     <item name="validateWholeGroup" xsi:type="boolean">true</item>
                 </item>
@@ -166,10 +164,11 @@
                     </item>
                 </argument>
                 <settings>
+                    <required>true</required>
                     <dataType>number</dataType>
                 </settings>
             </field>
-            <field name="disable_auto_group_change" formElement="checkbox">
+            <field name="disable_auto_group_change" formElement="checkbox" class="Magento\Customer\Ui\Component\Form\Field\DisableAutoGroupChange">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="fieldGroup" xsi:type="string">group_id</item>
@@ -265,10 +264,20 @@
             <settings>
                 <validation>
                     <rule name="validate-date" xsi:type="boolean">true</rule>
+                    <rule name="validate-dob" xsi:type="boolean">true</rule>
                 </validation>
                 <dataType>text</dataType>
                 <visible>true</visible>
             </settings>
+            <formElements>
+                <date>
+                    <settings>
+                        <options>
+                            <option name="maxDate" xsi:type="string">-1d</option>
+                        </options>
+                    </settings>
+                </date>
+            </formElements>
         </field>
         <field name="taxvat" formElement="input">
             <argument name="data" xsi:type="array">
diff --git a/app/code/Magento/Customer/view/frontend/email/account_new.html b/app/code/Magento/Customer/view/frontend/email/account_new.html
index 6a60aee863eb4..7b77883e41f71 100644
--- a/app/code/Magento/Customer/view/frontend/email/account_new.html
+++ b/app/code/Magento/Customer/view/frontend/email/account_new.html
@@ -4,9 +4,11 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Welcome to %store_name" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Welcome to %store_name" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
+"var store.frontend_name":"Store Name",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])":"Password Reset URL",
 "var customer.email":"Customer Email",
 "var customer.name":"Customer Name"
 } @-->
@@ -14,7 +16,7 @@
 {{template config_path="design/email/header_template"}}
 
 <p class="greeting">{{trans "%name," name=$customer.name}}</p>
-<p>{{trans "Welcome to %store_name." store_name=$store.getFrontendName()}}</p>
+<p>{{trans "Welcome to %store_name." store_name=$store.frontend_name}}</p>
 <p>
     {{trans
         'To sign in to our site, use these credentials during checkout or on the <a href="%customer_url">My Account</a> page:'
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..364fde0f5150c 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
@@ -4,9 +4,10 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Please confirm your %store_name account" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Please confirm your %store_name account" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var this.getUrl($store, 'customer/account/confirm/', [_query:[id:$customer.id, key:$customer.confirmation, back_url:$back_url]])":"Account Confirmation URL",
+"var store.frontend_name":"Store Name",
+"var this.getUrl($store,'customer/account/confirm/',[_query:[id:$customer.id,key:$customer.confirmation,back_url:$back_url],_nosid:1])":"Account Confirmation URL",
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var customer.email":"Customer Email",
 "var customer.name":"Customer Name"
diff --git a/app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html b/app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html
index 931851b28ac21..34e1103fb2f9d 100644
--- a/app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html
+++ b/app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html
@@ -4,16 +4,18 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Welcome to %store_name" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Welcome to %store_name" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
+"var store.frontend_name":"Store Name",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])":"Password Reset URL",
 "var customer.email":"Customer Email",
 "var customer.name":"Customer Name"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <p class="greeting">{{trans "%name," name=$customer.name}}</p>
-<p>{{trans "Thank you for confirming your %store_name account." store_name=$store.getFrontendName()}}</p>
+<p>{{trans "Thank you for confirming your %store_name account." store_name=$store.frontend_name}}</p>
 <p>
     {{trans
         'To sign in to our site, use these credentials during checkout or on the <a href="%customer_url">My Account</a> page:'
diff --git a/app/code/Magento/Customer/view/frontend/email/account_new_no_password.html b/app/code/Magento/Customer/view/frontend/email/account_new_no_password.html
index 26e417d7da5a7..6d7d89067d8a2 100644
--- a/app/code/Magento/Customer/view/frontend/email/account_new_no_password.html
+++ b/app/code/Magento/Customer/view/frontend/email/account_new_no_password.html
@@ -4,16 +4,18 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Welcome to %store_name" store_name=$store.getFrontendName()}} @-->
-<!--@vars { 
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL", 
+<!--@subject {{trans "Welcome to %store_name" store_name=$store.frontend_name}} @-->
+<!--@vars {
+"var store.frontend_name":"Store Name",
+"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
+"var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])":"Create Password URL",
 "var customer.email":"Customer Email", 
 "var customer.name":"Customer Name" 
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <p class="greeting">{{trans "%name," name=$customer.name}}</p>
-<p>{{trans "Welcome to %store_name." store_name=$store.getFrontendName()}}</p>
+<p>{{trans "Welcome to %store_name." store_name=$store.frontend_name}}</p>
 <p>
     {{trans
         'To sign in to our site and set a password, click on the <a href="%create_password_url">link</a>:'
diff --git a/app/code/Magento/Customer/view/frontend/email/change_email.html b/app/code/Magento/Customer/view/frontend/email/change_email.html
index f343433fe35e2..4853adf638066 100644
--- a/app/code/Magento/Customer/view/frontend/email/change_email.html
+++ b/app/code/Magento/Customer/view/frontend/email/change_email.html
@@ -4,19 +4,23 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Your %store_name email has been changed" store_name=$store.getFrontendName()}} @-->
-<!--@vars {} @-->
+<!--@subject {{trans "Your %store_name email has been changed" store_name=$store.frontend_name}} @-->
+<!--@vars {
+"var store.frontend_name":"Store Name",
+"var store_email":"Store Email",
+"var store_phone":"Store Phone"
+} @-->
 {{template config_path="design/email/header_template"}}
 
 <p class="greeting">{{trans "Hello,"}}</p>
 <br>
 
 <p>
-    {{trans "We have received a request to change the following information associated with your account at %store_name: email." store_name=$store.getFrontendName()}}
+    {{trans "We have received a request to change the following information associated with your account at %store_name: email." store_name=$store.frontend_name}}
     {{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
 </p>
 <br>
 
-<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
+<p>{{trans "Thanks,<br>%store_name" store_name=$store.frontend_name |raw}}</p>
 
 {{template config_path="design/email/footer_template"}}
diff --git a/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html b/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
index 0876e75beacad..49867bdedc9e0 100644
--- a/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
+++ b/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
@@ -4,19 +4,23 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Your %store_name email and password has been changed" store_name=$store.getFrontendName()}} @-->
-<!--@vars {} @-->
+<!--@subject {{trans "Your %store_name email and password has been changed" store_name=$store.frontend_name}} @-->
+<!--@vars {
+"var store.frontend_name":"Store Name",
+"var store_email":"Store Email",
+"var store_phone":"Store Phone"
+} @-->
 {{template config_path="design/email/header_template"}}
 
 <p class="greeting">{{trans "Hello,"}}</p>
 <br>
 
 <p>
-    {{trans "We have received a request to change the following information associated with your account at %store_name: email, password." store_name=$store.getFrontendName()}}
+    {{trans "We have received a request to change the following information associated with your account at %store_name: email, password." store_name=$store.frontend_name}}
     {{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
 </p>
 <br>
 
-<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
+<p>{{trans "Thanks,<br>%store_name" store_name=$store.frontend_name |raw}}</p>
 
 {{template config_path="design/email/footer_template"}}
diff --git a/app/code/Magento/Customer/view/frontend/email/password_new.html b/app/code/Magento/Customer/view/frontend/email/password_new.html
index 1d2468374c6f3..975c8f7254976 100644
--- a/app/code/Magento/Customer/view/frontend/email/password_new.html
+++ b/app/code/Magento/Customer/view/frontend/email/password_new.html
@@ -4,9 +4,11 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Reset your %store_name password" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Reset your %store_name password" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var this.getUrl(store, 'customer/account/')":"Customer Account URL",
+"var store.frontend_name":"Store Name",
+"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
+"var this.getUrl($store,'customer/account/createPassword',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])":"Password Reset URL",
 "var customer.name":"Customer Name"
 } @-->
 {{template config_path="design/email/header_template"}}
diff --git a/app/code/Magento/Customer/view/frontend/email/password_reset.html b/app/code/Magento/Customer/view/frontend/email/password_reset.html
index bfa5330cbf5b0..79015117c2280 100644
--- a/app/code/Magento/Customer/view/frontend/email/password_reset.html
+++ b/app/code/Magento/Customer/view/frontend/email/password_reset.html
@@ -4,9 +4,12 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Your %store_name password has been changed" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Your %store_name password has been changed" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var customer.name":"Customer Name"
+"var customer.name":"Customer Name",
+"var store.frontend_name":"Store Name",
+"var store_email":"Store Email",
+"var store_phone":"Store Phone"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -14,11 +17,11 @@
 <br>
 
 <p>
-    {{trans "We have received a request to change the following information associated with your account at %store_name: password." store_name=$store.getFrontendName()}}
+    {{trans "We have received a request to change the following information associated with your account at %store_name: password." store_name=$store.frontend_name}}
     {{trans 'If you have not authorized this action, please contact us immediately at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
 </p>
 <br>
 
-<p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
+<p>{{trans "Thanks,<br>%store_name" store_name=$store.frontend_name |raw}}</p>
 
 {{template config_path="design/email/footer_template"}}
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 59e7f16adfd51..5dc0e2dfafee9 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
@@ -4,10 +4,11 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Reset your %store_name password" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Reset your %store_name password" store_name=$store.frontend_name}} @-->
 <!--@vars {
+"var store.frontend_name":"Store Name",
 "var customer.name":"Customer Name",
-"var this.getUrl($store, 'customer/account/createPassword/', [_query:[id:$customer.id, token:$customer.rp_token]])":"Reset Password URL"
+"var this.getUrl($store,'customer/account/createPassword/',[_query:[token:$customer.rp_token],_nosid:1])":"Reset Password URL"
 } @-->
 {{template config_path="design/email/header_template"}}
 
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
index 2718f03909be2..e2b6792439576 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
@@ -67,7 +67,7 @@
                 </div>
             </div>
         </div>
-        <div class="field confirm password required" data-container="confirm-password">
+        <div class="field confirmation password required" data-container="confirm-password">
             <label class="label" for="password-confirmation"><span><?= $block->escapeHtml(__('Confirm New Password')) ?></span></label>
             <div class="control">
                 <input type="password" class="input-text" name="password_confirmation" id="password-confirmation"
@@ -93,7 +93,7 @@
     ], function($){
         var dataForm = $('#form-validate');
         var ignore = <?= /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null' ?>;
-        
+
         dataForm.mage('validation', {
         <?php if ($_dob->isEnabled()) : ?>
             errorPlacement: function(error, element) {
diff --git a/app/code/Magento/Customer/view/frontend/templates/messages/confirmAccountSuccessMessage.phtml b/app/code/Magento/Customer/view/frontend/templates/messages/confirmAccountSuccessMessage.phtml
new file mode 100644
index 0000000000000..a2edb20e967c6
--- /dev/null
+++ b/app/code/Magento/Customer/view/frontend/templates/messages/confirmAccountSuccessMessage.phtml
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\View\Element\Template $block */
+?>
+<?= $block->escapeHtml(__('You must confirm your account. Please check your email for the confirmation link or <a href="%1">click here</a> for a new link.', $block->getData('url')), ['a']);
diff --git a/app/code/Magento/Customer/view/frontend/templates/messages/customerAlreadyExistsErrorMessage.phtml b/app/code/Magento/Customer/view/frontend/templates/messages/customerAlreadyExistsErrorMessage.phtml
new file mode 100644
index 0000000000000..32982551b5b16
--- /dev/null
+++ b/app/code/Magento/Customer/view/frontend/templates/messages/customerAlreadyExistsErrorMessage.phtml
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\View\Element\Template $block */
+?>
+<?= $block->escapeHtml(__('There is already an account with this email address. If you are sure that it is your email address, <a href="%1">click here</a> to get your password and access your account.', $block->getData('url')), ['a']);
diff --git a/app/code/Magento/Customer/view/frontend/templates/messages/customerVatBillingAddressSuccessMessage.phtml b/app/code/Magento/Customer/view/frontend/templates/messages/customerVatBillingAddressSuccessMessage.phtml
new file mode 100644
index 0000000000000..294412cbc706d
--- /dev/null
+++ b/app/code/Magento/Customer/view/frontend/templates/messages/customerVatBillingAddressSuccessMessage.phtml
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\View\Element\Template $block */
+?>
+<?= $block->escapeHtml(__('If you are a registered VAT customer, please <a href="%1">click here</a> to enter your billing address for proper VAT calculation.', $block->getData('url')), ['a']);
diff --git a/app/code/Magento/Customer/view/frontend/templates/messages/customerVatShippingAddressSuccessMessage.phtml b/app/code/Magento/Customer/view/frontend/templates/messages/customerVatShippingAddressSuccessMessage.phtml
new file mode 100644
index 0000000000000..72dbf3f5e03d4
--- /dev/null
+++ b/app/code/Magento/Customer/view/frontend/templates/messages/customerVatShippingAddressSuccessMessage.phtml
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\View\Element\Template $block */
+?>
+<?= $block->escapeHtml(__('If you are a registered VAT customer, please <a href="%1">click here</a> to enter your shipping address for proper VAT calculation.', $block->getData('url')), ['a']);
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
index ac4b9f93e0c54..3c2f970faadee 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
@@ -35,3 +35,11 @@ $fieldCssClass .= $block->isRequired() ? ' required' : '';
         <?php endif; ?>
     </div>
 </div>
+
+<script type="text/x-magento-init">
+    {
+       "*": {
+           "Magento_Customer/js/validation": {}
+       }
+    }
+ </script>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
index c444a15705909..4c3432233189b 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
@@ -14,18 +14,14 @@
         </span>
     </label>
     <div class="control">
-            <?php
-            $_validationClass = $block->escapeHtmlAttr(
-                $this->helper(\Magento\Customer\Helper\Address::class)
-                     ->getAttributeValidationClass('telephone')
-            );
-            ?>
         <input type="text"
                name="telephone"
                id="telephone"
                value="<?= $block->escapeHtmlAttr($block->getTelephone()) ?>"
                title="<?= $block->escapeHtmlAttr(__('Phone Number')) ?>"
-               class="input-text <?= $_validationClass ?: '' ?>"
+               class="input-text <?= $block->escapeHtmlAttr(
+                   $block->getAttributeValidationClass('telephone')
+               ) ?>"
         >
     </div>
 </div>
diff --git a/app/code/Magento/Customer/view/frontend/web/js/validation.js b/app/code/Magento/Customer/view/frontend/web/js/validation.js
new file mode 100644
index 0000000000000..67a714212026a
--- /dev/null
+++ b/app/code/Magento/Customer/view/frontend/web/js/validation.js
@@ -0,0 +1,20 @@
+define([
+    'jquery',
+    'moment',
+    'jquery/validate',
+    'mage/translate'
+], function ($, moment) {
+    'use strict';
+
+    $.validator.addMethod(
+        'validate-dob',
+        function (value) {
+            if (value === '') {
+                return true;
+            }
+
+            return moment(value).isBefore(moment());
+        },
+        $.mage.__('The Date of Birth should not be greater than today.')
+    );
+});
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php
index 388b6dc2ea943..37230df202a6f 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CreateCustomerAddress.php
@@ -10,9 +10,10 @@
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Directory\Helper\Data as DirectoryData;
+use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\Api\DataObjectHelper;
 
 /**
  * Create customer address
@@ -38,23 +39,30 @@ class CreateCustomerAddress
      * @var DataObjectHelper
      */
     private $dataObjectHelper;
+    /**
+     * @var DirectoryData
+     */
+    private $directoryData;
 
     /**
      * @param GetAllowedAddressAttributes $getAllowedAddressAttributes
      * @param AddressInterfaceFactory $addressFactory
      * @param AddressRepositoryInterface $addressRepository
      * @param DataObjectHelper $dataObjectHelper
+     * @param DirectoryData $directoryData
      */
     public function __construct(
         GetAllowedAddressAttributes $getAllowedAddressAttributes,
         AddressInterfaceFactory $addressFactory,
         AddressRepositoryInterface $addressRepository,
-        DataObjectHelper $dataObjectHelper
+        DataObjectHelper $dataObjectHelper,
+        DirectoryData $directoryData
     ) {
         $this->getAllowedAddressAttributes = $getAllowedAddressAttributes;
         $this->addressFactory = $addressFactory;
         $this->addressRepository = $addressRepository;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->directoryData = $directoryData;
     }
 
     /**
@@ -67,6 +75,10 @@ public function __construct(
      */
     public function execute(int $customerId, array $data): AddressInterface
     {
+        // It is needed because AddressInterface has country_id field.
+        if (isset($data['country_code'])) {
+            $data['country_id'] = $data['country_code'];
+        }
         $this->validateData($data);
 
         /** @var AddressInterface $address */
@@ -98,6 +110,13 @@ public function validateData(array $addressData): void
         $attributes = $this->getAllowedAddressAttributes->execute();
         $errorInput = [];
 
+        //Add error for empty postcode with country with no optional ZIP
+        if (!$this->directoryData->isZipCodeOptional($addressData['country_id'])
+            && (!isset($addressData['postcode']) || empty($addressData['postcode']))
+        ) {
+            $errorInput[] = 'postcode';
+        }
+
         foreach ($attributes as $attributeName => $attributeInfo) {
             if ($attributeInfo->getIsRequired()
                 && (!isset($addressData[$attributeName]) || empty($addressData[$attributeName]))
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php
index 8741bff7aa88d..5a302f4c3df27 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/ExtractCustomerAddressData.php
@@ -105,6 +105,7 @@ public function execute(AddressInterface $address): array
             foreach ($addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES] as $attribute) {
                 $isArray = false;
                 if (is_array($attribute['value'])) {
+                    // @ignoreCoverageStart
                     $isArray = true;
                     foreach ($attribute['value'] as $attributeValue) {
                         if (is_array($attributeValue)) {
@@ -116,6 +117,7 @@ public function execute(AddressInterface $address): array
                         $customAttributes[$attribute['attribute_code']] = implode(',', $attribute['value']);
                         continue;
                     }
+                    // @ignoreCoverageEnd
                 }
                 if ($isArray) {
                     continue;
@@ -127,6 +129,10 @@ public function execute(AddressInterface $address): array
 
         $addressData['customer_id'] = null;
 
+        if (isset($addressData['country_id'])) {
+            $addressData['country_code'] = $addressData['country_id'];
+        }
+
         return $addressData;
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/UpdateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/UpdateCustomerAddress.php
index 65745a20bc8eb..26e53c7c3a0a8 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/UpdateCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/UpdateCustomerAddress.php
@@ -66,6 +66,9 @@ public function __construct(
      */
     public function execute(AddressInterface $address, array $data): void
     {
+        if (isset($data['country_code'])) {
+            $data['country_id'] = $data['country_code'];
+        }
         $this->validateData($data);
 
         $filteredData = array_diff_key($data, array_flip($this->restrictedKeys));
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/ChangeSubscriptionStatus.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ChangeSubscriptionStatus.php
deleted file mode 100644
index 1acb418e7bba6..0000000000000
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/ChangeSubscriptionStatus.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\CustomerGraphQl\Model\Customer;
-
-use Magento\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/CheckCustomerPassword.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerPassword.php
index 3cc831e1ca40e..c252628b6566e 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerPassword.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CheckCustomerPassword.php
@@ -9,12 +9,8 @@
 
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Framework\Exception\InvalidEmailOrPasswordException;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 
 /**
  * Check customer password
@@ -41,8 +37,6 @@ public function __construct(
      * @param string $password
      * @param int $customerId
      * @throws GraphQlAuthenticationException
-     * @throws GraphQlInputException
-     * @throws GraphQlNoSuchEntityException
      */
     public function execute(string $password, int $customerId)
     {
@@ -52,10 +46,6 @@ public function execute(string $password, int $customerId)
             throw new GraphQlAuthenticationException(__($e->getMessage()), $e);
         } catch (UserLockedException $e) {
             throw new GraphQlAuthenticationException(__($e->getMessage()), $e);
-        } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-        } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__($e->getMessage()), $e);
         }
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php
index 969c205329f2b..a631b7ba86194 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateCustomerAccount.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Newsletter\Model\SubscriptionManagerInterface;
 use Magento\Store\Api\Data\StoreInterface;
 
 /**
@@ -36,11 +37,6 @@ class CreateCustomerAccount
      */
     private $accountManagement;
 
-    /**
-     * @var ChangeSubscriptionStatus
-     */
-    private $changeSubscriptionStatus;
-
     /**
      * @var ValidateCustomerData
      */
@@ -51,30 +47,35 @@ class CreateCustomerAccount
      */
     private $dataObjectProcessor;
 
+    /**
+     * @var SubscriptionManagerInterface
+     */
+    private $subscriptionManager;
+
     /**
      * CreateCustomerAccount constructor.
      *
      * @param DataObjectHelper $dataObjectHelper
      * @param CustomerInterfaceFactory $customerFactory
      * @param AccountManagementInterface $accountManagement
-     * @param ChangeSubscriptionStatus $changeSubscriptionStatus
      * @param DataObjectProcessor $dataObjectProcessor
      * @param ValidateCustomerData $validateCustomerData
+     * @param SubscriptionManagerInterface $subscriptionManager
      */
     public function __construct(
         DataObjectHelper $dataObjectHelper,
         CustomerInterfaceFactory $customerFactory,
         AccountManagementInterface $accountManagement,
-        ChangeSubscriptionStatus $changeSubscriptionStatus,
         DataObjectProcessor $dataObjectProcessor,
-        ValidateCustomerData $validateCustomerData
+        ValidateCustomerData $validateCustomerData,
+        SubscriptionManagerInterface $subscriptionManager
     ) {
         $this->dataObjectHelper = $dataObjectHelper;
         $this->customerFactory = $customerFactory;
         $this->accountManagement = $accountManagement;
-        $this->changeSubscriptionStatus = $changeSubscriptionStatus;
         $this->validateCustomerData = $validateCustomerData;
         $this->dataObjectProcessor = $dataObjectProcessor;
+        $this->subscriptionManager = $subscriptionManager;
     }
 
     /**
@@ -94,7 +95,11 @@ public function execute(array $data, StoreInterface $store): CustomerInterface
         }
 
         if (isset($data['is_subscribed'])) {
-            $this->changeSubscriptionStatus->execute((int)$customer->getId(), (bool)$data['is_subscribed']);
+            if ((bool)$data['is_subscribed']) {
+                $this->subscriptionManager->subscribeCustomer((int)$customer->getId(), (int)$store->getId());
+            } else {
+                $this->subscriptionManager->unsubscribeCustomer((int)$customer->getId(), (int)$store->getId());
+            }
         }
         return $customer;
     }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php
index 63f42ea1825af..812b3fd283525 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php
@@ -70,6 +70,7 @@ public function execute(ContextInterface $context): CustomerInterface
 
         try {
             $customer = $this->customerRepository->getById($currentUserId);
+            // @codeCoverageIgnoreStart
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(
                 __('Customer with id "%customer_id" does not exist.', ['customer_id' => $currentUserId]),
@@ -77,6 +78,7 @@ public function execute(ContextInterface $context): CustomerInterface
             );
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
+            // @codeCoverageIgnoreEnd
         }
 
         if (true === $this->authentication->isLocked($currentUserId)) {
@@ -85,8 +87,10 @@ public function execute(ContextInterface $context): CustomerInterface
 
         try {
             $confirmationStatus = $this->accountManagement->getConfirmationStatus($currentUserId);
+            // @codeCoverageIgnoreStart
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
+            // @codeCoverageIgnoreEnd
         }
 
         if ($confirmationStatus === AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED) {
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php
index f7bf26513dc2e..d82b8c6f941fa 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerAccount.php
@@ -14,6 +14,7 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\Api\DataObjectHelper;
+use Magento\Newsletter\Model\SubscriptionManagerInterface;
 use Magento\Store\Api\Data\StoreInterface;
 
 /**
@@ -38,11 +39,6 @@ class UpdateCustomerAccount
      */
     private $dataObjectHelper;
 
-    /**
-     * @var ChangeSubscriptionStatus
-     */
-    private $changeSubscriptionStatus;
-
     /**
      * @var ValidateCustomerData
      */
@@ -53,28 +49,33 @@ class UpdateCustomerAccount
      */
     private $restrictedKeys;
 
+    /**
+     * @var SubscriptionManagerInterface
+     */
+    private $subscriptionManager;
+
     /**
      * @param SaveCustomer $saveCustomer
      * @param CheckCustomerPassword $checkCustomerPassword
      * @param DataObjectHelper $dataObjectHelper
-     * @param ChangeSubscriptionStatus $changeSubscriptionStatus
      * @param ValidateCustomerData $validateCustomerData
+     * @param SubscriptionManagerInterface $subscriptionManager
      * @param array $restrictedKeys
      */
     public function __construct(
         SaveCustomer $saveCustomer,
         CheckCustomerPassword $checkCustomerPassword,
         DataObjectHelper $dataObjectHelper,
-        ChangeSubscriptionStatus $changeSubscriptionStatus,
         ValidateCustomerData $validateCustomerData,
+        SubscriptionManagerInterface $subscriptionManager,
         array $restrictedKeys = []
     ) {
         $this->saveCustomer = $saveCustomer;
         $this->checkCustomerPassword = $checkCustomerPassword;
         $this->dataObjectHelper = $dataObjectHelper;
         $this->restrictedKeys = $restrictedKeys;
-        $this->changeSubscriptionStatus = $changeSubscriptionStatus;
         $this->validateCustomerData = $validateCustomerData;
+        $this->subscriptionManager = $subscriptionManager;
     }
 
     /**
@@ -112,7 +113,11 @@ public function execute(CustomerInterface $customer, array $data, StoreInterface
         $this->saveCustomer->execute($customer);
 
         if (isset($data['is_subscribed'])) {
-            $this->changeSubscriptionStatus->execute((int)$customer->getId(), (bool)$data['is_subscribed']);
+            if ((bool)$data['is_subscribed']) {
+                $this->subscriptionManager->subscribeCustomer((int)$customer->getId(), (int)$store->getId());
+            } else {
+                $this->subscriptionManager->unsubscribeCustomer((int)$customer->getId(), (int)$store->getId());
+            }
         }
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
index da588b98b5dbc..c26b3710ef561 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
@@ -58,10 +58,6 @@ public function resolve(
             throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
         }
 
-        if (empty($args['id'])) {
-            throw new GraphQlInputException(__('Address "id" value should be specified'));
-        }
-
         $address = $this->getCustomerAddress->execute((int)$args['id'], $context->getUserId());
         $this->deleteCustomerAddress->execute($address);
         return true;
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
index 4e49891b5870a..3e69723d4e771 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
@@ -7,6 +7,7 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
@@ -45,10 +46,12 @@ public function resolve(
         if (!isset($value['model'])) {
             throw new LocalizedException(__('"model" value should be specified'));
         }
-        /** @var Customer $customer */
+        /** @var CustomerInterface $customer */
         $customer = $value['model'];
+        $customerId = (int)$customer->getId();
+        $websiteId = (int)$customer->getWebsiteId();
+        $status = $this->subscriberFactory->create()->loadByCustomer($customerId, $websiteId)->isSubscribed();
 
-        $status = $this->subscriberFactory->create()->loadByCustomerId((int)$customer->getId())->isSubscribed();
         return (bool)$status;
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/composer.json b/app/code/Magento/CustomerGraphQl/composer.json
index 911624da8fe57..70a98f728b696 100644
--- a/app/code/Magento/CustomerGraphQl/composer.json
+++ b/app/code/Magento/CustomerGraphQl/composer.json
@@ -4,7 +4,6 @@
   "type": "magento2-module",
   "require": {
     "php": "~7.1.3||~7.2.0||~7.3.0",
-    "magento/module-customer": "*",
     "magento/module-authorization": "*",
     "magento/module-customer": "*",
     "magento/module-eav": "*",
@@ -12,7 +11,8 @@
     "magento/module-newsletter": "*",
     "magento/module-integration": "*",
     "magento/module-store": "*",
-    "magento/framework": "*"
+    "magento/framework": "*",
+    "magento/module-directory": "*"
   },
   "license": [
     "OSL-3.0",
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
index 793ff0954ee94..9aa1fdaa841e4 100644
--- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -28,7 +28,8 @@ input CustomerAddressInput {
     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")
+    country_id: CountryCodeEnum @doc(description: "Deprecated: use `country_code` instead.")
+    country_code: 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")
@@ -60,7 +61,7 @@ input CustomerInput {
     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")
+    email: String @doc(description: "The customer's email address. Required for customer creation")
     dob: String @doc(description: "Deprecated: Use `date_of_birth` instead")
     date_of_birth: String @doc(description: "The customer's date of birth")
     taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
@@ -102,7 +103,8 @@ type CustomerAddress @doc(description: "CustomerAddress contains detailed inform
     customer_id: Int @doc(description: "The customer ID") @deprecated(reason: "customer_id is not needed as part of CustomerAddress, address ID (id) is unique identifier for the addresses.")
     region: CustomerAddressRegion @doc(description: "An object containing the region name, region code, and region ID")
     region_id: Int @deprecated(reason: "Region ID is excessive on storefront and region code should suffice for all scenarios")
-    country_id: String @doc(description: "The customer's country")
+    country_id: String @doc(description: "The customer's country") @deprecated(reason: "Use `country_code` instead.")
+    country_code: CountryCodeEnum @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")
diff --git a/app/code/Magento/Deploy/Collector/Collector.php b/app/code/Magento/Deploy/Collector/Collector.php
index 7742f2971a2fe..b09001a7ac04c 100644
--- a/app/code/Magento/Deploy/Collector/Collector.php
+++ b/app/code/Magento/Deploy/Collector/Collector.php
@@ -9,7 +9,7 @@
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Package\PackageFactory;
 use Magento\Deploy\Package\PackageFile;
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\Framework\View\Asset\PreProcessor\FileNameResolver;
 
 /**
@@ -45,8 +45,8 @@ class Collector implements CollectorInterface
      * @var PackageFactory
      */
     private $packageFactory;
-    
-    /** @var \Magento\Framework\Module\ModuleManagerInterface */
+
+    /** @var \Magento\Framework\Module\Manager */
     private $moduleManager;
 
     /**
@@ -66,19 +66,19 @@ class Collector implements CollectorInterface
      * @param SourcePool $sourcePool
      * @param FileNameResolver $fileNameResolver
      * @param PackageFactory $packageFactory
-     * @param ModuleManagerInterface|null $moduleManager
+     * @param Manager|null $moduleManager
      */
     public function __construct(
         SourcePool $sourcePool,
         FileNameResolver $fileNameResolver,
         PackageFactory $packageFactory,
-        ModuleManagerInterface $moduleManager = null
+        Manager $moduleManager = null
     ) {
         $this->sourcePool = $sourcePool;
         $this->fileNameResolver = $fileNameResolver;
         $this->packageFactory = $packageFactory;
         $this->moduleManager = $moduleManager ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Module\ModuleManagerInterface::class);
+            ->get(\Magento\Framework\Module\Manager::class);
     }
 
     /**
diff --git a/app/code/Magento/Deploy/Console/DeployStaticOptions.php b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
index 1c02d24f7e99c..06887fc0206fc 100644
--- a/app/code/Magento/Deploy/Console/DeployStaticOptions.php
+++ b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
@@ -78,6 +78,11 @@ class DeployStaticOptions
      */
     const NO_JAVASCRIPT = 'no-javascript';
 
+    /**
+     * Key for js-bundle option
+     */
+    const NO_JS_BUNDLE = 'no-js-bundle';
+
     /**
      * Key for css option
      */
@@ -122,9 +127,6 @@ class DeployStaticOptions
      */
     const NO_LESS = 'no-less';
 
-    /**
-     * Default jobs amount
-     */
     const DEFAULT_JOBS_AMOUNT = 0;
 
     /**
@@ -275,6 +277,12 @@ private function getSkipOptions()
                 InputOption::VALUE_NONE,
                 'Do not deploy JavaScript files.'
             ),
+            new InputOption(
+                self::NO_JS_BUNDLE,
+                null,
+                InputOption::VALUE_NONE,
+                'Do not deploy JavaScript bundle files.'
+            ),
             new InputOption(
                 self::NO_CSS,
                 null,
diff --git a/app/code/Magento/Deploy/Package/Package.php b/app/code/Magento/Deploy/Package/Package.php
index 2e924d41a1b83..423f3072c4620 100644
--- a/app/code/Magento/Deploy/Package/Package.php
+++ b/app/code/Magento/Deploy/Package/Package.php
@@ -459,17 +459,17 @@ public function getParentMap()
      */
     public function getParentFiles($type = null)
     {
-        $files = [];
+        $files = [[]];
         foreach ($this->getParentPackages() as $parentPackage) {
             if ($type === null) {
                 // phpcs:ignore Magento2.Performance.ForeachArrayMerge.ForeachArrayMerge
-                $files = array_merge($files, $parentPackage->getFiles());
+                $files[] = $parentPackage->getFiles();
             } else {
                 // phpcs:ignore Magento2.Performance.ForeachArrayMerge.ForeachArrayMerge
-                $files = array_merge($files, $parentPackage->getFilesByType($type));
+                $files[] = $parentPackage->getFilesByType($type);
             }
         }
-        return $files;
+        return array_merge(...$files);
     }
 
     /**
diff --git a/app/code/Magento/Deploy/Process/Queue.php b/app/code/Magento/Deploy/Process/Queue.php
index 2f2a149239990..6c8db345187cc 100644
--- a/app/code/Magento/Deploy/Process/Queue.php
+++ b/app/code/Magento/Deploy/Process/Queue.php
@@ -161,6 +161,7 @@ public function getPackages()
     public function process()
     {
         $returnStatus = 0;
+        $logDelay = 10;
         $this->start = $this->lastJobStarted = time();
         $packages = $this->packages;
         while (count($packages) && $this->checkTimeout()) {
@@ -168,12 +169,24 @@ public function process()
                 // Unsets each member of $packages array (passed by reference) as each is executed
                 $this->assertAndExecute($name, $packages, $packageJob);
             }
-            $this->logger->info('.');
-            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-            sleep(3);
-            foreach ($this->inProgress as $name => $package) {
-                if ($this->isDeployed($package)) {
-                    unset($this->inProgress[$name]);
+
+            // refresh current status in console once in 10 iterations (once in 5 sec)
+            if ($logDelay >= 10) {
+                $this->logger->info('.');
+                $logDelay = 0;
+            } else {
+                $logDelay++;
+            }
+
+            if ($this->isCanBeParalleled()) {
+                // in parallel mode sleep before trying to check status and run new jobs
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                usleep(500000); // 0.5 sec (less sleep == less time waste)
+
+                foreach ($this->inProgress as $name => $package) {
+                    if ($this->isDeployed($package)) {
+                        unset($this->inProgress[$name]);
+                    }
                 }
             }
         }
@@ -243,15 +256,25 @@ private function executePackage(Package $package, string $name, array &$packages
      */
     private function awaitForAllProcesses()
     {
+        $logDelay = 10;
         while ($this->inProgress && $this->checkTimeout()) {
             foreach ($this->inProgress as $name => $package) {
                 if ($this->isDeployed($package)) {
                     unset($this->inProgress[$name]);
                 }
             }
-            $this->logger->info('.');
+
+            // refresh current status in console once in 10 iterations (once in 5 sec)
+            if ($logDelay >= 10) {
+                $this->logger->info('.');
+                $logDelay = 0;
+            } else {
+                $logDelay++;
+            }
+
+            // sleep before checking parallel jobs status
             // phpcs:ignore Magento2.Functions.DiscouragedFunction
-            sleep(5);
+            usleep(500000); // 0.5 sec (less sleep == less time waste)
         }
         if ($this->isCanBeParalleled()) {
             // close connections only if ran with forks
diff --git a/app/code/Magento/Deploy/Service/DeployPackage.php b/app/code/Magento/Deploy/Service/DeployPackage.php
index 34a6b147a0551..90d4cdb116969 100644
--- a/app/code/Magento/Deploy/Service/DeployPackage.php
+++ b/app/code/Magento/Deploy/Service/DeployPackage.php
@@ -249,23 +249,6 @@ private function checkFileSkip($filePath, array $options)
      */
     private function register(Package $package, PackageFile $file = null, $skipLogging = false)
     {
-        $logMessage = '.';
-        if ($file) {
-            $logMessage = "Processing file '{$file->getSourcePath()}'";
-            if ($file->getArea()) {
-                $logMessage .= "  for area '{$file->getArea()}'";
-            }
-            if ($file->getTheme()) {
-                $logMessage .= ", theme '{$file->getTheme()}'";
-            }
-            if ($file->getLocale()) {
-                $logMessage .= ", locale '{$file->getLocale()}'";
-            }
-            if ($file->getModule()) {
-                $logMessage .= "module '{$file->getModule()}'";
-            }
-        }
-
         $info = [
             'count' => $this->count,
             'last' => $file ? $file->getSourcePath() : ''
@@ -273,6 +256,23 @@ private function register(Package $package, PackageFile $file = null, $skipLoggi
         $this->deployStaticFile->writeTmpFile('info.json', $package->getPath(), json_encode($info));
 
         if (!$skipLogging) {
+            $logMessage = '.';
+            if ($file) {
+                $logMessage = "Processing file '{$file->getSourcePath()}'";
+                if ($file->getArea()) {
+                    $logMessage .= "  for area '{$file->getArea()}'";
+                }
+                if ($file->getTheme()) {
+                    $logMessage .= ", theme '{$file->getTheme()}'";
+                }
+                if ($file->getLocale()) {
+                    $logMessage .= ", locale '{$file->getLocale()}'";
+                }
+                if ($file->getModule()) {
+                    $logMessage .= "module '{$file->getModule()}'";
+                }
+            }
+
             $this->logger->info($logMessage);
         }
     }
diff --git a/app/code/Magento/Deploy/Service/DeployStaticContent.php b/app/code/Magento/Deploy/Service/DeployStaticContent.php
index 8903997159914..b6333d6fec71e 100644
--- a/app/code/Magento/Deploy/Service/DeployStaticContent.php
+++ b/app/code/Magento/Deploy/Service/DeployStaticContent.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Deploy\Service;
 
-use Magento\Deploy\Strategy\DeployStrategyFactory;
-use Magento\Deploy\Process\QueueFactory;
 use Magento\Deploy\Console\DeployStaticOptions as Options;
+use Magento\Deploy\Process\QueueFactory;
+use Magento\Deploy\Strategy\DeployStrategyFactory;
 use Magento\Framework\App\View\Deployment\Version\StorageInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\ObjectManagerInterface;
@@ -75,6 +75,9 @@ public function __construct(
      * @param array $options
      * @throws LocalizedException
      * @return void
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function deploy(array $options)
     {
@@ -106,27 +109,35 @@ public function deploy(array $options)
 
         $deployStrategy = $this->deployStrategyFactory->create(
             $options[Options::STRATEGY],
-            [
-                'queue' => $this->queueFactory->create($queueOptions)
-            ]
+            ['queue' => $this->queueFactory->create($queueOptions)]
         );
 
         $packages = $deployStrategy->deploy($options);
 
         if ($options[Options::NO_JAVASCRIPT] !== true) {
-            $deployRjsConfig = $this->objectManager->create(DeployRequireJsConfig::class, [
-                'logger' => $this->logger
-            ]);
-            $deployI18n = $this->objectManager->create(DeployTranslationsDictionary::class, [
-                'logger' => $this->logger
-            ]);
-            $deployBundle = $this->objectManager->create(Bundle::class, [
-                'logger' => $this->logger
-            ]);
+            $deployRjsConfig = $this->objectManager->create(
+                DeployRequireJsConfig::class,
+                ['logger' => $this->logger]
+            );
+            $deployI18n      = $this->objectManager->create(
+                DeployTranslationsDictionary::class,
+                ['logger' => $this->logger]
+            );
             foreach ($packages as $package) {
                 if (!$package->isVirtual()) {
                     $deployRjsConfig->deploy($package->getArea(), $package->getTheme(), $package->getLocale());
                     $deployI18n->deploy($package->getArea(), $package->getTheme(), $package->getLocale());
+                }
+            }
+        }
+
+        if ($options[Options::NO_JAVASCRIPT] !== true && $options[Options::NO_JS_BUNDLE] !== true) {
+            $deployBundle = $this->objectManager->create(
+                Bundle::class,
+                ['logger' => $this->logger]
+            );
+            foreach ($packages as $package) {
+                if (!$package->isVirtual()) {
                     $deployBundle->deploy($package->getArea(), $package->getTheme(), $package->getLocale());
                 }
             }
diff --git a/app/code/Magento/Deploy/Test/Unit/Process/QueueTest.php b/app/code/Magento/Deploy/Test/Unit/Process/QueueTest.php
index dc32de527c8c1..540826c67b790 100644
--- a/app/code/Magento/Deploy/Test/Unit/Process/QueueTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Process/QueueTest.php
@@ -112,6 +112,7 @@ public function testProcess()
         $package->expects($this->any())->method('getArea')->willReturn('area');
         $package->expects($this->any())->method('getPath')->willReturn('path');
         $package->expects($this->any())->method('getFiles')->willReturn([]);
+        $this->logger->expects($this->exactly(2))->method('info')->willReturnSelf();
 
         $this->appState->expects($this->once())->method('emulateAreaCode');
 
diff --git a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
index 396381960e544..fcc02476bb858 100644
--- a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
@@ -103,7 +103,7 @@ public function testDeploy($options, $expectedContentVersion)
             $package->expects($this->never())->method('getTheme');
             $package->expects($this->never())->method('getLocale');
         } else {
-            $package->expects($this->exactly(1))->method('isVirtual')->willReturn(false);
+            $package->expects($this->exactly(2))->method('isVirtual')->willReturn(false);
             $package->expects($this->exactly(3))->method('getArea')->willReturn('area');
             $package->expects($this->exactly(3))->method('getTheme')->willReturn('theme');
             $package->expects($this->exactly(3))->method('getLocale')->willReturn('locale');
@@ -198,6 +198,7 @@ public function deployDataProvider()
                 [
                     'strategy' =>  'compact',
                     'no-javascript' => false,
+                    'no-js-bundle' => false,
                     'no-html-minify' => false,
                     'refresh-content-version-only' => false,
                 ],
@@ -207,6 +208,7 @@ public function deployDataProvider()
                 [
                     'strategy' =>  'compact',
                     'no-javascript' => false,
+                    'no-js-bundle' => false,
                     'no-html-minify' => false,
                     'refresh-content-version-only' => false,
                     'content-version' =>  '123456',
@@ -226,25 +228,28 @@ public function deployDataProvider()
     public function testMaxExecutionTimeOptionPassed()
     {
         $options = [
-            DeployStaticOptions::MAX_EXECUTION_TIME => 100,
+            DeployStaticOptions::MAX_EXECUTION_TIME           => 100,
             DeployStaticOptions::REFRESH_CONTENT_VERSION_ONLY => false,
-            DeployStaticOptions::JOBS_AMOUNT => 3,
-            DeployStaticOptions::STRATEGY => 'compact',
-            DeployStaticOptions::NO_JAVASCRIPT => true,
-            DeployStaticOptions::NO_HTML_MINIFY => true,
+            DeployStaticOptions::JOBS_AMOUNT                  => 3,
+            DeployStaticOptions::STRATEGY                     => 'compact',
+            DeployStaticOptions::NO_JAVASCRIPT                => true,
+            DeployStaticOptions::NO_JS_BUNDLE                 => true,
+            DeployStaticOptions::NO_HTML_MINIFY               => true,
         ];
 
         $queueMock = $this->createMock(Queue::class);
         $strategyMock = $this->createMock(CompactDeploy::class);
         $this->queueFactory->expects($this->once())
             ->method('create')
-            ->with([
-                'logger' => $this->logger,
-                'maxExecTime' => 100,
-                'maxProcesses' => 3,
-                'options' => $options,
-                'deployPackageService' => null
-            ])
+            ->with(
+                [
+                    'logger'               => $this->logger,
+                    'maxExecTime'          => 100,
+                    'maxProcesses'         => 3,
+                    'options'              => $options,
+                    'deployPackageService' => null
+                ]
+            )
             ->willReturn($queueMock);
         $this->deployStrategyFactory->expects($this->once())
             ->method('create')
diff --git a/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php b/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php
index 2155efa017093..b35a3e68b0f20 100644
--- a/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php
+++ b/app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php
@@ -10,6 +10,7 @@
 use Magento\Developer\Model\Setup\Declaration\Schema\WhitelistGenerator;
 use Magento\Framework\Config\FileResolverByModule;
 use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -80,11 +81,12 @@ protected function execute(InputInterface $input, OutputInterface $output) : int
             $this->whitelistGenerator->generate($moduleName);
         } catch (ConfigurationMismatchException $e) {
             $output->writeln($e->getMessage());
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return Cli::RETURN_FAILURE;
         } catch (\Exception $e) {
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            $output->writeln($e->getMessage());
+            return Cli::RETURN_FAILURE;
         }
 
-        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+        return Cli::RETURN_SUCCESS;
     }
 }
diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/TablesWhitelistGenerateCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/TablesWhitelistGenerateCommandTest.php
new file mode 100644
index 0000000000000..8e547332c0b44
--- /dev/null
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/TablesWhitelistGenerateCommandTest.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Developer\Test\Unit\Console\Command;
+
+use Magento\Developer\Console\Command\TablesWhitelistGenerateCommand as GenerateCommand;
+use Magento\Developer\Model\Setup\Declaration\Schema\WhitelistGenerator;
+use Magento\Framework\Console\Cli;
+use Magento\Framework\Exception\ConfigurationMismatchException as ConfigException;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Tester\CommandTester;
+
+/**
+ * Class TablesWhitelistGenerateCommandTest
+ *
+ * @package Magento\Developer\Test\Unit\Console\Command
+ */
+class TablesWhitelistGenerateCommandTest extends TestCase
+{
+    // Exception Messages!
+    const CONFIG_EXCEPTION_MESSAGE = 'Configuration Exception Message';
+    const EXCEPTION_MESSAGE = 'General Exception Message';
+
+    /** @var WhitelistGenerator|MockObject $whitelistGenerator */
+    private $whitelistGenerator;
+
+    /** @var GenerateCommand $instance */
+    private $instance;
+
+    protected function setUp()
+    {
+        $this->whitelistGenerator = $this->getMockBuilder(WhitelistGenerator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->instance = new GenerateCommand($this->whitelistGenerator);
+    }
+
+    /**
+     * Test case for success scenario
+     *
+     * @param string $arguments
+     * @param string $expected
+     *
+     * @dataProvider successDataProvider
+     */
+    public function testCommandSuccess(string $arguments, string $expected)
+    {
+        $this->whitelistGenerator->expects($this->once())
+            ->method('generate')
+            ->with($arguments);
+
+        $commandTest = $this->execute($arguments);
+        $this->assertEquals($expected, $commandTest->getStatusCode());
+        $this->assertEquals('', $commandTest->getDisplay());
+    }
+
+    /**
+     * Test case for failure scenario
+     *
+     * @param string $arguments
+     * @param string $expected
+     * @param \Exception|ConfigException $exception
+     * @param string $output
+     *
+     * @dataProvider failureDataProvider
+     */
+    public function testCommandFailure(string $arguments, string $expected, $exception, string $output)
+    {
+        $this->whitelistGenerator->expects($this->once())
+            ->method('generate')
+            ->with($arguments)
+            ->willReturnCallback(
+                function () use ($exception) {
+                    throw $exception;
+                }
+            );
+
+        $commandTest = $this->execute($arguments);
+        $this->assertEquals($expected, $commandTest->getStatusCode());
+        $this->assertEquals($output . PHP_EOL, $commandTest->getDisplay());
+    }
+
+    /**
+     * Data provider for success test case
+     *
+     * @return array
+     */
+    public function successDataProvider()
+    {
+        return [
+            [
+                'all',
+                Cli::RETURN_SUCCESS,
+
+            ],
+            [
+                'Module_Name',
+                Cli::RETURN_SUCCESS
+            ]
+        ];
+    }
+
+    /**
+     * Data provider for failure test case
+     *
+     * @return array
+     */
+    public function failureDataProvider()
+    {
+        return [
+            [
+                'all',
+                Cli::RETURN_FAILURE,
+                new ConfigException(__('Configuration Exception Message')),
+                self::CONFIG_EXCEPTION_MESSAGE
+            ],
+            [
+                'Module_Name',
+                Cli::RETURN_FAILURE,
+                new ConfigException(__('Configuration Exception Message')),
+                self::CONFIG_EXCEPTION_MESSAGE
+            ],
+            [
+                'all',
+                Cli::RETURN_FAILURE,
+                new \Exception(self::EXCEPTION_MESSAGE),
+                self::EXCEPTION_MESSAGE
+            ],
+            [
+                'Module_Name',
+                Cli::RETURN_FAILURE,
+                new \Exception(self::EXCEPTION_MESSAGE),
+                self::EXCEPTION_MESSAGE
+            ]
+        ];
+    }
+
+    /**
+     * Execute command test class for symphony
+     *
+     * @param string $arguments
+     *
+     * @return CommandTester
+     */
+    private function execute(string $arguments)
+    {
+        $commandTest = new CommandTester($this->instance);
+        $commandTest->execute(['--' . GenerateCommand::MODULE_NAME_KEY => $arguments]);
+
+        return $commandTest;
+    }
+}
diff --git a/app/code/Magento/Developer/etc/adminhtml/system.xml b/app/code/Magento/Developer/etc/adminhtml/system.xml
index c64abd6eae725..197dc6f981acf 100644
--- a/app/code/Magento/Developer/etc/adminhtml/system.xml
+++ b/app/code/Magento/Developer/etc/adminhtml/system.xml
@@ -11,7 +11,7 @@
                 <label>Frontend Development Workflow</label>
                 <field id="type" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Workflow type</label>
-                    <comment>Not available in production mode</comment>
+                    <comment>Not available in production mode.</comment>
                     <source_model>Magento\Developer\Model\Config\Source\WorkflowType</source_model>
                     <frontend_model>Magento\Developer\Block\Adminhtml\System\Config\WorkflowType</frontend_model>
                     <backend_model>Magento\Developer\Model\Config\Backend\WorkflowType</backend_model>
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 5959294fe6dc7..ad76f5070b35b 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -10,7 +10,6 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\Async\CallbackDeferred;
-use Magento\Framework\Async\ProxyDeferredFactory;
 use Magento\Framework\HTTP\AsyncClient\HttpResponseDeferredInterface;
 use Magento\Framework\HTTP\AsyncClient\Request;
 use Magento\Framework\HTTP\AsyncClientInterface;
@@ -21,6 +20,7 @@
 use Magento\Quote\Model\Quote\Address\RateResult\Error;
 use Magento\Shipping\Model\Carrier\AbstractCarrier;
 use Magento\Shipping\Model\Rate\Result;
+use Magento\Shipping\Model\Rate\Result\ProxyDeferredFactory;
 use Magento\Framework\Xml\Security;
 use Magento\Dhl\Model\Validator\XmlValidator;
 
@@ -389,16 +389,17 @@ public function collectRates(RateRequest $request)
         //Saving $result to use proper result with the callback
         $this->_result = $result = $this->_getQuotes();
         //After quotes are loaded parsing the response.
-        return $this->proxyDeferredFactory->createFor(
-            Result::class,
-            new CallbackDeferred(
-                function () use ($request, $result) {
-                    $this->_result = $result;
-                    $this->_updateFreeMethodQuote($request);
-
-                    return $this->_result;
-                }
-            )
+        return $this->proxyDeferredFactory->create(
+            [
+                'deferred' => new CallbackDeferred(
+                    function () use ($request, $result) {
+                        $this->_result = $result;
+                        $this->_updateFreeMethodQuote($request);
+
+                        return $this->_result;
+                    }
+                )
+            ]
         );
     }
 
@@ -818,16 +819,16 @@ protected function _getAllItems()
 
             if (!empty($decimalItems)) {
                 foreach ($decimalItems as $decimalItem) {
-                    $fullItems = array_merge(
-                        $fullItems,
-                        array_fill(0, $decimalItem['qty'] * $qty, $decimalItem['weight'])
-                    );
+                    $fullItems[] = array_fill(0, $decimalItem['qty'] * $qty, $decimalItem['weight']);
                 }
             } else {
-                $fullItems = array_merge($fullItems, array_fill(0, $qty, $this->_getWeight($itemWeight)));
+                $fullItems[] = array_fill(0, $qty, $this->_getWeight($itemWeight));
             }
         }
-        sort($fullItems);
+        if ($fullItems) {
+            $fullItems = array_merge(...$fullItems);
+            sort($fullItems);
+        }
 
         return $fullItems;
     }
@@ -939,7 +940,7 @@ protected function _getDimension($dimension, $configWeightUnit = false)
             );
         }
 
-        return sprintf('%.3f', $dimension);
+        return round($dimension, 3);
     }
 
     /**
@@ -1057,23 +1058,24 @@ protected function _getQuotes()
             }
         }
 
-        return $this->proxyDeferredFactory->createFor(
-            Result::class,
-            new CallbackDeferred(
-                function () use ($deferredResponses, $responseBodies) {
-                    //Loading rates not found in cache
-                    foreach ($deferredResponses as $deferredResponseData) {
-                        $responseBodies[] = [
-                            'body' => $deferredResponseData['deferred']->get()->getBody(),
-                            'date' => $deferredResponseData['date'],
-                            'request' => $deferredResponseData['request'],
-                            'from_cache' => false
-                        ];
-                    }
+        return $this->proxyDeferredFactory->create(
+            [
+                'deferred' => new CallbackDeferred(
+                    function () use ($deferredResponses, $responseBodies) {
+                        //Loading rates not found in cache
+                        foreach ($deferredResponses as $deferredResponseData) {
+                            $responseBodies[] = [
+                                'body' => $deferredResponseData['deferred']->get()->getBody(),
+                                'date' => $deferredResponseData['date'],
+                                'request' => $deferredResponseData['request'],
+                                'from_cache' => false
+                            ];
+                        }
 
-                    return $this->processQuotesResponses($responseBodies);
-                }
-            )
+                        return $this->processQuotesResponses($responseBodies);
+                    }
+                )
+            ]
         );
     }
 
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml
index 792465ce45942..d71bb69c99c9b 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml
@@ -216,7 +216,7 @@
         <name>Botswana</name>
     </BW>
     <BY>
-        <currency>BYR</currency>
+        <currency>BYN</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
         <region>AP</region>
diff --git a/app/code/Magento/Dhl/etc/adminhtml/system.xml b/app/code/Magento/Dhl/etc/adminhtml/system.xml
index ea3da2ca031a5..93a16821e385d 100644
--- a/app/code/Magento/Dhl/etc/adminhtml/system.xml
+++ b/app/code/Magento/Dhl/etc/adminhtml/system.xml
@@ -88,7 +88,7 @@
                 </field>
                 <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>
+                    <comment>Package ready time after order submission (in hours).</comment>
                 </field>
                 <field id="specificerrmsg" translate="label" type="textarea" sortOrder="800" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Displayed Error Message</label>
diff --git a/app/code/Magento/Dhl/etc/config.xml b/app/code/Magento/Dhl/etc/config.xml
index b46152fb0ecad..3408447e70650 100644
--- a/app/code/Magento/Dhl/etc/config.xml
+++ b/app/code/Magento/Dhl/etc/config.xml
@@ -32,7 +32,7 @@
                 <specificerrmsg>This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.</specificerrmsg>
                 <divide_order_weight>1</divide_order_weight>
                 <unit_of_measure>K</unit_of_measure>
-                <size>R</size>
+                <size>0</size>
                 <handling_type>F</handling_type>
                 <handling_action>O</handling_action>
                 <shipment_days>Mon,Tue,Wed,Thu,Fri</shipment_days>
diff --git a/app/code/Magento/Dhl/etc/countries.xml b/app/code/Magento/Dhl/etc/countries.xml
index 792465ce45942..d71bb69c99c9b 100644
--- a/app/code/Magento/Dhl/etc/countries.xml
+++ b/app/code/Magento/Dhl/etc/countries.xml
@@ -216,7 +216,7 @@
         <name>Botswana</name>
     </BW>
     <BY>
-        <currency>BYR</currency>
+        <currency>BYN</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
         <region>AP</region>
diff --git a/app/code/Magento/Directory/Model/Currency/Import/CurrencyConverterApi.php b/app/code/Magento/Directory/Model/Currency/Import/CurrencyConverterApi.php
index 8b9e0b1be7df2..8e27b9905ed6f 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/CurrencyConverterApi.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/CurrencyConverterApi.php
@@ -7,43 +7,57 @@
 
 namespace Magento\Directory\Model\Currency\Import;
 
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface as ScopeConfig;
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\HTTP\ZendClientFactory;
+use Exception;
+
 /**
- * Currency rate import model (From http://free.currencyconverterapi.com/)
- *
- * Class \Magento\Directory\Model\Currency\Import\CurrencyConverterApi
+ * Currency rate converter (free.currconv.com).
  */
 class CurrencyConverterApi extends AbstractImport
 {
     /**
      * @var string
      */
-    const CURRENCY_CONVERTER_URL = 'http://free.currencyconverterapi.com/api/v3/convert?q={{CURRENCY_FROM}}_{{CURRENCY_TO}}&compact=ultra&apiKey={{API_KEY}}'; //@codingStandardsIgnoreLine
+    public const CURRENCY_CONVERTER_URL = 'https://free.currconv.com/api/v7/convert?apiKey={{ACCESS_KEY}}'
+        . '&q={{CURRENCY_RATES}}&compact=ultra';
 
     /**
      * Http Client Factory
      *
-     * @var \Magento\Framework\HTTP\ZendClientFactory
+     * @var ZendClientFactory
      */
     private $httpClientFactory;
 
     /**
      * Core scope config
      *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfig
      */
     private $scopeConfig;
 
     /**
-     * Initialize dependencies
-     *
-     * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
+     * @var string
+     */
+    private $currencyConverterServiceHost = '';
+
+    /**
+     * @var string
+     */
+    private $serviceUrl = '';
+
+    /**
+     * @param CurrencyFactory $currencyFactory
+     * @param ScopeConfig $scopeConfig
+     * @param ZendClientFactory $httpClientFactory
      */
     public function __construct(
-        \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
+        CurrencyFactory $currencyFactory,
+        ScopeConfig $scopeConfig,
+        ZendClientFactory $httpClientFactory
     ) {
         parent::__construct($currencyFactory);
         $this->scopeConfig = $scopeConfig;
@@ -77,30 +91,39 @@ public function fetchRates()
      * @param array $currenciesTo
      * @return array
      */
-    private function convertBatch($data, $currencyFrom, $currenciesTo)
+    private function convertBatch(array $data, string $currencyFrom, array $currenciesTo): array
     {
-        $apiKey = $this->scopeConfig->getValue(
-            'currency/currencyconverterapi/api_key',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-        if (!$apiKey) {
-            $this->_messages[] = __('No API Key was specified.');
+        $url = $this->getServiceURL($currencyFrom, $currenciesTo);
+        if (empty($url)) {
+            $data[$currencyFrom] = $this->makeEmptyResponse($currenciesTo);
             return $data;
         }
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        set_time_limit(0);
+        try {
+            $response = $this->getServiceResponse($url);
+        } finally {
+            ini_restore('max_execution_time');
+        }
+
+        if (!$this->validateResponse($response)) {
+            $data[$currencyFrom] = $this->makeEmptyResponse($currenciesTo);
+            return $data;
+        }
+
         foreach ($currenciesTo as $to) {
-            //phpcs:ignore Magento2.Functions.DiscouragedFunction
-            set_time_limit(0);
-            try {
-                $url = str_replace('{{CURRENCY_FROM}}', $currencyFrom, self::CURRENCY_CONVERTER_URL);
-                $url = str_replace('{{CURRENCY_TO}}', $to, $url);
-                $url = str_replace('{{API_KEY}}', $apiKey, $url);
-                if ($currencyFrom == $to) {
-                    $data[$currencyFrom][$to] = $this->_numberFormat(1);
+            if ($currencyFrom === $to) {
+                $data[$currencyFrom][$to] = $this->_numberFormat(1);
+            } else {
+                if (!isset($response[$currencyFrom . '_' . $to])) {
+                    $serviceHost =  $this->getServiceHost($url);
+                    $this->_messages[] = __('We can\'t retrieve a rate from %1 for %2.', $serviceHost, $to);
+                    $data[$currencyFrom][$to] = null;
                 } else {
-                    $data[$currencyFrom][$to] = $this->getCurrencyRate($currencyFrom, $to, $url);
+                    $data[$currencyFrom][$to] = $this->_numberFormat(
+                        (double)$response[$currencyFrom . '_' . $to]
+                    );
                 }
-            } finally {
-                ini_restore('max_execution_time');
             }
         }
 
@@ -108,33 +131,52 @@ private function convertBatch($data, $currencyFrom, $currenciesTo)
     }
 
     /**
-     * Get currency rate from api
+     * Get currency converter service host.
      *
-     * @param string $currencyFrom
-     * @param string $to
      * @param string $url
-     * @return double
+     * @return string
      */
-    private function getCurrencyRate($currencyFrom, $to, $url)
+    private function getServiceHost(string $url): string
     {
-        $rate = null;
-        $response = $this->getServiceResponse($url);
-        if (empty($response)) {
-            $this->_messages[] = __('We can\'t retrieve a rate from %1 for %2.', $url, $to);
-            $rate = null;
-        } else {
-            if (isset($response['error']) && $response['error']) {
-                if (!in_array($response['error'], $this->_messages)) {
-                    $this->_messages[] = $response['error'];
-                }
-                $rate = null;
-            } else {
-                $rate = $this->_numberFormat(
-                    (double)$response[$currencyFrom . '_' . $to]
-                );
+        if (!$this->currencyConverterServiceHost) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $this->currencyConverterServiceHost = parse_url($url, PHP_URL_SCHEME) . '://'
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                . parse_url($url, PHP_URL_HOST);
+        }
+        return $this->currencyConverterServiceHost;
+    }
+
+    /**
+     * Return service URL.
+     *
+     * @param string $currencyFrom
+     * @param array $currenciesTo
+     * @return string
+     */
+    private function getServiceURL(string $currencyFrom, array $currenciesTo): string
+    {
+        if (!$this->serviceUrl) {
+            // Get access key
+            $accessKey = $this->scopeConfig
+                ->getValue('currency/currencyconverterapi/api_key', ScopeInterface::SCOPE_STORE);
+            if (empty($accessKey)) {
+                $this->_messages[] = __('No API Key was specified or an invalid API Key was specified.');
+                return '';
             }
+            // Get currency rates request
+            $currencyQueryParts = [];
+            foreach ($currenciesTo as $currencyTo) {
+                $currencyQueryParts[] = sprintf('%s_%s', $currencyFrom, $currencyTo);
+            }
+            $currencyRates = implode(',', $currencyQueryParts);
+            $this->serviceUrl = str_replace(
+                ['{{ACCESS_KEY}}', '{{CURRENCY_RATES}}'],
+                [$accessKey, $currencyRates],
+                self::CURRENCY_CONVERTER_URL
+            );
         }
-        return $rate;
+        return $this->serviceUrl;
     }
 
     /**
@@ -144,9 +186,9 @@ private function getCurrencyRate($currencyFrom, $to, $url)
      * @param int $retry
      * @return array
      */
-    private function getServiceResponse($url, $retry = 0)
+    private function getServiceResponse($url, $retry = 0): array
     {
-        /** @var \Magento\Framework\HTTP\ZendClient $httpClient */
+        /** @var ZendClient $httpClient */
         $httpClient = $this->httpClientFactory->create();
         $response = [];
 
@@ -157,15 +199,15 @@ private function getServiceResponse($url, $retry = 0)
                 [
                     'timeout' => $this->scopeConfig->getValue(
                         'currency/currencyconverterapi/timeout',
-                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                        ScopeInterface::SCOPE_STORE
                     ),
                 ]
             )->request(
                 'GET'
             )->getBody();
 
-            $response = json_decode($jsonResponse, true);
-        } catch (\Exception $e) {
+            $response = json_decode($jsonResponse, true) ?: [];
+        } catch (Exception $e) {
             if ($retry == 0) {
                 $response = $this->getServiceResponse($url, 1);
             }
@@ -173,6 +215,32 @@ private function getServiceResponse($url, $retry = 0)
         return $response;
     }
 
+    /**
+     * Validate rates response.
+     *
+     * @param array $response
+     * @return bool
+     */
+    private function validateResponse(array $response): bool
+    {
+        if (!isset($response['error'])) {
+            return true;
+        }
+        $this->_messages[] = $response['error'] ?: __('Currency rates can\'t be retrieved.');
+        return false;
+    }
+
+    /**
+     * Make empty rates for provided currencies.
+     *
+     * @param array $currenciesTo
+     * @return array
+     */
+    private function makeEmptyResponse(array $currenciesTo): array
+    {
+        return array_fill_keys($currenciesTo, null);
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php b/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php
index af49d6daaf379..29cdbabb9b993 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/FixerIo.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Directory\Model\Currency\Import;
 
 use Magento\Store\Model\ScopeInterface;
@@ -32,6 +34,11 @@ class FixerIo extends AbstractImport
      */
     private $scopeConfig;
 
+    /**
+     * @var string
+     */
+    private $currencyConverterServiceHost = '';
+
     /**
      * Initialize dependencies
      *
@@ -73,6 +80,7 @@ public function fetchRates()
      */
     protected function _convert($currencyFrom, $currencyTo)
     {
+        return 1;
     }
 
     /**
@@ -98,7 +106,7 @@ private function convertBatch(array $data, string $currencyFrom, array $currenci
             [$accessKey, $currencyFrom, $currenciesStr],
             self::CURRENCY_CONVERTER_URL
         );
-
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         set_time_limit(0);
         try {
             $response = $this->getServiceResponse($url);
@@ -116,7 +124,8 @@ private function convertBatch(array $data, string $currencyFrom, array $currenci
                 $data[$currencyFrom][$currencyTo] = $this->_numberFormat(1);
             } else {
                 if (empty($response['rates'][$currencyTo])) {
-                    $this->_messages[] = __('We can\'t retrieve a rate from %1 for %2.', $url, $currencyTo);
+                    $serviceHost =  $this->getServiceHost($url);
+                    $this->_messages[] = __('We can\'t retrieve a rate from %1 for %2.', $serviceHost, $currencyTo);
                     $data[$currencyFrom][$currencyTo] = null;
                 } else {
                     $data[$currencyFrom][$currencyTo] = $this->_numberFormat(
@@ -198,4 +207,21 @@ private function makeEmptyResponse(array $currenciesTo): array
     {
         return array_fill_keys($currenciesTo, null);
     }
+
+    /**
+     * Get currency converter service host.
+     *
+     * @param string $url
+     * @return string
+     */
+    private function getServiceHost(string $url): string
+    {
+        if (!$this->currencyConverterServiceHost) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $this->currencyConverterServiceHost = parse_url($url, PHP_URL_SCHEME) . '://'
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                . parse_url($url, PHP_URL_HOST);
+        }
+        return $this->currencyConverterServiceHost;
+    }
 }
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Currency.php b/app/code/Magento/Directory/Model/ResourceModel/Currency.php
index 5339b0c9eb5bd..5db880c00343a 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Currency.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Currency.php
@@ -138,7 +138,7 @@ public function getAnyRate($currencyFrom, $currencyTo)
      */
     public function saveRates($rates)
     {
-        if (is_array($rates) && sizeof($rates) > 0) {
+        if (is_array($rates) && count($rates) > 0) {
             $connection = $this->getConnection();
             $data = [];
             foreach ($rates as $currencyCode => $rate) {
@@ -176,7 +176,7 @@ public function getConfigCurrencies($model, $path)
         $result = [];
         $rowSet = $connection->fetchAll($select, $bind);
         foreach ($rowSet as $row) {
-            $result = array_merge($result, explode(',', $row['value']));
+            $result[] = explode(',', $row['value']);
         }
         sort($result);
 
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddCountriesCaribbeanCuracaoKosovoSintMaarten.php b/app/code/Magento/Directory/Setup/Patch/Data/AddCountriesCaribbeanCuracaoKosovoSintMaarten.php
new file mode 100644
index 0000000000000..d7bec84e5440c
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddCountriesCaribbeanCuracaoKosovoSintMaarten.php
@@ -0,0 +1,90 @@
+<?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\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+/**
+ * Class AddCountriesCaribbeanCuracaoKosovoSintMaarten
+ *
+ * @package Magento\Directory\Setup\Patch
+ */
+class AddCountriesCaribbeanCuracaoKosovoSintMaarten implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * AddCountriesCaribbeanCuracaoKosovoSintMaarten constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        /**
+         * Fill table directory/country
+         */
+        $data = [
+            [
+                'country_id' => 'BQ',
+                'iso2_code' => 'BQ',
+                'iso3_code' => 'BES',
+            ],
+            [
+                'country_id' => 'CW',
+                'iso2_code' => 'CW',
+                'iso3_code' => 'CUW',
+            ],
+            [
+                'country_id' => 'SX',
+                'iso2_code' => 'SX',
+                'iso3_code' => 'SXM',
+            ],
+            [
+                'country_id' => 'XK',
+                'iso2_code' => 'XK',
+                'iso3_code' => 'XKX',
+            ],
+        ];
+
+        $this->moduleDataSetup->getConnection()->insertOnDuplicate(
+            $this->moduleDataSetup->getTable('directory_country'),
+            $data
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            InitializeDirectoryData::class
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBelgium.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBelgium.php
new file mode 100644
index 0000000000000..fa5fff3486a99
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForBelgium.php
@@ -0,0 +1,92 @@
+<?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\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+/**
+ * Add Regions for Belgium.
+ */
+class AddDataForBelgium implements DataPatchInterface
+{
+    /**
+     * @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->getDataForBelgium()
+        );
+    }
+
+    /**
+     * Belgium states data.
+     *
+     * @return array
+     */
+    private function getDataForBelgium()
+    {
+        return [
+            ['BE', 'VAN', 'Antwerpen'],
+            ['BE', 'WBR', 'Brabant wallon'],
+            ['BE', 'BRU', 'Brussels-Capital Region'],
+            ['BE', 'WHT', 'Hainaut'],
+            ['BE', 'VLI', 'Limburg'],
+            ['BE', 'WLG', 'Liège'],
+            ['BE', 'WLX', 'Luxembourg'],
+            ['BE', 'WNA', 'Namur'],
+            ['BE', 'VOV', 'Oost-Vlaanderen'],
+            ['BE', 'VBR', 'Vlaams-Brabant'],
+            ['BE', 'VWV', 'West-Vlaanderen'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            InitializeDirectoryData::class,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForChina.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForChina.php
new file mode 100644
index 0000000000000..0750f8056c4d7
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForChina.php
@@ -0,0 +1,117 @@
+<?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;
+
+/**
+ * Add China States
+ */
+class AddDataForChina implements DataPatchInterface
+{
+    /**
+     * @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->getDataForChina()
+        );
+    }
+
+    /**
+     * China states data.
+     *
+     * @return array
+     */
+    private function getDataForChina()
+    {
+        return [
+            ['CN', 'CN-AH', 'Anhui Sheng'],
+            ['CN', 'CN-BJ', 'Beijing Shi'],
+            ['CN', 'CN-CQ', 'Chongqing Shi'],
+            ['CN', 'CN-FJ', 'Fujian Sheng'],
+            ['CN', 'CN-GS', 'Gansu Sheng'],
+            ['CN', 'CN-GD', 'Guangdong Sheng'],
+            ['CN', 'CN-GX', 'Guangxi Zhuangzu Zizhiqu'],
+            ['CN', 'CN-GZ', 'Guizhou Sheng'],
+            ['CN', 'CN-HI', 'Hainan Sheng'],
+            ['CN', 'CN-HE', 'Hebei Sheng'],
+            ['CN', 'CN-HL', 'Heilongjiang Sheng'],
+            ['CN', 'CN-HA', 'Henan Sheng'],
+            ['CN', 'CN-HK', 'Hong Kong SAR'],
+            ['CN', 'CN-HB', 'Hubei Sheng'],
+            ['CN', 'CN-HN', 'Hunan Sheng'],
+            ['CN', 'CN-JS', 'Jiangsu Sheng'],
+            ['CN', 'CN-JX', 'Jiangxi Sheng'],
+            ['CN', 'CN-JL', 'Jilin Sheng'],
+            ['CN', 'CN-LN', 'Liaoning Sheng'],
+            ['CN', 'CN-MO', 'Macao SAR'],
+            ['CN', 'CN-NM', 'Nei Mongol Zizhiqu'],
+            ['CN', 'CN-NX', 'Ningxia Huizi Zizhiqu'],
+            ['CN', 'CN-QH', 'Qinghai Sheng'],
+            ['CN', 'CN-SN', 'Shaanxi Sheng'],
+            ['CN', 'CN-SD', 'Shandong Sheng'],
+            ['CN', 'CN-SH', 'Shanghai Shi'],
+            ['CN', 'CN-SX', 'Shanxi Sheng'],
+            ['CN', 'CN-SC', 'Sichuan Sheng'],
+            ['CN', 'CN-TW', 'Taiwan Sheng'],
+            ['CN', 'CN-TJ', 'Tianjin Shi'],
+            ['CN', 'CN-XJ', 'Xinjiang Uygur Zizhiqu'],
+            ['CN', 'CN-XZ', 'Xizang Zizhiqu'],
+            ['CN', 'CN-YN', 'Yunnan Sheng'],
+            ['CN', 'CN-ZJ', 'Zhejiang Sheng'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            InitializeDirectoryData::class,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForColombia.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForColombia.php
new file mode 100644
index 0000000000000..38a9759828588
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForColombia.php
@@ -0,0 +1,115 @@
+<?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;
+
+/**
+ * Class AddDataForColombia
+ */
+class AddDataForColombia implements DataPatchInterface
+{
+    /**
+     * @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->getDataForColombia()
+        );
+    }
+
+    /**
+     * Colombia states data.
+     *
+     * @return array
+     */
+    private function getDataForColombia()
+    {
+        return [
+            ['CO', 'CO-AMA', 'Amazonas'],
+            ['CO', 'CO-ANT', 'Antioquia'],
+            ['CO', 'CO-ARA', 'Arauca'],
+            ['CO', 'CO-ATL', 'Atlántico'],
+            ['CO', 'CO-BOL', 'Bolívar'],
+            ['CO', 'CO-BOY', 'Boyacá'],
+            ['CO', 'CO-CAL', 'Caldas'],
+            ['CO', 'CO-CAQ', 'Caquetá'],
+            ['CO', 'CO-CAS', 'Casanare'],
+            ['CO', 'CO-CAU', 'Cauca'],
+            ['CO', 'CO-CES', 'Cesar'],
+            ['CO', 'CO-CHO', 'Chocó'],
+            ['CO', 'CO-COR', 'Córdoba'],
+            ['CO', 'CO-CUN', 'Cundinamarca'],
+            ['CO', 'CO-GUA', 'Guainía'],
+            ['CO', 'CO-GUV', 'Guaviare'],
+            ['CO', 'CO-HUL', 'Huila'],
+            ['CO', 'CO-LAG', 'La Guajira'],
+            ['CO', 'CO-MAG', 'Magdalena'],
+            ['CO', 'CO-MET', 'Meta'],
+            ['CO', 'CO-NAR', 'Nariño'],
+            ['CO', 'CO-NSA', 'Norte de Santander'],
+            ['CO', 'CO-PUT', 'Putumayo'],
+            ['CO', 'CO-QUI', 'Quindío'],
+            ['CO', 'CO-RIS', 'Risaralda'],
+            ['CO', 'CO-SAP', 'San Andrés y Providencia'],
+            ['CO', 'CO-SAN', 'Santander'],
+            ['CO', 'CO-SUC', 'Sucre'],
+            ['CO', 'CO-TOL', 'Tolima'],
+            ['CO', 'CO-VAC', 'Valle del Cauca'],
+            ['CO', 'CO-VAU', 'Vaupés'],
+            ['CO', 'CO-VID', 'Vichada'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            InitializeDirectoryData::class,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Directory/Setup/Patch/Data/AddDataForPoland.php b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForPoland.php
new file mode 100644
index 0000000000000..c5ab4cd186286
--- /dev/null
+++ b/app/code/Magento/Directory/Setup/Patch/Data/AddDataForPoland.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See PLPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Directory\Setup\Patch\Data;
+
+use Magento\Directory\Setup\DataInstaller;
+use Magento\Directory\Setup\DataInstallerFactory;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+/**
+ * Add Poland States
+ */
+class AddDataForPoland implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var DataInstallerFactory
+     */
+    private $dataInstallerFactory;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param DataInstallerFactory $dataInstallerFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        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->getDataForPoland()
+        );
+    }
+
+    /**
+     * Poland states data.
+     *
+     * @return array
+     */
+    private function getDataForPoland()
+    {
+        return [
+            ['PL', 'PL-02', 'dolnośląskie'],
+            ['PL', 'PL-04', 'kujawsko-pomorskie'],
+            ['PL', 'PL-06', 'lubelskie'],
+            ['PL', 'PL-08', 'lubuskie'],
+            ['PL', 'PL-10', 'łódzkie'],
+            ['PL', 'PL-12', 'małopolskie'],
+            ['PL', 'PL-14', 'mazowieckie'],
+            ['PL', 'PL-16', 'opolskie'],
+            ['PL', 'PL-18', 'podkarpackie'],
+            ['PL', 'PL-20', 'podlaskie'],
+            ['PL', 'PL-22', 'pomorskie'],
+            ['PL', 'PL-24', 'śląskie'],
+            ['PL', 'PL-26', 'świętokrzyskie'],
+            ['PL', 'PL-28', 'warmińsko-mazurskie'],
+            ['PL', 'PL-30', 'wielkopolskie'],
+            ['PL', 'PL-32', 'zachodniopomorskie'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            InitializeDirectoryData::class,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Directory/Test/Mftf/Data/CurrencyConfigData.xml b/app/code/Magento/Directory/Test/Mftf/Data/CurrencyConfigData.xml
new file mode 100644
index 0000000000000..fb21ee42fe2fc
--- /dev/null
+++ b/app/code/Magento/Directory/Test/Mftf/Data/CurrencyConfigData.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="BaseCurrencyRUBConfigData">
+        <data key="path">currency/options/base</data>
+        <data key="label">Russian Ruble</data>
+        <data key="value">RUB</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Directory/Test/Mftf/Page/AdminCurrencySetupPage.xml b/app/code/Magento/Directory/Test/Mftf/Page/AdminCurrencySetupPage.xml
new file mode 100644
index 0000000000000..03c2b0f856d19
--- /dev/null
+++ b/app/code/Magento/Directory/Test/Mftf/Page/AdminCurrencySetupPage.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="AdminCurrencySetupPage" url="admin/system_config/edit/section/currency/" area="admin" module="Magento_Directory">
+        <section name="AdminScheduledImportSettingsSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/StoresConfigurationListSection.xml b/app/code/Magento/Directory/Test/Mftf/Section/AdminScheduledImportSettingsSection.xml
similarity index 52%
rename from app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/StoresConfigurationListSection.xml
rename to app/code/Magento/Directory/Test/Mftf/Section/AdminScheduledImportSettingsSection.xml
index f9f1bef38d17d..4c4b0d6c9541e 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/StoresConfigurationListSection.xml
+++ b/app/code/Magento/Directory/Test/Mftf/Section/AdminScheduledImportSettingsSection.xml
@@ -8,8 +8,9 @@
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="StoresConfigurationListSection">
-        <element name="sales" type="button" selector="#system_config_tabs > div:nth-child(4) > div"/>
-        <element name="salesPaymentMethods" type="button" selector="//a[contains(@class, 'item-nav')]//span[text()='Payment Methods']"/>
+    <section name="AdminScheduledImportSettingsSection">
+        <element name="head" type="button" selector="#currency_import-head"/>
+        <element name="enabled" type="input" selector="#currency_import_enabled"/>
+        <element name="service" type="input" selector="#currency_import_service"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Directory/Test/Mftf/Test/AdminScheduledImportSettingsHiddenTest.xml b/app/code/Magento/Directory/Test/Mftf/Test/AdminScheduledImportSettingsHiddenTest.xml
new file mode 100644
index 0000000000000..0320b6f422cd6
--- /dev/null
+++ b/app/code/Magento/Directory/Test/Mftf/Test/AdminScheduledImportSettingsHiddenTest.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="AdminScheduledImportSettingsHiddenTest">
+        <annotations>
+            <features value="Directory"/>
+            <title value="Scheduled import settings hidden" />
+            <description value="Scheduled Import Settings' should hide fields when 'Enabled' is 'No'"/>
+            <severity value="MINOR"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <magentoCLI command="config:set currency/import/enabled 1" stepKey="enableCurrencyImport"/>
+        </before>
+
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <magentoCLI command="config:set currency/import/enabled 0" stepKey="disableCurrencyImport"/>
+        </after>
+
+        <amOnPage url="{{AdminCurrencySetupPage.url}}" stepKey="openCurrencyOptionsPage" />
+        <conditionalClick dependentSelector="{{AdminScheduledImportSettingsSection.enabled}}" visible="false" selector="{{AdminScheduledImportSettingsSection.head}}" stepKey="openCollapsibleBlock"/>
+        <see selector="{{AdminScheduledImportSettingsSection.service}}" userInput="Fixer.io" stepKey="seeServiceFixerIo"/>
+        <selectOption selector="{{AdminScheduledImportSettingsSection.enabled}}" userInput="0" stepKey="disableCurrencyImportOption"/>
+        <dontSeeElement selector="{{AdminScheduledImportSettingsSection.service}}" stepKey="dontSeeServiceFixerIo"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/CurrencyConverterApiTest.php b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/CurrencyConverterApiTest.php
new file mode 100644
index 0000000000000..797f7b73f33be
--- /dev/null
+++ b/app/code/Magento/Directory/Test/Unit/Model/Currency/Import/CurrencyConverterApiTest.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * 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\CurrencyConverterApi;
+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;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * CurrencyConverterApi converter test.
+ */
+class CurrencyConverterApiTest extends TestCase
+{
+    /**
+     * @var CurrencyConverterApi
+     */
+    private $model;
+
+    /**
+     * @var CurrencyFactory|MockObject
+     */
+    private $currencyFactory;
+
+    /**
+     * @var ZendClientFactory|MockObject
+     */
+    private $httpClientFactory;
+
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->currencyFactory = $this->getMockBuilder(CurrencyFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->httpClientFactory = $this->getMockBuilder(ZendClientFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            CurrencyConverterApi::class,
+            [
+                'currencyFactory' => $this->currencyFactory,
+                'scopeConfig' => $this->scopeConfig,
+                'httpClientFactory' => $this->httpClientFactory,
+            ]
+        );
+    }
+
+    /**
+     * Prepare CurrencyFactory mock.
+     */
+    private function prepareCurrencyFactoryMock(): void
+    {
+        $currencyFromList = ['USD'];
+        $currencyToList = ['EUR', 'UAH'];
+
+        /** @var Currency|MockObject $currency */
+        $currency = $this->getMockBuilder(Currency::class)->disableOriginalConstructor()->getMock();
+        $currency->expects($this->once())->method('getConfigBaseCurrencies')->willReturn($currencyFromList);
+        $currency->expects($this->once())->method('getConfigAllowCurrencies')->willReturn($currencyToList);
+
+        $this->currencyFactory->expects($this->atLeastOnce())->method('create')->willReturn($currency);
+    }
+
+    /**
+     * Prepare FetchRates test.
+     *
+     * @param string $responseBody
+     */
+    private function prepareFetchRatesTest(string $responseBody): void
+    {
+        $this->prepareCurrencyFactoryMock();
+
+        $this->scopeConfig->method('getValue')
+            ->withConsecutive(
+                ['currency/currencyconverterapi/api_key', 'store'],
+                ['currency/currencyconverterapi/timeout', 'store']
+            )
+            ->willReturnOnConsecutiveCalls('api_key', 100);
+
+        /** @var ZendClient|MockObject $httpClient */
+        $httpClient = $this->getMockBuilder(ZendClient::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var DataObject|MockObject $currencyMock */
+        $httpResponse = $this->getMockBuilder(DataObject::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBody'])
+            ->getMock();
+
+        $this->httpClientFactory->expects($this->once())->method('create')->willReturn($httpClient);
+        $httpClient->expects($this->once())->method('setUri')->willReturnSelf();
+        $httpClient->expects($this->once())->method('setConfig')->willReturnSelf();
+        $httpClient->expects($this->once())->method('request')->willReturn($httpResponse);
+        $httpResponse->expects($this->once())->method('getBody')->willReturn($responseBody);
+    }
+
+    /**
+     * Test Fetch Rates
+     *
+     * @return void
+     */
+    public function testFetchRates(): void
+    {
+        $expectedCurrencyRateList = ['USD' => ['EUR' => 0.891285, 'UAH' => 26.16]];
+        $responseBody = '{"USD_EUR":0.891285,"USD_UAH":26.16,"USD_USD":1}';
+        $this->prepareFetchRatesTest($responseBody);
+
+        self::assertEquals($expectedCurrencyRateList, $this->model->fetchRates());
+    }
+
+    /**
+     * Test FetchRates when Service Response is empty.
+     */
+    public function testFetchRatesWhenServiceResponseIsEmpty(): void
+    {
+        $responseBody = '';
+        $expectedCurrencyRateList = ['USD' => ['EUR' => null, 'UAH' => null]];
+        $cantRetrieveCurrencyMessage = "We can't retrieve a rate from "
+            . "https://free.currconv.com for %s.";
+        $this->prepareFetchRatesTest($responseBody);
+
+        self::assertEquals($expectedCurrencyRateList, $this->model->fetchRates());
+
+        $messages = $this->model->getMessages();
+        self::assertEquals(sprintf($cantRetrieveCurrencyMessage, 'EUR'), (string) $messages[0]);
+        self::assertEquals(sprintf($cantRetrieveCurrencyMessage, 'UAH'), (string) $messages[1]);
+    }
+
+    /**
+     * Test FetchRates when Service Response has error.
+     */
+    public function testFetchRatesWhenServiceResponseHasError(): void
+    {
+        $serviceErrorMessage = 'Service error';
+        $responseBody = sprintf('{"error":"%s"}', $serviceErrorMessage);
+        $expectedCurrencyRateList = ['USD' => ['EUR' => null, 'UAH' => null]];
+        $this->prepareFetchRatesTest($responseBody);
+
+        self::assertEquals($expectedCurrencyRateList, $this->model->fetchRates());
+
+        $messages = $this->model->getMessages();
+        self::assertEquals($serviceErrorMessage, (string) $messages[0]);
+    }
+
+    /**
+     * Test FetchRates when Service URL is empty.
+     */
+    public function testFetchRatesWhenServiceUrlIsEmpty(): void
+    {
+        $this->prepareCurrencyFactoryMock();
+
+        $this->scopeConfig->method('getValue')
+            ->withConsecutive(
+                ['currency/currencyconverterapi/api_key', 'store'],
+                ['currency/currencyconverterapi/timeout', 'store']
+            )
+            ->willReturnOnConsecutiveCalls('', 100);
+
+        $expectedCurrencyRateList = ['USD' => ['EUR' => null, 'UAH' => null]];
+        self::assertEquals($expectedCurrencyRateList, $this->model->fetchRates());
+
+        $noApiKeyErrorMessage = 'No API Key was specified or an invalid API Key was specified.';
+        $messages = $this->model->getMessages();
+        self::assertEquals($noApiKeyErrorMessage, (string) $messages[0]);
+    }
+}
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 7efcf0d62712a..3147ac6ca2b91 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
@@ -74,7 +74,7 @@ public function testFetchRates(): void
         $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://data.fixer.io/api/latest?access_key=api_key&base=USD&symbols=EUR,UAH for UAH.";
+            . "http://data.fixer.io for UAH.";
 
         $this->scopeConfig->method('getValue')
             ->withConsecutive(
diff --git a/app/code/Magento/Directory/etc/adminhtml/system.xml b/app/code/Magento/Directory/etc/adminhtml/system.xml
index 7d650b14b3d97..5f97a5e8d90d6 100644
--- a/app/code/Magento/Directory/etc/adminhtml/system.xml
+++ b/app/code/Magento/Directory/etc/adminhtml/system.xml
@@ -48,7 +48,7 @@
             </group>
             <group id="currencyconverterapi" translate="label" sortOrder="45" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Currency Converter API</label>
-                <field id="api_key" translate="label" type="obscure" 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/currencyconverterapi/api_key</config_path>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
@@ -67,27 +67,45 @@
                 <field id="error_email" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Error Email Recipient</label>
                     <validate>validate-email</validate>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
                 </field>
                 <field id="error_email_identity" translate="label" type="select" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Error Email Sender</label>
                     <source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
                 </field>
                 <field id="error_email_template" translate="label comment" type="select" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Error 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>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
                 </field>
                 <field id="frequency" translate="label" type="select" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Frequency</label>
                     <source_model>Magento\Cron\Model\Config\Source\Frequency</source_model>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
                 </field>
                 <field id="service" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Service</label>
                     <source_model>Magento\Directory\Model\Currency\Import\Source\Service</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Currency\Cron</backend_model>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
                 </field>
                 <field id="time" translate="label" type="time" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Start Time</label>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
                 </field>
             </group>
         </section>
diff --git a/app/code/Magento/Directory/etc/config.xml b/app/code/Magento/Directory/etc/config.xml
index c18c4f29d5822..32099ff9d8af5 100644
--- a/app/code/Magento/Directory/etc/config.xml
+++ b/app/code/Magento/Directory/etc/config.xml
@@ -9,7 +9,7 @@
     <default>
         <system>
             <currency>
-                <installed>AZN,AZM,AFN,ALL,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,CLP,CNY,COP,KMF,CDF,CRC,HRK,CUP,DKK,DJF,DOP,XCD,EGP,SVC,GQE,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,TRL,TRY,NZD,NIC,NGN,KPW,NOK,OMR,PKR,PAB,PGK,PYG,PEN,PHP,PLN,QAR,RHD,RON,ROL,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,XPF,WST,YER,ZMK,ZWD</installed>
+                <installed>AZN,AZM,AFN,ALL,DZD,AOA,ARS,AMD,AWG,AUD,BSD,BHD,BDT,BBD,BYN,BZD,BMD,BTN,BOB,BAM,BWP,BRL,GBP,BND,BGN,BUK,BIF,KHR,CAD,CVE,CZK,KYD,CLP,CNY,COP,KMF,CDF,CRC,HRK,CUP,DKK,DJF,DOP,XCD,EGP,SVC,GQE,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,TRL,TRY,NZD,NIC,NGN,KPW,NOK,OMR,PKR,PAB,PGK,PYG,PEN,PHP,PLN,QAR,RHD,RON,ROL,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,XPF,WST,YER,ZMK,ZWD</installed>
             </currency>
         </system>
         <currency>
@@ -36,7 +36,7 @@
         <general>
             <country>
                 <optional_zip_countries>HK,IE,MO,PA,GB</optional_zip_countries>
-                <allow>AF,AL,DZ,AS,AD,AO,AI,AQ,AG,AR,AM,AW,AU,AT,AX,AZ,BS,BH,BD,BB,BY,BE,BZ,BJ,BM,BL,BT,BO,BA,BW,BV,BR,IO,VG,BN,BG,BF,BI,KH,CM,CA,CD,CV,KY,CF,TD,CL,CN,CX,CC,CO,KM,CG,CK,CR,HR,CU,CY,CZ,DK,DJ,DM,DO,EC,EG,SV,GQ,ER,EE,ET,FK,FO,FJ,FI,FR,GF,PF,TF,GA,GM,GE,DE,GG,GH,GI,GR,GL,GD,GP,GU,GT,GN,GW,GY,HT,HM,HN,HK,HU,IS,IM,IN,ID,IR,IQ,IE,IL,IT,CI,JE,JM,JP,JO,KZ,KE,KI,KW,KG,LA,LV,LB,LS,LR,LY,LI,LT,LU,ME,MF,MO,MK,MG,MW,MY,MV,ML,MT,MH,MQ,MR,MU,YT,FX,MX,FM,MD,MC,MN,MS,MA,MZ,MM,NA,NR,NP,NL,AN,NC,NZ,NI,NE,NG,NU,NF,KP,MP,NO,OM,PK,PW,PA,PG,PY,PE,PH,PN,PL,PS,PT,PR,QA,RE,RO,RS,RU,RW,SH,KN,LC,PM,VC,WS,SM,ST,SA,SN,SC,SL,SG,SK,SI,SB,SO,ZA,GS,KR,ES,LK,SD,SR,SJ,SZ,SE,CH,SY,TL,TW,TJ,TZ,TH,TG,TK,TO,TT,TN,TR,TM,TC,TV,VI,UG,UA,AE,GB,US,UM,UY,UZ,VU,VA,VE,VN,WF,EH,YE,ZM,ZW</allow>
+                <allow>AF,AL,DZ,AS,AD,AO,AI,AQ,AG,AR,AM,AW,AU,AT,AX,AZ,BS,BH,BD,BB,BY,BE,BZ,BJ,BM,BL,BT,BO,BQ,BA,BW,BV,BR,IO,VG,BN,BG,BF,BI,KH,CM,CA,CD,CV,KY,CF,TD,CL,CN,CX,CW,CC,CO,KM,CG,CK,CR,HR,CU,CY,CZ,DK,DJ,DM,DO,EC,EG,SV,GQ,ER,EE,ET,FK,FO,FJ,FI,FR,GF,PF,TF,GA,GM,GE,DE,GG,GH,GI,GR,GL,GD,GP,GU,GT,GN,GW,GY,HT,HM,HN,HK,HU,IS,IM,IN,ID,IR,IQ,IE,IL,IT,CI,JE,JM,JP,JO,KZ,KE,KI,KW,KG,LA,LV,LB,LS,LR,LY,LI,LT,LU,ME,MF,MO,MK,MG,MW,MY,MV,ML,MT,MH,MQ,MR,MU,YT,FX,MX,FM,MD,MC,MN,MS,MA,MZ,MM,NA,NR,NP,NL,AN,NC,NZ,NI,NE,NG,NU,NF,KP,MP,NO,OM,PK,PW,PA,PG,PY,PE,PH,PN,PL,PS,PT,PR,QA,RE,RO,RS,RU,RW,SH,KN,LC,PM,VC,WS,SM,ST,SA,SN,SC,SL,SG,SK,SI,SB,SO,ZA,GS,KR,ES,LK,SD,SR,SJ,SZ,SE,CH,SX,SY,TL,TW,TJ,TZ,TH,TG,TK,TO,TT,TN,TR,TM,TC,TV,VI,UG,UA,AE,GB,US,UM,UY,UZ,VU,VA,VE,VN,WF,EH,XK,YE,ZM,ZW</allow>
                 <default>US</default>
             </country>
             <locale>
diff --git a/app/code/Magento/Directory/etc/di.xml b/app/code/Magento/Directory/etc/di.xml
index 50cd65cc5045c..fb2c526ac730b 100644
--- a/app/code/Magento/Directory/etc/di.xml
+++ b/app/code/Magento/Directory/etc/di.xml
@@ -35,6 +35,7 @@
                 <item name="DE" xsi:type="string">DE</item>
                 <item name="AT" xsi:type="string">AT</item>
                 <item name="FI" xsi:type="string">FI</item>
+                <item name="BE" xsi:type="string">BE</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Downloadable/Api/DomainManagerInterface.php b/app/code/Magento/Downloadable/Api/DomainManagerInterface.php
new file mode 100644
index 0000000000000..ca98f18e36c33
--- /dev/null
+++ b/app/code/Magento/Downloadable/Api/DomainManagerInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Downloadable\Api;
+
+/**
+ * Interface DomainManagerInterface
+ * Manage downloadable domains whitelist.
+ */
+interface DomainManagerInterface
+{
+    /**
+     * Get the whitelist.
+     *
+     * @return array
+     */
+    public function getDomains(): array;
+
+    /**
+     * Add host to the whitelist.
+     *
+     * @param array $hosts
+     * @return void
+     */
+    public function addDomains(array $hosts): void;
+
+    /**
+     * Remove host from the whitelist.
+     *
+     * @param array $hosts
+     * @return void
+     */
+    public function removeDomains(array $hosts): void;
+}
diff --git a/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php b/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php
index 51efc74738043..8b8a9b6bf2895 100644
--- a/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php
+++ b/app/code/Magento/Downloadable/Block/Checkout/Cart/Item/Renderer.php
@@ -37,7 +37,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param PriceCurrencyInterface $priceCurrency
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param InterpretationStrategyInterface $messageInterpretationStrategy
      * @param \Magento\Downloadable\Helper\Catalog\Product\Configuration $downloadableProductConfiguration
      * @param array $data
@@ -51,7 +51,7 @@ public function __construct(
         \Magento\Framework\Url\Helper\Data $urlHelper,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         PriceCurrencyInterface $priceCurrency,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         InterpretationStrategyInterface $messageInterpretationStrategy,
         \Magento\Downloadable\Helper\Catalog\Product\Configuration $downloadableProductConfiguration,
         array $data = []
diff --git a/app/code/Magento/Downloadable/Console/Command/DomainsAddCommand.php b/app/code/Magento/Downloadable/Console/Command/DomainsAddCommand.php
new file mode 100644
index 0000000000000..76d9a13f70f1f
--- /dev/null
+++ b/app/code/Magento/Downloadable/Console/Command/DomainsAddCommand.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Downloadable\Console\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Magento\Downloadable\Api\DomainManagerInterface as DomainManager;
+
+/**
+ * Class DomainsAddCommand
+ *
+ * Command for adding downloadable domain to the whitelist
+ */
+class DomainsAddCommand extends Command
+{
+    /**
+     * Name of domains input argument
+     */
+    public const INPUT_KEY_DOMAINS = 'domains';
+
+    /**
+     * @var DomainManager
+     */
+    private $domainManager;
+
+    /**
+     * DomainsAddCommand constructor.
+     * @param DomainManager $domainManager
+     */
+    public function __construct(
+        DomainManager $domainManager
+    ) {
+        $this->domainManager = $domainManager;
+        parent::__construct();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function configure()
+    {
+        $description = 'Add domains to the downloadable domains whitelist';
+
+        $this->setName('downloadable:domains:add')
+            ->setDescription($description)
+            ->setDefinition(
+                [
+                    new InputArgument(
+                        self::INPUT_KEY_DOMAINS,
+                        InputArgument::IS_ARRAY,
+                        'Domains name'
+                    )
+                ]
+            );
+        parent::configure();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        try {
+            if ($input->getArgument(self::INPUT_KEY_DOMAINS)) {
+                $whitelistBefore = $this->domainManager->getDomains();
+                $newDomains = $input->getArgument(self::INPUT_KEY_DOMAINS);
+                $newDomains = array_filter(array_map('trim', $newDomains), 'strlen');
+
+                $this->domainManager->addDomains($newDomains);
+
+                foreach (array_diff($this->domainManager->getDomains(), $whitelistBefore) as $newHost) {
+                    $output->writeln(
+                        $newHost . ' was added to the whitelist.'
+                    );
+                }
+            }
+        } catch (\Exception $e) {
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
+                $output->writeln($e->getTraceAsString());
+            }
+            return;
+        }
+    }
+}
diff --git a/app/code/Magento/Downloadable/Console/Command/DomainsRemoveCommand.php b/app/code/Magento/Downloadable/Console/Command/DomainsRemoveCommand.php
new file mode 100644
index 0000000000000..a30e99a24859c
--- /dev/null
+++ b/app/code/Magento/Downloadable/Console/Command/DomainsRemoveCommand.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Downloadable\Console\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Magento\Downloadable\Api\DomainManagerInterface as DomainManager;
+
+/**
+ * Class DomainsRemoveCommand
+ *
+ * Command for removing downloadable domain from the whitelist
+ */
+class DomainsRemoveCommand extends Command
+{
+    /**
+     * Name of domains input argument
+     */
+    public const INPUT_KEY_DOMAINS = 'domains';
+
+    /**
+     * @var DomainManager
+     */
+    private $domainManager;
+
+    /**
+     * DomainsRemoveCommand constructor.
+     *
+     * @param DomainManager $domainManager
+     */
+    public function __construct(
+        DomainManager $domainManager
+    ) {
+        $this->domainManager = $domainManager;
+        parent::__construct();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function configure()
+    {
+        $description = 'Remove domains from the downloadable domains whitelist';
+
+        $this->setName('downloadable:domains:remove')
+            ->setDescription($description)
+            ->setDefinition(
+                [
+                    new InputArgument(
+                        self::INPUT_KEY_DOMAINS,
+                        InputArgument::IS_ARRAY,
+                        'Domain names'
+                    )
+                ]
+            );
+        parent::configure();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        try {
+            if ($input->getArgument(self::INPUT_KEY_DOMAINS)) {
+                $whitelistBefore = $this->domainManager->getDomains();
+                $removeDomains = $input->getArgument(self::INPUT_KEY_DOMAINS);
+                $removeDomains = array_filter(array_map('trim', $removeDomains), 'strlen');
+                $this->domainManager->removeDomains($removeDomains);
+
+                foreach (array_diff($whitelistBefore, $this->domainManager->getDomains()) as $removedHost) {
+                    $output->writeln(
+                        $removedHost . ' was removed from the whitelist.'
+                    );
+                }
+            }
+        } catch (\Exception $e) {
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
+                $output->writeln($e->getTraceAsString());
+            }
+            return;
+        }
+    }
+}
diff --git a/app/code/Magento/Downloadable/Console/Command/DomainsShowCommand.php b/app/code/Magento/Downloadable/Console/Command/DomainsShowCommand.php
new file mode 100644
index 0000000000000..eb4488353a096
--- /dev/null
+++ b/app/code/Magento/Downloadable/Console/Command/DomainsShowCommand.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Downloadable\Console\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Magento\Downloadable\Api\DomainManagerInterface as DomainManager;
+
+/**
+ * Class DomainsShowCommand
+ *
+ * Command for listing allowed downloadable domains
+ */
+class DomainsShowCommand extends Command
+{
+    /**
+     * @var DomainManager
+     */
+    private $domainManager;
+
+    /**
+     * DomainsShowCommand constructor.
+     * @param DomainManager $domainManager
+     */
+    public function __construct(
+        DomainManager $domainManager
+    ) {
+        $this->domainManager = $domainManager;
+        parent::__construct();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function configure()
+    {
+        $description = 'Display downloadable domains whitelist';
+
+        $this->setName('downloadable:domains:show')
+            ->setDescription($description);
+        parent::configure();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        try {
+            $whitelist = implode("\n", $this->domainManager->getDomains());
+            $output->writeln(
+                "Downloadable domains whitelist:\n$whitelist"
+            );
+        } catch (\Exception $e) {
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
+                $output->writeln($e->getTraceAsString());
+            }
+            return;
+        }
+    }
+}
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 83b2797050db9..a7c32eed8bb15 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php
@@ -7,6 +7,8 @@
 
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Class Upload
@@ -76,23 +78,27 @@ public function __construct(
      */
     public function execute()
     {
-        $type = $this->getRequest()->getParam('type');
-        $tmpPath = '';
-        if ($type == 'samples') {
-            $tmpPath = $this->_sample->getBaseTmpPath();
-        } elseif ($type == 'links') {
-            $tmpPath = $this->_link->getBaseTmpPath();
-        } elseif ($type == 'link_samples') {
-            $tmpPath = $this->_link->getBaseSampleTmpPath();
-        }
-
         try {
+            $type = $this->getRequest()->getParam('type');
+            $tmpPath = '';
+            if ($type === 'samples') {
+                $tmpPath = $this->_sample->getBaseTmpPath();
+            } elseif ($type === 'links') {
+                $tmpPath = $this->_link->getBaseTmpPath();
+            } elseif ($type === 'link_samples') {
+                $tmpPath = $this->_link->getBaseSampleTmpPath();
+            } else {
+                throw new LocalizedException(__('Upload type can not be determined.'));
+            }
+
             $uploader = $this->uploaderFactory->create(['fileId' => $type]);
 
             $result = $this->_fileHelper->uploadFromTmp($tmpPath, $uploader);
 
             if (!$result) {
-                throw new \Exception('File can not be moved from temporary folder to the destination folder.');
+                throw new FileSystemException(
+                    __('File can not be moved from temporary folder to the destination folder.')
+                );
             }
 
             unset($result['tmp_name'], $result['path']);
@@ -101,7 +107,7 @@ public function execute()
                 $relativePath = rtrim($tmpPath, '/') . '/' . ltrim($result['file'], '/');
                 $this->storageDatabase->saveFile($relativePath);
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }
 
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 a283891afc406..f310b376633d3 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
@@ -5,11 +5,14 @@
  */
 namespace Magento\Downloadable\Controller\Adminhtml\Product\Initialization\Helper\Plugin;
 
-use Magento\Framework\App\RequestInterface;
+use Magento\Downloadable\Api\Data\LinkInterfaceFactory;
+use Magento\Downloadable\Api\Data\SampleInterfaceFactory;
+use Magento\Downloadable\Helper\Download;
 use Magento\Downloadable\Model\Link\Builder as LinkBuilder;
+use Magento\Downloadable\Model\Product\Type;
+use Magento\Downloadable\Model\ResourceModel\Sample\Collection;
 use Magento\Downloadable\Model\Sample\Builder as SampleBuilder;
-use Magento\Downloadable\Api\Data\SampleInterfaceFactory;
-use Magento\Downloadable\Api\Data\LinkInterfaceFactory;
+use Magento\Framework\App\RequestInterface;
 
 /**
  * Class for initialization downloadable info from request.
@@ -42,8 +45,6 @@ class Downloadable
     private $linkBuilder;
 
     /**
-     * Constructor
-     *
      * @param RequestInterface $request
      * @param LinkBuilder $linkBuilder
      * @param SampleBuilder $sampleBuilder
@@ -79,14 +80,18 @@ public function afterInitialize(
         \Magento\Catalog\Model\Product $product
     ) {
         if ($downloadable = $this->request->getPost('downloadable')) {
+            $product->setTypeId(Type::TYPE_DOWNLOADABLE);
             $product->setDownloadableData($downloadable);
             $extension = $product->getExtensionAttributes();
+            $productLinks = $product->getTypeInstance()->getLinks($product);
+            $productSamples = $product->getTypeInstance()->getSamples($product);
             if (isset($downloadable['link']) && is_array($downloadable['link'])) {
                 $links = [];
                 foreach ($downloadable['link'] as $linkData) {
                     if (!$linkData || (isset($linkData['is_delete']) && $linkData['is_delete'])) {
                         continue;
                     } else {
+                        $linkData = $this->processLink($linkData, $productLinks);
                         $links[] = $this->linkBuilder->setData(
                             $linkData
                         )->build(
@@ -104,6 +109,7 @@ public function afterInitialize(
                     if (!$sampleData || (isset($sampleData['is_delete']) && (bool)$sampleData['is_delete'])) {
                         continue;
                     } else {
+                        $sampleData = $this->processSample($sampleData, $productSamples);
                         $samples[] = $this->sampleBuilder->setData(
                             $sampleData
                         )->build(
@@ -124,4 +130,69 @@ public function afterInitialize(
         }
         return $product;
     }
+
+    /**
+     * Check Links type and status.
+     *
+     * @param array $linkData
+     * @param array $productLinks
+     * @return array
+     */
+    private function processLink(array $linkData, array $productLinks): array
+    {
+        $linkId = $linkData['link_id'] ?? null;
+        if ($linkId && isset($productLinks[$linkId])) {
+            $linkData = $this->processFileStatus($linkData, $productLinks[$linkId]->getLinkFile());
+            $linkData['sample'] = $this->processFileStatus(
+                $linkData['sample'] ?? [],
+                $productLinks[$linkId]->getSampleFile()
+            );
+        } else {
+            $linkData = $this->processFileStatus($linkData, null);
+            $linkData['sample'] = $this->processFileStatus($linkData['sample'] ?? [], null);
+        }
+
+        return $linkData;
+    }
+
+    /**
+     * Check Sample type and status.
+     *
+     * @param array $sampleData
+     * @param Collection $productSamples
+     * @return array
+     */
+    private function processSample(array $sampleData, Collection $productSamples): array
+    {
+        $sampleId = $sampleData['sample_id'] ?? null;
+        /** @var \Magento\Downloadable\Model\Sample $productSample */
+        $productSample = $sampleId ? $productSamples->getItemById($sampleId) : null;
+        if ($sampleId && $productSample) {
+            $sampleData = $this->processFileStatus($sampleData, $productSample->getSampleFile());
+        } else {
+            $sampleData = $this->processFileStatus($sampleData, null);
+        }
+
+        return $sampleData;
+    }
+
+    /**
+     * Compare file path from request with DB and set status.
+     *
+     * @param array $data
+     * @param string|null $file
+     * @return array
+     */
+    private function processFileStatus(array $data, ?string $file): array
+    {
+        if (isset($data['type']) && $data['type'] === Download::LINK_TYPE_FILE && isset($data['file']['0']['file'])) {
+            if ($data['file'][0]['file'] !== $file) {
+                $data['file'][0]['status'] = 'new';
+            } else {
+                $data['file'][0]['status'] = 'old';
+            }
+        }
+
+        return $data;
+    }
 }
diff --git a/app/code/Magento/Downloadable/Model/DomainManager.php b/app/code/Magento/Downloadable/Model/DomainManager.php
new file mode 100644
index 0000000000000..e1f275902b034
--- /dev/null
+++ b/app/code/Magento/Downloadable/Model/DomainManager.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Downloadable\Model;
+
+use Magento\Framework\App\DeploymentConfig\Writer as ConfigWriter;
+use Magento\Downloadable\Api\DomainManagerInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\File\ConfigFilePool;
+
+/**
+ * Class DomainManager
+ *
+ * Manage downloadable domains whitelist in the environment config.
+ */
+class DomainManager implements DomainManagerInterface
+{
+    /**
+     * Path to the allowed domains in the deployment config
+     */
+    private const PARAM_DOWNLOADABLE_DOMAINS = 'downloadable_domains';
+
+    /**
+     * @var ConfigWriter
+     */
+    private $configWriter;
+
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * DomainManager constructor.
+     *
+     * @param ConfigWriter $configWriter
+     * @param DeploymentConfig $deploymentConfig
+     */
+    public function __construct(
+        ConfigWriter $configWriter,
+        DeploymentConfig $deploymentConfig
+    ) {
+        $this->configWriter = $configWriter;
+        $this->deploymentConfig = $deploymentConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDomains(): array
+    {
+        return array_map('strtolower', $this->deploymentConfig->get(self::PARAM_DOWNLOADABLE_DOMAINS) ?? []);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function addDomains(array $hosts): void
+    {
+        $whitelist = $this->getDomains();
+        foreach (array_map('strtolower', $hosts) as $host) {
+            if (!in_array($host, $whitelist)) {
+                $whitelist[] = $host;
+            }
+        }
+
+        $this->configWriter->saveConfig(
+            [
+                ConfigFilePool::APP_ENV => [
+                    self::PARAM_DOWNLOADABLE_DOMAINS => $whitelist
+                ]
+            ],
+            true
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function removeDomains(array $hosts): void
+    {
+        $whitelist = $this->getDomains();
+        foreach (array_map('strtolower', $hosts) as $host) {
+            if (in_array($host, $whitelist)) {
+                $index = array_search($host, $whitelist);
+                unset($whitelist[$index]);
+            }
+        }
+
+        $whitelist = array_values($whitelist);  // reindex whitelist to prevent non-sequential keying
+
+        $this->configWriter->saveConfig(
+            [
+                ConfigFilePool::APP_ENV => [
+                    self::PARAM_DOWNLOADABLE_DOMAINS => $whitelist
+                ]
+            ],
+            true
+        );
+    }
+}
diff --git a/app/code/Magento/Downloadable/Model/Link/Builder.php b/app/code/Magento/Downloadable/Model/Link/Builder.php
index 83d01f76fe9cd..ff76f7eeda440 100644
--- a/app/code/Magento/Downloadable/Model/Link/Builder.php
+++ b/app/code/Magento/Downloadable/Model/Link/Builder.php
@@ -69,6 +69,8 @@ public function __construct(
     }
 
     /**
+     * Set Data.
+     *
      * @param array $data
      * @return $this
      * @since 100.1.0
@@ -80,6 +82,8 @@ public function setData(array $data)
     }
 
     /**
+     * Build correct data structure.
+     *
      * @param \Magento\Downloadable\Api\Data\LinkInterface $link
      * @return \Magento\Downloadable\Api\Data\LinkInterface
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -134,6 +138,8 @@ public function build(\Magento\Downloadable\Api\Data\LinkInterface $link)
     }
 
     /**
+     * Reset data.
+     *
      * @return void
      */
     private function resetData()
@@ -142,6 +148,8 @@ private function resetData()
     }
 
     /**
+     * Get existing component or create new.
+     *
      * @return Link
      */
     private function getComponent()
@@ -153,6 +161,8 @@ private function getComponent()
     }
 
     /**
+     * Build correct sample structure.
+     *
      * @param \Magento\Downloadable\Api\Data\LinkInterface $link
      * @param array $sample
      * @return \Magento\Downloadable\Api\Data\LinkInterface
@@ -174,7 +184,8 @@ private function buildSample(\Magento\Downloadable\Api\Data\LinkInterface $link,
                 ),
                 \Magento\Downloadable\Api\Data\LinkInterface::class
             );
-            if ($link->getSampleType() === \Magento\Downloadable\Helper\Download::LINK_TYPE_FILE) {
+            if ($link->getSampleType() === \Magento\Downloadable\Helper\Download::LINK_TYPE_FILE
+                && isset($sample['file'])) {
                 $linkSampleFileName = $this->downloadableFile->moveFileFromTmp(
                     $this->getComponent()->getBaseSampleTmpPath(),
                     $this->getComponent()->getBaseSamplePath(),
diff --git a/app/code/Magento/Downloadable/Model/Link/ContentValidator.php b/app/code/Magento/Downloadable/Model/Link/ContentValidator.php
index 088356caefad0..28d61986a4f56 100644
--- a/app/code/Magento/Downloadable/Model/Link/ContentValidator.php
+++ b/app/code/Magento/Downloadable/Model/Link/ContentValidator.php
@@ -6,12 +6,29 @@
 namespace Magento\Downloadable\Model\Link;
 
 use Magento\Downloadable\Api\Data\LinkInterface;
+use Magento\Downloadable\Helper\File;
 use Magento\Downloadable\Model\File\ContentValidator as FileContentValidator;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Url\Validator as UrlValidator;
+use Magento\Downloadable\Model\Url\DomainValidator;
 
+/**
+ * Class to validate Link Content.
+ */
 class ContentValidator
 {
+    /**
+     * @var DomainValidator
+     */
+    private $domainValidator;
+
+    /**
+     * @var File
+     */
+    private $fileHelper;
+
     /**
      * @var FileContentValidator
      */
@@ -25,17 +42,23 @@ class ContentValidator
     /**
      * @param FileContentValidator $fileContentValidator
      * @param UrlValidator $urlValidator
+     * @param DomainValidator $domainValidator
+     * @param File|null $fileHelper
      */
     public function __construct(
         FileContentValidator $fileContentValidator,
-        UrlValidator $urlValidator
+        UrlValidator $urlValidator,
+        DomainValidator $domainValidator,
+        File $fileHelper = null
     ) {
         $this->fileContentValidator = $fileContentValidator;
         $this->urlValidator = $urlValidator;
+        $this->domainValidator = $domainValidator;
+        $this->fileHelper = $fileHelper ?? ObjectManager::getInstance()->get(File::class);
     }
 
     /**
-     * Check if link content is valid
+     * Check if link content is valid.
      *
      * @param LinkInterface $link
      * @param bool $validateLinkContent
@@ -63,50 +86,74 @@ public function isValid(LinkInterface $link, $validateLinkContent = true, $valid
         if ($validateSampleContent) {
             $this->validateSampleResource($link);
         }
+
         return true;
     }
 
     /**
-     * Validate link resource (file or URL)
+     * Validate link resource (file or URL).
      *
      * @param LinkInterface $link
-     * @throws InputException
      * @return void
+     * @throws InputException
      */
     protected function validateLinkResource(LinkInterface $link)
     {
-        if ($link->getLinkType() == 'url'
-            && !$this->urlValidator->isValid($link->getLinkUrl())
-        ) {
-            throw new InputException(__('Link URL must have valid format.'));
-        }
-        if ($link->getLinkType() == 'file'
-            && (!$link->getLinkFileContent()
-                || !$this->fileContentValidator->isValid($link->getLinkFileContent()))
-        ) {
-            throw new InputException(__('Provided file content must be valid base64 encoded data.'));
+        if ($link->getLinkType() === 'url') {
+            if (!$this->urlValidator->isValid($link->getLinkUrl())) {
+                throw new InputException(__('Link URL must have valid format.'));
+            }
+
+            if (!$this->domainValidator->isValid($link->getLinkUrl())) {
+                throw new InputException(__('Link URL\'s domain is not in list of downloadable_domains in env.php.'));
+            }
+        } elseif ($link->getLinkFileContent()) {
+            if (!$this->fileContentValidator->isValid($link->getLinkFileContent())) {
+                throw new InputException(__('Provided file content must be valid base64 encoded data.'));
+            }
+        } elseif (!$this->isFileValid($link->getBasePath() . $link->getLinkFile())) {
+            throw new InputException(__('Link file not found. Please try again.'));
         }
     }
 
     /**
-     * Validate sample resource (file or URL)
+     * Validate sample resource (file or URL).
      *
      * @param LinkInterface $link
-     * @throws InputException
      * @return void
+     * @throws InputException
      */
     protected function validateSampleResource(LinkInterface $link)
     {
-        if ($link->getSampleType() == 'url'
-            && !$this->urlValidator->isValid($link->getSampleUrl())
-        ) {
-            throw new InputException(__('Sample URL must have valid format.'));
+        if ($link->getSampleType() === 'url') {
+            if (!$this->urlValidator->isValid($link->getSampleUrl())) {
+                throw new InputException(__('Sample URL must have valid format.'));
+            }
+
+            if (!$this->domainValidator->isValid($link->getSampleUrl())) {
+                throw new InputException(__('Sample URL\'s domain is not in list of downloadable_domains in env.php.'));
+            }
+        } elseif ($link->getSampleFileContent()) {
+            if (!$this->fileContentValidator->isValid($link->getSampleFileContent())) {
+                throw new InputException(__('Provided file content must be valid base64 encoded data.'));
+            }
+        } elseif (!$this->isFileValid($link->getBaseSamplePath() . $link->getSampleFile())) {
+            throw new InputException(__('Link sample file not found. Please try again.'));
         }
-        if ($link->getSampleType() == 'file'
-            && (!$link->getSampleFileContent()
-                || !$this->fileContentValidator->isValid($link->getSampleFileContent()))
-        ) {
-            throw new InputException(__('Provided file content must be valid base64 encoded data.'));
+    }
+
+    /**
+     * Check that Links File or Sample is valid.
+     *
+     * @param string $file
+     * @return bool
+     */
+    private function isFileValid(string $file): bool
+    {
+        try {
+            return $this->fileHelper->ensureFileInFilesystem($file);
+        } catch (ValidatorException $e) {
+            return false;
         }
     }
 }
diff --git a/app/code/Magento/Downloadable/Model/LinkRepository.php b/app/code/Magento/Downloadable/Model/LinkRepository.php
index 0898f1924e538..68fbba2a7d385 100644
--- a/app/code/Magento/Downloadable/Model/LinkRepository.php
+++ b/app/code/Magento/Downloadable/Model/LinkRepository.php
@@ -97,7 +97,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList($sku)
     {
@@ -107,6 +107,8 @@ public function getList($sku)
     }
 
     /**
+     * @inheritdoc
+     *
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @return array
      */
@@ -166,9 +168,11 @@ protected function setBasicFields($resourceData, $dataObject)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @throws InputException
      */
     public function save($sku, LinkInterface $link, $isGlobalScopeContent = true)
     {
@@ -176,29 +180,28 @@ public function save($sku, LinkInterface $link, $isGlobalScopeContent = true)
         if ($link->getId() !== null) {
             return $this->updateLink($product, $link, $isGlobalScopeContent);
         } else {
-            if ($product->getTypeId() !== \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
+            if ($product->getTypeId() !== Type::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)) {
+            $this->validateLinkType($link);
+            $this->validateSampleType($link);
+            if (!$this->contentValidator->isValid($link, true, $link->hasSampleType())) {
                 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(__('The link type is invalid. Verify and try again.'));
-            }
             $title = $link->getTitle();
             if (empty($title)) {
                 throw new InputException(__('The link title is empty. Enter the link title and try again.'));
             }
+
             return $this->saveLink($product, $link, $isGlobalScopeContent);
         }
     }
 
     /**
+     * Construct Data structure and Save it.
+     *
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @param LinkInterface $link
      * @param bool $isGlobalScopeContent
@@ -220,7 +223,7 @@ protected function saveLink(
             'is_shareable' => $link->getIsShareable(),
         ];
 
-        if ($link->getLinkType() == 'file' && $link->getLinkFile() === null) {
+        if ($link->getLinkType() == 'file' && $link->getLinkFileContent() !== null) {
             $linkData['file'] = $this->jsonEncoder->encode(
                 [
                     $this->fileContentUploader->upload($link->getLinkFileContent(), 'link_file'),
@@ -242,7 +245,7 @@ protected function saveLink(
 
         if ($link->getSampleType() == 'file') {
             $linkData['sample']['type'] = 'file';
-            if ($link->getSampleFile() === null) {
+            if ($link->getSampleFileContent() !== null) {
                 $fileData = [
                     $this->fileContentUploader->upload($link->getSampleFileContent(), 'link_sample_file'),
                 ];
@@ -269,6 +272,8 @@ protected function saveLink(
     }
 
     /**
+     * Update existing Link.
+     *
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @param LinkInterface $link
      * @param bool $isGlobalScopeContent
@@ -298,9 +303,10 @@ protected function updateLink(
                 __("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)) {
+        $this->validateLinkType($link);
+        $this->validateSampleType($link);
+        $validateSampleContent = $link->hasSampleType();
+        if (!$this->contentValidator->isValid($link, true, $validateSampleContent)) {
             throw new InputException(__('The link information is invalid. Verify the link and try again.'));
         }
         if ($isGlobalScopeContent) {
@@ -312,20 +318,16 @@ protected function updateLink(
                 throw new InputException(__('The link title is empty. Enter the link title and try again.'));
             }
         }
-
-        if ($link->getLinkType() == 'file' && $link->getLinkFileContent() === null && !$link->getLinkFile()) {
-            $link->setLinkFile($existingLink->getLinkFile());
-        }
-        if ($link->getSampleType() == 'file' && $link->getSampleFileContent() === null && !$link->getSampleFile()) {
-            $link->setSampleFile($existingLink->getSampleFile());
+        if (!$validateSampleContent) {
+            $this->resetLinkSampleContent($link, $existingLink);
         }
-
         $this->saveLink($product, $link, $isGlobalScopeContent);
+
         return $existingLink->getId();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete($id)
     {
@@ -344,6 +346,52 @@ public function delete($id)
         return true;
     }
 
+    /**
+     * Check that Link type exist.
+     *
+     * @param LinkInterface $link
+     * @return void
+     * @throws InputException
+     */
+    private function validateLinkType(LinkInterface $link): void
+    {
+        if (!in_array($link->getLinkType(), ['url', 'file'], true)) {
+            throw new InputException(__('The link type is invalid. Verify and try again.'));
+        }
+    }
+
+    /**
+     * Check that Link sample type exist.
+     *
+     * @param LinkInterface $link
+     * @return void
+     * @throws InputException
+     */
+    private function validateSampleType(LinkInterface $link): void
+    {
+        if ($link->hasSampleType() && !in_array($link->getSampleType(), ['url', 'file'], true)) {
+            throw new InputException(__('The link sample type is invalid. Verify and try again.'));
+        }
+    }
+
+    /**
+     * Reset Sample type and file.
+     *
+     * @param LinkInterface $link
+     * @param LinkInterface $existingLink
+     * @return void
+     */
+    private function resetLinkSampleContent(LinkInterface $link, LinkInterface $existingLink): void
+    {
+        $existingType = $existingLink->getSampleType();
+        $link->setSampleType($existingType);
+        if ($existingType === 'file') {
+            $link->setSampleFile($existingLink->getSampleFile());
+        } else {
+            $link->setSampleUrl($existingLink->getSampleUrl());
+        }
+    }
+
     /**
      * Get MetadataPool instance
      *
diff --git a/app/code/Magento/Downloadable/Model/Sample/ContentValidator.php b/app/code/Magento/Downloadable/Model/Sample/ContentValidator.php
index 6a273bfe5d34e..697878017ee8b 100644
--- a/app/code/Magento/Downloadable/Model/Sample/ContentValidator.php
+++ b/app/code/Magento/Downloadable/Model/Sample/ContentValidator.php
@@ -6,12 +6,29 @@
 namespace Magento\Downloadable\Model\Sample;
 
 use Magento\Downloadable\Api\Data\SampleInterface;
+use Magento\Downloadable\Helper\File;
 use Magento\Downloadable\Model\File\ContentValidator as FileContentValidator;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Url\Validator as UrlValidator;
+use Magento\Downloadable\Model\Url\DomainValidator;
 
+/**
+ * Class to validate Sample Content.
+ */
 class ContentValidator
 {
+    /**
+     * @var File
+     */
+    private $fileHelper;
+
+    /**
+     * @var DomainValidator
+     */
+    private $domainValidator;
+
     /**
      * @var UrlValidator
      */
@@ -25,17 +42,23 @@ class ContentValidator
     /**
      * @param FileContentValidator $fileContentValidator
      * @param UrlValidator $urlValidator
+     * @param DomainValidator $domainValidator
+     * @param File|null $fileHelper
      */
     public function __construct(
         FileContentValidator $fileContentValidator,
-        UrlValidator $urlValidator
+        UrlValidator $urlValidator,
+        DomainValidator $domainValidator,
+        File $fileHelper = null
     ) {
         $this->fileContentValidator = $fileContentValidator;
         $this->urlValidator = $urlValidator;
+        $this->domainValidator = $domainValidator;
+        $this->fileHelper = $fileHelper ?? ObjectManager::getInstance()->get(File::class);
     }
 
     /**
-     * Check if sample content is valid
+     * Check if sample content is valid.
      *
      * @param SampleInterface $sample
      * @param bool $validateSampleContent
@@ -51,29 +74,48 @@ public function isValid(SampleInterface $sample, $validateSampleContent = true)
         if ($validateSampleContent) {
             $this->validateSampleResource($sample);
         }
+
         return true;
     }
 
     /**
-     * Validate sample resource (file or URL)
+     * Validate sample resource (file or URL).
      *
      * @param SampleInterface $sample
-     * @throws InputException
      * @return void
+     * @throws InputException
      */
     protected function validateSampleResource(SampleInterface $sample)
     {
-        $sampleFile = $sample->getSampleFileContent();
-        if ($sample->getSampleType() == 'file'
-            && (!$sampleFile || !$this->fileContentValidator->isValid($sampleFile))
-        ) {
-            throw new InputException(__('Provided file content must be valid base64 encoded data.'));
+        if ($sample->getSampleType() === 'url') {
+            if (!$this->urlValidator->isValid($sample->getSampleUrl())) {
+                throw new InputException(__('Sample URL must have valid format.'));
+            }
+
+            if (!$this->domainValidator->isValid($sample->getSampleUrl())) {
+                throw new InputException(__('Sample URL\'s domain is not in list of downloadable_domains in env.php.'));
+            }
+        } elseif ($sample->getSampleFileContent()) {
+            if (!$this->fileContentValidator->isValid($sample->getSampleFileContent())) {
+                throw new InputException(__('Provided file content must be valid base64 encoded data.'));
+            }
+        } elseif (!$this->isFileValid($sample->getBasePath() . $sample->getSampleFile())) {
+            throw new InputException(__('Sample file not found. Please try again.'));
         }
+    }
 
-        if ($sample->getSampleType() == 'url'
-            && !$this->urlValidator->isValid($sample->getSampleUrl())
-        ) {
-            throw new InputException(__('Sample URL must have valid format.'));
+    /**
+     * Check that Samples file is valid.
+     *
+     * @param string $file
+     * @return bool
+     */
+    private function isFileValid(string $file): bool
+    {
+        try {
+            return $this->fileHelper->ensureFileInFilesystem($file);
+        } catch (ValidatorException $e) {
+            return false;
         }
     }
 }
diff --git a/app/code/Magento/Downloadable/Model/SampleRepository.php b/app/code/Magento/Downloadable/Model/SampleRepository.php
index 07c7631fade13..37f376e666243 100644
--- a/app/code/Magento/Downloadable/Model/SampleRepository.php
+++ b/app/code/Magento/Downloadable/Model/SampleRepository.php
@@ -189,17 +189,12 @@ public function save(
                     __('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)) {
+            $this->validateSampleType($sample);
+            if (!$this->contentValidator->isValid($sample, true)) {
                 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(__('The sample type is invalid. Verify the sample type and try again.'));
-            }
-
             $title = $sample->getTitle();
             if (empty($title)) {
                 throw new InputException(__('The sample title is empty. Enter the title and try again.'));
@@ -230,7 +225,7 @@ protected function saveSample(
             'title' => $sample->getTitle(),
         ];
 
-        if ($sample->getSampleType() === 'file' && $sample->getSampleFile() === null) {
+        if ($sample->getSampleType() === 'file' && $sample->getSampleFileContent() !== null) {
             $sampleData['file'] = $this->jsonEncoder->encode(
                 [
                     $this->fileContentUploader->upload($sample->getSampleFileContent(), 'sample'),
@@ -293,9 +288,8 @@ protected function updateSample(
                 __("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)) {
+        $this->validateSampleType($sample);
+        if (!$this->contentValidator->isValid($sample, true)) {
             throw new InputException(__('The sample information is invalid. Verify the information and try again.'));
         }
         if ($isGlobalScopeContent) {
@@ -312,14 +306,8 @@ protected function updateSample(
         } else {
             $existingSample->setTitle($sample->getTitle());
         }
-
-        if ($sample->getSampleType() === 'file'
-            && $sample->getSampleFileContent() === null
-            && $sample->getSampleFile() !== null
-        ) {
-            $existingSample->setSampleFile($sample->getSampleFile());
-        }
         $this->saveSample($product, $sample, $isGlobalScopeContent);
+
         return $existingSample->getId();
     }
 
@@ -343,6 +331,20 @@ public function delete($id)
         return true;
     }
 
+    /**
+     * Check that Sample type exist.
+     *
+     * @param SampleInterface $sample
+     * @throws InputException
+     * @return void
+     */
+    private function validateSampleType(SampleInterface $sample): void
+    {
+        if (!in_array($sample->getSampleType(), ['url', 'file'], true)) {
+            throw new InputException(__('The sample type is invalid. Verify the sample type and try again.'));
+        }
+    }
+
     /**
      * Get MetadataPool instance
      *
diff --git a/app/code/Magento/Downloadable/Model/Url/DomainValidator.php b/app/code/Magento/Downloadable/Model/Url/DomainValidator.php
new file mode 100644
index 0000000000000..cab7fb134ea33
--- /dev/null
+++ b/app/code/Magento/Downloadable/Model/Url/DomainValidator.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Downloadable\Model\Url;
+
+use Magento\Downloadable\Api\DomainManagerInterface as DomainManager;
+use Magento\Framework\Validator\Ip as IpValidator;
+use Zend\Uri\Uri as UriHandler;
+
+/**
+ * Class is responsible for checking if downloadable product link domain is allowed.
+ */
+class DomainValidator
+{
+    /**
+     * Path to the allowed domains in the deployment config
+     */
+    public const PARAM_DOWNLOADABLE_DOMAINS = 'downloadable_domains';
+
+    /**
+     * @var IpValidator
+     */
+    private $ipValidator;
+
+    /**
+     * @var UriHandler
+     */
+    private $uriHandler;
+
+    /**
+     * @var DomainManager
+     */
+    private $domainManager;
+
+    /**
+     * @param DomainManager $domainManager
+     * @param IpValidator $ipValidator
+     * @param UriHandler $uriHandler
+     */
+    public function __construct(
+        DomainManager $domainManager,
+        IpValidator $ipValidator,
+        UriHandler $uriHandler
+    ) {
+        $this->domainManager = $domainManager;
+        $this->ipValidator = $ipValidator;
+        $this->uriHandler = $uriHandler;
+    }
+
+    /**
+     * Validate url input.
+     *
+     * Assert parsed host of $value is contained within environment whitelist
+     *
+     * @param string $value
+     * @return bool
+     */
+    public function isValid($value): bool
+    {
+        $host = $this->getHost($value);
+
+        $isIpAddress = $this->ipValidator->isValid($host);
+        $isValid = !$isIpAddress && in_array($host, $this->domainManager->getDomains());
+
+        return $isValid;
+    }
+
+    /**
+     * Extract host from url
+     *
+     * @param string $url
+     * @return string
+     */
+    private function getHost($url): string
+    {
+        $host = $this->uriHandler->parse($url)->getHost();
+
+        if ($host === null) {
+            return '';
+        }
+
+        // ipv6 hosts are brace-delimited in url; they are removed here for subsequent validation
+        return trim($host, '[] ');
+    }
+}
diff --git a/app/code/Magento/Downloadable/Setup/Patch/Data/AddDownloadableHostsConfig.php b/app/code/Magento/Downloadable/Setup/Patch/Data/AddDownloadableHostsConfig.php
new file mode 100644
index 0000000000000..0e88bd166b604
--- /dev/null
+++ b/app/code/Magento/Downloadable/Setup/Patch/Data/AddDownloadableHostsConfig.php
@@ -0,0 +1,217 @@
+<?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\Config\Model\Config\Backend\Admin\Custom;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Zend\Uri\Uri as UriHandler;
+use Magento\Framework\Url\ScopeResolverInterface;
+use Magento\Downloadable\Api\DomainManagerInterface as DomainManager;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Backend\App\Area\FrontNameResolver;
+
+/**
+ * Adding base url as allowed downloadable domain.
+ */
+class AddDownloadableHostsConfig implements DataPatchInterface
+{
+    /**
+     * @var UriHandler
+     */
+    private $uriHandler;
+
+    /**
+     * @var ScopeResolverInterface
+     */
+    private $scopeResolver;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var DomainManager
+     */
+    private $domainManager;
+
+    /**
+     * @var array
+     */
+    private $whitelist = [];
+
+    /**
+     * AddDownloadableHostsConfig constructor.
+     *
+     * @param UriHandler $uriHandler
+     * @param ScopeResolverInterface $scopeResolver
+     * @param ScopeConfigInterface $scopeConfig
+     * @param DomainManager $domainManager
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        UriHandler $uriHandler,
+        ScopeResolverInterface $scopeResolver,
+        ScopeConfigInterface $scopeConfig,
+        DomainManager $domainManager,
+        ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->uriHandler = $uriHandler;
+        $this->scopeResolver = $scopeResolver;
+        $this->scopeConfig = $scopeConfig;
+        $this->domainManager = $domainManager;
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $customStoreScope = $this->scopeResolver->getScope(Custom::CONFIG_SCOPE_ID);
+        $storeScopes = $this->scopeResolver->getScopes();
+        $allStoreScopes = array_merge($storeScopes, [$customStoreScope]);
+
+        foreach ($allStoreScopes as $scope) {
+            $this->addStoreAndWebsiteUrlsFromScope($scope);
+        }
+
+        $customAdminUrl = $this->scopeConfig->getValue(
+            FrontNameResolver::XML_PATH_CUSTOM_ADMIN_URL,
+            ScopeInterface::SCOPE_STORE
+        );
+
+        if ($customAdminUrl) {
+            $this->addHost($customAdminUrl);
+        }
+
+        if ($this->moduleDataSetup->tableExists('downloadable_link')) {
+            $select = $this->moduleDataSetup->getConnection()
+                ->select()
+                ->from(
+                    $this->moduleDataSetup->getTable('downloadable_link'),
+                    ['link_url']
+                )
+                ->where('link_type = ?', 'url');
+
+            foreach ($this->moduleDataSetup->getConnection()->fetchAll($select) as $link) {
+                $this->addHost($link['link_url']);
+            }
+
+            $select = $this->moduleDataSetup->getConnection()
+                ->select()
+                ->from(
+                    $this->moduleDataSetup->getTable('downloadable_link'),
+                    ['sample_url']
+                )
+                ->where('sample_type = ?', 'url');
+
+            foreach ($this->moduleDataSetup->getConnection()->fetchAll($select) as $link) {
+                $this->addHost($link['sample_url']);
+            }
+        }
+
+        if ($this->moduleDataSetup->tableExists('downloadable_sample')) {
+            $select = $this->moduleDataSetup->getConnection()
+                ->select()
+                ->from(
+                    $this->moduleDataSetup->getTable('downloadable_sample'),
+                    ['sample_url']
+                )
+                ->where('sample_type = ?', 'url');
+
+            foreach ($this->moduleDataSetup->getConnection()->fetchAll($select) as $link) {
+                $this->addHost($link['sample_url']);
+            }
+        }
+
+        $this->domainManager->addDomains($this->whitelist);
+    }
+
+    /**
+     * Add stores and website urls from store scope
+     *
+     * @param Store $scope
+     */
+    private function addStoreAndWebsiteUrlsFromScope(Store $scope)
+    {
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_WEB, false));
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_WEB, true));
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_LINK, false));
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_LINK, true));
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_DIRECT_LINK, false));
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_DIRECT_LINK, true));
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_MEDIA, false));
+        $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_MEDIA, true));
+
+        try {
+            $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_STATIC, false));
+            $this->addHost($scope->getBaseUrl(UrlInterface::URL_TYPE_STATIC, true));
+        } catch (\UnexpectedValueException $e) {} //@codingStandardsIgnoreLine
+
+        try {
+            $website = $scope->getWebsite();
+        } catch (NoSuchEntityException $e) {
+            return;
+        }
+
+        if ($website) {
+            $this->addHost($website->getConfig(Store::XML_PATH_SECURE_BASE_URL));
+            $this->addHost($website->getConfig(Store::XML_PATH_UNSECURE_BASE_URL));
+            $this->addHost($website->getConfig(Store::XML_PATH_SECURE_BASE_LINK_URL));
+            $this->addHost($website->getConfig(Store::XML_PATH_UNSECURE_BASE_LINK_URL));
+            $this->addHost($website->getConfig(Store::XML_PATH_SECURE_BASE_MEDIA_URL));
+            $this->addHost($website->getConfig(Store::XML_PATH_UNSECURE_BASE_MEDIA_URL));
+            $this->addHost($website->getConfig(Store::XML_PATH_SECURE_BASE_STATIC_URL));
+            $this->addHost($website->getConfig(Store::XML_PATH_UNSECURE_BASE_STATIC_URL));
+        }
+    }
+
+    /**
+     * Add host to whitelist
+     *
+     * @param string $url
+     */
+    private function addHost($url)
+    {
+        if (!is_string($url)) {
+            return;
+        }
+
+        $host = $this->uriHandler->parse($url)->getHost();
+        if ($host && !in_array($host, $this->whitelist)) {
+            $this->whitelist[] = $host;
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Downloadable/Setup/Patch/Schema/ChangeTmpTablesEngine.php b/app/code/Magento/Downloadable/Setup/Patch/Schema/ChangeTmpTablesEngine.php
deleted file mode 100644
index caf2f7745a3dd..0000000000000
--- a/app/code/Magento/Downloadable/Setup/Patch/Schema/ChangeTmpTablesEngine.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Downloadable\Setup\Patch\Schema;
-
-use Magento\Framework\Setup\Patch\SchemaPatchInterface;
-use Magento\Framework\Setup\SchemaSetupInterface;
-
-/**
- * Change engine for temporary tables to InnoDB.
- */
-class ChangeTmpTablesEngine implements SchemaPatchInterface
-{
-    /**
-     * @var SchemaSetupInterface
-     */
-    private $schemaSetup;
-
-    /**
-     * @param SchemaSetupInterface $schemaSetup
-     */
-    public function __construct(SchemaSetupInterface $schemaSetup)
-    {
-        $this->schemaSetup = $schemaSetup;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function apply()
-    {
-        $this->schemaSetup->startSetup();
-
-        $tableName = $this->schemaSetup->getTable('catalog_product_index_price_downlod_tmp');
-        if ($this->schemaSetup->getConnection()->isTableExists($tableName)) {
-            $this->schemaSetup->getConnection()->changeTableEngine($tableName, 'InnoDB');
-        }
-
-        $this->schemaSetup->endSetup();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public static function getDependencies()
-    {
-        return [];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getAliases()
-    {
-        return [];
-    }
-}
diff --git a/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminDownloadableProductActionGroup.xml b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminDownloadableProductActionGroup.xml
index f40f5cb47e4dd..2d2cdd969ac9d 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminDownloadableProductActionGroup.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/AdminDownloadableProductActionGroup.xml
@@ -51,18 +51,20 @@
         </annotations>
         <arguments>
             <argument name="link" defaultValue="downloadableLink"/>
+            <argument name="index" type="string" defaultValue="1"/>
         </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"/>
+        <fillField userInput="{{link.title}}" selector="{{AdminProductDownloadableSection.addLinkTitleInput(index)}}" stepKey="fillDownloadableLinkTitle"/>
+        <fillField userInput="{{link.price}}" selector="{{AdminProductDownloadableSection.addLinkPriceInput(index)}}" stepKey="fillDownloadableLinkPrice"/>
+        <selectOption userInput="{{link.file_type}}" selector="{{AdminProductDownloadableSection.addLinkFileTypeSelector(index)}}" stepKey="selectDownloadableLinkFileType"/>
+        <selectOption userInput="{{link.sample_type}}" selector="{{AdminProductDownloadableSection.addLinkSampleTypeSelector(index)}}" stepKey="selectDownloadableLinkSampleType"/>
+        <selectOption userInput="{{link.shareable}}" selector="{{AdminProductDownloadableSection.addLinkShareableSelector(index)}}" stepKey="selectDownloadableLinkShareable"/>
+        <checkOption selector="{{AdminProductDownloadableSection.addLinkIsUnlimitedDownloads(index)}}" stepKey="checkDownloadableLinkUnlimited"/>
+        <fillField userInput="{{link.file}}" selector="{{AdminProductDownloadableSection.addLinkFileUrlInput(index)}}" stepKey="fillDownloadableLinkFileUrl"/>
+        <attachFile userInput="{{link.sample}}" selector="{{AdminProductDownloadableSection.addLinkSampleUploadFile(index)}}" stepKey="attachDownloadableLinkUploadSample"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterFillingOutForm" />
     </actionGroup>
 
     <!--Add a downloadable sample file-->
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
index 1a6be43b38d2c..2986532ef1138 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
@@ -74,6 +74,21 @@
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
         <requiredEntity type="downloadable_link">apiDownloadableLink</requiredEntity>
     </entity>
+    <entity name="ApiDownloadableProductUnderscoredSku" 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>
     <entity name="DownloadableProductWithTwoLink100" type="product">
         <data key="sku" unique="suffix">downloadableproduct</data>
         <data key="type_id">downloadable</data>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontDownloadableProductSection.xml b/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontDownloadableProductSection.xml
index 20b62ef060309..dc2a58be138e7 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontDownloadableProductSection.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontDownloadableProductSection.xml
@@ -15,5 +15,6 @@
         <element name="downloadableLinkSampleByTitle" type="text" selector="//label[contains(., '{{title}}')]/a[contains(@class, 'sample link')]" parameterized="true"/>
         <element name="downloadableSampleLabel" type="text" selector="//a[contains(.,normalize-space('{{title}}'))]" parameterized="true" timeout="30"/>
         <element name="downloadableLinkSelectAllCheckbox" type="checkbox" selector="#links_all" />
+        <element name="downloadableLinkSelectAllLabel" type="text" selector="label[for='links_all']" />
     </section>
 </sections>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
index 64f33b01e668f..a7ce96ddf1fde 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
@@ -19,12 +19,14 @@
             <group value="Downloadable"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
             <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
                 <argument name="product" value="DownloadableProduct"/>
             </actionGroup>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
         </after>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml
index a7acdfded29b6..d95ddaf12470d 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml
@@ -18,7 +18,12 @@
             <testCaseId value="MC-114"/>
             <group value="Downloadable"/>
         </annotations>
-
+        <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com" before="enableAdminAccountSharing"/>
+        </before>
+        <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com" before="setStoreDefaultConfig"/>
+        </after>
         <!-- Create a downloadable product -->
         <!-- Replacing steps in base AdminAddDefaultVideoSimpleProductTest -->
         <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductAndAssignItToCustomStoreTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductAndAssignItToCustomStoreTest.xml
index 5d7e4518525f7..4f07334640cf3 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductAndAssignItToCustomStoreTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductAndAssignItToCustomStoreTest.xml
@@ -20,6 +20,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
@@ -27,6 +28,7 @@
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml
index 0ae2c1254be01..54a2ff606f384 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml
@@ -20,6 +20,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
@@ -27,6 +28,7 @@
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml
index eadefabb8bbcb..24741c281d7f6 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminCreateDownloadableProductWithLinkTest">
+    <test name="AdminCreateDownloadableProductWithDefaultSetLinksTest">
         <annotations>
             <features value="Catalog"/>
             <stories value="Create Downloadable Product"/>
@@ -20,13 +20,17 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-
+            <!-- Reindex and clear page cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" arguments="full_page" stepKey="flushCache"/>
             <!-- Login as admin -->
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
@@ -72,6 +76,8 @@
 
         <!-- Save product -->
         <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
 
         <!-- Find downloadable product in grid -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml
index 8bd4305e6b358..06cf31b763f1c 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml
@@ -20,6 +20,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
@@ -27,6 +28,7 @@
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithInvalidDomainLinkUrlTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithInvalidDomainLinkUrlTest.xml
new file mode 100644
index 0000000000000..f2e4bdfb4890f
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithInvalidDomainLinkUrlTest.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="AdminCreateDownloadableProductWithInvalidDomainLinkUrlTest" extends="AdminCreateDownloadableProductWithLinkTest">
+        <annotations>
+            <stories value="Create Downloadable Product"/>
+            <title value="Create Downloadable Product with invalid domain link url"/>
+            <description value="Admin should not be able to create downloadable product with invalid domain link url"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-18282"/>
+            <useCaseId value="MC-17700"/>
+            <group value="Downloadable"/>
+        </annotations>
+        <before>
+            <remove keyForRemoval="addDownloadableDomain" />
+        </before>
+        <actionGroup ref="addDownloadableProductLink" stepKey="addDownloadableProductLink">
+            <argument name="link" value="downloadableLink"/>
+            <argument name="index" value="0"/>
+        </actionGroup>
+        <actionGroup ref="SaveProductFormNoSuccessCheck" stepKey="saveProduct"/>
+        <see selector="{{AdminProductMessagesSection.errorMessage}}" userInput="Link URL's domain is not in list of downloadable_domains in env.php." stepKey="seeLinkUrlInvalidMessage" after="saveProduct" />
+        <magentoCLI stepKey="addDownloadableDomain2" command="downloadable:domains:add static.magento.com" after="seeLinkUrlInvalidMessage" />
+        <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillDownloadableProductFormAgain" after="addDownloadableDomain2">
+            <argument name="product" value="DownloadableProduct"/>
+        </actionGroup>
+        <checkOption selector="{{AdminProductDownloadableSection.isDownloadableProduct}}" stepKey="checkIsDownloadable" after="fillDownloadableProductFormAgain"/>
+        <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkIsLinksPurchasedSeparately" after="checkIsDownloadable"/>
+        <actionGroup ref="addDownloadableProductLink" stepKey="addDownloadableProductLinkAgain" after="checkIsLinksPurchasedSeparately">
+            <argument name="link" value="downloadableLink"/>
+            <argument name="index" value="0"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProductAfterAddingDomainToWhitelist" after="addDownloadableProductLinkAgain" />
+        <scrollTo selector="{{StorefrontDownloadableProductSection.downloadableLinkByTitle(downloadableLink.title)}}" stepKey="scrollToLinks"/>
+        <click selector="{{StorefrontDownloadableProductSection.downloadableLinkByTitle(downloadableLink.title)}}" stepKey="selectProductLink"/>
+        <see selector="{{CheckoutCartProductSection.ProductPriceByName(DownloadableProduct.name)}}" userInput="$52.99" stepKey="assertProductPriceInCart"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithLinkTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithLinkTest.xml
index d8bd641e84e55..e43b8f94c7a3d 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithLinkTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithLinkTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminCreateDownloadableProductWithDefaultSetLinksTest">
+    <test name="AdminCreateDownloadableProductWithLinkTest">
         <annotations>
             <features value="Catalog"/>
             <stories value="Create Downloadable Product"/>
@@ -20,6 +20,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
@@ -27,6 +28,7 @@
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml
index 3efd4b8ab276f..fb6a48254fa8d 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml
@@ -20,6 +20,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
@@ -27,6 +28,7 @@
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml
index 07f7c40bb3560..5e3fe6836f7e9 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml
@@ -20,6 +20,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
@@ -27,6 +28,7 @@
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml
index 275e72b2ec8cb..fb59d51831bae 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml
@@ -20,6 +20,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
@@ -27,6 +28,7 @@
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml
index f326a047c32b5..af9487e3e6a23 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml
@@ -20,6 +20,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
@@ -27,6 +28,7 @@
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml
index 8e33a082d0ba2..dd7e3331a0ed2 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml
@@ -20,6 +20,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
@@ -27,6 +28,7 @@
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml
index d3c2d6e5d71a4..07124ea4846be 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml
@@ -18,6 +18,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="DownloadableProductWithTwoLink" stepKey="createDownloadableProduct">
@@ -31,6 +32,7 @@
             </createData>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest.xml
index 8cb0d5fde9863..20c1acaf8d612 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest.xml
@@ -37,12 +37,16 @@
             <group value="catalog"/>
         </annotations>
         <before>
+            <!-- Add downloadable domains -->
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <!--Create product-->
             <comment userInput="Create product" stepKey="commentCreateProduct"/>
             <createData entity="SimpleProduct2" stepKey="createProduct"/>
         </before>
         <after>
+            <!-- Remove downloadable domains -->
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
             <!--Delete product-->
             <comment userInput="Delete product" stepKey="commentDeleteProduct"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
index 3ee6cef47738b..3597c12e82df0 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
@@ -19,9 +19,11 @@
             <group value="Downloadable"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
         </after>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml
index d8bbbb2b4d62b..0d98862d9a5e7 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultVideoDownloadableProductTest.xml
@@ -18,6 +18,12 @@
             <testCaseId value="MC-207"/>
             <group value="Downloadable"/>
         </annotations>
+        <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com" before="enableAdminAccountSharing"/>
+        </before>
+        <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com" before="setStoreDefaultConfig"/>
+        </after>
 
         <!-- Create a downloadable product -->
         <!-- Replacing steps in base AdminRemoveDefaultVideoSimpleProductTest -->
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml
index 66177b6875dd9..b5f437996d69b 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml
@@ -19,6 +19,7 @@
             <group value="Downloadable"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com" before="product"/>
             <createData entity="ApiDownloadableProduct" stepKey="product"/>
             <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
                 <requiredEntity createDataKey="product"/>
@@ -27,6 +28,9 @@
                 <requiredEntity createDataKey="product"/>
             </createData>
         </before>
+        <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com" before="delete"/>
+        </after>
     </test>
     <test name="AdvanceCatalogSearchDownloadableBySkuTest" extends="AdvanceCatalogSearchSimpleProductBySkuTest">
         <annotations>
@@ -39,7 +43,8 @@
             <group value="Downloadable"/>
         </annotations>
         <before>
-            <createData entity="ApiDownloadableProduct" stepKey="product"/>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com" before="product"/>
+            <createData entity="ApiDownloadableProductUnderscoredSku" stepKey="product"/>
             <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
                 <requiredEntity createDataKey="product"/>
             </createData>
@@ -47,6 +52,9 @@
                 <requiredEntity createDataKey="product"/>
             </createData>
         </before>
+        <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com" before="delete"/>
+        </after>
     </test>
     <test name="AdvanceCatalogSearchDownloadableByDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByDescriptionTest">
         <annotations>
@@ -59,6 +67,7 @@
             <group value="Downloadable"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com" before="product"/>
             <createData entity="ApiDownloadableProduct" stepKey="product"/>
             <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
                 <requiredEntity createDataKey="product"/>
@@ -67,6 +76,9 @@
                 <requiredEntity createDataKey="product"/>
             </createData>
         </before>
+        <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com" before="delete"/>
+        </after>
     </test>
     <test name="AdvanceCatalogSearchDownloadableByShortDescriptionTest" extends="AdvanceCatalogSearchSimpleProductByShortDescriptionTest">
         <annotations>
@@ -79,6 +91,7 @@
             <group value="Downloadable"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com" before="product"/>
             <createData entity="ApiDownloadableProduct" stepKey="product"/>
             <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
                 <requiredEntity createDataKey="product"/>
@@ -87,6 +100,9 @@
                 <requiredEntity createDataKey="product"/>
             </createData>
         </before>
+        <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com" before="delete"/>
+        </after>
     </test>
     <test name="AdvanceCatalogSearchDownloadableByPriceTest" extends="AdvanceCatalogSearchSimpleProductByPriceTest">
         <annotations>
@@ -99,6 +115,7 @@
             <group value="Downloadable"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com" before="product"/>
             <createData entity="ApiDownloadableProduct" stepKey="product"/>
             <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
                 <requiredEntity createDataKey="product"/>
@@ -107,5 +124,8 @@
                 <requiredEntity createDataKey="product"/>
             </createData>
         </before>
+        <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com" before="delete"/>
+        </after>
     </test>
 </tests>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/EditDownloadableProductWithSeparateLinksFromCartTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/EditDownloadableProductWithSeparateLinksFromCartTest.xml
index 0b905964fd2d9..274dd39468a2b 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/EditDownloadableProductWithSeparateLinksFromCartTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/EditDownloadableProductWithSeparateLinksFromCartTest.xml
@@ -18,6 +18,9 @@
             <group value="Downloadable"/>
         </annotations>
         <before>
+            <!-- Add downloadable domains -->
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
+
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
@@ -61,6 +64,9 @@
             <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
         </before>
         <after>
+            <!-- Remove downloadable domains -->
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
+
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
index b960d15b2fdf1..b9773415059ec 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
@@ -18,6 +18,7 @@
             <testCaseId value="MC-16011"/>
         </annotations>
         <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
             <magentoCLI command="config:set {{EnableGuestCheckoutWithDownloadableItems.path}} {{EnableGuestCheckoutWithDownloadableItems.value}}" stepKey="enableGuestCheckoutWithDownloadableItems" />
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="DownloadableProductWithOneLink" stepKey="createProduct">
@@ -28,6 +29,7 @@
             </createData>
         </before>
         <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
             <magentoCLI command="config:set {{DisableGuestCheckoutWithDownloadableItems.path}} {{DisableGuestCheckoutWithDownloadableItems.value}}" stepKey="disableGuestCheckoutWithDownloadableItems" />
             <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/ManualSelectAllDownloadableLinksDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/ManualSelectAllDownloadableLinksDownloadableProductTest.xml
new file mode 100644
index 0000000000000..a86fd544d24d6
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/ManualSelectAllDownloadableLinksDownloadableProductTest.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="ManualSelectAllDownloadableLinksDownloadableProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create Downloadable Product"/>
+            <title value="Manual select all downloadable links downloadable product test"/>
+            <description value="Manually selecting all downloadable links must change 'Select/Unselect all' button label to 'Unselect all', and 'Select all' otherwise"/>
+            <severity value="MAJOR"/>
+            <group value="Downloadable"/>
+        </annotations>
+        <before>
+            <!-- Add downloadable domains -->
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
+
+            <!-- Create category -->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+
+            <!-- Create downloadable product -->
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+            <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+            <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="createProduct">
+                <argument name="productType" value="downloadable"/>
+            </actionGroup>
+
+            <!-- Fill downloadable product values -->
+            <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillDownloadableProductForm">
+                <argument name="product" value="DownloadableProduct"/>
+            </actionGroup>
+
+            <!-- Add downloadable product to category -->
+            <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}"
+                                        parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
+
+            <!-- Fill downloadable link information before the creation link -->
+            <actionGroup ref="AdminAddDownloadableLinkInformationActionGroup" stepKey="addDownloadableLinkInformation"/>
+
+            <!-- Links can be purchased separately -->
+            <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}"
+                         stepKey="checkOptionPurchaseSeparately"/>
+
+            <!-- Add first downloadable link -->
+            <actionGroup ref="addDownloadableProductLinkWithMaxDownloads" stepKey="addFirstDownloadableProductLink">
+                <argument name="link" value="downloadableLinkWithMaxDownloads"/>
+            </actionGroup>
+
+            <!-- Add second downloadable link -->
+            <actionGroup ref="addDownloadableProductLink" stepKey="addSecondDownloadableProductLink">
+                <argument name="link" value="downloadableLink"/>
+            </actionGroup>
+
+            <!-- Save product -->
+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        </before>
+        <after>
+            <!-- Remove downloadable domains -->
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
+
+            <!-- Delete category -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Delete created downloadable product -->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="DownloadableProduct"/>
+            </actionGroup>
+
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Step 1: Navigate to store front Product page as guest -->
+        <amOnPage url="/{{DownloadableProduct.sku}}.html"
+                  stepKey="amOnStorefrontProductPage"/>
+
+        <!-- Step 2: Check first downloadable link checkbox -->
+        <click
+            selector="{{StorefrontDownloadableProductSection.downloadableLinkByTitle(downloadableLinkWithMaxDownloads.title)}}"
+            stepKey="selectFirstCheckbox"/>
+
+        <!-- Step 3: Check second downloadable link checkbox -->
+        <click
+            selector="{{StorefrontDownloadableProductSection.downloadableLinkByTitle(downloadableLink.title)}}"
+            stepKey="selectSecondCheckbox"/>
+
+        <!-- Step 4: Grab "Select/Unselect All" button label text -->
+        <grabTextFrom
+            selector="{{StorefrontDownloadableProductSection.downloadableLinkSelectAllLabel}}"
+            stepKey="grabUnselectAllButtonText"/>
+
+        <!-- Step 5: Assert that 'Select/Unselect all' button text is 'Unselect all' after manually checking all checkboxes -->
+        <assertEquals
+            message="Assert that 'Select/Unselect all' button text is 'Unselect all' after manually checking all checkboxes"
+            stepKey="assertButtonTextOne">
+                <expectedResult type="string">Unselect all</expectedResult>
+                <actualResult type="string">{$grabUnselectAllButtonText}</actualResult>
+        </assertEquals>
+
+        <!-- Step 6: Uncheck second downloadable link checkbox -->
+        <click
+            selector="{{StorefrontDownloadableProductSection.downloadableLinkByTitle(downloadableLink.title)}}"
+            stepKey="unselectSecondCheckbox"/>
+
+        <!-- Step 7: Grab "Select/Unselect All" button label text -->
+        <grabTextFrom
+            selector="{{StorefrontDownloadableProductSection.downloadableLinkSelectAllLabel}}"
+            stepKey="grabSelectAllButtonText"/>
+
+        <!-- Step 8: Assert that 'Select/Unselect all' button text is 'Select all' after manually unchecking one checkbox -->
+        <assertEquals
+            message="Assert that 'Select/Unselect all' button text is 'Select all' after manually unchecking one checkbox"
+            stepKey="assertButtonTextTwo">
+                <expectedResult type="string">Select all</expectedResult>
+                <actualResult type="string">{$grabSelectAllButtonText}</actualResult>
+        </assertEquals>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml
index 4864d11c884bc..94fca6f507637 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml
@@ -20,6 +20,13 @@
             <group value="WYSIWYGDisabled"/>
         </annotations>
 
+        <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com" before="loginAsAdmin"/>
+        </before>
+        <after>
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com" before="logout"/>
+        </after>
+
         <!-- A Cms page containing the New Products Widget gets created here via extends -->
 
         <!-- Create a Downloadable product to appear in the widget -->
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/SelectAllDownloadableLinksDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/SelectAllDownloadableLinksDownloadableProductTest.xml
index 94940f0e08195..f9ca6fea09cf0 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/SelectAllDownloadableLinksDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/SelectAllDownloadableLinksDownloadableProductTest.xml
@@ -18,6 +18,9 @@
             <group value="Downloadable"/>
         </annotations>
         <before>
+            <!-- Add downloadable domains -->
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
+
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
@@ -61,6 +64,9 @@
             <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
         </before>
         <after>
+            <!-- Remove downloadable domains -->
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
+
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAdvanceCatalogSearchDownloadableBySkuWithHyphenTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAdvanceCatalogSearchDownloadableBySkuWithHyphenTest.xml
new file mode 100644
index 0000000000000..e4a5bd732a83c
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAdvanceCatalogSearchDownloadableBySkuWithHyphenTest.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="StorefrontAdvanceCatalogSearchDownloadableBySkuWithHyphenTest" 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 that contains hyphen"/>
+             <description value="Guest customer should be able to advance search Downloadable product with product that contains hyphen"/>
+             <severity value="MAJOR"/>
+             <testCaseId value="MC-252"/>
+             <group value="Downloadable"/>
+             <group value="SearchEngineMysql"/>
+         </annotations>
+         <before>
+             <magentoCLI command="downloadable:domains:add example.com static.magento.com" before="product" stepKey="addDownloadableDomain"/>
+             <createData entity="ApiDownloadableProduct" stepKey="product"/>
+             <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink1">
+                 <requiredEntity createDataKey="product"/>
+             </createData>
+             <createData entity="ApiDownloadableLink" stepKey="addDownloadableLink2">
+                 <requiredEntity createDataKey="product"/>
+             </createData>
+         </before>
+         <after>
+             <magentoCLI command="downloadable:domains:remove example.com static.magento.com" stepKey="removeDownloadableDomain"/>
+         </after>
+     </test>
+ </tests>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/VerifyDisableDownloadableProductSamplesAreNotAccessibleTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/VerifyDisableDownloadableProductSamplesAreNotAccessibleTest.xml
index f29bbcf925e26..ba2e3453a6d99 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/VerifyDisableDownloadableProductSamplesAreNotAccessibleTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/VerifyDisableDownloadableProductSamplesAreNotAccessibleTest.xml
@@ -21,6 +21,9 @@
             <group value="catalog"/>
         </annotations>
         <before>
+            <!-- Add downloadable domains -->
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
+
             <!-- Create category -->
             <createData entity="_defaultCategory" stepKey="createCategory"/>
 
@@ -40,6 +43,9 @@
             </createData>
         </before>
         <after>
+            <!-- Remove downloadable domains -->
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
+
             <!-- Delete product -->
             <deleteData createDataKey="createProduct" stepKey="deleteDownloadableProduct"/>
 
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 25a5d86b0385c..55353c16b4727 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
@@ -7,6 +7,9 @@
 
 use Magento\Catalog\Api\Data\ProductExtensionInterface;
 
+/**
+ * Unit tests for \Magento\Downloadable\Controller\Adminhtml\Product\Initialization\Helper\Plugin\Downloadable.
+ */
 class DownloadableTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -34,12 +37,20 @@ class DownloadableTest extends \PHPUnit\Framework\TestCase
      */
     private $extensionAttributesMock;
 
+    /**
+     * @var \Magento\Downloadable\Model\Product\Type|\Magento\Catalog\Api\Data\ProductExtensionInterface
+     */
+    private $downloadableProductTypeMock;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
         $this->productMock = $this->createPartialMock(
             \Magento\Catalog\Model\Product::class,
-            ['setDownloadableData', 'getExtensionAttributes', '__wakeup']
+            ['setDownloadableData', 'getExtensionAttributes', '__wakeup', 'getTypeInstance']
         );
         $this->subjectMock = $this->createMock(
             \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper::class
@@ -62,6 +73,10 @@ protected function setUp()
         $sampleBuilderMock = $this->getMockBuilder(\Magento\Downloadable\Model\Sample\Builder::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->downloadableProductTypeMock = $this->createPartialMock(
+            \Magento\Downloadable\Model\Product\Type::class,
+            ['getLinks', 'getSamples']
+        );
         $this->downloadablePlugin =
             new \Magento\Downloadable\Controller\Adminhtml\Product\Initialization\Helper\Plugin\Downloadable(
                 $this->requestMock,
@@ -86,6 +101,11 @@ public function testAfterInitializeWithNoDataToSave($downloadable)
         $this->productMock->expects($this->once())
             ->method('getExtensionAttributes')
             ->willReturn($this->extensionAttributesMock);
+        $this->productMock->expects($this->exactly(2))
+            ->method('getTypeInstance')
+            ->willReturn($this->downloadableProductTypeMock);
+        $this->downloadableProductTypeMock->expects($this->once())->method('getLinks')->willReturn([]);
+        $this->downloadableProductTypeMock->expects($this->once())->method('getSamples')->willReturn([]);
         $this->extensionAttributesMock->expects($this->once())
             ->method('setDownloadableProductLinks')
             ->with([]);
diff --git a/app/code/Magento/Downloadable/Test/Unit/Helper/DataTest.php b/app/code/Magento/Downloadable/Test/Unit/Helper/DataTest.php
new file mode 100644
index 0000000000000..7c59ef7d7ec64
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Unit/Helper/DataTest.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Downloadable\Test\Unit\Helper;
+
+use Magento\Downloadable\Model\Link;
+use Magento\Store\Model\ScopeInterface;
+use PHPUnit\Framework\TestCase;
+use Magento\Downloadable\Helper\Data;
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class DataTest extends TestCase
+{
+    /**
+     * @var Data
+     */
+    private $helper;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * Setup environment for test
+     */
+    protected function setUp()
+    {
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->contextMock = $this->createMock(Context::class);
+        $this->contextMock->method('getScopeConfig')->willReturn($this->scopeConfigMock);
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->helper = $objectManager->getObject(
+            Data::class,
+            ['context' => $this->contextMock]
+        );
+    }
+
+    /**
+     * Test getIsShareable() with data provider
+     *
+     * @param int $linkShareable
+     * @param bool $config
+     * @param bool $expectedResult
+     * @dataProvider getIsShareableDataProvider
+     */
+    public function testGetIsShareable($linkShareable, $config, $expectedResult)
+    {
+        $this->scopeConfigMock->method('isSetFlag')
+            ->with(Link::XML_PATH_CONFIG_IS_SHAREABLE, ScopeInterface::SCOPE_STORE)
+            ->willReturn($config);
+
+        $linkMock = $this->createMock(Link::class);
+        $linkMock->method('getIsShareable')->willReturn($linkShareable);
+
+        $this->assertEquals($expectedResult, $this->helper->getIsShareable($linkMock));
+    }
+
+    /**
+     * Data provider for getIsShareable()
+     *
+     * @return array
+     */
+    public function getIsShareableDataProvider()
+    {
+        return [
+            'link shareable yes' => [Link::LINK_SHAREABLE_YES, true, true],
+            'link shareable no' => [Link::LINK_SHAREABLE_NO, true, false],
+            'link shareable config true' => [Link::LINK_SHAREABLE_CONFIG, true, true],
+            'link shareable config false' => [Link::LINK_SHAREABLE_CONFIG, false, false],
+        ];
+    }
+}
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Link/ContentValidatorTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Link/ContentValidatorTest.php
index 2639c22ff2ca2..152e3699f9691 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Model/Link/ContentValidatorTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Model/Link/ContentValidatorTest.php
@@ -5,8 +5,12 @@
  */
 namespace Magento\Downloadable\Test\Unit\Model\Link;
 
+use Magento\Downloadable\Helper\File;
 use Magento\Downloadable\Model\Link\ContentValidator;
 
+/**
+ * Unit tests for Magento\Downloadable\Model\Link\ContentValidator.
+ */
 class ContentValidatorTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -24,6 +28,11 @@ class ContentValidatorTest extends \PHPUnit\Framework\TestCase
      */
     protected $urlValidatorMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $domainValidatorMock;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -34,13 +43,34 @@ class ContentValidatorTest extends \PHPUnit\Framework\TestCase
      */
     protected $sampleFileMock;
 
+    /**
+     * @var File|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileMock;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
         $this->fileValidatorMock = $this->createMock(\Magento\Downloadable\Model\File\ContentValidator::class);
         $this->urlValidatorMock = $this->createMock(\Magento\Framework\Url\Validator::class);
+        $this->domainValidatorMock = $this->createMock(\Magento\Downloadable\Model\Url\DomainValidator::class);
         $this->linkFileMock = $this->createMock(\Magento\Downloadable\Api\Data\File\ContentInterface::class);
         $this->sampleFileMock = $this->createMock(\Magento\Downloadable\Api\Data\File\ContentInterface::class);
-        $this->validator = new ContentValidator($this->fileValidatorMock, $this->urlValidatorMock);
+        $this->fileMock = $this->createMock(File::class);
+
+        $this->validator = $objectManager->getObject(
+            ContentValidator::class,
+            [
+                'fileContentValidator' => $this->fileValidatorMock,
+                'urlValidator' => $this->urlValidatorMock,
+                'fileHelper' => $this->fileMock,
+                'domainValidator' => $this->domainValidatorMock,
+            ]
+        );
     }
 
     public function testIsValid()
@@ -60,6 +90,7 @@ public function testIsValid()
         ];
         $this->fileValidatorMock->expects($this->any())->method('isValid')->will($this->returnValue(true));
         $this->urlValidatorMock->expects($this->any())->method('isValid')->will($this->returnValue(true));
+        $this->domainValidatorMock->expects($this->any())->method('isValid')->will($this->returnValue(true));
         $linkMock = $this->getLinkMock($linkData);
         $this->assertTrue($this->validator->isValid($linkMock));
     }
@@ -80,6 +111,7 @@ public function testIsValidSkipLinkContent()
         ];
         $this->fileValidatorMock->expects($this->once())->method('isValid')->will($this->returnValue(true));
         $this->urlValidatorMock->expects($this->never())->method('isValid')->will($this->returnValue(true));
+        $this->domainValidatorMock->expects($this->never())->method('isValid')->will($this->returnValue(true));
         $linkMock = $this->getLinkMock($linkData);
         $this->assertTrue($this->validator->isValid($linkMock, false));
     }
@@ -100,6 +132,7 @@ public function testIsValidSkipSampleContent()
         ];
         $this->fileValidatorMock->expects($this->never())->method('isValid')->will($this->returnValue(true));
         $this->urlValidatorMock->expects($this->once())->method('isValid')->will($this->returnValue(true));
+        $this->domainValidatorMock->expects($this->once())->method('isValid')->will($this->returnValue(true));
         $linkMock = $this->getLinkMock($linkData);
         $this->assertTrue($this->validator->isValid($linkMock, true, false));
     }
@@ -123,6 +156,7 @@ public function testIsValidThrowsExceptionIfSortOrderIsInvalid($sortOrder)
         ];
         $this->fileValidatorMock->expects($this->any())->method('isValid')->will($this->returnValue(true));
         $this->urlValidatorMock->expects($this->any())->method('isValid')->will($this->returnValue(true));
+        $this->domainValidatorMock->expects($this->any())->method('isValid')->will($this->returnValue(true));
         $contentMock = $this->getLinkMock($linkContentData);
         $this->validator->isValid($contentMock);
     }
@@ -158,6 +192,7 @@ public function testIsValidThrowsExceptionIfPriceIsInvalid($price)
         ];
         $this->fileValidatorMock->expects($this->any())->method('isValid')->will($this->returnValue(true));
         $this->urlValidatorMock->expects($this->any())->method('isValid')->will($this->returnValue(true));
+        $this->domainValidatorMock->expects($this->any())->method('isValid')->will($this->returnValue(true));
         $contentMock = $this->getLinkMock($linkContentData);
         $this->validator->isValid($contentMock);
     }
@@ -191,6 +226,7 @@ public function testIsValidThrowsExceptionIfNumberOfDownloadsIsInvalid($numberOf
             'sample_type' => 'file',
         ];
         $this->urlValidatorMock->expects($this->any())->method('isValid')->will($this->returnValue(true));
+        $this->domainValidatorMock->expects($this->any())->method('isValid')->will($this->returnValue(true));
         $this->fileValidatorMock->expects($this->any())->method('isValid')->will($this->returnValue(true));
         $contentMock = $this->getLinkMock($linkContentData);
         $this->validator->isValid($contentMock);
@@ -223,45 +259,29 @@ protected function getLinkMock(array $linkData)
                     'isShareable',
                     'getNumberOfDownloads',
                     'getLinkType',
-                    'getLinkFile'
+                    'getLinkFile',
                 ]
             )
             ->getMockForAbstractClass();
-        $linkMock->expects($this->any())->method('getTitle')->will($this->returnValue(
-            $linkData['title']
-        ));
-        $linkMock->expects($this->any())->method('getPrice')->will($this->returnValue(
-            $linkData['price']
-        ));
-        $linkMock->expects($this->any())->method('getSortOrder')->will($this->returnValue(
-            $linkData['sort_order']
-        ));
-        $linkMock->expects($this->any())->method('isShareable')->will($this->returnValue(
-            $linkData['shareable']
-        ));
-        $linkMock->expects($this->any())->method('getNumberOfDownloads')->will($this->returnValue(
-            $linkData['number_of_downloads']
-        ));
-        $linkMock->expects($this->any())->method('getLinkType')->will($this->returnValue(
-            $linkData['link_type']
-        ));
-        $linkMock->expects($this->any())->method('getLinkFile')->will($this->returnValue(
-            $this->linkFileMock
-        ));
+        $linkMock->expects($this->any())->method('getTitle')->will($this->returnValue($linkData['title']));
+        $linkMock->expects($this->any())->method('getPrice')->will($this->returnValue($linkData['price']));
+        $linkMock->expects($this->any())->method('getSortOrder')->will($this->returnValue($linkData['sort_order']));
+        $linkMock->expects($this->any())->method('isShareable')->will($this->returnValue($linkData['shareable']));
+        $linkMock->expects($this->any())->method('getNumberOfDownloads')->will(
+            $this->returnValue($linkData['number_of_downloads'])
+        );
+        $linkMock->expects($this->any())->method('getLinkType')->will($this->returnValue($linkData['link_type']));
+        $linkMock->expects($this->any())->method('getLinkFile')->will($this->returnValue($this->linkFileMock));
         if (isset($linkData['link_url'])) {
-            $linkMock->expects($this->any())->method('getLinkUrl')->will($this->returnValue(
-                $linkData['link_url']
-            ));
+            $linkMock->expects($this->any())->method('getLinkUrl')->will($this->returnValue($linkData['link_url']));
         }
         if (isset($linkData['sample_url'])) {
-            $linkMock->expects($this->any())->method('getSampleUrl')->will($this->returnValue(
-                $linkData['sample_url']
-            ));
+            $linkMock->expects($this->any())->method('getSampleUrl')->will($this->returnValue($linkData['sample_url']));
         }
         if (isset($linkData['sample_type'])) {
-            $linkMock->expects($this->any())->method('getSampleType')->will($this->returnValue(
-                $linkData['sample_type']
-            ));
+            $linkMock->expects($this->any())->method('getSampleType')->will(
+                $this->returnValue($linkData['sample_type'])
+            );
         }
         if (isset($linkData['link_file_content'])) {
             $linkMock->expects($this->any())->method('getLinkFileContent')->willReturn($linkData['link_file_content']);
@@ -270,9 +290,8 @@ protected function getLinkMock(array $linkData)
             $linkMock->expects($this->any())->method('getSampleFileContent')
                 ->willReturn($linkData['sample_file_content']);
         }
-        $linkMock->expects($this->any())->method('getSampleFile')->will($this->returnValue(
-            $this->sampleFileMock
-        ));
+        $linkMock->expects($this->any())->method('getSampleFile')->will($this->returnValue($this->sampleFileMock));
+
         return $linkMock;
     }
 }
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/LinkRepositoryTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/LinkRepositoryTest.php
index 821f251929f8b..25f720f27150c 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Model/LinkRepositoryTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Model/LinkRepositoryTest.php
@@ -98,7 +98,9 @@ protected function setUp()
             \Magento\Framework\Json\EncoderInterface::class
         );
         $this->linkFactoryMock = $this->createPartialMock(\Magento\Downloadable\Model\LinkFactory::class, ['create']);
-        $this->productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, [
+        $this->productMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product::class,
+            [
                 '__wakeup',
                 'getTypeId',
                 'setDownloadableData',
@@ -107,8 +109,9 @@ protected function setUp()
                 'getStoreId',
                 'getStore',
                 'getWebsiteIds',
-                'getData'
-            ]);
+                'getData',
+            ]
+        );
         $this->service = new \Magento\Downloadable\Model\LinkRepository(
             $this->repositoryMock,
             $this->productTypeMock,
@@ -162,7 +165,8 @@ protected function getLinkMock(array $linkData)
                     'getNumberOfDownloads',
                     'getIsShareable',
                     'getLinkUrl',
-                    'getLinkFile'
+                    'getLinkFile',
+                    'hasSampleType',
                 ]
             )
             ->getMockForAbstractClass();
@@ -309,12 +313,15 @@ public function testUpdate()
         $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
         $storeMock->expects($this->any())->method('getWebsiteId')->will($this->returnValue($websiteId));
         $this->productMock->expects($this->any())->method('getStore')->will($this->returnValue($storeMock));
-        $existingLinkMock = $this->createPartialMock(\Magento\Downloadable\Model\Link::class, [
+        $existingLinkMock = $this->createPartialMock(
+            \Magento\Downloadable\Model\Link::class,
+            [
                 '__wakeup',
                 'getId',
                 'load',
-                'getProductId'
-            ]);
+                'getProductId',
+            ]
+        );
         $this->linkFactoryMock->expects($this->once())->method('create')->will($this->returnValue($existingLinkMock));
         $linkMock = $this->getLinkMock($linkData);
         $this->contentValidatorMock->expects($this->any())->method('isValid')->with($linkMock)
@@ -371,12 +378,15 @@ public function testUpdateWithExistingFile()
         $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
         $storeMock->expects($this->any())->method('getWebsiteId')->will($this->returnValue($websiteId));
         $this->productMock->expects($this->any())->method('getStore')->will($this->returnValue($storeMock));
-        $existingLinkMock = $this->createPartialMock(\Magento\Downloadable\Model\Link::class, [
+        $existingLinkMock = $this->createPartialMock(
+            \Magento\Downloadable\Model\Link::class,
+            [
                 '__wakeup',
                 'getId',
                 'load',
-                'getProductId'
-            ]);
+                'getProductId',
+            ]
+        );
         $this->linkFactoryMock->expects($this->once())->method('create')->will($this->returnValue($existingLinkMock));
         $linkMock = $this->getLinkMock($linkData);
         $this->contentValidatorMock->expects($this->any())->method('isValid')->with($linkMock)
@@ -436,6 +446,8 @@ public function testUpdateThrowsExceptionIfTitleIsEmptyAndScopeIsGlobal()
             'price' => 10.1,
             'number_of_downloads' => 100,
             'is_shareable' => true,
+            'link_type' => 'url',
+            'link_url' => 'https://google.com',
         ];
         $this->repositoryMock->expects($this->any())->method('get')->with($productSku, true)
             ->will($this->returnValue($this->productMock));
@@ -501,10 +513,12 @@ public function testGetList()
             'sample_file' => '/r/o/rock.melody.ogg',
             'link_type' => 'url',
             'link_url' => 'http://link.url',
-            'link_file' => null
+            'link_file' => null,
         ];
 
-        $linkMock = $this->createPartialMock(\Magento\Downloadable\Model\Link::class, [
+        $linkMock = $this->createPartialMock(
+            \Magento\Downloadable\Model\Link::class,
+            [
                 'getId',
                 'getStoreTitle',
                 'getTitle',
@@ -519,8 +533,9 @@ public function testGetList()
                 'getSampleUrl',
                 'getLinkType',
                 'getLinkFile',
-                'getLinkUrl'
-            ]);
+                'getLinkUrl',
+            ]
+        );
 
         $linkInterfaceMock = $this->createMock(\Magento\Downloadable\Api\Data\LinkInterface::class);
 
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Sample/ContentValidatorTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Sample/ContentValidatorTest.php
index c863fb7ad62ff..4a32a45859cec 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Model/Sample/ContentValidatorTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Model/Sample/ContentValidatorTest.php
@@ -6,7 +6,11 @@
 namespace Magento\Downloadable\Test\Unit\Model\Sample;
 
 use Magento\Downloadable\Model\Sample\ContentValidator;
+use Magento\Downloadable\Helper\File;
 
+/**
+ * Unit tests for Magento\Downloadable\Model\Sample\ContentValidator.
+ */
 class ContentValidatorTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -34,12 +38,31 @@ class ContentValidatorTest extends \PHPUnit\Framework\TestCase
      */
     protected $sampleFileMock;
 
+    /**
+     * @var File|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileMock;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
         $this->fileValidatorMock = $this->createMock(\Magento\Downloadable\Model\File\ContentValidator::class);
         $this->urlValidatorMock = $this->createMock(\Magento\Framework\Url\Validator::class);
         $this->sampleFileMock = $this->createMock(\Magento\Downloadable\Api\Data\File\ContentInterface::class);
-        $this->validator = new ContentValidator($this->fileValidatorMock, $this->urlValidatorMock);
+        $this->fileMock = $this->createMock(File::class);
+
+        $this->validator = $objectManager->getObject(
+            ContentValidator::class,
+            [
+                'fileContentValidator' => $this->fileValidatorMock,
+                'urlValidator' => $this->urlValidatorMock,
+                'fileHelper' => $this->fileMock,
+            ]
+        );
     }
 
     public function testIsValid()
@@ -94,28 +117,29 @@ public function getInvalidSortOrder()
     protected function getSampleContentMock(array $sampleContentData)
     {
         $contentMock = $this->createMock(\Magento\Downloadable\Api\Data\SampleInterface::class);
-        $contentMock->expects($this->any())->method('getTitle')->will($this->returnValue(
-            $sampleContentData['title']
-        ));
-
-        $contentMock->expects($this->any())->method('getSortOrder')->will($this->returnValue(
-            $sampleContentData['sort_order']
-        ));
-        $contentMock->expects($this->any())->method('getSampleType')->will($this->returnValue(
-            $sampleContentData['sample_type']
-        ));
+        $contentMock->expects($this->any())->method('getTitle')->will(
+            $this->returnValue($sampleContentData['title'])
+        );
+
+        $contentMock->expects($this->any())->method('getSortOrder')->will(
+            $this->returnValue($sampleContentData['sort_order'])
+        );
+        $contentMock->expects($this->any())->method('getSampleType')->will(
+            $this->returnValue($sampleContentData['sample_type'])
+        );
         if (isset($sampleContentData['sample_url'])) {
-            $contentMock->expects($this->any())->method('getSampleUrl')->will($this->returnValue(
-                $sampleContentData['sample_url']
-            ));
+            $contentMock->expects($this->any())->method('getSampleUrl')->will(
+                $this->returnValue($sampleContentData['sample_url'])
+            );
         }
         if (isset($sampleContentData['sample_file_content'])) {
             $contentMock->expects($this->any())->method('getSampleFileContent')
                 ->willReturn($sampleContentData['sample_file_content']);
         }
-        $contentMock->expects($this->any())->method('getSampleFile')->will($this->returnValue(
-            $this->sampleFileMock
-        ));
+        $contentMock->expects($this->any())->method('getSampleFile')->will(
+            $this->returnValue($this->sampleFileMock)
+        );
+
         return $contentMock;
     }
 }
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/SampleRepositoryTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/SampleRepositoryTest.php
index 8e13bd83b039e..f1674c6838a2d 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Model/SampleRepositoryTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Model/SampleRepositoryTest.php
@@ -149,25 +149,26 @@ protected function getSampleMock(array $sampleData)
             $sampleMock->expects($this->any())->method('getId')->willReturn($sampleData['id']);
         }
         $sampleMock->expects($this->any())->method('getTitle')->will($this->returnValue($sampleData['title']));
-        $sampleMock->expects($this->any())->method('getSortOrder')->will($this->returnValue(
-            $sampleData['sort_order']
-        ));
+        $sampleMock->expects($this->any())->method('getSortOrder')->will(
+            $this->returnValue($sampleData['sort_order'])
+        );
 
         if (isset($sampleData['sample_type'])) {
-            $sampleMock->expects($this->any())->method('getSampleType')->will($this->returnValue(
-                $sampleData['sample_type']
-            ));
+            $sampleMock->expects($this->any())->method('getSampleType')->will(
+                $this->returnValue($sampleData['sample_type'])
+            );
         }
         if (isset($sampleData['sample_url'])) {
-            $sampleMock->expects($this->any())->method('getSampleUrl')->will($this->returnValue(
-                $sampleData['sample_url']
-            ));
+            $sampleMock->expects($this->any())->method('getSampleUrl')->will(
+                $this->returnValue($sampleData['sample_url'])
+            );
         }
         if (isset($sampleData['sample_file'])) {
-            $sampleMock->expects($this->any())->method('getSampleFile')->will($this->returnValue(
-                $sampleData['sample_file']
-            ));
+            $sampleMock->expects($this->any())->method('getSampleFile')->will(
+                $this->returnValue($sampleData['sample_file'])
+            );
         }
+
         return $sampleMock;
     }
 
@@ -353,6 +354,8 @@ public function testUpdateThrowsExceptionIfTitleIsEmptyAndScopeIsGlobal()
             'id' => $sampleId,
             'title' => '',
             'sort_order' => 1,
+            'sample_type' => 'url',
+            'sample_url' => 'https://google.com',
         ];
         $this->repositoryMock->expects($this->any())->method('get')->with($productSku, true)
             ->will($this->returnValue($this->productMock));
@@ -414,10 +417,12 @@ public function testGetList()
             'sort_order' => 21,
             'sample_type' => 'file',
             'sample_url' => null,
-            'sample_file' => '/r/o/rock.melody.ogg'
+            'sample_file' => '/r/o/rock.melody.ogg',
         ];
 
-        $sampleMock = $this->createPartialMock(\Magento\Downloadable\Model\Sample::class, [
+        $sampleMock = $this->createPartialMock(
+            \Magento\Downloadable\Model\Sample::class,
+            [
                 'getId',
                 'getStoreTitle',
                 'getTitle',
@@ -426,8 +431,9 @@ public function testGetList()
                 'getSampleUrl',
                 'getSortOrder',
                 'getData',
-                '__wakeup'
-            ]);
+                '__wakeup',
+            ]
+        );
 
         $sampleInterfaceMock = $this->createMock(\Magento\Downloadable\Api\Data\SampleInterface::class);
 
diff --git a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/SamplesTest.php b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/SamplesTest.php
new file mode 100644
index 0000000000000..2f5b47a1d86b5
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/SamplesTest.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Downloadable\Test\Unit\Ui\DataProvider\Product\Form\Modifier\Data;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Data\Samples;
+use \Magento\Framework\Escaper;
+use Magento\Downloadable\Model\Product\Type;
+use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Downloadable\Helper\File as DownloadableFile;
+use Magento\Framework\UrlInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+
+/**
+ * Test class to cover Sample Modifier
+ *
+ * Class \Magento\Downloadable\Test\Unit\Ui\DataProvider\Product\Form\Modifier\Data\SampleTest
+ */
+class SamplesTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var LocatorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $locatorMock;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
+    /**
+     * @var DownloadableFile|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $downloadableFileMock;
+
+    /**
+     * @var UrlInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlBuilderMock;
+
+    /**
+     * @var ProductInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productMock;
+
+    /**
+     * @var Samples
+     */
+    private $samples;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->productMock = $this->getMockBuilder(ProductInterface::class)
+            ->setMethods(['getSamplesTitle', 'getId', 'getTypeId'])
+            ->getMockForAbstractClass();
+        $this->locatorMock = $this->createMock(LocatorInterface::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->escaperMock = $this->createMock(Escaper::class);
+        $this->downloadableFileMock = $this->createMock(DownloadableFile::class);
+        $this->urlBuilderMock = $this->createMock(UrlInterface::class);
+        $this->samples = $this->objectManagerHelper->getObject(
+            Samples::class,
+            [
+                'escaper' => $this->escaperMock,
+                'locator' => $this->locatorMock,
+                'scopeConfig' => $this->scopeConfigMock,
+                'downloadableFile' => $this->downloadableFileMock,
+                'urlBuilder' => $this->urlBuilderMock
+            ]
+        );
+    }
+
+    /**
+     * Test getSamplesTitle()
+     *
+     * @param int|null $id
+     * @param string $typeId
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectedGetTitle
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectedGetValue
+     * @return void
+     * @dataProvider getSamplesTitleDataProvider
+     */
+    public function testGetSamplesTitle($id, $typeId, $expectedGetTitle, $expectedGetValue)
+    {
+        $title = 'My Title';
+        $this->locatorMock->expects($this->any())
+            ->method('getProduct')
+            ->willReturn($this->productMock);
+        $this->productMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($id);
+        $this->productMock->expects($this->any())
+            ->method('getTypeId')
+            ->willReturn($typeId);
+        $this->productMock->expects($expectedGetTitle)
+            ->method('getSamplesTitle')
+            ->willReturn($title);
+        $this->scopeConfigMock->expects($expectedGetValue)
+            ->method('getValue')
+            ->willReturn($title);
+
+        /* Assert Result */
+        $this->assertEquals($title, $this->samples->getSamplesTitle());
+    }
+
+    /**
+     * @return array
+     */
+    public function getSamplesTitleDataProvider()
+    {
+        return [
+            [
+                'id' => 1,
+                'typeId' => Type::TYPE_DOWNLOADABLE,
+                'expectedGetTitle' => $this->once(),
+                'expectedGetValue' => $this->never(),
+            ],
+            [
+                'id' => null,
+                'typeId' => Type::TYPE_DOWNLOADABLE,
+                'expectedGetTitle' => $this->never(),
+                'expectedGetValue' => $this->once(),
+            ],
+            [
+                'id' => 1,
+                'typeId' => 'someType',
+                'expectedGetTitle' => $this->never(),
+                'expectedGetValue' => $this->once(),
+            ],
+            [
+                'id' => null,
+                'typeId' => 'someType',
+                'expectedGetTitle' => $this->never(),
+                'expectedGetValue' => $this->once(),
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Links.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Links.php
index f29708cc9a2c6..0a3ea2fc6ba19 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Links.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Links.php
@@ -13,6 +13,7 @@
 use Magento\Framework\UrlInterface;
 use Magento\Downloadable\Model\Link as LinkModel;
 use Magento\Downloadable\Api\Data\LinkInterface;
+use Magento\Framework\Exception\ValidatorException;
 
 /**
  * Class Links
@@ -155,7 +156,7 @@ protected function addSampleFile(array $linkData, LinkInterface $link)
         $sampleFile = $link->getSampleFile();
         if ($sampleFile) {
             $file = $this->downloadableFile->getFilePath($this->linkModel->getBaseSamplePath(), $sampleFile);
-            if ($this->downloadableFile->ensureFileInFilesystem($file)) {
+            if ($this->isLinkFileValid($file)) {
                 $linkData['sample']['file'][0] = [
                     'file' => $sampleFile,
                     'name' => $this->downloadableFile->getFileFromPathFile($sampleFile),
@@ -184,7 +185,7 @@ protected function addLinkFile(array $linkData, LinkInterface $link)
         $linkFile = $link->getLinkFile();
         if ($linkFile) {
             $file = $this->downloadableFile->getFilePath($this->linkModel->getBasePath(), $linkFile);
-            if ($this->downloadableFile->ensureFileInFilesystem($file)) {
+            if ($this->isLinkFileValid($file)) {
                 $linkData['file'][0] = [
                     'file' => $linkFile,
                     'name' => $this->downloadableFile->getFileFromPathFile($linkFile),
@@ -201,6 +202,21 @@ protected function addLinkFile(array $linkData, LinkInterface $link)
         return $linkData;
     }
 
+    /**
+     * Check that Links File or Sample is valid.
+     *
+     * @param string $file
+     * @return bool
+     */
+    private function isLinkFileValid(string $file): bool
+    {
+        try {
+            return $this->downloadableFile->ensureFileInFilesystem($file);
+        } catch (ValidatorException $e) {
+            return false;
+        }
+    }
+
     /**
      * Return formatted price with two digits after decimal point
      *
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Samples.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Samples.php
index b000de487b775..988f429de1d87 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Samples.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Samples.php
@@ -11,6 +11,7 @@
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Downloadable\Helper\File as DownloadableFile;
+use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\UrlInterface;
 use Magento\Downloadable\Api\Data\SampleInterface;
 
@@ -136,7 +137,7 @@ protected function addSampleFile(array $sampleData, SampleInterface $sample)
         $sampleFile = $sample->getSampleFile();
         if ($sampleFile) {
             $file = $this->downloadableFile->getFilePath($this->sampleModel->getBasePath(), $sampleFile);
-            if ($this->downloadableFile->ensureFileInFilesystem($file)) {
+            if ($this->isSampleFileValid($file)) {
                 $sampleData['file'][0] = [
                     'file' => $sampleFile,
                     'name' => $this->downloadableFile->getFileFromPathFile($sampleFile),
@@ -152,4 +153,19 @@ protected function addSampleFile(array $sampleData, SampleInterface $sample)
 
         return $sampleData;
     }
+
+    /**
+     * Check that Sample file is valid.
+     *
+     * @param string $file
+     * @return bool
+     */
+    private function isSampleFileValid(string $file): bool
+    {
+        try {
+            return $this->downloadableFile->ensureFileInFilesystem($file);
+        } catch (ValidatorException $e) {
+            return false;
+        }
+    }
 }
diff --git a/app/code/Magento/Downloadable/etc/db_schema.xml b/app/code/Magento/Downloadable/etc/db_schema.xml
index ccbefa4fb3992..ee7b3c5683ea1 100644
--- a/app/code/Magento/Downloadable/etc/db_schema.xml
+++ b/app/code/Magento/Downloadable/etc/db_schema.xml
@@ -233,7 +233,7 @@
             <column name="website_id"/>
         </constraint>
     </table>
-    <table name="catalog_product_index_price_downlod_tmp" resource="default" engine="memory"
+    <table name="catalog_product_index_price_downlod_tmp" resource="default" engine="innodb"
            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"/>
diff --git a/app/code/Magento/Downloadable/etc/di.xml b/app/code/Magento/Downloadable/etc/di.xml
index 4e9b0b55afb0b..3dc592958588c 100644
--- a/app/code/Magento/Downloadable/etc/di.xml
+++ b/app/code/Magento/Downloadable/etc/di.xml
@@ -92,6 +92,7 @@
     <preference for="Magento\Downloadable\Api\Data\File\ContentUploaderInterface" type="Magento\Downloadable\Model\File\ContentUploader" />
     <preference for="Magento\Downloadable\Model\Product\TypeHandler\TypeHandlerInterface" type="Magento\Downloadable\Model\Product\TypeHandler\TypeHandler" />
     <preference for="Magento\Downloadable\Api\Data\DownloadableOptionInterface" type="Magento\Downloadable\Model\DownloadableOption" />
+    <preference for="Magento\Downloadable\Api\DomainManagerInterface" type="Magento\Downloadable\Model\DomainManager"/>
     <type name="Magento\Framework\EntityManager\Operation\ExtensionPool">
         <arguments>
             <argument name="extensionActions" xsi:type="array">
@@ -164,4 +165,25 @@
             <argument name="connectionName" xsi:type="string">indexer</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Console\CommandListInterface">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="addDomainsCommand" xsi:type="object">Magento\Downloadable\Console\Command\DomainsAddCommand</item>
+                <item name="removeDomainsCommand" xsi:type="object">Magento\Downloadable\Console\Command\DomainsRemoveCommand</item>
+                <item name="showDomainsCommand" xsi:type="object">Magento\Downloadable\Console\Command\DomainsShowCommand</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Eav\Model\Config">
+        <arguments>
+            <argument name="attributesForPreload" xsi:type="array">
+                <item name="catalog_product" xsi:type="array">
+                    <item name="links_exist" xsi:type="string">catalog_product</item>
+                    <item name="links_purchased_separately" xsi:type="string">catalog_product</item>
+                    <item name="links_title" xsi:type="string">catalog_product</item>
+                    <item name="samples_title" xsi:type="string">catalog_product</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Downloadable/i18n/en_US.csv b/app/code/Magento/Downloadable/i18n/en_US.csv
index 87427bf483966..1e96413aa08a1 100644
--- a/app/code/Magento/Downloadable/i18n/en_US.csv
+++ b/app/code/Magento/Downloadable/i18n/en_US.csv
@@ -118,3 +118,5 @@ Downloads,Downloads
 "Use Content-Disposition","Use Content-Disposition"
 "Disable Guest Checkout if Cart Contains Downloadable Items","Disable Guest Checkout if Cart Contains Downloadable Items"
 "Guest checkout will only work with shareable.","Guest checkout will only work with shareable."
+"Link URL's domain is not in list of downloadable_domains in env.php.","Link URL's domain is not in list of downloadable_domains in env.php."
+"Sample URL's domain is not in list of downloadable_domains in env.php.","Sample URL's domain is not in list of downloadable_domains in env.php."
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
index 8d471a1e49e7f..17d5b73f49506 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
@@ -18,14 +18,14 @@
     </legend><br />
     <?php $_links = $block->getLinks(); ?>
     <?php $_isRequired = $block->getLinkSelectionRequired(); ?>
-    <div class="field admin__field link <?php if ($_isRequired) { echo ' required _required'; } ?>">
+    <div class="field admin__field link<?php if ($_isRequired) { echo ' _required'; } ?>">
         <label class="label admin__field-label"><span><?= $block->escapeHtml($block->getLinksTitle()) ?></span></label>
         <div class="control admin__field-control" id="downloadable-links-list">
             <?php foreach ($_links as $_link) : ?>
                 <div class="nested admin__field-option">
                 <?php if ($_linksPurchasedSeparately) : ?>
                     <input type="checkbox"
-                           class="admin__control-checkbox checkbox<?php if ($_isRequired) :?> validate-one-required-by-name<?php endif; ?> product downloadable link"
+                           class="admin__control-checkbox checkbox<?php if ($_isRequired) :?> required-entry<?php endif; ?> product downloadable link"
                            name="links[]" id="links_<?= $block->escapeHtmlAttr($_link->getId()) ?>"
                            value="<?= $block->escapeHtmlAttr($_link->getId()) ?>"
                            <?= $block->escapeHtml($block->getLinkCheckedValue($_link)) ?>
@@ -81,7 +81,7 @@ require(['prototype'], function(){
         }
     }
 //]]>
-    
+
 });
 </script>
 <?php endif;?>
diff --git a/app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js b/app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js
index a1e8c785c696a..8bdea0b3a70b6 100644
--- a/app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js
+++ b/app/code/Magento/Downloadable/view/frontend/web/js/downloadable.js
@@ -12,12 +12,17 @@ define([
 ], function ($) {
     'use strict';
 
+    /**
+     * Downloadable widget
+     */
     $.widget('mage.downloadable', {
         options: {
             priceHolderSelector: '.price-box'
         },
 
-        /** @inheritdoc */
+        /**
+         *  @inheritdoc
+         */
         _create: function () {
             var self = this;
 
@@ -65,6 +70,32 @@ define([
                     }
                 }
             });
+
+            this.reloadAllCheckText();
+        },
+
+        /**
+         * Reload all-elements-checkbox's label
+         * @private
+         */
+        reloadAllCheckText: function () {
+            var allChecked = true,
+                allElementsCheck = $(this.options.allElements),
+                allElementsLabel = $('label[for="' + allElementsCheck.attr('id') + '"] > span');
+
+            $(this.options.linkElement).each(function () {
+                if (!this.checked) {
+                    allChecked = false;
+                }
+            });
+
+            if (allChecked) {
+                allElementsLabel.text(allElementsCheck.attr('data-checked'));
+                allElementsCheck.prop('checked', true);
+            } else {
+                allElementsLabel.text(allElementsCheck.attr('data-notchecked'));
+                allElementsCheck.prop('checked', false);
+            }
         }
     });
 
diff --git a/app/code/Magento/DownloadableGraphQl/Model/Cart/BuyRequest/DownloadableLinksDataProvider.php b/app/code/Magento/DownloadableGraphQl/Model/Cart/BuyRequest/DownloadableLinksDataProvider.php
index 18f883b61516d..5f159971e4a19 100644
--- a/app/code/Magento/DownloadableGraphQl/Model/Cart/BuyRequest/DownloadableLinksDataProvider.php
+++ b/app/code/Magento/DownloadableGraphQl/Model/Cart/BuyRequest/DownloadableLinksDataProvider.php
@@ -40,12 +40,7 @@ public function execute(array $cartItemData): array
 
         if (isset($cartItemData['data']) && isset($cartItemData['data']['sku'])) {
             $sku = $cartItemData['data']['sku'];
-
-            try {
-                $product = $this->productRepository->get($sku);
-            } catch (NoSuchEntityException $e) {
-                throw new GraphQlNoSuchEntityException(__('Could not find specified product.'));
-            }
+            $product = $this->productRepository->get($sku);
 
             if ($product->getLinksPurchasedSeparately() && isset($cartItemData['downloadable_product_links'])) {
                 $downloadableLinks = $cartItemData['downloadable_product_links'];
diff --git a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
index db452d1e5ace1..2226f1acd8501 100644
--- a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
@@ -43,20 +43,20 @@ enum DownloadableFileTypeEnum @deprecated(reason: "`sample_url` serves to get th
 }
 
 type DownloadableProductLinks @doc(description: "DownloadableProductLinks defines characteristics of a downloadable product") {
-    id: Int @deprecated(reason: "This information shoud not be exposed on frontend")
+    id: Int @deprecated(reason: "This information should not be exposed on frontend")
     title: String @doc(description: "The display name of the link")
     sort_order: Int @doc(description: "A number indicating the sort order")
     price: Float @doc(description: "The price of the downloadable product")
     sample_url: String @doc(description: "URL to the downloadable sample")
-    is_shareable: Boolean @deprecated(reason: "This information shoud not be exposed on frontend")
-    number_of_downloads: Int @deprecated(reason: "This information shoud not be exposed on frontend")
+    is_shareable: Boolean @deprecated(reason: "This information should not be exposed on frontend")
+    number_of_downloads: Int @deprecated(reason: "This information should not be exposed on frontend")
     link_type: DownloadableFileTypeEnum @deprecated(reason: "`sample_url` serves to get the downloadable sample")
     sample_type: DownloadableFileTypeEnum @deprecated(reason: "`sample_url` serves to get the downloadable sample")
     sample_file: String @deprecated(reason: "`sample_url` serves to get the downloadable sample")
 }
 
 type DownloadableProductSamples @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") {
-    id: Int @deprecated(reason: "This information shoud not be exposed on frontend")
+    id: Int @deprecated(reason: "This information should not be exposed on frontend")
     title: String @doc(description: "The display name of the sample")
     sort_order: Int @doc(description: "A number indicating the sort order")
     sample_url: String @doc(description: "URL to the downloadable sample")
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 e03964bd2c386..c9cdf52f55dd1 100644
--- a/app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php
+++ b/app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php
@@ -8,12 +8,14 @@
 namespace Magento\DownloadableImportExport\Model\Import\Product\Type;
 
 use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
+use Magento\Downloadable\Model\Url\DomainValidator;
 use Magento\Framework\EntityManager\MetadataPool;
 use \Magento\Store\Model\Store;
 
 /**
  * Class Downloadable
  *
+ * phpcs:disable Magento2.Commenting.ConstantsPHPDocFormatting
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
@@ -101,6 +103,10 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
 
     const ERROR_COLS_IS_EMPTY = 'emptyOptions';
 
+    private const ERROR_LINK_URL_NOT_IN_DOMAIN_WHITELIST = 'linkUrlNotInDomainWhitelist';
+
+    private const ERROR_SAMPLE_URL_NOT_IN_DOMAIN_WHITELIST = 'sampleUrlNotInDomainWhitelist';
+
     /**
      * Validation failure message template definitions
      *
@@ -111,7 +117,11 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
         self::ERROR_GROUP_TITLE_NOT_FOUND => 'Group titles not found for downloadable products',
         self::ERROR_OPTION_NO_TITLE => 'Option no title',
         self::ERROR_MOVE_FILE => 'Error move file',
-        self::ERROR_COLS_IS_EMPTY => 'Missing sample and links data for the downloadable product'
+        self::ERROR_COLS_IS_EMPTY => 'Missing sample and links data for the downloadable product',
+        self::ERROR_LINK_URL_NOT_IN_DOMAIN_WHITELIST =>
+            'Link URL\'s domain is not in list of downloadable_domains in env.php.',
+        self::ERROR_SAMPLE_URL_NOT_IN_DOMAIN_WHITELIST =>
+            'Sample URL\'s domain is not in list of downloadable_domains in env.php.'
     ];
 
     /**
@@ -244,6 +254,11 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      */
     protected $downloadableHelper;
 
+    /**
+     * @var DomainValidator
+     */
+    private $domainValidator;
+
     /**
      * Downloadable constructor
      *
@@ -253,6 +268,7 @@ class Downloadable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * @param array $params
      * @param \Magento\DownloadableImportExport\Helper\Uploader $uploaderHelper
      * @param \Magento\DownloadableImportExport\Helper\Data $downloadableHelper
+     * @param DomainValidator $domainValidator
      * @param MetadataPool $metadataPool
      */
     public function __construct(
@@ -262,12 +278,14 @@ public function __construct(
         array $params,
         \Magento\DownloadableImportExport\Helper\Uploader $uploaderHelper,
         \Magento\DownloadableImportExport\Helper\Data $downloadableHelper,
+        DomainValidator $domainValidator,
         MetadataPool $metadataPool = null
     ) {
         parent::__construct($attrSetColFac, $prodAttrColFac, $resource, $params, $metadataPool);
         $this->parameters = $this->_entityModel->getParameters();
         $this->_resource = $resource;
         $this->uploaderHelper = $uploaderHelper;
+        $this->domainValidator = $domainValidator;
         $this->downloadableHelper = $downloadableHelper;
     }
 
@@ -336,17 +354,36 @@ public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
      */
     protected function isRowValidSample(array $rowData)
     {
-        $result = false;
-        if (isset($rowData[self::COL_DOWNLOADABLE_SAMPLES])
-            && $rowData[self::COL_DOWNLOADABLE_SAMPLES] != ''
-            && $this->sampleGroupTitle($rowData) == '') {
-            $this->_entityModel->addRowError(self::ERROR_GROUP_TITLE_NOT_FOUND, $this->rowNum);
+        $hasSampleLinkData = (
+            isset($rowData[self::COL_DOWNLOADABLE_SAMPLES]) &&
+            $rowData[self::COL_DOWNLOADABLE_SAMPLES] != ''
+        );
+
+        if (!$hasSampleLinkData) {
+            return false;
+        }
+
+        $sampleData = $this->prepareSampleData($rowData[static::COL_DOWNLOADABLE_SAMPLES]);
+
+        if ($this->sampleGroupTitle($rowData) == '') {
             $result = true;
+            $this->_entityModel->addRowError(self::ERROR_GROUP_TITLE_NOT_FOUND, $this->rowNum);
         }
-        if (isset($rowData[self::COL_DOWNLOADABLE_SAMPLES])
-            && $rowData[self::COL_DOWNLOADABLE_SAMPLES] != '') {
-            $result = $this->isTitle($this->prepareSampleData($rowData[self::COL_DOWNLOADABLE_SAMPLES]));
+
+        $result = $result ?? $this->isTitle($sampleData);
+
+        foreach ($sampleData as $link) {
+            if ($this->hasDomainNotInWhitelist($link, 'link_type', 'link_url')) {
+                $this->_entityModel->addRowError(static::ERROR_LINK_URL_NOT_IN_DOMAIN_WHITELIST, $this->rowNum);
+                $result = true;
+            }
+
+            if ($this->hasDomainNotInWhitelist($link, 'sample_type', 'sample_url')) {
+                $this->_entityModel->addRowError(static::ERROR_SAMPLE_URL_NOT_IN_DOMAIN_WHITELIST, $this->rowNum);
+                $result = true;
+            }
         }
+
         return $result;
     }
 
@@ -358,19 +395,36 @@ protected function isRowValidSample(array $rowData)
      */
     protected function isRowValidLink(array $rowData)
     {
-        $result = false;
-        if (isset($rowData[self::COL_DOWNLOADABLE_LINKS]) &&
-            $rowData[self::COL_DOWNLOADABLE_LINKS] != '' &&
-            $this->linksAdditionalAttributes($rowData, 'group_title', self::DEFAULT_GROUP_TITLE) == ''
-        ) {
+        $hasLinkData = (
+            isset($rowData[self::COL_DOWNLOADABLE_LINKS]) &&
+            $rowData[self::COL_DOWNLOADABLE_LINKS] != ''
+        );
+
+        if (!$hasLinkData) {
+            return false;
+        }
+
+        $linkData = $this->prepareLinkData($rowData[self::COL_DOWNLOADABLE_LINKS]);
+
+        if ($this->linksAdditionalAttributes($rowData, 'group_title', self::DEFAULT_GROUP_TITLE) == '') {
             $this->_entityModel->addRowError(self::ERROR_GROUP_TITLE_NOT_FOUND, $this->rowNum);
             $result = true;
         }
-        if (isset($rowData[self::COL_DOWNLOADABLE_LINKS]) &&
-            $rowData[self::COL_DOWNLOADABLE_LINKS] != ''
-        ) {
-            $result = $this->isTitle($this->prepareLinkData($rowData[self::COL_DOWNLOADABLE_LINKS]));
+
+        $result = $result ?? $this->isTitle($linkData);
+
+        foreach ($linkData as $link) {
+            if ($this->hasDomainNotInWhitelist($link, 'link_type', 'link_url')) {
+                $this->_entityModel->addRowError(static::ERROR_LINK_URL_NOT_IN_DOMAIN_WHITELIST, $this->rowNum);
+                $result = true;
+            }
+
+            if ($this->hasDomainNotInWhitelist($link, 'sample_type', 'sample_url')) {
+                $this->_entityModel->addRowError(static::ERROR_SAMPLE_URL_NOT_IN_DOMAIN_WHITELIST, $this->rowNum);
+                $result = true;
+            }
         }
+
         return $result;
     }
 
@@ -733,6 +787,7 @@ protected function prepareSampleData($rowCol, $entityId = null)
             $rowCol
         );
         foreach ($options as $option) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $result[] = array_merge(
                 $this->dataSample,
                 ['product_id' => $entityId],
@@ -757,6 +812,7 @@ protected function prepareLinkData($rowCol, $entityId = null)
             $rowCol
         );
         foreach ($options as $option) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $result[] = array_merge(
                 $this->dataLink,
                 ['product_id' => $entityId],
@@ -829,6 +885,7 @@ protected function parseSampleOption($values)
 
     /**
      * Uploading files into the "downloadable/files" media folder.
+     *
      * Return a new file name if the same file is already exists.
      *
      * @param string $fileName
@@ -861,4 +918,23 @@ protected function clear()
         $this->productIds = [];
         return $this;
     }
+
+    /**
+     * Does link contain url not in whitelist?
+     *
+     * @param array $link
+     * @param string $linkTypeKey
+     * @param string $linkUrlKey
+     * @return bool
+     */
+    private function hasDomainNotInWhitelist(array $link, string $linkTypeKey, string $linkUrlKey): bool
+    {
+        return (
+            isset($link[$linkTypeKey]) &&
+            $link[$linkTypeKey] === 'url' &&
+            isset($link[$linkUrlKey]) &&
+            strlen($link[$linkUrlKey]) &&
+            !$this->domainValidator->isValid($link[$linkUrlKey])
+        );
+    }
 }
diff --git a/app/code/Magento/DownloadableImportExport/Test/Unit/Helper/DataTest.php b/app/code/Magento/DownloadableImportExport/Test/Unit/Helper/DataTest.php
new file mode 100644
index 0000000000000..ce42514e52263
--- /dev/null
+++ b/app/code/Magento/DownloadableImportExport/Test/Unit/Helper/DataTest.php
@@ -0,0 +1,279 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\DownloadableImportExport\Test\Unit\Helper;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\DownloadableImportExport\Helper\Data as HelperData;
+use Magento\DownloadableImportExport\Model\Import\Product\Type\Downloadable;
+use PHPUnit\Framework\TestCase;
+
+class DataTest extends TestCase
+{
+    /**
+     * @var HelperData
+     */
+    private $helper;
+
+    /**
+     * Setup environment for test
+     */
+    protected function setUp()
+    {
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->helper = $objectManagerHelper->getObject(HelperData::class);
+    }
+
+    /**
+     * Test isRowDownloadableEmptyOptions with dataProvider
+     *
+     * @param array $rowData
+     * @param bool $expected
+     * @dataProvider isRowDownloadableEmptyOptionsDataProvider
+     */
+    public function testIsRowDownloadableEmptyOptions($rowData, $expected)
+    {
+        $this->assertEquals($expected, $this->helper->isRowDownloadableEmptyOptions($rowData));
+    }
+
+    /**
+     * Data Provider to test isRowDownloadableEmptyOptions
+     *
+     * @return array
+     */
+    public function isRowDownloadableEmptyOptionsDataProvider()
+    {
+        return [
+            'Data set include downloadable link and sample' => [
+                [
+                    Downloadable::COL_DOWNLOADABLE_LINKS => 'https://magento2.com/download_link',
+                    Downloadable::COL_DOWNLOADABLE_SAMPLES => 'https://magento2.com/sample_link'
+                ],
+                false
+            ],
+            'Data set with empty' => [
+                [
+                    Downloadable::COL_DOWNLOADABLE_LINKS => '',
+                    Downloadable::COL_DOWNLOADABLE_SAMPLES => ''
+                ],
+                true
+            ]
+        ];
+    }
+
+    /**
+     * Test isRowDownloadableNoValid with dataProvider
+     *
+     * @param array $rowData
+     * @param bool $expected
+     * @dataProvider isRowDownloadableNoValidDataProvider
+     */
+    public function isRowDownloadableNoValid($rowData, $expected)
+    {
+        $this->assertEquals($expected, $this->helper->isRowDownloadableNoValid($rowData));
+    }
+
+    /**
+     * Data Provider to test isRowDownloadableEmptyOptions
+     *
+     * @return array
+     */
+    public function isRowDownloadableNoValidDataProvider()
+    {
+        return [
+            'Data set include downloadable link and sample' => [
+                [
+                    Downloadable::COL_DOWNLOADABLE_LINKS => 'https://magento2.com/download_link',
+                    Downloadable::COL_DOWNLOADABLE_SAMPLES => 'https://magento2.com/sample_link'
+                ],
+                true
+            ],
+            'Data set with empty' => [
+                [
+                    Downloadable::COL_DOWNLOADABLE_LINKS => '',
+                    Downloadable::COL_DOWNLOADABLE_SAMPLES => ''
+                ],
+                false
+            ]
+        ];
+    }
+
+    /**
+     * Test fillExistOptions with dataProvider
+     *
+     * @param array $base
+     * @param array $option
+     * @param array $existingOptions
+     * @param array $expected
+     * @dataProvider fillExistOptionsDataProvider
+     */
+    public function testFillExistOptions($base, $option, $existingOptions, $expected)
+    {
+        $this->assertEquals($expected, $this->helper->fillExistOptions($base, $option, $existingOptions));
+    }
+
+    /**
+     * Data Provider to test fillExistOptions
+     *
+     * @return array
+     */
+    public function fillExistOptionsDataProvider()
+    {
+        return [
+            'Data set 1' => [
+                [],
+                [
+                    'product_id' => 1,
+                    'sample_type' => 'sample_type1',
+                    'sample_url' => 'sample_url1',
+                    'sample_file' => 'sample_file1',
+                    'link_file' => 'link_file1',
+                    'link_type' => 'link_type1',
+                    'link_url' => 'link_url1'
+                ],
+                [
+                    [
+                        'product_id' => 1,
+                        'sample_type' => 'sample_type1',
+                        'sample_url' => 'sample_url1',
+                        'sample_file' => 'sample_file1',
+                        'link_file' => 'link_file1',
+                        'link_type' => 'link_type1',
+                        'link_url' => 'link_url1'
+                    ],
+                    [
+                        'product_id' => 2,
+                        'sample_type' => 'sample_type2',
+                        'sample_url' => 'sample_url2',
+                        'sample_file' => 'sample_file2',
+                        'link_file' => 'link_file2',
+                        'link_type' => 'link_type2',
+                        'link_url' => 'link_url2'
+                    ]
+                ],
+                [
+                    'product_id' => 1,
+                    'sample_type' => 'sample_type1',
+                    'sample_url' => 'sample_url1',
+                    'sample_file' => 'sample_file1',
+                    'link_file' => 'link_file1',
+                    'link_type' => 'link_type1',
+                    'link_url' => 'link_url1'
+                ]
+            ],
+            'Data set 2' => [
+                [],
+                [
+                    'product_id' => 1,
+                    'sample_type' => 'sample_type1',
+                    'sample_url' => 'sample_url1',
+                    'sample_file' => 'sample_file1',
+                    'link_file' => 'link_file1',
+                    'link_type' => 'link_type1',
+                    'link_url' => 'link_url1'
+                ],
+                [],
+                []
+            ]
+        ];
+    }
+
+    /**
+     * Test prepareDataForSave with dataProvider
+     *
+     * @param array $base
+     * @param array $replacement
+     * @param array $expected
+     * @dataProvider prepareDataForSaveDataProvider
+     */
+    public function testPrepareDataForSave($base, $replacement, $expected)
+    {
+        $this->assertEquals($expected, $this->helper->prepareDataForSave($base, $replacement));
+    }
+
+    /**
+     * Data Provider to test prepareDataForSave
+     *
+     * @return array
+     */
+    public function prepareDataForSaveDataProvider()
+    {
+        return [
+            'Data set 1' => [
+                [],
+                [],
+                []
+            ],
+
+            'Data set 2' => [
+                [
+                    'product_id' => 1,
+                    'sample_type' => 'sample_type1',
+                    'sample_url' => 'sample_url1',
+                    'sample_file' => 'sample_file1',
+                    'link_file' => 'link_file1',
+                    'link_type' => 'link_type1',
+                    'link_url' => 'link_url1'
+                ],
+                [
+                    [
+                        'product_id' => 2,
+                        'sample_type' => 'sample_type2',
+                        'sample_url' => 'sample_url2',
+                        'sample_file' => 'sample_file2',
+                        'link_file' => 'link_file2',
+                        'link_type' => 'link_type2',
+                        'link_url' => 'link_url2'
+                    ]
+                ],
+                [
+                    [
+                        'product_id' => 2,
+                        'sample_type' => 'sample_type2',
+                        'sample_url' => 'sample_url2',
+                        'sample_file' => 'sample_file2',
+                        'link_file' => 'link_file2',
+                        'link_type' => 'link_type2',
+                        'link_url' => 'link_url2'
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Test getTypeByValue with dataProvider
+     *
+     * @param string $option
+     * @param string $expected
+     * @dataProvider getTypeByValueDataProvider
+     */
+    public function testGetTypeByValue($option, $expected)
+    {
+        $this->assertEquals($expected, $this->helper->getTypeByValue($option));
+    }
+
+    /**
+     * Data Provider for getTypeByValue
+     *
+     * @return array
+     */
+    public function getTypeByValueDataProvider()
+    {
+        return [
+            'Case File Option Value' => [
+                'file1',
+                Downloadable::FILE_OPTION_VALUE
+            ],
+            'Case url Option Value' => [
+                'https://example.com',
+                Downloadable::URL_OPTION_VALUE
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Eav/Model/Config.php b/app/code/Magento/Eav/Model/Config.php
index 0eecca21b0d54..20126d5146c35 100644
--- a/app/code/Magento/Eav/Model/Config.php
+++ b/app/code/Magento/Eav/Model/Config.php
@@ -7,12 +7,20 @@
 
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Eav\Model\Entity\Type;
+use Magento\Eav\Model\ResourceModel\Attribute\DefaultEntityAttributes\ProviderInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Serialize\SerializerInterface;
 
 /**
+ * EAV config model.
+ *
  * @api
+ * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @since 100.0.2
  */
 class Config
@@ -25,6 +33,11 @@ class Config
     const ATTRIBUTES_CODES_CACHE_ID = 'EAV_ENTITY_ATTRIBUTES_CODES';
     /**#@-*/
 
+    /**
+     * Xml path to caching user defined eav attributes configuration.
+     */
+    private const XML_PATH_CACHE_USER_DEFINED_ATTRIBUTES = 'dev/caching/cache_user_defined_attributes';
+
     /**#@-*/
     protected $_entityTypeData;
 
@@ -116,6 +129,11 @@ class Config
      */
     private $serializer;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * Cache of attributes per set
      *
@@ -123,6 +141,20 @@ class Config
      */
     private $attributesPerSet = [];
 
+    /**
+     * Is system attributes loaded flag.
+     *
+     * @var array
+     */
+    private $isSystemAttributesLoaded = [];
+
+    /**
+     * List of predefined system attributes for preload.
+     *
+     * @var array
+     */
+    private $attributesForPreload;
+
     /**
      * @param \Magento\Framework\App\CacheInterface $cache
      * @param \Magento\Eav\Model\Entity\TypeFactory $entityTypeFactory
@@ -130,6 +162,8 @@ class Config
      * @param \Magento\Framework\App\Cache\StateInterface $cacheState
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param SerializerInterface $serializer
+     * @param ScopeConfigInterface $scopeConfig
+     * @param array $attributesForPreload
      * @codeCoverageIgnore
      */
     public function __construct(
@@ -138,7 +172,9 @@ public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Type\CollectionFactory $entityTypeCollectionFactory,
         \Magento\Framework\App\Cache\StateInterface $cacheState,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        SerializerInterface $serializer = null
+        SerializerInterface $serializer = null,
+        ScopeConfigInterface $scopeConfig = null,
+        $attributesForPreload = []
     ) {
         $this->_cache = $cache;
         $this->_entityTypeFactory = $entityTypeFactory;
@@ -146,6 +182,8 @@ public function __construct(
         $this->_cacheState = $cacheState;
         $this->_universalFactory = $universalFactory;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+        $this->attributesForPreload = $attributesForPreload;
     }
 
     /**
@@ -487,7 +525,7 @@ public function getAttributes($entityType)
      * @param   mixed $entityType
      * @param   mixed $code
      * @return  AbstractAttribute
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function getAttribute($entityType, $code)
     {
@@ -507,8 +545,152 @@ public function getAttribute($entityType, $code)
             return $this->attributes[$entityTypeCode][$code];
         }
 
+        if (array_key_exists($entityTypeCode, $this->attributesForPreload)
+            && array_key_exists($code, $this->attributesForPreload[$entityTypeCode])
+        ) {
+            $this->initSystemAttributes($entityType, $this->attributesForPreload[$entityTypeCode]);
+        }
+        if (isset($this->attributes[$entityTypeCode][$code])) {
+            \Magento\Framework\Profiler::stop('EAV: ' . __METHOD__);
+            return $this->attributes[$entityTypeCode][$code];
+        }
+
+        if ($this->scopeConfig->getValue(self::XML_PATH_CACHE_USER_DEFINED_ATTRIBUTES)) {
+            $attribute = $this->cacheUserDefinedAttribute($entityType, $entityTypeCode, $code);
+        } else {
+            $attribute = $this->initUserDefinedAttribute($entityType, $entityTypeCode, $code);
+        }
+
+        \Magento\Framework\Profiler::stop('EAV: ' . __METHOD__);
+        return $attribute;
+    }
+
+    /**
+     * Initialize predefined system attributes for preload.
+     *
+     * @param string $entityType
+     * @param array $systemAttributes
+     * @return $this|bool|void
+     * @throws LocalizedException
+     */
+    private function initSystemAttributes($entityType, $systemAttributes)
+    {
+        $entityType = $this->getEntityType($entityType);
+        $entityTypeCode = $entityType->getEntityTypeCode();
+        if (!empty($this->isSystemAttributesLoaded[$entityTypeCode])) {
+            return;
+        }
+
+        $cacheKey = self::ATTRIBUTES_CACHE_ID . '-' . $entityTypeCode . '-preload';
+        if ($this->isCacheEnabled() && ($attributes = $this->_cache->load($cacheKey))) {
+            $attributes = $this->serializer->unserialize($attributes);
+            if ($attributes) {
+                foreach ($attributes as $attribute) {
+                    $attributeObject = $this->_createAttribute($entityType, $attribute);
+                    $this->saveAttribute($attributeObject, $entityTypeCode, $attributeObject->getAttributeCode());
+                }
+                return true;
+            }
+        }
+
+        \Magento\Framework\Profiler::start('EAV: ' . __METHOD__, ['group' => 'EAV', 'method' => __METHOD__]);
+
+        /** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection $attributes */
+        $attributes = $this->_universalFactory->create(
+            $entityType->getEntityAttributeCollection()
+        )->setEntityTypeFilter(
+            $entityType
+        )->addFieldToFilter(
+            'attribute_code',
+            ['in' => array_keys($systemAttributes)]
+        )->getData();
+
+        $attributeData = [];
+        foreach ($attributes as $attribute) {
+            if (empty($attribute['attribute_model'])) {
+                $attribute['attribute_model'] = $entityType->getAttributeModel();
+            }
+            $attributeObject = $this->_createAttribute($entityType, $attribute);
+            $this->saveAttribute($attributeObject, $entityTypeCode, $attributeObject->getAttributeCode());
+            $attributeData[$attribute['attribute_code']] = $attributeObject->toArray();
+        }
+        if ($this->isCacheEnabled()) {
+            $this->_cache->save(
+                $this->serializer->serialize($attributeData),
+                $cacheKey,
+                [
+                    \Magento\Eav\Model\Cache\Type::CACHE_TAG,
+                    \Magento\Eav\Model\Entity\Attribute::CACHE_TAG
+                ]
+            );
+        }
+
+        \Magento\Framework\Profiler::stop('EAV: ' . __METHOD__);
+        $this->isSystemAttributesLoaded[$entityTypeCode] = true;
+
+        return $this;
+    }
+
+    /**
+     * Initialize user defined attribute from cache or cache it.
+     *
+     * @param string $entityType
+     * @param mixed $entityTypeCode
+     * @param string $code
+     * @return AbstractAttribute
+     * @throws LocalizedException
+     */
+    private function cacheUserDefinedAttribute($entityType, $entityTypeCode, $code): AbstractAttribute
+    {
+        $cacheKey = self::ATTRIBUTES_CACHE_ID . '-attribute-' . $entityTypeCode . '-' . $code;
+        $attributeData = $this->isCacheEnabled() && ($attribute = $this->_cache->load($cacheKey))
+            ? $this->serializer->unserialize($attribute)
+            : null;
+        if ($attributeData) {
+            if (isset($attributeData['attribute_id'])) {
+                $attribute = $this->_createAttribute($entityType, $attributeData);
+            } else {
+                $entityType = $this->getEntityType($entityType);
+                $attribute = $this->createAttribute($entityType->getAttributeModel());
+                $attribute->setAttributeCode($code);
+                $attribute = $this->setAttributeData($attribute, $entityType);
+            }
+        } else {
+            $attribute = $this->createAttributeByAttributeCode($entityType, $code);
+            $this->_addAttributeReference(
+                $attribute->getAttributeId(),
+                $attribute->getAttributeCode(),
+                $entityTypeCode
+            );
+            $this->saveAttribute($attribute, $entityTypeCode, $attribute->getAttributeCode());
+            if ($this->isCacheEnabled()) {
+                $this->_cache->save(
+                    $this->serializer->serialize($attribute->getData()),
+                    $cacheKey,
+                    [
+                        \Magento\Eav\Model\Cache\Type::CACHE_TAG,
+                        \Magento\Eav\Model\Entity\Attribute::CACHE_TAG
+                    ]
+                );
+            }
+        }
+
+        return $attribute;
+    }
+
+    /**
+     * Initialize user defined attribute and save it to memory cache.
+     *
+     * @param mixed $entityType
+     * @param string $entityTypeCode
+     * @param string $code
+     * @return AbstractAttribute|null
+     * @throws LocalizedException
+     */
+    private function initUserDefinedAttribute($entityType, $entityTypeCode, $code): ?AbstractAttribute
+    {
         $attributes = $this->loadAttributes($entityTypeCode);
-        $attribute = isset($attributes[$code]) ? $attributes[$code] : null;
+        $attribute = $attributes[$code] ?? null;
         if (!$attribute) {
             $attribute = $this->createAttributeByAttributeCode($entityType, $code);
             $this->_addAttributeReference(
@@ -518,7 +700,7 @@ public function getAttribute($entityType, $code)
             );
             $this->saveAttribute($attribute, $entityTypeCode, $attribute->getAttributeCode());
         }
-        \Magento\Framework\Profiler::stop('EAV: ' . __METHOD__);
+
         return $attribute;
     }
 
@@ -639,7 +821,7 @@ protected function _createAttribute($entityType, $attributeData)
             $existsFullAttribute = $attribute->hasIsRequired();
             $fullAttributeData = array_key_exists('is_required', $attributeData);
 
-            if ($existsFullAttribute || !$existsFullAttribute && !$fullAttributeData) {
+            if ($existsFullAttribute || (!$existsFullAttribute && !$fullAttributeData)) {
                 return $attribute;
             }
         }
@@ -708,6 +890,7 @@ public function importAttributesData($entityType, array $attributes)
      * @param string $entityType
      * @param string $attributeCode
      * @return AbstractAttribute
+     * @throws LocalizedException
      */
     private function createAttributeByAttributeCode($entityType, $attributeCode)
     {
@@ -723,13 +906,28 @@ private function createAttributeByAttributeCode($entityType, $attributeCode)
             $attribute->setAttributeCode($attributeCode);
         }
 
+        $attribute = $this->setAttributeData($attribute, $entityType);
+
+        return $attribute;
+    }
+
+    /**
+     * Set entity type id, backend type, is global to attribute.
+     *
+     * @param AbstractAttribute $attribute
+     * @param AbstractModel $entityType
+     * @return AbstractAttribute
+     */
+    private function setAttributeData($attribute, $entityType): AbstractAttribute
+    {
         $entity = $entityType->getEntity();
-        if ($entity instanceof \Magento\Eav\Model\ResourceModel\Attribute\DefaultEntityAttributes\ProviderInterface
+        if ($entity instanceof ProviderInterface
             && in_array($attribute->getAttributeCode(), $entity->getDefaultAttributes(), true)
         ) {
             $attribute->setBackendType(AbstractAttribute::TYPE_STATIC)->setIsGlobal(1);
         }
         $attribute->setEntityType($entityType)->setEntityTypeId($entityType->getId());
+
         return $attribute;
     }
 
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index 1fd71e446e6bb..7649c89a07955 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -11,21 +11,22 @@
 use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
 use Magento\Eav\Model\Entity\Attribute\UniqueValidationInterface;
+use Magento\Eav\Model\ResourceModel\Attribute\DefaultEntityAttributes\ProviderInterface as DefaultAttributesProvider;
 use Magento\Framework\App\Config\Element;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Framework\DB\Adapter\DuplicateException;
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor;
 use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
-use Magento\Eav\Model\ResourceModel\Attribute\DefaultEntityAttributes\ProviderInterface as DefaultAttributesProvider;
-use Magento\Framework\Model\ResourceModel\AbstractResource;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Entity/Attribute/Model - entity abstract
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -266,6 +267,8 @@ public function setConnection($connection)
     /**
      * Resource initialization
      *
+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
+     *
      * @return void
      */
     protected function _construct()
@@ -412,61 +415,44 @@ protected function _getConfig()
      *
      * @param string|int|Element $attribute
      * @return AbstractAttribute|false
+     * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function getAttribute($attribute)
     {
         /** @var $config \Magento\Eav\Model\Config */
         $config = $this->_getConfig();
-        if (is_numeric($attribute)) {
-            $attributeId = $attribute;
-            $attributeInstance = $config->getAttribute($this->getEntityType(), $attributeId);
-            if ($attributeInstance) {
-                $attributeCode = $attributeInstance->getAttributeCode();
-            }
-        } elseif (is_string($attribute)) {
-            $attributeCode = $attribute;
-            $attributeInstance = $config->getAttribute($this->getEntityType(), $attributeCode);
-            if (!$attributeInstance->getAttributeCode() && in_array($attribute, $this->getDefaultAttributes())) {
-                $attributeInstance->setAttributeCode(
-                    $attribute
-                )->setBackendType(
-                    AbstractAttribute::TYPE_STATIC
-                )->setIsGlobal(
-                    1
-                )->setEntity(
-                    $this
-                )->setEntityType(
-                    $this->getEntityType()
-                )->setEntityTypeId(
-                    $this->getEntityType()->getId()
-                );
-            }
-        } elseif ($attribute instanceof AbstractAttribute) {
-            $attributeInstance = $attribute;
-            $attributeCode = $attributeInstance->getAttributeCode();
+
+        $attributeInstance = $config->getAttribute($this->getEntityType(), $attribute);
+
+        if (!$attributeInstance->getAttributeCode() && in_array($attribute, $this->getDefaultAttributes(), true)) {
+            $attributeInstance = clone $attributeInstance;
+            $attributeInstance->setData([]);
+            $attributeInstance->setAttributeCode(
+                $attribute
+            )->setBackendType(
+                AbstractAttribute::TYPE_STATIC
+            )->setIsGlobal(
+                1
+            )->setEntity(
+                $this
+            )->setEntityType(
+                $this->getEntityType()
+            )->setEntityTypeId(
+                $this->getEntityType()->getId()
+            );
         }
 
-        if (empty($attributeInstance)
-            || !$attributeInstance instanceof AbstractAttribute
-            || !$attributeInstance->getId()
-            && !in_array($attributeInstance->getAttributeCode(), $this->getDefaultAttributes())
+        if (!$attributeInstance instanceof AbstractAttribute
+            || (!$attributeInstance->getId()
+                && !in_array($attributeInstance->getAttributeCode(), $this->getDefaultAttributes(), true))
         ) {
             return false;
         }
 
-        $attribute = $attributeInstance;
-
-        if (!$attribute->getAttributeCode()) {
-            $attribute->setAttributeCode($attributeCode);
-        }
-        if (!$attribute->getAttributeModel()) {
-            $attribute->setAttributeModel($this->_getDefaultAttributeModel());
-        }
-
-        $this->addAttribute($attribute);
+        $this->addAttribute($attributeInstance);
 
-        return $attribute;
+        return $attributeInstance;
     }
 
     /**
@@ -640,7 +626,7 @@ protected function _isApplicableAttribute($object, $attribute)
     public function walkAttributes($partMethod, array $args = [], $collectExceptionMessages = null)
     {
         $methodArr = explode('/', $partMethod);
-        switch (sizeof($methodArr)) {
+        switch (count($methodArr)) {
             case 1:
                 $part = 'attribute';
                 $method = $methodArr[0];
@@ -687,6 +673,7 @@ public function walkAttributes($partMethod, array $args = [], $collectExceptionM
             }
 
             try {
+                // phpcs:disable Magento2.Functions.DiscouragedFunction
                 $results[$attrCode] = call_user_func_array([$instance, $method], $args);
             } catch (\Magento\Eav\Model\Entity\Attribute\Exception $e) {
                 if ($collectExceptionMessages) {
@@ -826,9 +813,9 @@ public function getValueTablePrefix()
             $prefix = (string) $this->getEntityType()->getValueTablePrefix();
             if (!empty($prefix)) {
                 $this->_valueTablePrefix = $prefix;
-                /**
-                 * entity type prefix include DB table name prefix
-                 */
+            /**
+             * entity type prefix include DB table name prefix
+             */
                 //$this->_resource->getTableName($prefix);
             } else {
                 $this->_valueTablePrefix = $this->getEntityTable();
@@ -991,9 +978,9 @@ public function getDefaultAttributeSourceModel()
     /**
      * Load entity's attributes into the object
      *
-     * @param   AbstractModel $object
-     * @param   int $entityId
-     * @param   array|null $attributes
+     * @param AbstractModel $object
+     * @param int $entityId
+     * @param array|null $attributes
      * @return $this
      */
     public function load($object, $entityId, $attributes = [])
@@ -1131,8 +1118,8 @@ protected function _getLoadAttributesSelect($object, $table)
     /**
      * Initialize attribute value for object
      *
-     * @param   DataObject $object
-     * @param   array $valueRow
+     * @param DataObject $object
+     * @param array $valueRow
      * @return $this
      */
     protected function _setAttributeValue($object, $valueRow)
@@ -1237,7 +1224,7 @@ protected function _getOrigObject($object)
     /**
      * Aggregate Data for attributes that will be deleted
      *
-     * @param array &$delete
+     * @param &array $delete
      * @param AbstractAttribute $attribute
      * @param AbstractEntity $object
      * @return void
@@ -1248,6 +1235,7 @@ private function _aggregateDeleteData(&$delete, $attribute, $object)
             if (!isset($delete[$tableName])) {
                 $delete[$tableName] = [];
             }
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $delete[$tableName] = array_merge((array)$delete[$tableName], $valuesData);
         }
     }
@@ -1422,7 +1410,7 @@ protected function _prepareStaticValue($key, $value)
     /**
      * Save object collected data
      *
-     * @param   array $saveData array('newObject', 'entityRow', 'insert', 'update', 'delete')
+     * @param array $saveData array('newObject', 'entityRow', 'insert', 'update', 'delete')
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -1517,9 +1505,9 @@ protected function _processSaveData($saveData)
     /**
      * Insert entity attribute value
      *
-     * @param   DataObject $object
-     * @param   AbstractAttribute $attribute
-     * @param   mixed $value
+     * @param DataObject $object
+     * @param AbstractAttribute $attribute
+     * @param mixed $value
      * @return $this
      */
     protected function _insertAttribute($object, $attribute, $value)
@@ -1530,10 +1518,10 @@ protected function _insertAttribute($object, $attribute, $value)
     /**
      * Update entity attribute value
      *
-     * @param   DataObject $object
-     * @param   AbstractAttribute $attribute
-     * @param   mixed $valueId
-     * @param   mixed $value
+     * @param DataObject $object
+     * @param AbstractAttribute $attribute
+     * @param mixed $valueId
+     * @param mixed $value
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -1892,10 +1880,12 @@ protected function _getDefaultAttributes()
      */
     public function getDefaultAttributes()
     {
-        return array_unique(array_merge(
-            $this->_getDefaultAttributes(),
-            [$this->getEntityIdField(), $this->getLinkField()]
-        ));
+        return array_unique(
+            array_merge(
+                $this->_getDefaultAttributes(),
+                [$this->getEntityIdField(), $this->getLinkField()]
+            )
+        );
     }
 
     /**
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index 8bd9ca2cc03c8..651bc96193780 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -285,13 +285,8 @@ public function beforeSave()
 
             // save default date value as timestamp
             if ($hasDefaultValue) {
-                try {
-                    $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(__('The default date is invalid. Verify the date and try again.'));
-                }
+                $defaultValue = $this->getUtcDateDefaultValue($defaultValue);
+                $this->setDefaultValue($defaultValue);
             }
         }
 
@@ -310,6 +305,29 @@ public function beforeSave()
         return parent::beforeSave();
     }
 
+    /**
+     * Convert localized date default value to UTC
+     *
+     * @param string $defaultValue
+     * @return string
+     * @throws LocalizedException
+     */
+    private function getUtcDateDefaultValue(string $defaultValue): string
+    {
+        $hasTime = $this->getFrontendInput() === 'datetime';
+        try {
+            $defaultValue = $this->_localeDate->date($defaultValue, null, $hasTime, $hasTime);
+            if ($hasTime) {
+                $defaultValue->setTimezone(new \DateTimeZone($this->_localeDate->getDefaultTimezone()));
+            }
+            $utcValue = $defaultValue->format(DateTime::DATETIME_PHP_FORMAT);
+        } catch (\Exception $e) {
+            throw new LocalizedException(__('The default date is invalid. Verify the date and try again.'));
+        }
+
+        return $utcValue;
+    }
+
     /**
      * @inheritdoc
      *
@@ -346,6 +364,7 @@ public function getBackendTypeByInput($type)
                 break;
 
             case 'date':
+            case 'datetime':
                 $field = 'datetime';
                 break;
 
@@ -401,6 +420,10 @@ public function getDefaultValueByInput($type)
                 $field = 'default_value_date';
                 break;
 
+            case 'datetime':
+                $field = 'default_value_datetime';
+                break;
+
             case 'boolean':
                 $field = 'default_value_yesno';
                 break;
@@ -489,9 +512,6 @@ public function getIdentities()
     /**
      * @inheritdoc
      * @since 100.0.7
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -505,9 +525,6 @@ public function __sleep()
     /**
      * @inheritdoc
      * @since 100.0.7
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
index 16fe495de18db..7066a752fe2a2 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
@@ -329,7 +329,7 @@ public function getAttributeCode()
     }
 
     /**
-     * Set attribute model
+     * Set attribute model class.
      *
      * @param array $data
      * @return $this
@@ -1405,9 +1405,6 @@ public function setExtensionAttributes(\Magento\Eav\Api\Data\AttributeExtensionI
     /**
      * @inheritdoc
      * @since 100.0.7
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -1433,9 +1430,6 @@ public function __sleep()
     /**
      * @inheritdoc
      * @since 100.0.7
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
index a9cd3be246bb1..ea454fc0bcc74 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
@@ -7,6 +7,8 @@
 namespace Magento\Eav\Model\Entity\Attribute\Frontend;
 
 /**
+ * Entity datetime frontend attribute
+ *
  * @api
  * @since 100.0.2
  */
@@ -42,10 +44,12 @@ public function getValue(\Magento\Framework\DataObject $object)
         $value = parent::getValue($object);
 
         if ($value) {
+            $showTime = $this->getAttribute()->getFrontendInput() === 'datetime'
+                ? \IntlDateFormatter::MEDIUM : \IntlDateFormatter::NONE;
             $data = $this->_localeDate->formatDateTime(
                 new \DateTime($value),
                 \IntlDateFormatter::MEDIUM,
-                \IntlDateFormatter::NONE
+                $showTime
             );
         }
 
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Source/SpecificSourceInterface.php b/app/code/Magento/Eav/Model/Entity/Attribute/Source/SpecificSourceInterface.php
new file mode 100644
index 0000000000000..c6422962f6b1b
--- /dev/null
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/SpecificSourceInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Eav\Model\Entity\Attribute\Source;
+
+use Magento\Framework\Api\CustomAttributesDataInterface;
+
+/**
+ * Can provide entity-specific options for an attribute.
+ */
+interface SpecificSourceInterface extends SourceInterface
+{
+    /**
+     * List of options specific to an entity.
+     *
+     * Same format as for "getAllOptions".
+     * Will be called instead of "getAllOptions".
+     *
+     * @param CustomAttributesDataInterface $entity
+     * @return array
+     */
+    public function getOptionsFor(CustomAttributesDataInterface $entity): array;
+}
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 f9aa1a9ed3ba1..ef7b4a69808bc 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php
@@ -211,9 +211,13 @@ public function addValueSortToCollection($collection, $dir = \Magento\Framework\
             $collection,
             $attribute,
             $valueExpr
+        )->addOptionToCollection(
+            $collection,
+            $attribute,
+            $valueExpr
         );
 
-        $collection->getSelect()->order("{$attribute->getAttributeCode()} {$dir}");
+        $collection->getSelect()->order("{$attribute->getAttributeCode()}_order {$dir}");
 
         return $this;
     }
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
index c5077733e10ae..9e4ad6fb53a33 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
@@ -11,7 +11,9 @@
 use Magento\Eav\Model\Entity\Attribute as EntityAttribute;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Select;
+use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
 /**
  * EAV attribute resource model
@@ -20,7 +22,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
-class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+class Attribute extends AbstractDb
 {
     /**
      * Eav Entity attributes cache
@@ -189,6 +191,23 @@ protected function _beforeSave(AbstractModel $object)
         return parent::_beforeSave($object);
     }
 
+    /**
+     * @inheritdoc
+     *
+     * @param AbstractModel $attribute
+     * @return AbstractDb
+     * @throws CouldNotDeleteException
+     */
+    protected function _beforeDelete(AbstractModel $attribute)
+    {
+        /** @var $attribute \Magento\Eav\Api\Data\AttributeInterface */
+        if ($attribute->getId() && !$attribute->getIsUserDefined()) {
+            throw new CouldNotDeleteException(__("The system attribute can't be deleted."));
+        }
+
+        return parent::_beforeDelete($attribute);
+    }
+
     /**
      * Save additional attribute data after save attribute
      *
@@ -761,9 +780,6 @@ public function getValidAttributeIds($attributeIds)
      *
      * @return array
      * @since 100.0.7
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -777,9 +793,6 @@ public function __sleep()
      *
      * @return void
      * @since 100.0.7
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
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 79c277dcb6a82..a7be59e2c05d5 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php
@@ -42,10 +42,13 @@ public function addOptionValueToCollection($collection, $attribute, $valueExpr)
             "{$optionTable2}.option_id={$valueExpr} AND {$optionTable2}.store_id=?",
             $collection->getStoreId()
         );
-        $valueExpr = $connection->getCheckSql(
-            "{$optionTable2}.value_id IS NULL",
-            "{$optionTable1}.option_id",
-            "{$optionTable2}.option_id"
+        $valueIdExpr = $connection->getIfNullSql(
+            "{$optionTable2}.option_id",
+            "{$optionTable1}.option_id"
+        );
+        $valueExpr = $connection->getIfNullSql(
+            "{$optionTable2}.value",
+            "{$optionTable1}.value"
         );
 
         $collection->getSelect()->joinLeft(
@@ -55,7 +58,37 @@ public function addOptionValueToCollection($collection, $attribute, $valueExpr)
         )->joinLeft(
             [$optionTable2 => $this->getTable('eav_attribute_option_value')],
             $tableJoinCond2,
-            [$attributeCode => $valueExpr]
+            [
+                $attributeCode => $valueIdExpr,
+                $attributeCode . '_value' => $valueExpr,
+            ]
+        );
+
+        return $this;
+    }
+
+    /**
+     * Add Join with option for collection select
+     *
+     * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
+     * @param \Magento\Eav\Model\Entity\Attribute $attribute
+     * @param \Zend_Db_Expr $valueExpr
+     * @return $this
+     */
+    public function addOptionToCollection($collection, $attribute, $valueExpr)
+    {
+        $connection = $this->getConnection();
+        $attributeCode = $attribute->getAttributeCode();
+        $optionTable1 = $attributeCode . '_option_t1';
+        $tableJoinCond1 = "{$optionTable1}.option_id={$valueExpr}";
+        $valueExpr = $connection->getIfNullSql(
+            "{$optionTable1}.sort_order"
+        );
+
+        $collection->getSelect()->joinLeft(
+            [$optionTable1 => $this->getTable('eav_attribute_option')],
+            $tableJoinCond1,
+            ["{$attributeCode}_order" => $valueExpr]
         );
 
         return $this;
diff --git a/app/code/Magento/Eav/Model/Validator/Attribute/Data.php b/app/code/Magento/Eav/Model/Validator/Attribute/Data.php
index cd0d5141154c0..15dcea077c887 100644
--- a/app/code/Magento/Eav/Model/Validator/Attribute/Data.php
+++ b/app/code/Magento/Eav/Model/Validator/Attribute/Data.php
@@ -4,15 +4,15 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Eav\Model\Validator\Attribute;
+
+use Magento\Eav\Model\Attribute;
+
 /**
  * EAV attribute data validator
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Eav\Model\Validator\Attribute;
-
-use Magento\Eav\Model\Attribute;
-
 class Data extends \Magento\Framework\Validator\AbstractValidator
 {
     /**
@@ -126,7 +126,7 @@ public function isValid($entity)
             $dataModel = $this->_attrDataFactory->create($attribute, $entity);
             $dataModel->setExtractedData($data);
             if (!isset($data[$attributeCode])) {
-                $data[$attributeCode] = null;
+                $data[$attributeCode] = '';
             }
             $result = $dataModel->validateValue($data[$attributeCode]);
             if (true !== $result) {
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php
index 66549f2e00415..163f3d208e724 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DatetimeTest.php
@@ -5,22 +5,31 @@
  */
 namespace Magento\Eav\Test\Unit\Model\Entity\Attribute\Frontend;
 
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Eav\Model\Entity\Attribute\Frontend\Datetime;
+use Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory;
+use Magento\Framework\DataObject;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-class DatetimeTest extends \PHPUnit\Framework\TestCase
+/**
+ * Class to test Entity datetime frontend attribute
+ */
+class DatetimeTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var TimezoneInterface|MockObject
      */
     private $localeDateMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var BooleanFactory|MockObject
      */
     private $booleanFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var AbstractAttribute|MockObject
      */
     private $attributeMock;
 
@@ -29,40 +38,63 @@ class DatetimeTest extends \PHPUnit\Framework\TestCase
      */
     private $model;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->booleanFactoryMock = $this->createMock(\Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory::class);
-        $this->localeDateMock = $this->createMock(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
+        $this->booleanFactoryMock = $this->createMock(BooleanFactory::class);
+        $this->localeDateMock = $this->createMock(TimezoneInterface::class);
         $this->attributeMock = $this->createPartialMock(
-            \Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class,
-            ['getAttributeCode', 'getFrontendLabel', 'getData']
+            AbstractAttribute::class,
+            ['getAttributeCode', 'getFrontendLabel', 'getFrontendInput']
         );
 
         $this->model = new Datetime($this->booleanFactoryMock, $this->localeDateMock);
         $this->model->setAttribute($this->attributeMock);
     }
 
-    public function testGetValue()
+    /**
+     * Test to retrieve attribute value
+     *
+     * @param string $frontendInput
+     * @param int $timeType
+     * @dataProvider getValueDataProvider
+     */
+    public function testGetValue(string $frontendInput, int $timeType)
     {
         $attributeValue = '11-11-2011';
+        $attributeCode = 'datetime';
         $date = new \DateTime($attributeValue);
-        $object = new \Magento\Framework\DataObject(['datetime' => $attributeValue]);
+        $object = new DataObject([$attributeCode => $attributeValue]);
 
         $this->attributeMock->expects($this->any())
             ->method('getAttributeCode')
-            ->willReturn('datetime');
+            ->willReturn($attributeCode);
         $this->attributeMock->expects($this->any())
-            ->method('getData')
-            ->with('frontend_input')
-            ->willReturn('text');
+            ->method('getFrontendInput')
+            ->willReturn($frontendInput);
         $this->localeDateMock->expects($this->once())
             ->method('formatDateTime')
-            ->with($date, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE, null, null, null)
+            ->with($date, \IntlDateFormatter::MEDIUM, $timeType)
             ->willReturn($attributeValue);
 
         $this->assertEquals($attributeValue, $this->model->getValue($object));
     }
 
+    /**
+     * Retrieve attribute value data provider
+     *
+     * @return array
+     */
+    public function getValueDataProvider(): array
+    {
+        return [
+            ['frontendInput' => 'date', 'timeType' => \IntlDateFormatter::NONE],
+            ['frontendInput' => 'datetime', 'timeType' => \IntlDateFormatter::MEDIUM],
+        ];
+    }
+
     /**
      * @param mixed $labelText
      * @param string $attributeCode
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 b68446d22f910..2997874f6ea34 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
@@ -314,7 +314,10 @@ public function testAddValueSortToCollection()
         $attrOption->expects($this->once())->method('addOptionValueToCollection')
             ->with($collection, $this->abstractAttributeMock, $expr)
             ->willReturnSelf();
-        $select->expects($this->once())->method('order')->with("{$attributeCode} {$dir}");
+        $attrOption->expects($this->once())->method('addOptionToCollection')
+            ->with($collection, $this->abstractAttributeMock, $expr)
+            ->willReturnSelf();
+        $select->expects($this->once())->method('order')->with("{$attributeCode}_order {$dir}");
 
         $this->assertEquals($this->model, $this->model->addValueSortToCollection($collection, $dir));
     }
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 402497a1379c0..ae4ae7ee707e3 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeTest.php
@@ -5,14 +5,21 @@
  */
 namespace Magento\Eav\Test\Unit\Model\Entity;
 
+use Magento\Eav\Model\Entity\Attribute;
+use Magento\Eav\Model\Entity\Attribute\FrontendLabel;
+use Magento\Eav\Model\Entity\Attribute\FrontendLabelFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
 /**
- * Class AttributeTest.
+ * Test for EAV Entity attribute model
  */
-class AttributeTest extends \PHPUnit\Framework\TestCase
+class AttributeTest extends TestCase
 {
     /**
      * Attribute model to be tested
-     * @var \Magento\Eav\Model\Entity\Attribute|\PHPUnit_Framework_MockObject_MockObject
+     * @var Attribute|MockObject
      */
     protected $_model;
 
@@ -21,7 +28,7 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->_model = $this->createPartialMock(\Magento\Eav\Model\Entity\Attribute::class, ['__wakeup']);
+        $this->_model = $this->createPartialMock(Attribute::class, ['__wakeup']);
     }
 
     /**
@@ -57,6 +64,7 @@ public static function dataGetBackendTypeByInput()
             ['image', 'text'],
             ['textarea', 'text'],
             ['date', 'datetime'],
+            ['datetime', 'datetime'],
             ['select', 'int'],
             ['boolean', 'int'],
             ['price', 'decimal'],
@@ -91,6 +99,7 @@ public static function dataGetDefaultValueByInput()
             ['weight', 'default_value_text'],
             ['textarea', 'default_value_textarea'],
             ['date', 'default_value_date'],
+            ['datetime', 'default_value_datetime'],
             ['boolean', 'default_value_yesno']
         ];
     }
@@ -130,7 +139,7 @@ public function testGetFrontendLabels()
     {
         $attributeId = 1;
         $storeLabels = ['test_attribute_store1'];
-        $frontendLabelFactory = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\FrontendLabelFactory::class)
+        $frontendLabelFactory = $this->getMockBuilder(FrontendLabelFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -142,15 +151,15 @@ public function testGetFrontendLabels()
             '_resource' => $resource,
             'frontendLabelFactory' => $frontendLabelFactory,
         ];
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_model = $objectManager->getObject(\Magento\Eav\Model\Entity\Attribute::class, $arguments);
+        $objectManager = new ObjectManager($this);
+        $this->_model = $objectManager->getObject(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)
+        $frontendLabel = $this->getMockBuilder(FrontendLabel::class)
             ->setMethods(['setStoreId', 'setLabel'])
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/DataTest.php b/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/DataTest.php
index 07ce6fbfc6a4c..acba37cc45788 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/DataTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/DataTest.php
@@ -4,13 +4,54 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
+namespace Magento\Eav\Test\Unit\Model\Validator\Attribute;
+
 /**
  * Test for \Magento\Eav\Model\Validator\Attribute\Data
  */
-namespace Magento\Eav\Test\Unit\Model\Validator\Attribute;
-
 class DataTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Eav\Model\AttributeDataFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $attrDataFactory;
+
+    /**
+     * @var \Magento\Eav\Model\Validator\Attribute\Data
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->attrDataFactory = $this->getMockBuilder(\Magento\Eav\Model\AttributeDataFactory::class)
+            ->setMethods(['create'])
+            ->setConstructorArgs(
+                [
+                    'objectManager' => $this->createMock(\Magento\Framework\ObjectManagerInterface::class),
+                    'string' => $this->createMock(\Magento\Framework\Stdlib\StringUtils::class)
+                ]
+            )
+            ->getMock();
+
+        $this->model = $this->objectManager->getObject(
+            \Magento\Eav\Model\Validator\Attribute\Data::class,
+            [
+                '_attrDataFactory' => $this->attrDataFactory
+            ]
+        );
+    }
+
     /**
      * Testing  \Magento\Eav\Model\Validator\Attribute\Data::isValid
      *
@@ -381,13 +422,15 @@ public function testAddErrorMessages()
     protected function _getAttributeMock($attributeData)
     {
         $attribute = $this->getMockBuilder(\Magento\Eav\Model\Attribute::class)
-            ->setMethods([
-                'getAttributeCode',
-                'getDataModel',
-                'getFrontendInput',
-                '__wakeup',
-                'getIsVisible',
-            ])
+            ->setMethods(
+                [
+                    'getAttributeCode',
+                    'getDataModel',
+                    'getFrontendInput',
+                    '__wakeup',
+                    'getIsVisible',
+                ]
+            )
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -436,7 +479,7 @@ protected function _getDataModelMock($returnValue, $argument = null)
         $dataModel = $this->getMockBuilder(
             \Magento\Eav\Model\Attribute\Data\AbstractData::class
         )->disableOriginalConstructor()->setMethods(
-            ['validateValue']
+            ['setExtractedData', 'validateValue']
         )->getMockForAbstractClass();
         if ($argument) {
             $dataModel->expects(
@@ -466,4 +509,24 @@ protected function _getEntityMock()
         )->disableOriginalConstructor()->getMock();
         return $entity;
     }
+
+    /**
+     * Test for isValid() without data for attribute.
+     *
+     * @return void
+     */
+    public function testIsValidWithoutData() : void
+    {
+        $attributeData = ['attribute_code' => 'attribute', 'frontend_input' => 'text', 'is_visible' => true];
+        $entity = $this->_getEntityMock();
+        $attribute = $this->_getAttributeMock($attributeData);
+        $dataModel = $this->_getDataModelMock(true, $this->logicalAnd($this->isEmpty(), $this->isType('string')));
+        $dataModel->expects($this->once())->method('setExtractedData')->with([])->willReturnSelf();
+        $this->attrDataFactory->expects($this->once())
+            ->method('create')
+            ->with($attribute, $entity)
+            ->willReturn($dataModel);
+        $this->model->setAttributes([$attribute])->setData([]);
+        $this->assertTrue($this->model->isValid($entity));
+    }
 }
diff --git a/app/code/Magento/Eav/etc/adminhtml/system.xml b/app/code/Magento/Eav/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..86916abe812d9
--- /dev/null
+++ b/app/code/Magento/Eav/etc/adminhtml/system.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_Config:etc/system_file.xsd">
+    <system>
+        <section id="dev">
+            <group id="caching" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="0" showInStore="0">
+                <label>Caching Settings</label>
+                <field id="cache_user_defined_attributes" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                    <label>Cache User Defined Attributes</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>By default only system EAV attributes are cached.</comment>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/Eav/etc/config.xml b/app/code/Magento/Eav/etc/config.xml
index 2a86437d96abe..c0a4287909b7d 100644
--- a/app/code/Magento/Eav/etc/config.xml
+++ b/app/code/Magento/Eav/etc/config.xml
@@ -20,5 +20,10 @@
                 </input_types>
             </validator_data>
         </general>
+        <dev>
+            <caching>
+                <cache_user_defined_attributes>0</cache_user_defined_attributes>
+            </caching>
+        </dev>
     </default>
 </config>
diff --git a/app/code/Magento/Eav/etc/db_schema.xml b/app/code/Magento/Eav/etc/db_schema.xml
index 407aa8976d684..8dc917b22d09f 100644
--- a/app/code/Magento/Eav/etc/db_schema.xml
+++ b/app/code/Magento/Eav/etc/db_schema.xml
@@ -458,10 +458,6 @@
         <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"/>
-        <constraint xsi:type="unique" referenceId="EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID_OPTION_ID">
-            <column name="store_id"/>
-            <column name="option_id"/>
-        </constraint>
         <index referenceId="EAV_ATTRIBUTE_OPTION_VALUE_OPTION_ID" indexType="btree">
             <column name="option_id"/>
         </index>
diff --git a/app/code/Magento/Eav/etc/db_schema_whitelist.json b/app/code/Magento/Eav/etc/db_schema_whitelist.json
index 1814c7ba2dbc3..fbcba0741eadf 100644
--- a/app/code/Magento/Eav/etc/db_schema_whitelist.json
+++ b/app/code/Magento/Eav/etc/db_schema_whitelist.json
@@ -287,8 +287,7 @@
         "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_OPTION_VALUE_STORE_ID_OPTION_ID": true
+            "EAV_ATTRIBUTE_OPTION_VALUE_STORE_ID_STORE_STORE_ID": true
         }
     },
     "eav_attribute_label": {
@@ -389,4 +388,4 @@
             "EAV_FORM_ELEMENT_TYPE_ID_ATTRIBUTE_ID": true
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
index 93f4caa10adf9..b9102bc5e00c4 100644
--- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
@@ -108,21 +108,28 @@ public function testConnection()
      */
     private function buildConfig($options = [])
     {
-        $host = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
+        $hostname = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
         // @codingStandardsIgnoreStart
         $protocol = parse_url($options['hostname'], PHP_URL_SCHEME);
         // @codingStandardsIgnoreEnd
         if (!$protocol) {
             $protocol = 'http';
         }
-        if (!empty($options['port'])) {
-            $host .= ':' . $options['port'];
+
+        $authString = '';
+        if (!empty($options['enableAuth']) && (int)$options['enableAuth'] === 1) {
+            $authString = "{$options['username']}:{$options['password']}@";
         }
-        if (!empty($options['enableAuth']) && ($options['enableAuth'] == 1)) {
-            $host = sprintf('%s://%s:%s@%s', $protocol, $options['username'], $options['password'], $host);
+
+        $portString = '';
+        if (!empty($options['port'])) {
+            $portString = ':' . $options['port'];
         }
 
+        $host = $protocol . '://' . $authString . $hostname . $portString;
+
         $options['hosts'] = [$host];
+
         return $options;
     }
 
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
index f6d0a6318a5f2..fa193d86c03c7 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
@@ -193,6 +193,9 @@ public function addDocs(array $documents, $storeId, $mappedIndexerId)
      */
     public function cleanIndex($storeId, $mappedIndexerId)
     {
+        // needed to fix bug with double indices in alias because of second reindex in same process
+        unset($this->preparedIndex[$storeId]);
+
         $this->checkIndex($storeId, $mappedIndexerId, true);
         $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex);
 
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
index 0f3020974d08a..348a1c708a78c 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
@@ -132,11 +132,17 @@ public function getFields(array $context = []): array
 
             if ($attributeAdapter->isTextType()) {
                 $keywordFieldName = FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD;
+                $index = $this->indexTypeConverter->convert(
+                    IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
+                );
                 $allAttributes[$fieldName]['fields'][$keywordFieldName] = [
                     'type' => $this->fieldTypeConverter->convert(
                         FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD
                     )
                 ];
+                if ($index) {
+                    $allAttributes[$fieldName]['fields'][$keywordFieldName]['index'] = $index;
+                }
             }
 
             if ($attributeAdapter->isComplexType()) {
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldsMappingPreprocessorInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldsMappingPreprocessorInterface.php
new file mode 100644
index 0000000000000..6eea6560f7273
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldsMappingPreprocessorInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Adapter;
+
+/**
+ * Modifies fields mapping before save
+ */
+interface FieldsMappingPreprocessorInterface
+{
+    /**
+     * Modifies fields mapping before save
+     *
+     * @param array $mapping
+     * @return array
+     */
+    public function process(array $mapping): array;
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
index f9b827304446d..d933d8bb5d0b5 100644
--- a/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php
@@ -103,21 +103,28 @@ public function testConnection()
      */
     private function buildConfig($options = [])
     {
-        $host = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
+        $hostname = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
         // @codingStandardsIgnoreStart
         $protocol = parse_url($options['hostname'], PHP_URL_SCHEME);
         // @codingStandardsIgnoreEnd
         if (!$protocol) {
             $protocol = 'http';
         }
-        if (!empty($options['port'])) {
-            $host .= ':' . $options['port'];
+
+        $authString = '';
+        if (!empty($options['enableAuth']) && (int)$options['enableAuth'] === 1) {
+            $authString = "{$options['username']}:{$options['password']}@";
         }
-        if (!empty($options['enableAuth']) && ($options['enableAuth'] == 1)) {
-            $host = sprintf('%s://%s:%s@%s', $protocol, $options['username'], $options['password'], $host);
+
+        $portString = '';
+        if (!empty($options['port'])) {
+            $portString = ':' . $options['port'];
         }
 
+        $host = $protocol . '://' . $authString . $hostname . $portString;
+
         $options['hosts'] = [$host];
+
         return $options;
     }
 
diff --git a/app/code/Magento/Elasticsearch/Model/Config/Backend/MinimumShouldMatch.php b/app/code/Magento/Elasticsearch/Model/Config/Backend/MinimumShouldMatch.php
new file mode 100644
index 0000000000000..ea64ccd772682
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Config/Backend/MinimumShouldMatch.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\Config\Backend;
+
+use Magento\Framework\App\Config\Value;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Elasticsearch minimum should match data model
+ */
+class MinimumShouldMatch extends Value
+{
+    /**
+     * @inheritDoc
+     */
+    public function beforeSave()
+    {
+        $result = parent::beforeSave();
+        $this->validateValue();
+        return $result;
+    }
+
+    /**
+     * Validates config value
+     *
+     * @throws LocalizedException
+     */
+    public function validateValue(): void
+    {
+        if (strlen($this->getValue()) && !preg_match('/^((\d+<)?-?\d+%?\s?)+$/', $this->getValue())) {
+            throw new LocalizedException(
+                __(
+                    'Value for the field "%1" was not saved because of the incorrect format.',
+                    __('Minimum Terms to Match')
+                )
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
index aac396f238358..ad52f81bf8eda 100644
--- a/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
+++ b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
@@ -68,7 +68,6 @@ public function apply()
         foreach ($items as $item) {
             $ids[] = (int)$item->getId();
         }
-        $this->collection->setPageSize(null);
         $this->collection->getSelect()->where('e.entity_id IN (?)', $ids);
         $orderList = join(',', $ids);
         $this->collection->getSelect()->reset(\Magento\Framework\DB\Select::ORDER);
diff --git a/app/code/Magento/Elasticsearch/Observer/CategoryProductIndexer.php b/app/code/Magento/Elasticsearch/Observer/CategoryProductIndexer.php
index fd2734bb713b3..e2b3e18a0ffb9 100644
--- a/app/code/Magento/Elasticsearch/Observer/CategoryProductIndexer.php
+++ b/app/code/Magento/Elasticsearch/Observer/CategoryProductIndexer.php
@@ -11,6 +11,7 @@
 use Magento\Elasticsearch\Model\Config;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Catalog\Model\Indexer\Category\Flat\State as FlatState;
 
 /**
  * Checks if a category has changed products and depends on indexer configuration.
@@ -27,14 +28,24 @@ class CategoryProductIndexer implements ObserverInterface
      */
     private $processor;
 
+    /**
+     * @var FlatState
+     */
+    private $flatState;
+
     /**
      * @param Config $config
      * @param Processor $processor
+     * @param FlatState $flatState
      */
-    public function __construct(Config $config, Processor $processor)
-    {
+    public function __construct(
+        Config $config,
+        Processor $processor,
+        FlatState $flatState
+    ) {
         $this->processor = $processor;
         $this->config = $config;
+        $this->flatState = $flatState;
     }
 
     /**
@@ -47,7 +58,7 @@ public function execute(Observer $observer): void
         }
 
         $productIds = $observer->getEvent()->getProductIds();
-        if (!empty($productIds) && $this->processor->isIndexerScheduled()) {
+        if (!empty($productIds) && $this->processor->isIndexerScheduled() && $this->flatState->isFlatEnabled()) {
             $this->processor->markIndexerAsInvalid();
         }
     }
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
index ddf75c0a78e25..8a44b58d35fb8 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php
@@ -7,6 +7,7 @@
 
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface as TypeResolver;
+use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerPool;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Search\Request\Query\BoolExpression;
@@ -50,6 +51,10 @@ class Match implements QueryInterface
      * @var ValueTransformerPool
      */
     private $valueTransformerPool;
+    /**
+     * @var Config
+     */
+    private $config;
 
     /**
      * @param FieldMapperInterface $fieldMapper
@@ -57,13 +62,15 @@ class Match implements QueryInterface
      * @param AttributeProvider|null $attributeProvider
      * @param TypeResolver|null $fieldTypeResolver
      * @param ValueTransformerPool|null $valueTransformerPool
+     * @param Config|null $config
      */
     public function __construct(
         FieldMapperInterface $fieldMapper,
         array $preprocessorContainer,
         AttributeProvider $attributeProvider = null,
         TypeResolver $fieldTypeResolver = null,
-        ValueTransformerPool $valueTransformerPool = null
+        ValueTransformerPool $valueTransformerPool = null,
+        Config $config = null
     ) {
         $this->fieldMapper = $fieldMapper;
         $this->preprocessorContainer = $preprocessorContainer;
@@ -73,6 +80,7 @@ public function __construct(
             ->get(TypeResolver::class);
         $this->valueTransformerPool = $valueTransformerPool ?? ObjectManager::getInstance()
             ->get(ValueTransformerPool::class);
+        $this->config = $config ?? ObjectManager::getInstance()->get(Config::class);
     }
 
     /**
@@ -83,11 +91,15 @@ public function build(array $selectQuery, RequestQueryInterface $requestQuery, $
         $queryValue = $this->prepareQuery($requestQuery->getValue(), $conditionType);
         $queries = $this->buildQueries($requestQuery->getMatches(), $queryValue);
         $requestQueryBoost = $requestQuery->getBoost() ?: 1;
+        $minimumShouldMatch = $this->config->getElasticsearchConfigData('minimum_should_match');
         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'];
+                if ($minimumShouldMatch) {
+                    $matchQuery['minimum_should_match'] = $minimumShouldMatch;
+                }
                 $queryBody[$matchKey][$field] = $matchQuery;
             }
             $selectQuery['bool'][$query['condition']][] = $queryBody;
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
index 5f5807e212961..99fd416b5cd3e 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Elasticsearch\Test\Unit\Elasticsearch5\Model\Client;
 
+use Magento\Elasticsearch\Elasticsearch5\Model\Client\Elasticsearch;
 use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
@@ -38,7 +40,7 @@ class ElasticsearchTest extends \PHPUnit\Framework\TestCase
      *
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->elasticsearchClientMock = $this->getMockBuilder(\Elasticsearch\Client::class)
             ->setMethods(
@@ -497,6 +499,40 @@ public function testDeleteMapping()
         );
     }
 
+    /**
+     * Ensure that configuration returns correct url.
+     *
+     * @param array $options
+     * @param string $expectedResult
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \ReflectionException
+     * @dataProvider getOptionsDataProvider
+     */
+    public function testBuildConfig(array $options, $expectedResult): void
+    {
+        $buildConfig = new Elasticsearch($options);
+        $config = $this->getPrivateMethod(Elasticsearch::class, 'buildConfig');
+        $result = $config->invoke($buildConfig, $options);
+        $this->assertEquals($expectedResult, $result['hosts'][0]);
+    }
+
+    /**
+     * Return private method for elastic search class.
+     *
+     * @param $className
+     * @param $methodName
+     * @return \ReflectionMethod
+     * @throws \ReflectionException
+     */
+    private function getPrivateMethod($className, $methodName)
+    {
+        $reflector = new \ReflectionClass($className);
+        $method = $reflector->getMethod($methodName);
+        $method->setAccessible(true);
+
+        return $method;
+    }
+
     /**
      * Test deleteMapping() method
      * @expectedException \Exception
@@ -545,6 +581,35 @@ public function testSuggest()
         $this->assertEquals([], $this->model->suggest($query));
     }
 
+    /**
+     * Get options data provider.
+     */
+    public function getOptionsDataProvider()
+    {
+        return [
+            [
+                'without_protocol' => [
+                    'hostname' => 'localhost',
+                    'port' => '9200',
+                    'timeout' => 15,
+                    'index' => 'magento2',
+                    'enableAuth' => 0,
+                ],
+                'expected_result' => 'http://localhost:9200'
+            ],
+            [
+                'with_protocol' => [
+                    'hostname' => 'https://localhost',
+                    'port' => '9200',
+                    'timeout' => 15,
+                    'index' => 'magento2',
+                    'enableAuth' => 0,
+                ],
+                'expected_result' => 'https://localhost:9200'
+            ]
+        ];
+    }
+
     /**
      * Get elasticsearch client options
      *
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
index f90c13c9bfb65..c08a4298b42d2 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
@@ -264,6 +264,7 @@ public function attributeProvider()
                         'fields' => [
                             'keyword' => [
                                 'type' => 'string',
+                                'index' => 'not_analyzed'
                             ]
                         ]
                     ],
@@ -294,6 +295,7 @@ public function attributeProvider()
                         'fields' => [
                             'keyword' => [
                                 'type' => 'string',
+                                'index' => 'not_analyzed'
                             ]
                         ]
                     ],
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Config/Backend/MinimumShouldMatchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Config/Backend/MinimumShouldMatchTest.php
new file mode 100644
index 0000000000000..e8f3621eda25d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Config/Backend/MinimumShouldMatchTest.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\Config\Backend;
+
+use Magento\Elasticsearch\Model\Config\Backend\MinimumShouldMatch;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+use Throwable;
+
+/**
+ * Test elasticsearch minimum should match data model
+ */
+class MinimumShouldMatchTest extends TestCase
+{
+    /**
+     * @var MinimumShouldMatch
+     */
+    private $model;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->model = $objectManager->getObject(MinimumShouldMatch::class);
+        parent::setUp();
+    }
+
+    /**
+     * @param string $value
+     * @param bool $valid
+     * @dataProvider validateValueDataProvider
+     * @throws LocalizedException
+     */
+    public function testValidateValue(string $value, bool $valid)
+    {
+        $this->model->setValue($value);
+        try {
+            $this->model->validateValue();
+        } catch (Throwable $exception) {
+            $this->assertFalse($valid);
+            return;
+        }
+        $this->assertTrue($valid);
+    }
+
+    /**
+     * @return array
+     */
+    public function validateValueDataProvider(): array
+    {
+        return  [
+            ['3', true],
+            ['-2', true],
+            ['75%', true],
+            ['-25%', true],
+            ['3<90%', true],
+            ['2<-25% 9<-3', true],
+            ['90%<3', false],
+            ['<90%', false],
+            ['90%<', false],
+            ['-3<2', false],
+            ['two', false],
+            ['2<', false],
+            ['<2', false],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Observer/CategoryProductIndexerTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Observer/CategoryProductIndexerTest.php
index adebee0d591ab..944699908b984 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Observer/CategoryProductIndexerTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Observer/CategoryProductIndexerTest.php
@@ -69,7 +69,6 @@ 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);
     }
 
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
index d0ffc6debcd8a..705b06e9769f2 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php
@@ -9,14 +9,19 @@
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ResolverInterface as TypeResolver;
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder;
 use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
 use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerPool;
 use Magento\Framework\Search\Request\Query\Match as MatchRequestQuery;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject as MockObject;
+use PHPUnit\Framework\TestCase;
 
-class MatchTest extends \PHPUnit\Framework\TestCase
+/**
+ * Test Match query builder
+ */
+class MatchTest extends TestCase
 {
     /**
      * @var AttributeProvider|MockObject
@@ -32,6 +37,14 @@ class MatchTest extends \PHPUnit\Framework\TestCase
      * @var MatchQueryBuilder
      */
     private $matchQueryBuilder;
+    /**
+     * @var MockObject
+     */
+    private $config;
+    /**
+     * @var MockObject
+     */
+    private $fieldMapper;
 
     /**
      * @inheritdoc
@@ -40,22 +53,25 @@ protected function setUp()
     {
         $this->attributeProvider = $this->createMock(AttributeProvider::class);
         $this->fieldTypeResolver = $this->createMock(TypeResolver::class);
-
+        $this->config = $this->createMock(Config::class);
+        $this->fieldMapper = $this->getMockForAbstractClass(FieldMapperInterface::class);
+        $this->fieldMapper->method('getFieldName')
+            ->willReturnArgument(0);
         $valueTransformerPoolMock = $this->createMock(ValueTransformerPool::class);
         $valueTransformerMock = $this->createMock(ValueTransformerInterface::class);
         $valueTransformerPoolMock->method('get')
             ->willReturn($valueTransformerMock);
         $valueTransformerMock->method('transform')
             ->willReturnArgument(0);
-
         $this->matchQueryBuilder = (new ObjectManager($this))->getObject(
             MatchQueryBuilder::class,
             [
-                'fieldMapper' => $this->getFieldMapper(),
+                'fieldMapper' => $this->fieldMapper,
                 'preprocessorContainer' => [],
                 'attributeProvider' => $this->attributeProvider,
                 'fieldTypeResolver' => $this->fieldTypeResolver,
                 'valueTransformerPool' => $valueTransformerPoolMock,
+                'config' => $this->config,
             ]
         );
     }
@@ -63,130 +79,146 @@ protected function setUp()
     /**
      * Tests that method constructs a correct select query.
      *
-     * @see MatchQueryBuilder::build
+     * @param string $searchQuery
+     * @param array $fields
+     * @param array $expected
+     * @param string|null $minimumShouldMatch
+     * @dataProvider buildDataProvider
      */
-    public function testBuild()
-    {
-        $attributeAdapter = $this->createMock(AttributeAdapter::class);
-        $this->attributeProvider->expects($this->once())
-            ->method('getByAttributeCode')
-            ->with('some_field')
-            ->willReturn($attributeAdapter);
-        $this->fieldTypeResolver->expects($this->once())
-            ->method('getFieldType')
-            ->with($attributeAdapter)
-            ->willReturn('text');
-
-        $rawQueryValue = 'query_value';
-        $selectQuery = $this->matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'not');
+    public function testBuild(
+        string $searchQuery,
+        array $fields,
+        array $expected,
+        ?string $minimumShouldMatch = null
+    ) {
+        $this->config->method('getElasticsearchConfigData')
+            ->with('minimum_should_match')
+            ->willReturn($minimumShouldMatch);
+
+        foreach ($fields as $field) {
+            $this->mockAttribute($field['field']);
+        }
+
+        $requestQuery = new MatchRequestQuery('match', $searchQuery, 1, $fields);
+        $query = $this->matchQueryBuilder->build([], $requestQuery, 'should');
 
         $expectedSelectQuery = [
             'bool' => [
-                'must_not' => [
+                'should' => $expected,
+            ],
+        ];
+
+        $this->assertEquals(
+            $expectedSelectQuery,
+            $query
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function buildDataProvider(): array
+    {
+        return [
+            'match query without minimum_should_match' => [
+                'fitness bottle',
+                [
+                    [
+                        'field' => 'name',
+                        'boost' => 5
+                    ]
+                ],
+                [
+                    [
+                        'match' => [
+                            'name' => [
+                                'query' => 'fitness bottle',
+                                'boost' => 6,
+                            ],
+                        ],
+                    ],
+                ]
+            ],
+            'match_phrase query without minimum_should_match' => [
+                '"fitness bottle"',
+                [
+                    [
+                        'field' => 'name',
+                        'boost' => 5
+                    ]
+                ],
+                [
+                    [
+                        'match_phrase' => [
+                            'name' => [
+                                'query' => 'fitness bottle',
+                                'boost' => 6,
+                            ],
+                        ],
+                    ],
+                ]
+            ],
+            'match query with minimum_should_match' => [
+                'fitness bottle',
+                [
+                    [
+                        'field' => 'name',
+                        'boost' => 5
+                    ]
+                ],
+                [
                     [
                         'match' => [
-                            'some_field' => [
-                                'query' => $rawQueryValue,
-                                'boost' => 43,
+                            'name' => [
+                                'query' => 'fitness bottle',
+                                'boost' => 6,
+                                'minimum_should_match' => '2<75%',
                             ],
                         ],
                     ],
                 ],
+                '2<75%'
             ],
+            'match_phrase query with minimum_should_match' => [
+                '"fitness bottle"',
+                [
+                    [
+                        'field' => 'name',
+                        'boost' => 5
+                    ]
+                ],
+                [
+                    [
+                        'match_phrase' => [
+                            'name' => [
+                                'query' => 'fitness bottle',
+                                'boost' => 6,
+                                'minimum_should_match' => '2<75%',
+                            ],
+                        ],
+                    ],
+                ],
+                '2<75%'
+            ]
         ];
-        $this->assertEquals($expectedSelectQuery, $selectQuery);
     }
 
     /**
-     * Tests that method constructs a correct "match" query depending on query value.
-     *
-     * @dataProvider matchProvider
+     * Mock attribute
      *
-     * @param string $rawQueryValue
-     * @param string $queryValue
-     * @param string $match
+     * @param string $attributeCode
+     * @param string $type
      */
-    public function testBuildMatchQuery($rawQueryValue, $queryValue, $match)
+    private function mockAttribute(string $attributeCode, string $type = 'text')
     {
         $attributeAdapter = $this->createMock(AttributeAdapter::class);
         $this->attributeProvider->expects($this->once())
             ->method('getByAttributeCode')
-            ->with('some_field')
+            ->with($attributeCode)
             ->willReturn($attributeAdapter);
         $this->fieldTypeResolver->expects($this->once())
             ->method('getFieldType')
             ->with($attributeAdapter)
-            ->willReturn('text');
-
-        $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'],
-        ];
-    }
-
-    /**
-     * 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;
+            ->willReturn($type);
     }
 }
diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json
index 05d3ce94f02f9..3cf5444d86223 100644
--- a/app/code/Magento/Elasticsearch/composer.json
+++ b/app/code/Magento/Elasticsearch/composer.json
@@ -12,7 +12,7 @@
         "magento/module-store": "*",
         "magento/module-catalog-inventory": "*",
         "magento/framework": "*",
-        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
+        "elasticsearch/elasticsearch": "~2.0||~5.1||~6.1"
     },
     "suggest": {
         "magento/module-config": "*"
diff --git a/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml b/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml
index dd42b408ff75e..41c6710412db9 100644
--- a/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml
+++ b/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml
@@ -63,6 +63,14 @@
                         <field id="engine">elasticsearch</field>
                     </depends>
                 </field>
+                <field id="elasticsearch_minimum_should_match" translate="label" type="text" sortOrder="93" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Minimum Terms to Match</label>
+                    <depends>
+                        <field id="engine">elasticsearch</field>
+                    </depends>
+                    <comment><![CDATA[<a href="https://docs.magento.com/m2/ce/user_guide/catalog/search-elasticsearch.html">Learn more</a> about valid syntax.]]></comment>
+                    <backend_model>Magento\Elasticsearch\Model\Config\Backend\MinimumShouldMatch</backend_model>
+                </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>
@@ -117,6 +125,14 @@
                         <field id="engine">elasticsearch5</field>
                     </depends>
                 </field>
+                <field id="elasticsearch5_minimum_should_match" translate="label" type="text" sortOrder="93" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Minimum Terms to Match</label>
+                    <depends>
+                        <field id="engine">elasticsearch5</field>
+                    </depends>
+                    <comment><![CDATA[<a href="https://docs.magento.com/m2/ce/user_guide/catalog/search-elasticsearch.html">Learn more</a> about valid syntax.]]></comment>
+                    <backend_model>Magento\Elasticsearch\Model\Config\Backend\MinimumShouldMatch</backend_model>
+                </field>
             </group>
         </section>
     </system>
diff --git a/app/code/Magento/Elasticsearch/etc/config.xml b/app/code/Magento/Elasticsearch/etc/config.xml
index 0e01aba5ed857..9df21978b5414 100644
--- a/app/code/Magento/Elasticsearch/etc/config.xml
+++ b/app/code/Magento/Elasticsearch/etc/config.xml
@@ -14,12 +14,14 @@
                 <elasticsearch_index_prefix>magento2</elasticsearch_index_prefix>
                 <elasticsearch_enable_auth>0</elasticsearch_enable_auth>
                 <elasticsearch_server_timeout>15</elasticsearch_server_timeout>
+                <elasticsearch_minimum_should_match></elasticsearch_minimum_should_match>
 
                 <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>
+                <elasticsearch5_minimum_should_match></elasticsearch5_minimum_should_match>
             </search>
         </catalog>
     </default>
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index 55df6a5a37f46..f42d957276d76 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -267,7 +267,7 @@
     </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="clientFactory" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Client\ClientFactoryProxy</argument>
             <argument name="clientConfig" xsi:type="object">Magento\Elasticsearch\Model\Config</argument>
         </arguments>
     </virtualType>
diff --git a/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/AddDefaultSearchField.php b/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/AddDefaultSearchField.php
new file mode 100644
index 0000000000000..27767f6567d96
--- /dev/null
+++ b/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/AddDefaultSearchField.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch6\Model\Adapter\FieldMapper;
+
+use Magento\Elasticsearch\Model\Adapter\FieldsMappingPreprocessorInterface;
+
+/**
+ * Add default search field (catch all field) to the mapping.
+ */
+class AddDefaultSearchField implements FieldsMappingPreprocessorInterface
+{
+    /**
+     * catch all field name
+     */
+    private const NAME = '_search';
+    /**
+     * Add default search field (catch all field) to the fields.
+     *
+     * Emulates catch all field (_all) for elasticsearch version 6.0+
+     *
+     * @param array $mapping
+     * @return array
+     */
+    public function process(array $mapping): array
+    {
+        return [self::NAME => ['type' => 'text']] + $mapping;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/CopySearchableFieldsToSearchField.php b/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/CopySearchableFieldsToSearchField.php
new file mode 100644
index 0000000000000..6179eacba5ad7
--- /dev/null
+++ b/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/CopySearchableFieldsToSearchField.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch6\Model\Adapter\FieldMapper;
+
+use Magento\Elasticsearch\Model\Adapter\FieldsMappingPreprocessorInterface;
+
+/**
+ * Add "copy_to" parameter for default search field to index fields.
+ */
+class CopySearchableFieldsToSearchField implements FieldsMappingPreprocessorInterface
+{
+    /**
+     * List of field types to copy
+     */
+    private const FIELD_TYPES = ['text', 'keyword'];
+    /**
+     * Add "copy_to" parameter for default search field to index fields.
+     *
+     * Emulates catch all field (_all) for elasticsearch version 6.0+
+     *
+     * @param array $mapping
+     * @return array
+     */
+    public function process(array $mapping): array
+    {
+        foreach ($mapping as $field => $definition) {
+            if ($this->isSearchable($definition)) {
+                $definition['copy_to'][] = '_search';
+                $mapping[$field] = $definition;
+            }
+        }
+        return $mapping;
+    }
+
+    /**
+     * Determine if the field is searchable by mapping
+     *
+     * The field is searchable if it's indexed and its mapping type is either "text" or "keyword"
+     *
+     * @param array $mapping
+     * @return bool
+     */
+    private function isSearchable(array $mapping): bool
+    {
+        return in_array($mapping['type'] ?? null, self::FIELD_TYPES) && (($mapping['index'] ?? true) !== false);
+    }
+}
diff --git a/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
index 34129a5af0012..ff299be786aa8 100644
--- a/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
@@ -5,8 +5,9 @@
  */
 namespace Magento\Elasticsearch6\Model\Client;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\AdvancedSearch\Model\Client\ClientInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldsMappingPreprocessorInterface;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Elasticsearch client
@@ -29,17 +30,23 @@ class Elasticsearch implements ClientInterface
      * @var bool
      */
     private $pingResult;
+    /**
+     * @var FieldsMappingPreprocessorInterface[]
+     */
+    private $fieldsMappingPreprocessors;
 
     /**
      * Initialize Elasticsearch Client
      *
      * @param array $options
      * @param \Elasticsearch\Client|null $elasticsearchClient
+     * @param FieldsMappingPreprocessorInterface[] $fieldsMappingPreprocessors
      * @throws LocalizedException
      */
     public function __construct(
         $options = [],
-        $elasticsearchClient = null
+        $elasticsearchClient = null,
+        $fieldsMappingPreprocessors = []
     ) {
         if (empty($options['hostname']) || ((!empty($options['enableAuth']) &&
                     ($options['enableAuth'] == 1)) && (empty($options['username']) || empty($options['password'])))) {
@@ -54,6 +61,17 @@ public function __construct(
         }
         $this->client[getmypid()] = $elasticsearchClient;
         $this->clientOptions = $options;
+        foreach ($fieldsMappingPreprocessors as $preprocessor) {
+            if (!$preprocessor instanceof FieldsMappingPreprocessorInterface) {
+                throw new \InvalidArgumentException(
+                    sprintf(
+                        'Instance of FieldsMappingPreprocessorInterface is expected, got %s instead.',
+                        get_class($preprocessor)
+                    )
+                );
+            }
+        }
+        $this->fieldsMappingPreprocessors = $fieldsMappingPreprocessors;
     }
 
     /**
@@ -103,21 +121,28 @@ public function testConnection()
      */
     private function buildConfig($options = [])
     {
-        $host = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
+        $hostname = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
         // @codingStandardsIgnoreStart
         $protocol = parse_url($options['hostname'], PHP_URL_SCHEME);
         // @codingStandardsIgnoreEnd
         if (!$protocol) {
             $protocol = 'http';
         }
-        if (!empty($options['port'])) {
-            $host .= ':' . $options['port'];
+
+        $authString = '';
+        if (!empty($options['enableAuth']) && (int)$options['enableAuth'] === 1) {
+            $authString = "{$options['username']}:{$options['password']}@";
         }
-        if (!empty($options['enableAuth']) && ($options['enableAuth'] == 1)) {
-            $host = sprintf('%s://%s:%s@%s', $protocol, $options['username'], $options['password'], $host);
+
+        $portString = '';
+        if (!empty($options['port'])) {
+            $portString = ':' . $options['port'];
         }
 
+        $host = $protocol . '://' . $authString . $hostname . $portString;
+
         $options['hosts'] = [$host];
+
         return $options;
     }
 
@@ -249,11 +274,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
             'type' => $entityType,
             'body' => [
                 $entityType => [
-                    'properties' => [
-                        '_search' => [
-                            'type' => 'text'
-                        ],
-                    ],
+                    'properties' => [],
                     'dynamic_templates' => [
                         [
                             'price_mapping' => [
@@ -291,7 +312,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
             ],
         ];
 
-        foreach ($fields as $field => $fieldInfo) {
+        foreach ($this->applyFieldsMappingPreprocessors($fields) as $field => $fieldInfo) {
             $params['body'][$entityType]['properties'][$field] = $fieldInfo;
         }
 
@@ -336,4 +357,18 @@ public function suggest($query)
     {
         return $this->getClient()->suggest($query);
     }
+
+    /**
+     * Apply fields mapping preprocessors
+     *
+     * @param array $properties
+     * @return array
+     */
+    private function applyFieldsMappingPreprocessors(array $properties): array
+    {
+        foreach ($this->fieldsMappingPreprocessors as $preprocessor) {
+            $properties = $preprocessor->process($properties);
+        }
+        return $properties;
+    }
 }
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/ActionGroup/AdminElasticConnectionTestActionGroup.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/ActionGroup/AdminElasticConnectionTestActionGroup.xml
new file mode 100644
index 0000000000000..d00c1c59a0f8d
--- /dev/null
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/ActionGroup/AdminElasticConnectionTestActionGroup.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="AdminElasticConnectionTestActionGroup">
+        <annotations>
+            <description>Check ElasticSearch connection after enabling.</description>
+        </annotations>
+        <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="openAdminCatalogSearchConfigPage"/>
+        <waitForPageLoad stepKey="waitPageToLoad"/>
+        <conditionalClick selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" dependentSelector="{{AdminCatalogSearchConfigurationSection.elastic6ConnectionWizard}}" visible="false" stepKey="expandCatalogSearchTab"/>
+        <waitForElementVisible selector="{{AdminCatalogSearchConfigurationSection.elastic6ConnectionWizard}}" stepKey="waitForConnectionButton"/>
+        <click selector="{{AdminCatalogSearchConfigurationSection.elastic6ConnectionWizard}}" stepKey="clickOnTestConnectionButton"/>
+        <waitForPageLoad stepKey="waitForConnectionEstablishment"/>
+        <grabTextFrom selector="{{AdminCatalogSearchConfigurationSection.connectionStatus}}" stepKey="grabConnectionStatus"/>
+        <assertEquals expected="{{AdminElasticsearch6TestConnectionMessageData.successMessage}}" expectedType="string" actual="$grabConnectionStatus"  stepKey="assertThatConnectionSuccessful"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Data/AdminElasticSearch6MessagesData.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Data/AdminElasticSearch6MessagesData.xml
new file mode 100644
index 0000000000000..3fa0ef9fd1c28
--- /dev/null
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Data/AdminElasticSearch6MessagesData.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="AdminElasticsearch6TestConnectionMessageData">
+        <data key="successMessage">Successful! Test again?</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Data/ConfigData.xml
new file mode 100644
index 0000000000000..f1f2f39f4457b
--- /dev/null
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Data/ConfigData.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="SearchEngineElasticsearchConfigData">
+        <data key="path">catalog/search/engine</data>
+        <data key="scope_id">1</data>
+        <data key="label">Elasticsearch 6.0+</data>
+        <data key="value">elasticsearch6</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Data/Elasticsearch6ConfigData.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Data/Elasticsearch6ConfigData.xml
new file mode 100644
index 0000000000000..7a61f13e62049
--- /dev/null
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Data/Elasticsearch6ConfigData.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="EnableElasticSearch6Config">
+        <data key="path">catalog/search/engine</data>
+        <data key="value">elasticsearch6</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Section/AdminCatalogSearchConfigurationSection.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Section/AdminCatalogSearchConfigurationSection.xml
new file mode 100644
index 0000000000000..a6f35606ed79b
--- /dev/null
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Section/AdminCatalogSearchConfigurationSection.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="elastic6ConnectionWizard" type="button" selector="#catalog_search_elasticsearch6_test_connect_wizard"/>
+        <element name="connectionStatus" type="text" selector="#catalog_search_elasticsearch6_test_connect_wizard_result"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Suite/SearchEngineElasticsearchSuite.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Suite/SearchEngineElasticsearchSuite.xml
new file mode 100644
index 0000000000000..d612f5bd17a2f
--- /dev/null
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Suite/SearchEngineElasticsearchSuite.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="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
+    <suite name="SearchEngineElasticsearchSuite">
+        <before>
+            <magentoCLI stepKey="setSearchEngineToElasticsearch" command="config:set {{SearchEngineElasticsearchConfigData.path}} {{SearchEngineElasticsearchConfigData.value}}"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after></after>
+        <include>
+            <group name="SearchEngineElasticsearch" />
+        </include>
+        <exclude>
+            <group name="skip"/>
+        </exclude>
+    </suite>
+</suites>
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticSearchForChineseLocaleTest.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticSearchForChineseLocaleTest.xml
new file mode 100644
index 0000000000000..fd18a0f4e1e5e
--- /dev/null
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticSearchForChineseLocaleTest.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="StorefrontElasticSearch6ForChineseLocaleTest">
+        <annotations>
+            <features value="Elasticsearch6"/>
+            <stories value="Elasticsearch6 for Chinese"/>
+            <title value="Elastic search for Chinese locale"/>
+            <description value="Elastic search for Chinese locale"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-6310"/>
+            <useCaseId value="MAGETWO-91625"/>
+            <group value="elasticsearch"/>
+        </annotations>
+        <before>
+            <!-- Set search engine to Elastic 6, set Locale to China, create category and product, then go to Storefront -->
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <magentoCLI command="config:set --scope={{GeneralLocalCodeConfigsForChina.scope}} --scope-code={{GeneralLocalCodeConfigsForChina.scope_code}} {{GeneralLocalCodeConfigsForChina.path}} {{GeneralLocalCodeConfigsForChina.value}}" stepKey="setLocaleToChina"/>
+            <magentoCLI command="config:set {{EnableElasticSearch6Config.path}} {{EnableElasticSearch6Config.value}}" stepKey="enableElasticsearch6"/>
+            <actionGroup ref="AdminElasticConnectionTestActionGroup" stepKey="checkConnection"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage"/>
+        </before>
+        <after>
+            <!-- Delete created data and reset initial configuration -->
+            <magentoCLI command="config:set --scope={{GeneralLocalCodeConfigsForUS.scope}} --scope-code={{GeneralLocalCodeConfigsForUS.scope_code}} {{GeneralLocalCodeConfigsForUS.path}} {{GeneralLocalCodeConfigsForUS.value}}" stepKey="setLocaleToUS"/>
+            <magentoCLI command="config:set {{SetDefaultSearchEngineConfig.path}} {{SetDefaultSearchEngineConfig.value}}" stepKey="resetSearchEnginePreviousState"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <!-- Search for product by name -->
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductName">
+            <argument name="phrase" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <!-- Check if searched product is displayed -->
+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="$$createProduct.name$$" stepKey="seeProductNameInCategoryPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearch6SearchInvalidValueTest.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearch6SearchInvalidValueTest.xml
new file mode 100644
index 0000000000000..a144a4849db60
--- /dev/null
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearch6SearchInvalidValueTest.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="StorefrontElasticsearch6SearchInvalidValueTest">
+        <annotations>
+            <features value="Elasticsearch6"/>
+            <stories value="Search Product on Storefront"/>
+            <title value="Elasticsearch: try to search by invalid value of 'Searchable' attribute"/>
+            <description value="Elasticsearch: try to search by invalid value of 'Searchable' attribute"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-17906"/>
+            <useCaseId value="MC-15759"/>
+            <group value="elasticsearch"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create category-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <!--Set Minimal Query Length-->
+            <magentoCLI command="config:set {{SetMinQueryLength2Config.path}} {{SetMinQueryLength2Config.value}}" stepKey="setMinQueryLength"/>
+            <!--Reindex indexes and clear cache-->
+            <magentoCLI command="indexer:reindex catalogsearch_fulltext" stepKey="reindex"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCache"/>
+        </before>
+        <after>
+            <!--Set configs to default-->
+            <magentoCLI command="config:set {{SetMinQueryLength3Config.path}} {{SetMinQueryLength3Config.value}}" stepKey="setMinQueryLengthPreviousState"/>
+            <!--Delete created data-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="deleteProductAttributeByAttributeCode" stepKey="deleteProductAttribute">
+                <argument name="ProductAttributeCode" value="{{textProductAttribute.attribute_code}}"/>
+            </actionGroup>
+            <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+            <waitForPageLoad stepKey="waitForAttributePageLoad"/>
+            <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
+            <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
+            <waitForPageLoad stepKey="waitForProductIndexPage"/>
+            <actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteProduct"/>
+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetFiltersIfExist"/>
+            <magentoCLI command="indexer:reindex catalogsearch_fulltext" stepKey="reindex"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCache"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Create new searchable product attribute-->
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
+        <actionGroup ref="AdminCreateSearchableProductAttribute" stepKey="createAttribute">
+            <argument name="attribute" value="textProductAttribute"/>
+        </actionGroup>
+        <!--Assign attribute to the Default set-->
+        <actionGroup ref="AdminOpenAttributeSetGridPageActionGroup" stepKey="openAttributeSetPage"/>
+        <actionGroup ref="AdminOpenAttributeSetByNameActionGroup" stepKey="openDefaultAttributeSet"/>
+        <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
+            <argument name="group" value="Product Details"/>
+            <argument name="attribute" value="{{textProductAttribute.attribute_code}}"/>
+        </actionGroup>
+        <actionGroup ref="SaveAttributeSet" stepKey="saveAttributeSet"/>
+        <!--Create product and fill new attribute field-->
+        <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="ProductWithSpecialSymbols"/>
+        </actionGroup>
+        <actionGroup ref="SetCategoryByName" stepKey="addCategoryToProduct">
+            <argument name="categoryName" value="$$createCategory.name$$"/>
+        </actionGroup>
+        <fillField selector="{{AdminProductFormSection.attributeRequiredInput(textProductAttribute.attribute_code)}}" userInput="searchable" stepKey="fillTheAttributeRequiredInputField"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <!-- TODO: REMOVE AFTER FIX MC-21717 -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush eav" stepKey="flushCache"/>
+        <!--Assert search results on storefront-->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchForFirstSearchTerm">
+            <argument name="phrase" value="?searchable;"/>
+        </actionGroup>
+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="{{ProductWithSpecialSymbols.name}}" stepKey="seeProductName"/>
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchProductForSecondSearchTerm">
+            <argument name="phrase" value="? searchable ;"/>
+        </actionGroup>
+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="{{ProductWithSpecialSymbols.name}}" stepKey="seeProductNameSecondTime"/>
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchForSecondSearchTerm">
+            <argument name="phrase" value="?;"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForSecondSearchTerm"/>
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchProductForWithSpecialSymbols">
+            <argument name="phrase" value="?{{ProductWithSpecialSymbols.name}};"/>
+        </actionGroup>
+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="{{ProductWithSpecialSymbols.name}}" stepKey="seeProductWithSpecialSymbols"/>
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchProductForWithSpecialSymbolsSecondTime">
+            <argument name="phrase" value="? {{ProductWithSpecialSymbols.name}} ;"/>
+        </actionGroup>
+        <see selector="{{StorefrontCategoryMainSection.productName}}" userInput="{{ProductWithSpecialSymbols.name}}" stepKey="seeProductWithSpecialSymbolsSecondTime"/>
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchForThirdSearchTerm">
+            <argument name="phrase" value="?anythingcangobetween;"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForThirdSearchTerm"/>
+        <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchForForthSearchTerm">
+            <argument name="phrase" value="? anything at all ;"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckSearchIsEmpty" stepKey="checkEmptyForForthSearchTerm"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/AddDefaultSearchFieldTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/AddDefaultSearchFieldTest.php
new file mode 100644
index 0000000000000..1a1e7f4e0d643
--- /dev/null
+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/AddDefaultSearchFieldTest.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch6\Test\Unit\Model\Adapter\FieldMapper;
+
+use Magento\Elasticsearch6\Model\Adapter\FieldMapper\AddDefaultSearchField;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test mapping preprocessor AddDefaultSearchField
+ */
+class AddDefaultSearchFieldTest extends TestCase
+{
+    /**
+     * Test default search field "_search" should be prepended and overwrite if exist.
+     *
+     * @dataProvider processDataProvider
+     * @param array $mappingBefore
+     * @param array $mappingAfter
+     */
+    public function testProcess(array $mappingBefore, array $mappingAfter)
+    {
+        $objectManager = new ObjectManager($this);
+        $model = $objectManager->getObject(AddDefaultSearchField::class);
+        $this->assertEquals($mappingAfter, $model->process($mappingBefore));
+    }
+
+    /**
+     * @return array
+     */
+    public function processDataProvider(): array
+    {
+        return [
+            '_search field should be prepended if not exist' => [
+                [
+                    'name' => [
+                        'type' => 'text'
+                    ]
+                ],
+                [
+                    '_search' => [
+                        'type' => 'text'
+                    ],
+                    'name' => [
+                        'type' => 'text'
+                    ]
+                ]
+            ],
+            '_search field should be prepended and overwrite if exist' => [
+                [
+                    'name' => [
+                        'type' => 'text',
+                    ],
+                    '_search' => [
+                        'type' => 'keyword'
+                    ],
+                ],
+                [
+                    '_search' => [
+                        'type' => 'text'
+                    ],
+                    'name' => [
+                        'type' => 'text',
+                    ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/CopySearchableFieldsToSearchFieldTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/CopySearchableFieldsToSearchFieldTest.php
new file mode 100644
index 0000000000000..cfe8b71095d21
--- /dev/null
+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Adapter/FieldMapper/CopySearchableFieldsToSearchFieldTest.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch6\Test\Unit\Model\Adapter\FieldMapper;
+
+use Magento\Elasticsearch6\Model\Adapter\FieldMapper\CopySearchableFieldsToSearchField;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test mapping preprocessor CopySearchableFieldsToSearchField
+ */
+class CopySearchableFieldsToSearchFieldTest extends TestCase
+{
+    /**
+     * Test "copy_to" parameter should be added to searchable fields.
+     *
+     * @dataProvider processDataProvider
+     * @param array $mappingBefore
+     * @param array $mappingAfter
+     */
+    public function testProcess(array $mappingBefore, array $mappingAfter)
+    {
+        $objectManager = new ObjectManager($this);
+        $model = $objectManager->getObject(CopySearchableFieldsToSearchField::class);
+        $this->assertEquals($mappingAfter, $model->process($mappingBefore));
+    }
+
+    /**
+     * @return array
+     */
+    public function processDataProvider(): array
+    {
+        return [
+            'index text field should be copied' => [
+                [
+                    'name' => [
+                        'type' => 'text'
+                    ]
+                ],
+                [
+                    'name' => [
+                        'type' => 'text',
+                        'copy_to' => [
+                            '_search'
+                        ]
+                    ]
+                ]
+            ],
+            'non-index text field should not be copied' => [
+                [
+                    'name' => [
+                        'type' => 'text',
+                        'index' => false
+                    ]
+                ],
+                [
+                    'name' => [
+                        'type' => 'text',
+                        'index' => false
+                    ]
+                ]
+            ],
+            'index keyword field should be copied' => [
+                [
+                    'material' => [
+                        'type' => 'keyword'
+                    ]
+                ],
+                [
+                    'material' => [
+                        'type' => 'keyword',
+                        'copy_to' => [
+                            '_search'
+                        ]
+                    ]
+                ]
+            ],
+            'non-index keyword field should not be copied' => [
+                [
+                    'country_of_manufacture' => [
+                        'type' => 'keyword',
+                        'index' => false
+                    ]
+                ],
+                [
+                    'country_of_manufacture' => [
+                        'type' => 'keyword',
+                        'index' => false
+                    ]
+                ]
+            ],
+            'index integer field should not be copied' => [
+                [
+                    'sale' => [
+                        'type' => 'integer',
+                    ]
+                ],
+                [
+                    'sale' => [
+                        'type' => 'integer',
+                    ]
+                ]
+            ],
+            'non-index integer field should not be copied' => [
+                [
+                    'position_category_1' => [
+                        'type' => 'integer',
+                        'index' => false
+                    ]
+                ],
+                [
+                    'position_category_1' => [
+                        'type' => 'integer',
+                        'index' => false
+                    ]
+                ]
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
index 487a5a886f951..607624d7b5e8e 100644
--- a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
@@ -3,13 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Elasticsearch6\Test\Unit\Model\Client;
 
 use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
+use Magento\Elasticsearch6\Model\Adapter\FieldMapper\AddDefaultSearchField;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch6\Model\Client\Elasticsearch;
 
 /**
- * Class ElasticsearchTest
+ * Test elasticsearch client methods
  */
 class ElasticsearchTest extends \PHPUnit\Framework\TestCase
 {
@@ -83,10 +86,13 @@ protected function setUp()
 
         $this->objectManager = new ObjectManagerHelper($this);
         $this->model = $this->objectManager->getObject(
-            \Magento\Elasticsearch6\Model\Client\Elasticsearch::class,
+            Elasticsearch::class,
             [
                 'options' => $this->getOptions(),
-                'elasticsearchClient' => $this->elasticsearchClientMock
+                'elasticsearchClient' => $this->elasticsearchClientMock,
+                'fieldsMappingPreprocessors' => [
+                    new AddDefaultSearchField()
+                ]
             ]
         );
     }
@@ -97,7 +103,7 @@ protected function setUp()
     public function testConstructorOptionsException()
     {
         $result = $this->objectManager->getObject(
-            \Magento\Elasticsearch6\Model\Client\Elasticsearch::class,
+            Elasticsearch::class,
             [
                 'options' => []
             ]
@@ -119,6 +125,69 @@ public function testConstructorWithOptions()
         $this->assertNotNull($result);
     }
 
+    /**
+     * Ensure that configuration returns correct url.
+     *
+     * @param array $options
+     * @param string $expectedResult
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \ReflectionException
+     * @dataProvider getOptionsDataProvider
+     */
+    public function testBuildConfig(array $options, $expectedResult): void
+    {
+        $buildConfig = new Elasticsearch($options);
+        $config = $this->getPrivateMethod(Elasticsearch::class, 'buildConfig');
+        $result = $config->invoke($buildConfig, $options);
+        $this->assertEquals($expectedResult, $result['hosts'][0]);
+    }
+
+    /**
+     * Return private method for elastic search class.
+     *
+     * @param $className
+     * @param $methodName
+     * @return \ReflectionMethod
+     * @throws \ReflectionException
+     */
+    private function getPrivateMethod($className, $methodName)
+    {
+        $reflector = new \ReflectionClass($className);
+        $method = $reflector->getMethod($methodName);
+        $method->setAccessible(true);
+
+        return $method;
+    }
+
+    /**
+     * Get options data provider.
+     */
+    public function getOptionsDataProvider()
+    {
+        return [
+            [
+                'without_protocol' => [
+                    'hostname' => 'localhost',
+                    'port' => '9200',
+                    'timeout' => 15,
+                    'index' => 'magento2',
+                    'enableAuth' => 0,
+                ],
+                'expected_result' => 'http://localhost:9200'
+            ],
+            [
+                'with_protocol' => [
+                    'hostname' => 'https://localhost',
+                    'port' => '9200',
+                    'timeout' => 15,
+                    'index' => 'magento2',
+                    'enableAuth' => 0,
+                ],
+                'expected_result' => 'https://localhost:9200'
+            ]
+        ];
+    }
+
     /**
      * Test ping functionality
      */
diff --git a/app/code/Magento/Elasticsearch6/composer.json b/app/code/Magento/Elasticsearch6/composer.json
index 9107f5e900415..b2411f6740fae 100644
--- a/app/code/Magento/Elasticsearch6/composer.json
+++ b/app/code/Magento/Elasticsearch6/composer.json
@@ -9,7 +9,7 @@
         "magento/module-search": "*",
         "magento/module-store": "*",
         "magento/module-elasticsearch": "*",
-        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
+        "elasticsearch/elasticsearch": "~2.0||~5.1||~6.1"
     },
     "suggest": {
         "magento/module-config": "*"
diff --git a/app/code/Magento/Elasticsearch6/etc/adminhtml/system.xml b/app/code/Magento/Elasticsearch6/etc/adminhtml/system.xml
index 067a0acb8c908..beccb0c1ceb81 100644
--- a/app/code/Magento/Elasticsearch6/etc/adminhtml/system.xml
+++ b/app/code/Magento/Elasticsearch6/etc/adminhtml/system.xml
@@ -79,6 +79,15 @@
                         <field id="engine">elasticsearch6</field>
                     </depends>
                 </field>
+                <field id="elasticsearch6_minimum_should_match" translate="label" type="text" sortOrder="93" showInDefault="1"
+                       showInWebsite="0" showInStore="0">
+                    <label>Minimum Terms to Match</label>
+                    <depends>
+                        <field id="engine">elasticsearch6</field>
+                    </depends>
+                    <comment><![CDATA[<a href="https://docs.magento.com/m2/ce/user_guide/catalog/search-elasticsearch.html">Learn more</a> about valid syntax.]]></comment>
+                    <backend_model>Magento\Elasticsearch\Model\Config\Backend\MinimumShouldMatch</backend_model>
+                </field>
             </group>
         </section>
     </system>
diff --git a/app/code/Magento/Elasticsearch6/etc/config.xml b/app/code/Magento/Elasticsearch6/etc/config.xml
index 047ae977fdef1..3c0f28ee16eaa 100644
--- a/app/code/Magento/Elasticsearch6/etc/config.xml
+++ b/app/code/Magento/Elasticsearch6/etc/config.xml
@@ -14,6 +14,7 @@
                 <elasticsearch6_index_prefix>magento2</elasticsearch6_index_prefix>
                 <elasticsearch6_enable_auth>0</elasticsearch6_enable_auth>
                 <elasticsearch6_server_timeout>15</elasticsearch6_server_timeout>
+                <elasticsearch6_minimum_should_match></elasticsearch6_minimum_should_match>
             </search>
         </catalog>
     </default>
diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
index 580c61ffc8cdb..6419b0aa3ee73 100644
--- a/app/code/Magento/Elasticsearch6/etc/di.xml
+++ b/app/code/Magento/Elasticsearch6/etc/di.xml
@@ -111,6 +111,15 @@
         </arguments>
     </type>
 
+    <type name="Magento\Elasticsearch6\Model\Client\Elasticsearch">
+        <arguments>
+            <argument name="fieldsMappingPreprocessors" xsi:type="array">
+                <item name="elasticsearch6_copy_searchable_fields_to_search_field" xsi:type="object">Magento\Elasticsearch6\Model\Adapter\FieldMapper\CopySearchableFieldsToSearchField</item>
+                <item name="elasticsearch6_add_default_search_field" xsi:type="object">Magento\Elasticsearch6\Model\Adapter\FieldMapper\AddDefaultSearchField</item>
+            </argument>
+        </arguments>
+    </type>
+
     <type name="Magento\Framework\Search\Dynamic\IntervalFactory">
         <arguments>
             <argument name="intervals" xsi:type="array">
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
index 0ca6615b075b2..ec5596e2194a1 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
@@ -3,12 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * Adminhtml system template preview block
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Email\Block\Adminhtml\Template;
 
 /**
@@ -55,19 +51,22 @@ public function __construct(
      * Prepare html output
      *
      * @return string
+     * @throws \Exception
      */
     protected function _toHtml()
     {
+        $request = $this->getRequest();
+
         $storeId = $this->getAnyStoreView()->getId();
         /** @var $template \Magento\Email\Model\Template */
         $template = $this->_emailFactory->create();
 
-        if ($id = (int)$this->getRequest()->getParam('id')) {
+        if ($id = (int)$request->getParam('id')) {
             $template->load($id);
         } else {
-            $template->setTemplateType($this->getRequest()->getParam('type'));
-            $template->setTemplateText($this->getRequest()->getParam('text'));
-            $template->setTemplateStyles($this->getRequest()->getParam('styles'));
+            $template->setTemplateType($request->getParam('type'));
+            $template->setTemplateText($request->getParam('text'));
+            $template->setTemplateStyles($request->getParam('styles'));
         }
 
         \Magento\Framework\Profiler::start($this->profilerName);
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Popup.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Popup.php
index 31d172935da7f..4f36eedd09b83 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Popup.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Popup.php
@@ -7,12 +7,12 @@
 
 namespace Magento\Email\Controller\Adminhtml\Email\Template;
 
-use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
  * Rendering popup email template.
  */
-class Popup extends \Magento\Backend\App\Action implements HttpGetActionInterface
+class Popup extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory
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 c1a8eec07e461..a92836b2995a2 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php
@@ -4,19 +4,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Email\Controller\Adminhtml\Email\Template;
 
+use Magento\Email\Controller\Adminhtml\Email\Template;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
  * Rendering email template preview.
  */
-class Preview extends \Magento\Email\Controller\Adminhtml\Email\Template implements HttpGetActionInterface
+class Preview extends Template implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Preview transactional email action.
-     *
-     * @return void
      */
     public function execute()
     {
@@ -24,7 +26,6 @@ public function execute()
             $this->_view->loadLayout();
             $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Email Preview'));
             $this->_view->renderLayout();
-            $this->getResponse()->setHeader('Content-Security-Policy', "script-src 'self'");
         } catch (\Exception $e) {
             $this->messageManager->addErrorMessage(
                 __('An error occurred. The email template can not be opened for preview.')
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
index 5eae1d1462184..8acb0a9fddb75 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -362,12 +362,19 @@ public function getProcessedTemplate(array $variables = [])
         $variables = $this->addEmailVariables($variables, $storeId);
         $processor->setVariables($variables);
 
+        $previousStrictMode = $processor->setStrictMode(
+            !$this->getData('is_legacy') && is_numeric($this->getTemplateId())
+        );
+
         try {
             $result = $processor->filter($this->getTemplateText());
         } catch (\Exception $e) {
             $this->cancelDesignConfig();
             throw new \LogicException(__($e->getMessage()), $e->getCode(), $e);
+        } finally {
+            $processor->setStrictMode($previousStrictMode);
         }
+
         if ($isDesignApplied) {
             $this->cancelDesignConfig();
         }
@@ -455,6 +462,9 @@ protected function addEmailVariables($variables, $storeId)
         if (!isset($variables['store'])) {
             $variables['store'] = $store;
         }
+        if (!isset($variables['store']['frontend_name'])) {
+            $variables['store']['frontend_name'] = $store->getFrontendName();
+        }
         if (!isset($variables['logo_url'])) {
             $variables['logo_url'] = $this->getLogoUrl($storeId);
         }
diff --git a/app/code/Magento/Email/Model/Template.php b/app/code/Magento/Email/Model/Template.php
index 7306db1222872..ca962b31e63af 100644
--- a/app/code/Magento/Email/Model/Template.php
+++ b/app/code/Magento/Email/Model/Template.php
@@ -246,12 +246,20 @@ public function getProcessedTemplateSubject(array $variables)
 
         $this->applyDesignConfig();
         $storeId = $this->getDesignConfig()->getStore();
+
+        $previousStrictMode = $processor->setStrictMode(
+            !$this->getData('is_legacy') && is_numeric($this->getTemplateId())
+        );
+
         try {
             $processedResult = $processor->setStoreId($storeId)->filter(__($this->getTemplateSubject()));
         } catch (\Exception $e) {
             $this->cancelDesignConfig();
             throw new \Magento\Framework\Exception\MailException(__($e->getMessage()), $e);
+        } finally {
+            $processor->setStrictMode($previousStrictMode);
         }
+
         $this->cancelDesignConfig();
         return $processedResult;
     }
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index a29b1165d83c8..82ebc8c78d8b2 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -8,6 +8,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\Filter\VariableResolverInterface;
 use Magento\Framework\View\Asset\ContentProcessorException;
 use Magento\Framework\View\Asset\ContentProcessorInterface;
 
@@ -50,6 +51,7 @@ class Filter extends \Magento\Framework\Filter\Template
      * Modifier Callbacks
      *
      * @var array
+     * @deprecated Use the new Directive Processor interfaces
      */
     protected $_modifiers = ['nl2br' => ''];
 
@@ -165,15 +167,20 @@ class Filter extends \Magento\Framework\Filter\Template
     protected $configVariables;
 
     /**
-     * @var \Magento\Email\Model\Template\Css\Processor
+     * @var Css\Processor
      */
     private $cssProcessor;
 
     /**
-     * @var ReadInterface
+     * @var Filesystem
      */
     private $pubDirectory;
 
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\Read
+     */
+    private $pubDirectoryRead;
+
     /**
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Psr\Log\LoggerInterface $logger
@@ -190,7 +197,10 @@ class Filter extends \Magento\Framework\Filter\Template
      * @param \Magento\Variable\Model\Source\Variables $configVariables
      * @param array $variables
      * @param \Magento\Framework\Css\PreProcessor\Adapter\CssInliner|null $cssInliner
-     *
+     * @param array $directiveProcessors
+     * @param VariableResolverInterface|null $variableResolver
+     * @param Css\Processor|null $cssProcessor
+     * @param Filesystem|null $pubDirectory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -208,7 +218,11 @@ public function __construct(
         \Pelago\Emogrifier $emogrifier,
         \Magento\Variable\Model\Source\Variables $configVariables,
         $variables = [],
-        \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner = null
+        \Magento\Framework\Css\PreProcessor\Adapter\CssInliner $cssInliner = null,
+        array $directiveProcessors = [],
+        VariableResolverInterface $variableResolver = null,
+        Css\Processor $cssProcessor = null,
+        Filesystem $pubDirectory = null
     ) {
         $this->_escaper = $escaper;
         $this->_assetRepo = $assetRepo;
@@ -224,8 +238,12 @@ public function __construct(
         $this->emogrifier = $emogrifier;
         $this->cssInliner = $cssInliner ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Css\PreProcessor\Adapter\CssInliner::class);
+        $this->cssProcessor = $cssProcessor ?: ObjectManager::getInstance()
+            ->get(Css\Processor::class);
+        $this->pubDirectory = $pubDirectory ?: ObjectManager::getInstance()
+            ->get(Filesystem::class);
         $this->configVariables = $configVariables;
-        parent::__construct($string, $variables);
+        parent::__construct($string, $variables, $directiveProcessors, $variableResolver);
     }
 
     /**
@@ -321,32 +339,14 @@ public function setDesignParams(array $designParams)
     }
 
     /**
-     * Get CSS processor
-     *
-     * @deprecated 100.1.2
-     * @return Css\Processor
-     */
-    private function getCssProcessor()
-    {
-        if (!$this->cssProcessor) {
-            $this->cssProcessor = ObjectManager::getInstance()->get(Css\Processor::class);
-        }
-        return $this->cssProcessor;
-    }
-
-    /**
-     * Get pub directory
+     * Sets pub directory
      *
-     * @deprecated 100.1.2
      * @param string $dirType
-     * @return ReadInterface
+     * @return void
      */
-    private function getPubDirectory($dirType)
+    private function setPubDirectory($dirType)
     {
-        if (!$this->pubDirectory) {
-            $this->pubDirectory = ObjectManager::getInstance()->get(Filesystem::class)->getDirectoryRead($dirType);
-        }
-        return $this->pubDirectory;
+        $this->pubDirectoryRead = $this->pubDirectory->getDirectoryRead($dirType);
     }
 
     /**
@@ -639,7 +639,10 @@ public function varDirective($construction)
             return $construction[0];
         }
 
-        list($directive, $modifiers) = $this->explodeModifiers($construction[2], 'escape');
+        list($directive, $modifiers) = $this->explodeModifiers(
+            $construction[2] . ($construction['filters'] ?? ''),
+            'escape'
+        );
         return $this->applyModifiers($this->getVariable($directive, ''), $modifiers);
     }
 
@@ -656,6 +659,7 @@ public function varDirective($construction)
      * @param string $value
      * @param string $default assumed modifier if none present
      * @return array
+     * @deprecated Use the new FilterApplier or Directive Processor interfaces
      */
     protected function explodeModifiers($value, $default = null)
     {
@@ -674,6 +678,7 @@ protected function explodeModifiers($value, $default = null)
      * @param string $value
      * @param string $modifiers
      * @return string
+     * @deprecated Use the new FilterApplier or Directive Processor interfaces
      */
     protected function applyModifiers($value, $modifiers)
     {
@@ -701,6 +706,7 @@ protected function applyModifiers($value, $modifiers)
      * @param string $value
      * @param string $type
      * @return string
+     * @deprecated Use the new FilterApplier or Directive Processor interfaces
      */
     public function modifierEscape($value, $type = 'html')
     {
@@ -844,7 +850,7 @@ public function cssDirective($construction)
             return '/* ' . __('"file" parameter must be specified') . ' */';
         }
 
-        $css = $this->getCssProcessor()->process(
+        $css = $this->cssProcessor->process(
             $this->getCssFilesContent([$params['file']])
         );
 
@@ -947,9 +953,9 @@ public function getCssFilesContent(array $files)
         try {
             foreach ($files as $file) {
                 $asset = $this->_assetRepo->createAsset($file, $designParams);
-                $pubDirectory = $this->getPubDirectory($asset->getContext()->getBaseDirType());
-                if ($pubDirectory->isExist($asset->getPath())) {
-                    $css .= $pubDirectory->readFile($asset->getPath());
+                $this->setPubDirectory($asset->getContext()->getBaseDirType());
+                if ($this->pubDirectoryRead->isExist($asset->getPath())) {
+                    $css .= $this->pubDirectoryRead->readFile($asset->getPath());
                 } else {
                     $css .= $asset->getContent();
                 }
@@ -979,7 +985,7 @@ public function applyInlineCss($html)
         $cssToInline = $this->getCssFilesContent(
             $this->getInlineCssFiles()
         );
-        $cssToInline = $this->getCssProcessor()->process($cssToInline);
+        $cssToInline = $this->cssProcessor->process($cssToInline);
 
         // Only run Emogrify if HTML and CSS contain content
         if ($html && $cssToInline) {
diff --git a/app/code/Magento/Email/Model/Transport.php b/app/code/Magento/Email/Model/Transport.php
index cbce1682cb5fa..79ceb56a8834d 100644
--- a/app/code/Magento/Email/Model/Transport.php
+++ b/app/code/Magento/Email/Model/Transport.php
@@ -9,7 +9,6 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\MailException;
-use Magento\Framework\Mail\EmailMessageInterface;
 use Magento\Framework\Mail\MessageInterface;
 use Magento\Framework\Mail\TransportInterface;
 use Magento\Framework\Phrase;
@@ -62,12 +61,12 @@ class Transport implements TransportInterface
     private $message;
 
     /**
-     * @param EmailMessageInterface $message Email message object
+     * @param MessageInterface $message Email message object
      * @param ScopeConfigInterface $scopeConfig Core store config
      * @param null|string|array|\Traversable $parameters Config options for sendmail parameters
      */
     public function __construct(
-        EmailMessageInterface $message,
+        MessageInterface $message,
         ScopeConfigInterface $scopeConfig,
         $parameters = null
     ) {
diff --git a/app/code/Magento/Email/Setup/Patch/Data/FlagLegacyTemplates.php b/app/code/Magento/Email/Setup/Patch/Data/FlagLegacyTemplates.php
new file mode 100644
index 0000000000000..6a97f38239bd6
--- /dev/null
+++ b/app/code/Magento/Email/Setup/Patch/Data/FlagLegacyTemplates.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Email\Setup\Patch\Data;
+
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+/**
+ * Flag all existing email templates overrides as legacy
+ */
+class FlagLegacyTemplates implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(ModuleDataSetupInterface $moduleDataSetup)
+    {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup
+            ->getConnection()
+            ->update($this->moduleDataSetup->getTable('email_template'), ['is_legacy' => '1']);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml b/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml
index 3b99ade32e6ce..c859b956810c7 100644
--- a/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml
+++ b/app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml
@@ -27,8 +27,8 @@
         <click selector="{{AdminEmailTemplateEditSection.loadTemplateButton}}" stepKey="clickLoadTemplateButton"/>
         <fillField selector="{{AdminEmailTemplateEditSection.templateCode}}" userInput="{{EmailTemplate.templateName}}" stepKey="fillTemplateNameField"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveTemplateButton"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You saved the email template." stepKey="seeSuccessMessage"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the email template." stepKey="seeSuccessMessage"/>
     </actionGroup>
 
     <!--Create New Custom Template -->
@@ -63,8 +63,8 @@
         <click selector="{{AdminEmailTemplateEditSection.deleteTemplateButton}}" after="checkTemplateName" stepKey="deleteTemplate"/>
         <waitForElementVisible selector="{{AdminEmailTemplateEditSection.acceptPopupButton}}" after="deleteTemplate" stepKey="waitForConfirmButton"/>
         <click selector="{{AdminEmailTemplateEditSection.acceptPopupButton}}" after="waitForConfirmButton" stepKey="acceptPopup"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" after="acceptPopup" stepKey="waitForSuccessMessage"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the email template." after="waitForSuccessMessage" stepKey="seeSuccessfulMessage"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" after="acceptPopup" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the email template." after="waitForSuccessMessage" stepKey="seeSuccessfulMessage"/>
     </actionGroup>
 
     <actionGroup name="PreviewEmailTemplate" extends="FindAndOpenEmailTemplate">
diff --git a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php
index 286e9a989d4d8..4d168ffbf2bdc 100644
--- a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php
+++ b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php
@@ -18,26 +18,42 @@ class PreviewTest extends \PHPUnit\Framework\TestCase
 
     const MALICIOUS_TEXT = 'test malicious';
 
+    /**
+     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $request;
+
+    /**
+     * @var \Magento\Email\Block\Adminhtml\Template\Preview
+     */
+    protected $preview;
+
+    /**
+     * @var \Magento\Framework\Filter\Input\MaliciousCode|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $maliciousCode;
+
+    /**
+     * @var \Magento\Email\Model\Template|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $template;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeManager;
+
     /**
      * Init data
      */
     protected function setUp()
     {
         $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-    }
 
-    /**
-     * Check of processing email templates
-     *
-     * @param array $requestParamMap
-     *
-     * @dataProvider toHtmlDataProvider
-     * @param $requestParamMap
-     */
-    public function testToHtml($requestParamMap)
-    {
         $storeId = 1;
-        $template = $this->getMockBuilder(\Magento\Email\Model\Template::class)
+        $designConfigData = [];
+
+        $this->template = $this->getMockBuilder(\Magento\Email\Model\Template::class)
             ->setMethods(
                 [
                     'setDesignConfig',
@@ -50,71 +66,106 @@ public function testToHtml($requestParamMap)
             )
             ->disableOriginalConstructor()
             ->getMock();
-        $template->expects($this->once())
+
+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->request = $this->createMock(\Magento\Framework\App\Request\Http::class);
+
+        $this->maliciousCode = $this->createPartialMock(
+            \Magento\Framework\Filter\Input\MaliciousCode::class,
+            ['filter']
+        );
+
+        $this->template->expects($this->once())
             ->method('getProcessedTemplate')
             ->with($this->equalTo([]))
             ->willReturn(self::MALICIOUS_TEXT);
-        $designConfigData = [];
-        $template->expects($this->atLeastOnce())
-            ->method('getDesignConfig')
+
+        $this->template->method('getDesignConfig')
             ->willReturn(new \Magento\Framework\DataObject($designConfigData));
+
         $emailFactory = $this->createPartialMock(\Magento\Email\Model\TemplateFactory::class, ['create']);
         $emailFactory->expects($this->any())
             ->method('create')
-            ->willReturn($template);
+            ->willReturn($this->template);
 
-        $request = $this->createMock(\Magento\Framework\App\RequestInterface::class);
-        $request->expects($this->any())->method('getParam')->willReturnMap($requestParamMap);
         $eventManage = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
         $scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $design = $this->createMock(\Magento\Framework\View\DesignInterface::class);
         $store = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getId', '__wakeup']);
-        $store->expects($this->any())->method('getId')->willReturn($storeId);
-        $storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $storeManager->expects($this->atLeastOnce())
-            ->method('getDefaultStoreView')
+
+        $store->expects($this->any())
+            ->method('getId')
+            ->willReturn($storeId);
+
+        $this->storeManager->method('getDefaultStoreView')
             ->willReturn($store);
-        $storeManager->expects($this->any())->method('getDefaultStoreView')->willReturn(null);
-        $storeManager->expects($this->any())->method('getStores')->willReturn([$store]);
+
+        $this->storeManager->expects($this->any())->method('getDefaultStoreView')->willReturn(null);
+        $this->storeManager->expects($this->any())->method('getStores')->willReturn([$store]);
         $appState = $this->getMockBuilder(\Magento\Framework\App\State::class)
-            ->setConstructorArgs([$scopeConfig])
+            ->setConstructorArgs(
+                [
+                    $scopeConfig
+                ]
+            )
             ->setMethods(['emulateAreaCode'])
             ->disableOriginalConstructor()
             ->getMock();
         $appState->expects($this->any())
             ->method('emulateAreaCode')
-            ->with(\Magento\Email\Model\AbstractTemplate::DEFAULT_DESIGN_AREA, [$template, 'getProcessedTemplate'])
-            ->willReturn($template->getProcessedTemplate());
+            ->with(
+                \Magento\Email\Model\AbstractTemplate::DEFAULT_DESIGN_AREA,
+                [$this->template, 'getProcessedTemplate']
+            )
+            ->willReturn($this->template->getProcessedTemplate());
 
         $context = $this->createPartialMock(
             \Magento\Backend\Block\Template\Context::class,
             ['getRequest', 'getEventManager', 'getScopeConfig', 'getDesignPackage', 'getStoreManager', 'getAppState']
         );
-        $context->expects($this->any())->method('getRequest')->willReturn($request);
+        $context->expects($this->any())->method('getRequest')->willReturn($this->request);
         $context->expects($this->any())->method('getEventManager')->willReturn($eventManage);
         $context->expects($this->any())->method('getScopeConfig')->willReturn($scopeConfig);
         $context->expects($this->any())->method('getDesignPackage')->willReturn($design);
-        $context->expects($this->any())->method('getStoreManager')->willReturn($storeManager);
+        $context->expects($this->any())->method('getStoreManager')->willReturn($this->storeManager);
         $context->expects($this->once())->method('getAppState')->willReturn($appState);
 
-        $maliciousCode = $this->createPartialMock(\Magento\Framework\Filter\Input\MaliciousCode::class, ['filter']);
-        $maliciousCode->expects($this->once())
-            ->method('filter')
-            ->with($this->equalTo($requestParamMap[1][2]))
-            ->willReturn(self::MALICIOUS_TEXT);
-
         /** @var \Magento\Email\Block\Adminhtml\Template\Preview $preview */
-        $preview = $this->objectManagerHelper->getObject(
+        $this->preview = $this->objectManagerHelper->getObject(
             \Magento\Email\Block\Adminhtml\Template\Preview::class,
             [
                 'context' => $context,
-                'maliciousCode' => $maliciousCode,
+                'maliciousCode' => $this->maliciousCode,
                 'emailFactory' => $emailFactory
             ]
         );
-        $this->assertEquals(self::MALICIOUS_TEXT, $preview->toHtml());
+    }
+
+    /**
+     * Check of processing email templates
+     *
+     * @param array $requestParamMap
+     * @dataProvider toHtmlDataProvider
+     */
+    public function testToHtml($requestParamMap)
+    {
+        $this->request->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap($requestParamMap);
+        $this->template
+            ->expects($this->atLeastOnce())
+            ->method('getDesignConfig');
+        $this->storeManager->expects($this->atLeastOnce())
+            ->method('getDefaultStoreView');
+        $this->maliciousCode->expects($this->once())
+            ->method('filter')
+            ->with($this->equalTo($requestParamMap[1][2]))
+            ->willReturn(self::MALICIOUS_TEXT);
+
+        $this->assertEquals(self::MALICIOUS_TEXT, $this->preview->toHtml());
     }
 
     /**
diff --git a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Render/SenderTest.php b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Render/SenderTest.php
new file mode 100644
index 0000000000000..4ca330f87a6ef
--- /dev/null
+++ b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Render/SenderTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Email\Test\Unit\Block\Adminhtml\Template\Render;
+
+use Magento\Email\Block\Adminhtml\Template\Grid\Renderer\Sender;
+use Magento\Framework\DataObject;
+
+/**
+ * Class \Magento\Email\Test\Unit\Block\Adminhtml\Template\Render\SenderTest
+ */
+class SenderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Sender
+     */
+    protected $block;
+
+    /**
+     * Setup environment
+     */
+    protected function setUp()
+    {
+        $this->block = $this->getMockBuilder(Sender::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['escapeHtml'])
+            ->getMock();
+    }
+
+    /**
+     * Test render() with sender name and sender email are not empty
+     */
+    public function testRenderWithSenderNameAndEmail()
+    {
+        $templateSenderEmail = 'test';
+        $this->block->expects($this->any())->method('escapeHtml')->with($templateSenderEmail)
+            ->willReturn('test');
+        $actualResult = $this->block->render(
+            new DataObject(
+                [
+                    'template_sender_name' => 'test',
+                    'template_sender_email' => 'test@localhost.com'
+                ]
+            )
+        );
+        $this->assertEquals('test [test@localhost.com]', $actualResult);
+    }
+
+    /**
+     * Test render() with sender name and sender email are empty
+     */
+    public function testRenderWithNoSenderNameAndEmail()
+    {
+        $templateSenderEmail = '';
+        $this->block->expects($this->any())->method('escapeHtml')->with($templateSenderEmail)
+            ->willReturn('');
+        $actualResult = $this->block->render(
+            new DataObject(
+                [
+                    'template_sender_name' => '',
+                    'template_sender_email' => ''
+                ]
+            )
+        );
+        $this->assertEquals('---', $actualResult);
+    }
+}
diff --git a/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Render/TypeTest.php b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Render/TypeTest.php
new file mode 100644
index 0000000000000..88eff38c81799
--- /dev/null
+++ b/app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/Render/TypeTest.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Email\Test\Unit\Block\Adminhtml\Template\Render;
+
+use Magento\Email\Block\Adminhtml\Template\Grid\Renderer\Type;
+use Magento\Framework\DataObject;
+use Magento\Framework\Phrase;
+
+/**
+ * Class \Magento\Email\Test\Unit\Block\Adminhtml\Template\Render\TypeTest
+ */
+class TypeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Type
+     */
+    protected $block;
+
+    /**
+     * Setup environment
+     */
+    protected function setUp()
+    {
+        $this->block = $this->getMockBuilder(Type::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['__'])
+            ->getMock();
+    }
+
+    /**
+     * Test render() with supported template Text type
+     */
+    public function testRenderWithSupportedTemplateTextType()
+    {
+        $testCase = [
+            'dataset' => [
+                'template_type' => '1'
+            ],
+            'expectedResult' => 'Text'
+        ];
+        $this->executeTestCase($testCase);
+    }
+
+    /**
+     * Test render() with supported template HTML type
+     */
+    public function testRenderWithSupportedTemplateHtmlType()
+    {
+        $testCase = [
+            'dataset' => [
+                'template_type' => '2'
+            ],
+            'expectedResult' => 'HTML'
+        ];
+        $this->executeTestCase($testCase);
+    }
+
+    /**
+     * Test render() with unsupported template type
+     */
+    public function testRenderWithUnsupportedTemplateType()
+    {
+        $testCase = [
+            'dataset' => [
+                'template_type' => '5'
+            ],
+            'expectedResult' => 'Unknown'
+        ];
+        $this->executeTestCase($testCase);
+    }
+
+    /**
+     * Execute Test case
+     *
+     * @param array $testCase
+     */
+    public function executeTestCase($testCase)
+    {
+        $actualResult = $this->block->render(
+            new DataObject(
+                [
+                    'template_type' => $testCase['dataset']['template_type'],
+                ]
+            )
+        );
+        $this->assertEquals(new Phrase($testCase['expectedResult']), $actualResult);
+    }
+}
diff --git a/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php b/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php
index 9a67bf59dd4bf..d4584ce86dff2 100644
--- a/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php
+++ b/app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php
@@ -54,11 +54,6 @@ class PreviewTest extends \PHPUnit\Framework\TestCase
      */
     protected $pageTitleMock;
 
-    /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $responseMock;
-
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -84,16 +79,11 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->responseMock = $this->getMockBuilder(\Magento\Framework\App\ResponseInterface::class)
-            ->setMethods(['setHeader'])
-            ->getMockForAbstractClass();
-
         $this->context = $objectManager->getObject(
             \Magento\Backend\App\Action\Context::class,
             [
                 'request' => $this->requestMock,
-                'view' => $this->viewMock,
-                'response' => $this->responseMock
+                'view' => $this->viewMock
             ]
         );
         $this->object = $objectManager->getObject(
@@ -118,9 +108,6 @@ public function testExecute()
         $this->pageTitleMock->expects($this->once())
             ->method('prepend')
             ->willReturnSelf();
-        $this->responseMock->expects($this->once())
-            ->method('setHeader')
-            ->with('Content-Security-Policy', "script-src 'self'");
 
         $this->assertNull($this->object->execute());
     }
diff --git a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php
index 0a0e9f780351d..036ab1b273fb0 100644
--- a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php
@@ -117,8 +117,8 @@ protected function setUp()
     /**
      * Return the model under test with additional methods mocked.
      *
-     * @param array $mockedMethods
-     * @param array $data
+     * @param  array $mockedMethods
+     * @param  array $data
      * @return \Magento\Email\Model\Template|\PHPUnit_Framework_MockObject_MockObject
      */
     protected function getModelMock(array $mockedMethods = [], array $data = [])
@@ -150,17 +150,18 @@ protected function getModelMock(array $mockedMethods = [], array $data = [])
     }
 
     /**
-     * @param $variables array
-     * @param $templateType string
-     * @param $storeId int
-     * @param $expectedVariables array
-     * @param $expectedResult string
+     * @param        $variables array
+     * @param        $templateType string
+     * @param        $storeId int
+     * @param        $expectedVariables array
+     * @param        $expectedResult string
      * @dataProvider getProcessedTemplateProvider
      */
     public function testGetProcessedTemplate($variables, $templateType, $storeId, $expectedVariables, $expectedResult)
     {
         $filterTemplate = $this->getMockBuilder(\Magento\Email\Model\Template\Filter::class)
-            ->setMethods([
+            ->setMethods(
+                [
                 'setUseSessionInUrl',
                 'setPlainTemplateMode',
                 'setIsChildTemplate',
@@ -170,7 +171,9 @@ public function testGetProcessedTemplate($variables, $templateType, $storeId, $e
                 'filter',
                 'getStoreId',
                 'getInlineCssFiles',
-            ])
+                'setStrictMode',
+                ]
+            )
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -194,20 +197,27 @@ public function testGetProcessedTemplate($variables, $templateType, $storeId, $e
         $filterTemplate->expects($this->any())
             ->method('getStoreId')
             ->will($this->returnValue($storeId));
+        $filterTemplate->expects($this->exactly(2))
+            ->method('setStrictMode')
+            ->withConsecutive([$this->equalTo(true)], [$this->equalTo(false)])
+            ->willReturnOnConsecutiveCalls(false, true);
 
         $expectedVariables['store'] = $this->store;
 
-        $model = $this->getModelMock([
+        $model = $this->getModelMock(
+            [
             'getDesignParams',
             'applyDesignConfig',
             'getTemplateText',
             'isPlain',
-        ]);
+            ]
+        );
         $filterTemplate->expects($this->any())
             ->method('setVariables')
             ->with(array_merge(['this' => $model], $expectedVariables));
         $model->setTemplateFilter($filterTemplate);
         $model->setTemplateType($templateType);
+        $model->setTemplateId('123');
 
         $designParams = [
             'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
@@ -241,7 +251,8 @@ public function testGetProcessedTemplate($variables, $templateType, $storeId, $e
     public function testGetProcessedTemplateException()
     {
         $filterTemplate = $this->getMockBuilder(\Magento\Email\Model\Template\Filter::class)
-            ->setMethods([
+            ->setMethods(
+                [
                 'setUseSessionInUrl',
                 'setPlainTemplateMode',
                 'setIsChildTemplate',
@@ -251,7 +262,9 @@ public function testGetProcessedTemplateException()
                 'filter',
                 'getStoreId',
                 'getInlineCssFiles',
-            ])
+                'setStrictMode',
+                ]
+            )
             ->disableOriginalConstructor()
             ->getMock();
         $filterTemplate->expects($this->once())
@@ -272,13 +285,19 @@ public function testGetProcessedTemplateException()
         $filterTemplate->expects($this->any())
             ->method('getStoreId')
             ->will($this->returnValue(1));
+        $filterTemplate->expects($this->exactly(2))
+            ->method('setStrictMode')
+            ->withConsecutive([$this->equalTo(false)], [$this->equalTo(true)])
+            ->willReturnOnConsecutiveCalls(true, false);
 
-        $model = $this->getModelMock([
+        $model = $this->getModelMock(
+            [
             'getDesignParams',
             'applyDesignConfig',
             'getTemplateText',
             'isPlain',
-        ]);
+            ]
+        );
 
         $designParams = [
             'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
@@ -290,6 +309,7 @@ public function testGetProcessedTemplateException()
             ->will($this->returnValue($designParams));
         $model->setTemplateFilter($filterTemplate);
         $model->setTemplateType(\Magento\Framework\App\TemplateTypesInterface::TYPE_TEXT);
+        $model->setTemplateId('abc');
 
         $filterTemplate->expects($this->once())
             ->method('filter')
@@ -361,9 +381,9 @@ public function testGetDefaultEmailLogo()
     }
 
     /**
-     * @param array $config
+     * @param             array $config
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @dataProvider invalidInputParametersDataProvider
+     * @dataProvider      invalidInputParametersDataProvider
      */
     public function testSetDesignConfigWithInvalidInputParametersThrowsException($config)
     {
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
index 2c9fdae111fd8..778573396b011 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -3,6 +3,9 @@
  * 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\Css\Processor;
@@ -14,6 +17,7 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class FilterTest extends \PHPUnit\Framework\TestCase
 {
@@ -92,6 +96,31 @@ class FilterTest extends \PHPUnit\Framework\TestCase
      */
     private $cssInliner;
 
+    /**
+     * @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Email\Model\Template\Css\Processor
+     */
+    private $cssProcessor;
+
+    /**
+     * @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Framework\Filesystem
+     */
+    private $pubDirectory;
+
+    /**
+     * @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Framework\Filesystem\Directory\Read
+     */
+    private $pubDirectoryRead;
+
+    /**
+     * @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Framework\Filter\VariableResolver\StrategyResolver
+     */
+    private $variableResolver;
+
+    /**
+     * @var array
+     */
+    private $directiveProcessors;
+
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -147,6 +176,41 @@ protected function setUp()
         $this->cssInliner = $this->objectManager->getObject(
             \Magento\Framework\Css\PreProcessor\Adapter\CssInliner::class
         );
+
+        $this->cssProcessor = $this->getMockBuilder(\Magento\Email\Model\Template\Css\Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->pubDirectory = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->pubDirectoryRead = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\Read::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->variableResolver =
+            $this->getMockBuilder(\Magento\Framework\Filter\VariableResolver\StrategyResolver::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+        $this->directiveProcessors = [
+            'depend' =>
+                $this->getMockBuilder(\Magento\Framework\Filter\DirectiveProcessor\DependDirective::class)
+                    ->disableOriginalConstructor()
+                    ->getMock(),
+            'if' =>
+                $this->getMockBuilder(\Magento\Framework\Filter\DirectiveProcessor\IfDirective::class)
+                    ->disableOriginalConstructor()
+                    ->getMock(),
+            'template' =>
+                $this->getMockBuilder(\Magento\Framework\Filter\DirectiveProcessor\TemplateDirective::class)
+                    ->disableOriginalConstructor()
+                    ->getMock(),
+            'legacy' =>
+                $this->getMockBuilder(\Magento\Framework\Filter\DirectiveProcessor\LegacyDirective::class)
+                    ->disableOriginalConstructor()
+                    ->getMock(),
+        ];
     }
 
     /**
@@ -173,89 +237,16 @@ protected function getModel($mockedMethods = null)
                     $this->configVariables,
                     [],
                     $this->cssInliner,
+                    $this->directiveProcessors,
+                    $this->variableResolver,
+                    $this->cssProcessor,
+                    $this->pubDirectory
                 ]
             )
             ->setMethods($mockedMethods)
             ->getMock();
     }
 
-    /**
-     * Tests proper parsing of the {{trans ...}} directive used in email templates
-     *
-     * @dataProvider transDirectiveDataProvider
-     * @param $value
-     * @param $expected
-     * @param array $variables
-     */
-    public function testTransDirective($value, $expected, array $variables = [])
-    {
-        $filter = $this->getModel()->setVariables($variables);
-        $this->assertEquals($expected, $filter->filter($value));
-    }
-
-    /**
-     * Data provider for various possible {{trans ...}} usages
-     *
-     * @return array
-     */
-    public function transDirectiveDataProvider()
-    {
-        return [
-            'empty directive' => [
-                '{{trans}}',
-                '',
-            ],
-
-            'empty string' => [
-                '{{trans ""}}',
-                '',
-            ],
-
-            'no padding' => [
-                '{{trans"Hello cruel coder..."}}',
-                'Hello cruel coder...',
-            ],
-
-            'multi-line padding' => [
-                "{{trans \t\n\r'Hello cruel coder...' \t\n\r}}",
-                'Hello cruel coder...',
-            ],
-
-            'capture escaped double-quotes inside text' => [
-                '{{trans "Hello \"tested\" world!"}}',
-                'Hello &quot;tested&quot; world!',
-            ],
-
-            'capture escaped single-quotes inside text' => [
-                "{{trans 'Hello \\'tested\\' world!'|escape}}",
-                "Hello &#039;tested&#039; world!",
-            ],
-
-            'basic var' => [
-                '{{trans "Hello %adjective world!" adjective="tested"}}',
-                'Hello tested world!',
-            ],
-
-            'auto-escaped output' => [
-                '{{trans "Hello %adjective <strong>world</strong>!" adjective="<em>bad</em>"}}',
-                'Hello &lt;em&gt;bad&lt;/em&gt; &lt;strong&gt;world&lt;/strong&gt;!',
-            ],
-
-            'unescaped modifier' => [
-                '{{trans "Hello %adjective <strong>world</strong>!" adjective="<em>bad</em>"|raw}}',
-                'Hello <em>bad</em> <strong>world</strong>!',
-            ],
-
-            'variable replacement' => [
-                '{{trans "Hello %adjective world!" adjective="$mood"}}',
-                'Hello happy world!',
-                [
-                    'mood' => 'happy'
-                ],
-            ],
-        ];
-    }
-
     /**
      * Test basic usages of applyInlineCss
      *
@@ -329,17 +320,16 @@ public function testGetCssFilesContent()
             ->with($file, $designParams)
             ->willReturn($asset);
 
-        $pubDirectory = $this->getMockBuilder(ReadInterface::class)
-            ->getMockForAbstractClass();
-        $reflectionClass = new \ReflectionClass(Filter::class);
-        $reflectionProperty = $reflectionClass->getProperty('pubDirectory');
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($filter, $pubDirectory);
-        $pubDirectory->expects($this->once())
+        $this->pubDirectory
+            ->expects($this->once())
+            ->method('getDirectoryRead')
+            ->willReturn($this->pubDirectoryRead);
+
+        $this->pubDirectoryRead->expects($this->once())
             ->method('isExist')
             ->with($path . DIRECTORY_SEPARATOR . $file)
             ->willReturn(true);
-        $pubDirectory->expects($this->once())
+        $this->pubDirectoryRead->expects($this->once())
             ->method('readFile')
             ->with($path . DIRECTORY_SEPARATOR . $file)
             ->willReturn($css);
@@ -396,43 +386,6 @@ public function testApplyInlineCssThrowsExceptionWhenDesignParamsNotSet()
         $filter->applyInlineCss('test');
     }
 
-    /**
-     * Ensure that after filter callbacks are reset after exception is thrown during filtering
-     */
-    public function testAfterFilterCallbackGetsResetWhenExceptionTriggered()
-    {
-        $value = '{{var random_var}}';
-        $exception = new \Exception('Test exception');
-        $exceptionResult = sprintf(__('Error filtering template: %s'), $exception->getMessage());
-
-        $this->appState->expects($this->once())
-            ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\App\State::MODE_DEVELOPER));
-        $this->logger->expects($this->once())
-            ->method('critical')
-            ->with($exception);
-
-        $filter = $this->getModel(['varDirective', 'resetAfterFilterCallbacks']);
-        $filter->expects($this->once())
-            ->method('varDirective')
-            ->will($this->throwException($exception));
-
-        // Callbacks must be reset after exception is thrown
-        $filter->expects($this->once())
-            ->method('resetAfterFilterCallbacks');
-
-        // Build arbitrary object to pass into the addAfterFilterCallback method
-        $callbackObject = $this->getMockBuilder('stdObject')
-            ->setMethods(['afterFilterCallbackMethod'])
-            ->getMock();
-        // Callback should never run due to exception happening during filtering
-        $callbackObject->expects($this->never())
-            ->method('afterFilterCallbackMethod');
-        $filter->addAfterFilterCallback([$callbackObject, 'afterFilterCallbackMethod']);
-
-        $this->assertEquals($exceptionResult, $filter->filter($value));
-    }
-
     public function testConfigDirectiveAvailable()
     {
         $path = "web/unsecure/base_url";
diff --git a/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
index 12b970f623e2d..cda3a4f4a1934 100644
--- a/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
@@ -514,14 +514,20 @@ public function testGetProcessedTemplateSubject()
 
         $templateSubject = 'templateSubject';
         $model->setTemplateSubject($templateSubject);
+        $model->setTemplateId('123');
 
+        class_exists(Template::class, true);
         $filterTemplate = $this->getMockBuilder(\Magento\Framework\Filter\Template::class)
-            ->setMethods(['setVariables', 'setStoreId', 'filter'])
+            ->setMethods(['setVariables', 'setStoreId', 'filter', 'setStrictMode'])
             ->disableOriginalConstructor()
             ->getMock();
         $model->expects($this->once())
             ->method('getTemplateFilter')
             ->willReturn($filterTemplate);
+        $filterTemplate->expects($this->exactly(2))
+            ->method('setStrictMode')
+            ->withConsecutive([$this->equalTo(true)], [$this->equalTo(false)])
+            ->willReturnOnConsecutiveCalls(false, true);
 
         $model->expects($this->once())
             ->method('applyDesignConfig');
diff --git a/app/code/Magento/Email/Test/Unit/ViewModel/Template/Preview/FormTest.php b/app/code/Magento/Email/Test/Unit/ViewModel/Template/Preview/FormTest.php
new file mode 100644
index 0000000000000..88c323c923c45
--- /dev/null
+++ b/app/code/Magento/Email/Test/Unit/ViewModel/Template/Preview/FormTest.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Email\Test\Unit\ViewModel\Template\Preview;
+
+use Magento\Email\ViewModel\Template\Preview\Form;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+/**
+ * Class FormTest
+ *
+ * @covers \Magento\Email\ViewModel\Template\Preview\Form
+ */
+class FormTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var Form */
+    protected $form;
+
+    /** @var  Http|\PHPUnit_Framework_MockObject_MockObject  */
+    protected $requestMock;
+
+    protected function setUp()
+    {
+        $this->requestMock = $this->createPartialMock(
+            Http::class,
+            ['getParam', 'getMethod']
+        );
+
+        $objectManagerHelper = new ObjectManager($this);
+
+        $this->form = $objectManagerHelper->getObject(
+            Form::class,
+            ['request'=> $this->requestMock]
+        );
+    }
+
+    /**
+     * Tests that the form is created with the expected fields based on the request type.
+     *
+     * @dataProvider getFormFieldsDataProvider
+     * @param string $httpMethod
+     * @param array $httpParams
+     * @param array $expectedFields
+     * @throws LocalizedException
+     */
+    public function testGetFormFields(string $httpMethod, array $httpParams, array $expectedFields)
+    {
+        $this->requestMock->expects($this->once())
+            ->method('getMethod')
+            ->willReturn($httpMethod);
+
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap($httpParams);
+
+        $actualFields = $this->form->getFormFields();
+
+        $this->assertEquals($expectedFields, $actualFields);
+    }
+
+    /**
+     * Tests that an exception is thrown when a required parameter is missing for the request type.
+     *
+     * @dataProvider getFormFieldsInvalidDataProvider
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Missing expected parameter
+     * @param string $httpMethod
+     * @param array $httpParams
+     */
+    public function testGetFormFieldsMissingParameter(string $httpMethod, array $httpParams)
+    {
+        $this->requestMock->expects($this->once())
+            ->method('getMethod')
+            ->willReturn($httpMethod);
+
+        $this->requestMock->expects($this->once())
+            ->method('getParam')
+            ->willReturnMap($httpParams);
+
+        $this->form->getFormFields();
+    }
+
+    /**
+     * @return array
+     */
+    public function getFormFieldsDataProvider()
+    {
+        return [
+            'get_request_valid' => [
+                'httpMethod' => 'GET',
+                'httpParams' => [
+                    ['id', null, 1]
+                ],
+                'expectedFields' => [
+                    'id' => 1
+                ]
+            ],
+            'get_request_valid_ignore_params' => [
+                'httpMethod' => 'GET',
+                'httpParams' => [
+                    ['id', null, 1],
+                    ['text', null, 'Hello World'],
+                    ['type', null, 2],
+                    ['styles', null, '']
+                ],
+                'expectedFields' => [
+                    'id' => 1
+                ]
+            ],
+            'post_request_valid' => [
+                'httpMethod' => 'POST',
+                'httpParams' => [
+                    ['text', null, 'Hello World'],
+                    ['type', null, 2],
+                    ['styles', null, '']
+                ],
+                'expectedFields' => [
+                    'text' => 'Hello World',
+                    'type' => 2,
+                    'styles' => ''
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getFormFieldsInvalidDataProvider()
+    {
+        return [
+            'get_request_missing_id' => [
+                'httpMethod' => 'GET',
+                'httpParams' => [
+                    ['text', null, 'Hello World'],
+                    ['type', null, 2],
+                    ['styles', null, '']
+                ]
+            ],
+            'post_request_missing_text' => [
+                'httpMethod' => 'POST',
+                'httpParams' => [
+                    ['type', null, 2],
+                    ['styles', null, '']
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Email/ViewModel/Template/Preview/Form.php b/app/code/Magento/Email/ViewModel/Template/Preview/Form.php
new file mode 100644
index 0000000000000..9db93cb94a299
--- /dev/null
+++ b/app/code/Magento/Email/ViewModel/Template/Preview/Form.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Email\ViewModel\Template\Preview;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * Class Form
+ */
+class Form implements ArgumentInterface
+{
+    private $expectedParamsGetRequest = [
+        'id'
+    ];
+
+    private $expectedParamsPostRequest = [
+        'text',
+        'type',
+        'styles'
+    ];
+
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @param RequestInterface $request
+     */
+    public function __construct(RequestInterface $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * Gets the fields to be included in the email preview form.
+     *
+     * @return array
+     * @throws LocalizedException
+     */
+    public function getFormFields()
+    {
+        $params = $fields = [];
+        $method = $this->request->getMethod();
+
+        if ($method === 'GET') {
+            $params = $this->expectedParamsGetRequest;
+        } elseif ($method === 'POST') {
+            $params = $this->expectedParamsPostRequest;
+        }
+
+        foreach ($params as $paramName) {
+            $fieldValue = $this->request->getParam($paramName);
+            if ($fieldValue === null) {
+                throw new LocalizedException(
+                    __("Missing expected parameter \"$paramName\" while attempting to generate template preview.")
+                );
+            }
+            $fields[$paramName] = $fieldValue;
+        }
+
+        return $fields;
+    }
+}
diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index 548d9a422c132..9070fbac7c653 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -12,6 +12,7 @@
         "magento/module-config": "*",
         "magento/module-store": "*",
         "magento/module-theme": "*",
+        "magento/module-require-js": "*",
         "magento/module-media-storage": "*",
         "magento/module-variable": "*"
     },
diff --git a/app/code/Magento/Email/etc/db_schema.xml b/app/code/Magento/Email/etc/db_schema.xml
index dbb8855e9e57e..82c5f18ddb9e9 100644
--- a/app/code/Magento/Email/etc/db_schema.xml
+++ b/app/code/Magento/Email/etc/db_schema.xml
@@ -27,6 +27,8 @@
         <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"/>
+        <column xsi:type="boolean" name="is_legacy" nullable="false"
+                default="false" comment="Should the template render in legacy mode"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="template_id"/>
         </constraint>
diff --git a/app/code/Magento/Email/etc/di.xml b/app/code/Magento/Email/etc/di.xml
index 9ec3e04728a2c..73ba21ed7537b 100644
--- a/app/code/Magento/Email/etc/di.xml
+++ b/app/code/Magento/Email/etc/di.xml
@@ -72,4 +72,22 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Filter\Template">
+        <arguments>
+            <argument name="directiveProcessors" xsi:type="array">
+                <item name="depend" sortOrder="100" xsi:type="object">Magento\Framework\Filter\DirectiveProcessor\DependDirective</item>
+                <item name="if" sortOrder="200" xsi:type="object">Magento\Framework\Filter\DirectiveProcessor\IfDirective</item>
+                <item name="template" sortOrder="300" xsi:type="object">Magento\Framework\Filter\DirectiveProcessor\TemplateDirective</item>
+                <item name="legacy" sortOrder="400" xsi:type="object">Magento\Framework\Filter\DirectiveProcessor\LegacyDirective</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Filter\DirectiveProcessor\Filter\FilterPool">
+        <arguments>
+            <argument name="filters" xsi:type="array">
+                <item name="nl2br" xsi:type="object">Magento\Framework\Filter\DirectiveProcessor\Filter\NewlineToBreakFilter</item>
+                <item name="escape" xsi:type="object">Magento\Framework\Filter\DirectiveProcessor\Filter\EscapeFilter</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml
index 97f31c618f9b7..886a76b3af6f8 100644
--- a/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml
+++ b/app/code/Magento/Email/view/adminhtml/layout/adminhtml_email_template_preview.xml
@@ -12,7 +12,12 @@
         <referenceContainer name="backend.page" remove="true"/>
         <referenceContainer name="menu.wrapper" remove="true"/>
         <referenceContainer name="root">
-            <block name="preview.page.content" class="Magento\Backend\Block\Page" template="Magento_Email::preview/iframeswitcher.phtml"/>
+            <block name="preview.page.content" class="Magento\Backend\Block\Page" template="Magento_Email::preview/iframeswitcher.phtml">
+                <arguments>
+                    <argument name="preview_form_view_model" xsi:type="object">Magento\Email\ViewModel\Template\Preview\Form</argument>
+                </arguments>
+            </block>
+            <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Email/view/adminhtml/templates/preview/iframeswitcher.phtml b/app/code/Magento/Email/view/adminhtml/templates/preview/iframeswitcher.phtml
index 4d26b59b093e2..29ceb71a138e4 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/preview/iframeswitcher.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/preview/iframeswitcher.phtml
@@ -7,13 +7,34 @@
 /** @var \Magento\Backend\Block\Page $block */
 ?>
 <div id="preview" class="cms-revision-preview">
-    <iframe
-            name="preview_iframe"
+    <iframe name="preview_iframe"
             id="preview_iframe"
             frameborder="0"
             title="<?= $block->escapeHtmlAttr(__('Preview')) ?>"
             width="100%"
-            sandbox="allow-forms allow-pointer-lock"
-            src="<?= $block->escapeUrl($block->getUrl('*/*/popup', ['_current' => true])) ?>"
-    />
+            sandbox="allow-same-origin allow-pointer-lock"
+    ></iframe>
+    <form id="preview_form"
+          action="<?= $block->escapeUrl($block->getUrl('*/*/popup')) ?>"
+          method="post"
+          target="preview_iframe"
+    >
+    <input type="hidden" name="form_key" value="<?= /* @noEscape */ $block->getFormKey() ?>" />
+    <?php foreach ($block->getPreviewFormViewModel()->getFormFields() as $name => $value) : ?>
+        <input type="hidden" name="<?= $block->escapeHtmlAttr($name) ?>" value="<?= $block->escapeHtmlAttr($value) ?>"/>
+    <?php endforeach; ?>
+    </form>
 </div>
+<script>
+require([
+    'jquery'
+], function($) {
+    $(document).ready(function() {
+        $('#preview_form').submit();
+    });
+
+    $('#preview_iframe').load(function() {
+        $(this).height($(this).contents().height());
+    });
+});
+</script>
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 82b09f1095585..7378fa4b2e47f 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
@@ -13,8 +13,8 @@ use Magento\Framework\App\TemplateTypesInterface;
     <?= $block->getBlockHtml('formkey') ?>
     <fieldset class="admin__fieldset form-inline">
         <legend class="admin__legend"><span><?= $block->escapeHtml(__('Load Default Template')) ?></span></legend><br>
-        <div class="admin__field">
-            <label class="admin__field-label" for="template_select"><?= $block->escapeHtml(__('Template')) ?></label>
+        <div class="admin__field required">
+            <label class="admin__field-label" for="template_select"><span><?= $block->escapeHtml(__('Template')) ?></span></label>
             <div class="admin__field-control">
                 <select id="template_select" name="code" class="admin__control-select required-entry">
                     <?php foreach ($block->getTemplateOptions() as $group => $options) : ?>
@@ -48,7 +48,7 @@ use Magento\Framework\App\TemplateTypesInterface;
     <?= /* @noEscape */ $block->getFormHtml() ?>
 </form>
 
-<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="get" id="email_template_preview_form" target="_blank">
+<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="email_template_preview_form" target="_blank">
     <?= /* @noEscape */ $block->getBlockHtml('formkey') ?>
     <div class="no-display">
         <input type="hidden" id="preview_type" name="type" value="<?= /* @noEscape */ $block->isTextType() ? 1 : 2 ?>" />
@@ -153,6 +153,7 @@ require([
             } else {
                 $('preview_type').value = <?= (int) $block->getTemplateType() ?>;
             }
+
             if (typeof tinyMCE == 'undefined' || !tinyMCE.get('template_text')) {
                 $('preview_text').value = $('template_text').value;
             } else {
diff --git a/app/code/Magento/Email/view/frontend/email/footer.html b/app/code/Magento/Email/view/frontend/email/footer.html
index 40e18372252bc..b9db3b8597cad 100644
--- a/app/code/Magento/Email/view/frontend/email/footer.html
+++ b/app/code/Magento/Email/view/frontend/email/footer.html
@@ -6,7 +6,7 @@
 -->
 <!--@subject {{trans "Footer"}} @-->
 <!--@vars {
-"var store.getFrontendName()":"Store Name"
+"var store.frontend_name":"Store Name"
 } @-->
 
                     <!-- End Content -->
@@ -14,7 +14,7 @@
                 </tr>
                 <tr>
                     <td class="footer">
-                        <p class="closing">{{trans "Thank you, %store_name" store_name=$store.getFrontendName()}}!</p>
+                        <p class="closing">{{trans "Thank you, %store_name" store_name=$store.frontend_name}}!</p>
                     </td>
                 </tr>
             </table>
diff --git a/app/code/Magento/Email/view/frontend/email/header.html b/app/code/Magento/Email/view/frontend/email/header.html
index c4f49698dc69b..45e299cb51d17 100644
--- a/app/code/Magento/Email/view/frontend/email/header.html
+++ b/app/code/Magento/Email/view/frontend/email/header.html
@@ -6,6 +6,8 @@
 -->
 <!--@subject {{trans "Header"}} @-->
 <!--@vars {
+"var logo_url":"Email Logo Image URL",
+"var logo_alt":"Email Logo Alt Text",
 "var logo_height":"Email Logo Image Height",
 "var logo_width":"Email Logo Image Width",
 "var template_styles|raw":"Template CSS"
diff --git a/app/code/Magento/EncryptionKey/Test/Mftf/ActionGroup/AdminEncryptionKeyChangeKeyAutoActionGroup.xml b/app/code/Magento/EncryptionKey/Test/Mftf/ActionGroup/AdminEncryptionKeyChangeKeyAutoActionGroup.xml
new file mode 100644
index 0000000000000..62568ebb551e1
--- /dev/null
+++ b/app/code/Magento/EncryptionKey/Test/Mftf/ActionGroup/AdminEncryptionKeyChangeKeyAutoActionGroup.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="AdminEncryptionKeyChangeKeyAutoActionGroup">
+        <annotations>
+            <description>Change Encryption Key Auto Generate Action Group.</description>
+        </annotations>
+        <arguments>
+            <argument name="encryptionKeyData" defaultValue="AdminEncryptionKeyAutoGenerate"/>
+        </arguments>
+
+        <selectOption selector="{{AdminEncryptionKeyChangeFormSection.autoGenerate}}" userInput="{{encryptionKeyData.autoGenerate}}" stepKey="selectGenerateMode"/>
+        <click selector="{{AdminEncryptionKeyChangeFormSection.changeEncryptionKey}}" stepKey="clickChangeButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The encryption key has been changed." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/EncryptionKey/Test/Mftf/ActionGroup/AdminEncryptionKeyChangeKeyManualActionGroup.xml b/app/code/Magento/EncryptionKey/Test/Mftf/ActionGroup/AdminEncryptionKeyChangeKeyManualActionGroup.xml
new file mode 100644
index 0000000000000..0880bd07a0739
--- /dev/null
+++ b/app/code/Magento/EncryptionKey/Test/Mftf/ActionGroup/AdminEncryptionKeyChangeKeyManualActionGroup.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="AdminEncryptionKeyChangeKeyManualActionGroup">
+        <annotations>
+            <description>Change Encryption Key - No-Auto Generate Action Group.</description>
+        </annotations>
+        <arguments>
+            <argument name="encryptionKeyData" defaultValue="AdminEncryptionKeyManualGenerate"/>
+        </arguments>
+
+        <selectOption selector="{{AdminEncryptionKeyChangeFormSection.autoGenerate}}" userInput="{{encryptionKeyData.autoGenerate}}" stepKey="selectGenerateMode"/>
+        <fillField selector="{{AdminEncryptionKeyChangeFormSection.cryptKey}}" userInput="{{encryptionKeyData.cryptKey}}" stepKey="fillCryptKey"/>
+        <click selector="{{AdminEncryptionKeyChangeFormSection.changeEncryptionKey}}" stepKey="clickChangeButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The encryption key has been changed." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/EncryptionKey/Test/Mftf/ActionGroup/AdminEncryptionKeyNavigateToChangePageActionGroup.xml b/app/code/Magento/EncryptionKey/Test/Mftf/ActionGroup/AdminEncryptionKeyNavigateToChangePageActionGroup.xml
new file mode 100644
index 0000000000000..69847526a15a0
--- /dev/null
+++ b/app/code/Magento/EncryptionKey/Test/Mftf/ActionGroup/AdminEncryptionKeyNavigateToChangePageActionGroup.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="AdminEncryptionKeyNavigateToChangePageActionGroup">
+        <annotations>
+            <description>Navigate to change encryption key page.</description>
+        </annotations>
+        <amOnPage url="{{AdminEncryptionKeyChangeFormPage.url}}" stepKey="navigateToChangeEncryptionPage" />
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/EncryptionKey/Test/Mftf/Data/AdminEncryptionKeyData.xml b/app/code/Magento/EncryptionKey/Test/Mftf/Data/AdminEncryptionKeyData.xml
new file mode 100644
index 0000000000000..ff1fe3fd2e10c
--- /dev/null
+++ b/app/code/Magento/EncryptionKey/Test/Mftf/Data/AdminEncryptionKeyData.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">
+    <entity name="AdminEncryptionKeyAutoGenerate">
+        <data key="autoGenerate">Yes</data>
+    </entity>
+    <entity name="AdminEncryptionKeyManualGenerate">
+        <data key="autoGenerate">No</data>
+        <data key="cryptKey">9d469ae32ec27dfec0206cb5d63f135d</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/EncryptionKey/Test/Mftf/Page/AdminEncryptionKeyChangeFormPage.xml b/app/code/Magento/EncryptionKey/Test/Mftf/Page/AdminEncryptionKeyChangeFormPage.xml
new file mode 100644
index 0000000000000..b3b8b33fc0364
--- /dev/null
+++ b/app/code/Magento/EncryptionKey/Test/Mftf/Page/AdminEncryptionKeyChangeFormPage.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="AdminEncryptionKeyChangeFormPage" url="admin/crypt_key/index" area="admin" module="Magento_EncryptionKey">
+        <section name="AdminCustomerConfigSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/EncryptionKey/Test/Mftf/Section/AdminEncryptionKeyChangeFormSection.xml b/app/code/Magento/EncryptionKey/Test/Mftf/Section/AdminEncryptionKeyChangeFormSection.xml
new file mode 100644
index 0000000000000..7ce37af60fd7f
--- /dev/null
+++ b/app/code/Magento/EncryptionKey/Test/Mftf/Section/AdminEncryptionKeyChangeFormSection.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="AdminEncryptionKeyChangeFormSection">
+        <element name="autoGenerate" type="select" selector="#generate_random"/>
+        <element name="cryptKey" type="input" selector="#crypt_key"/>
+        <element name="changeEncryptionKey" type="button" selector=".page-actions-buttons #save" timeout="10"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/EncryptionKey/Test/Mftf/Test/AdminEncryptionKeyAutoGenerateKeyTest.xml b/app/code/Magento/EncryptionKey/Test/Mftf/Test/AdminEncryptionKeyAutoGenerateKeyTest.xml
new file mode 100644
index 0000000000000..ded57f4aad019
--- /dev/null
+++ b/app/code/Magento/EncryptionKey/Test/Mftf/Test/AdminEncryptionKeyAutoGenerateKeyTest.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="AdminEncryptionKeyAutoGenerateKeyTest">
+        <annotations>
+            <features value="Encryption Key"/>
+            <stories value="Change Encryption Key"/>
+            <title value="Change Encryption Key by Auto Generate Key"/>
+            <description value="Change Encryption Key by Auto Generate Key"/>
+            <severity value="CRITICAL"/>
+            <group value="encryption_key"/>
+        </annotations>
+
+        <before>
+            <!--Login to Admin Area-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
+        </before>
+
+        <after>
+            <!--Logout from Admin Area-->
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+
+        <actionGroup ref="AdminEncryptionKeyNavigateToChangePageActionGroup" stepKey="navigateToPage"/>
+        <actionGroup ref="AdminEncryptionKeyChangeKeyAutoActionGroup" stepKey="changeKeyAutoGenerate"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/EncryptionKey/Test/Mftf/Test/AdminEncryptionKeyManualGenerateKeyTest.xml b/app/code/Magento/EncryptionKey/Test/Mftf/Test/AdminEncryptionKeyManualGenerateKeyTest.xml
new file mode 100644
index 0000000000000..f3a9849969263
--- /dev/null
+++ b/app/code/Magento/EncryptionKey/Test/Mftf/Test/AdminEncryptionKeyManualGenerateKeyTest.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="AdminEncryptionKeyManualGenerateKeyTest">
+        <annotations>
+            <features value="Encryption Key"/>
+            <stories value="Change Encryption Key"/>
+            <title value="Change Encryption Key by Manual Key"/>
+            <description value="Change Encryption Key by Manual Key"/>
+            <severity value="CRITICAL"/>
+            <group value="encryption_key"/>
+        </annotations>
+
+        <before>
+            <!--Login to Admin Area-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
+        </before>
+
+        <after>
+            <!--Logout from Admin Area-->
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+
+        <actionGroup ref="AdminEncryptionKeyNavigateToChangePageActionGroup" stepKey="navigateToPage"/>
+        <actionGroup ref="AdminEncryptionKeyChangeKeyManualActionGroup" stepKey="changeKeyManualGenerate"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Fedex/Test/Mftf/Data/FedExConfigData.xml b/app/code/Magento/Fedex/Test/Mftf/Data/FedExConfigData.xml
new file mode 100644
index 0000000000000..d03403970ae55
--- /dev/null
+++ b/app/code/Magento/Fedex/Test/Mftf/Data/FedExConfigData.xml
@@ -0,0 +1,49 @@
+<?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="AdminFedexEnableForCheckoutConfigData" type="fedex_config">
+        <data key="path">carriers/fedex/active</data>
+        <data key="value">1</data>
+        <data key="label">Yes</data>
+    </entity>
+    <entity name="AdminFedexEnableSandboxModeConfigData" type="fedex_config">
+        <data key="path">carriers/fedex/sandbox_mode</data>
+        <data key="value">1</data>
+        <data key="label">Yes</data>
+    </entity>
+    <entity name="AdminFedexEnableDebugConfigData" type="fedex_config">
+        <data key="path">carriers/fedex/debug</data>
+        <data key="value">1</data>
+        <data key="label">Yes</data>
+    </entity>
+    <entity name="AdminFedexEnableShowMethodConfigData" type="fedex_config">
+        <data key="path">carriers/fedex/showmethod</data>
+        <data key="value">1</data>
+        <data key="label">Yes</data>
+    </entity>
+    <entity name="AdminFedexDisableShowMethodConfigData" type="fedex_config">
+        <data key="path">carriers/fedex/showmethod</data>
+        <data key="value">0</data>
+        <data key="label">No</data>
+    </entity>
+    <entity name="AdminFedexDisableDebugConfigData" type="fedex_config">
+        <data key="path">carriers/fedex/debug</data>
+        <data key="value">0</data>
+        <data key="label">No</data>
+    </entity>
+    <entity name="AdminFedexDisableSandboxModeConfigData" type="fedex_config">
+        <data key="path">carriers/fedex/sandbox_mode</data>
+        <data key="value">0</data>
+        <data key="label">No</data>
+    </entity>
+    <entity name="AdminFedexDisableForCheckoutConfigData" type="fedex_config">
+        <data key="path">carriers/fedex/active</data>
+        <data key="value">0</data>
+        <data key="label">No</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml b/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml
new file mode 100644
index 0000000000000..91a76383babd4
--- /dev/null
+++ b/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreatingShippingLabelTest">
+        <annotations>
+            <features value="Fedex"/>
+            <stories value="Shipping label"/>
+            <title value="Creating shipping label"/>
+            <description value="Creating shipping label"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-20287"/>
+            <useCaseId value="MC-18215"/>
+            <group value="shipping"/>
+            <skip>
+                <issueId value="MQE-1578"/>
+            </skip>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!-- Create product -->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!--Set Fedex configs data-->
+            <magentoCLI command="config:set {{AdminFedexEnableForCheckoutConfigData.path}} {{AdminFedexEnableForCheckoutConfigData.value}}" stepKey="enableCheckout"/>
+            <magentoCLI command="config:set {{AdminFedexEnableSandboxModeConfigData.path}} {{AdminFedexEnableSandboxModeConfigData.value}}" stepKey="enableSandbox"/>
+            <magentoCLI command="config:set {{AdminFedexEnableDebugConfigData.path}} {{AdminFedexEnableDebugConfigData.value}}" stepKey="enableDebug"/>
+            <magentoCLI command="config:set {{AdminFedexEnableShowMethodConfigData.path}} {{AdminFedexEnableShowMethodConfigData.value}}" stepKey="enableShowMethod"/>
+            <!--TODO: add fedex credentials-->
+            <!--Set StoreInformation configs data-->
+            <magentoCLI command="config:set {{AdminGeneralSetStoreNameConfigData.path}} '{{AdminGeneralSetStoreNameConfigData.value}}'" stepKey="setStoreInformationName"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStorePhoneConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.telephone}}" stepKey="setStoreInformationPhone"/>
+            <magentoCLI command="config:set {{AdminGeneralSetCountryConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.country_id}}" stepKey="setStoreInformationCountry"/>
+            <magentoCLI command="config:set {{AdminGeneralSetCityConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.city}}" stepKey="setStoreInformationCity"/>
+            <magentoCLI command="config:set {{AdminGeneralSetPostcodeConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.postcode}}" stepKey="setStoreInformationPostcode"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStreetAddressConfigData.path}} '{{DE_Address_Berlin_Not_Default_Address.street[0]}}'" stepKey="setStoreInformationStreetAddress"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStreetAddress2ConfigData.path}} '{{US_Address_California.street[0]}}'" stepKey="setStoreInformationStreetAddress2"/>
+            <magentoCLI command="config:set {{AdminGeneralSetVatNumberConfigData.path}} {{AdminGeneralSetVatNumberConfigData.value}}" stepKey="setStoreInformationVatNumber"/>
+            <!--Set Shipping settings origin data-->
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginCountryConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.country_id}}" stepKey="setOriginCountry"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginCityConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.city}}" stepKey="setOriginCity"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginZipCodeConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.postcode}}" stepKey="setOriginZipCode"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddressConfigData.path}} '{{DE_Address_Berlin_Not_Default_Address.street[0]}}'" stepKey="setOriginStreetAddress"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddress2ConfigData.path}} '{{US_Address_California.street[0]}}'" stepKey="setOriginStreetAddress2"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <!--Reset configs-->
+            <magentoCLI command="config:set {{AdminFedexDisableForCheckoutConfigData.path}} {{AdminFedexDisableForCheckoutConfigData.value}}" stepKey="disableCheckout"/>
+            <magentoCLI command="config:set {{AdminFedexDisableSandboxModeConfigData.path}} {{AdminFedexDisableSandboxModeConfigData.value}}" stepKey="disableSandbox"/>
+            <magentoCLI command="config:set {{AdminFedexDisableDebugConfigData.path}} {{AdminFedexDisableDebugConfigData.value}}" stepKey="disableDebug"/>
+            <magentoCLI command="config:set {{AdminFedexDisableShowMethodConfigData.path}} {{AdminFedexDisableShowMethodConfigData.value}}" stepKey="disableShowMethod"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStoreNameConfigData.path}} ''" stepKey="setStoreInformationName"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStorePhoneConfigData.path}} ''" stepKey="setStoreInformationPhone"/>
+            <magentoCLI command="config:set {{AdminGeneralSetCityConfigData.path}} ''" stepKey="setStoreInformationCity"/>
+            <magentoCLI command="config:set {{AdminGeneralSetPostcodeConfigData.path}} ''" stepKey="setStoreInformationPostcode"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStreetAddressConfigData.path}} ''" stepKey="setStoreInformationStreetAddress"/>
+            <magentoCLI command="config:set {{AdminGeneralSetStreetAddress2ConfigData.path}} ''" stepKey="setStoreInformationStreetAddress2"/>
+            <magentoCLI command="config:set {{AdminGeneralSetVatNumberConfigData.path}} ''" stepKey="setStoreInformationVatNumber"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginCityConfigData.path}} ''" stepKey="setOriginCity"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginZipCodeConfigData.path}} ''" stepKey="setOriginZipCode"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddressConfigData.path}} ''" stepKey="setOriginStreetAddress"/>
+            <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddress2ConfigData.path}} ''" stepKey="setOriginStreetAddress2"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <!--Delete created data-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Add country of manufacture to product-->
+        <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="amOnEditPage"/>
+        <waitForPageLoad stepKey="waitForEditPage"/>
+        <actionGroup ref="AdminFillProductCountryOfManufactureActionGroup" stepKey="fillCountryOfManufacture">
+            <argument name="countryId" value="DE"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
+        <!--Place for order using FedEx shipping method-->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnStorefrontProductPage"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="addAddress">
+            <argument name="customerVar" value="Simple_US_Utah_Customer"/>
+            <argument name="customerAddressVar" value="US_Address_California"/>
+            <argument name="shippingMethod" value="Federal Express"/>
+        </actionGroup>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceOrder">
+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
+        </actionGroup>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
+        <!--Open created order in admin-->
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
+        <actionGroup ref="searchAdminDataGridByKeyword" stepKey="searchOrder">
+            <argument name="keyword" value="$grabOrderNumber"/>
+        </actionGroup>
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <!--Create Invoice-->
+        <actionGroup ref="AdminCreateInvoiceActionGroup" stepKey="createInvoice"/>
+        <!--Create shipping label-->
+        <actionGroup ref="goToShipmentIntoOrder" stepKey="goToShipmentIntoOrder"/>
+        <checkOption selector="{{AdminShipmentTotalSection.createShippingLabel}}" stepKey="checkCreateShippingLabel"/>
+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
+        <actionGroup ref="AdminShipmentCreateShippingLabelActionGroup" stepKey="createPackage">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminGoToShipmentTabActionGroup" stepKey="goToShipmentTab"/>
+        <click selector="{{AdminOrderShipmentsTabSection.viewGridRow('1')}}" stepKey="clickRowToViewShipment"/>
+        <waitForPageLoad stepKey="waitForShipmentItemsSection"/>
+        <seeElement selector="{{AdminShipmentTrackingInformationShippingSection.shippingInfoTable}}" stepKey="seeInformationTable"/>
+        <seeElement selector="{{AdminShipmentTrackingInformationShippingSection.shippingNumber}}" stepKey="seeShippingNumberElement"/>
+        <grabTextFrom selector="{{AdminShipmentTrackingInformationShippingSection.shippingMethod}}" stepKey="grabShippingMethod"/>
+        <grabTextFrom selector="{{AdminShipmentTrackingInformationShippingSection.shippingMethodTitle}}" stepKey="grabShippingMethodTitle"/>
+        <assertEquals actual="$grabShippingMethod" expectedType="string" expected="Federal Express" stepKey="assertShippingMethodIsFedEx"/>
+        <assertEquals actual="$grabShippingMethodTitle" expectedType="string" expected="Federal Express" stepKey="assertShippingMethodTitleIsFedEx"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventOrderToQuoteObserverTest.php b/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventOrderToQuoteObserverTest.php
new file mode 100644
index 0000000000000..85c062d9cec11
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Unit/Observer/SalesEventOrderToQuoteObserverTest.php
@@ -0,0 +1,179 @@
+<?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\Framework\Event;
+use Magento\Framework\Message\MessageInterface;
+use Magento\GiftMessage\Helper\Message;
+use Magento\GiftMessage\Model\Message as MessageModel;
+use Magento\GiftMessage\Model\MessageFactory;
+use Magento\GiftMessage\Observer\SalesEventOrderToQuoteObserver;
+use Magento\Framework\Event\Observer;
+use Magento\Quote\Model\Quote;
+use Magento\Sales\Model\Order;
+use Magento\Store\Model\Store;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ *  SalesEventOrderToQuoteObserverTest
+ */
+class SalesEventOrderToQuoteObserverTest extends TestCase
+{
+    /**
+     * @var SalesEventOrderToQuoteObserver
+     */
+    private $observer;
+
+    /**
+     * @var MessageFactory|MockObject
+     */
+    private $messageFactoryMock;
+
+    /**
+     * @var Message|MockObject
+     */
+    private $giftMessageMock;
+
+    /**
+     * @var Observer|MockObject
+     */
+    private $observerMock;
+
+    /**
+     * @var Event|MockObject
+     */
+    private $eventMock;
+
+    /**
+     * @var Order|MockObject
+     */
+    private $orderMock;
+
+    /**
+     * @var Store|MockObject
+     */
+    private $storeMock;
+
+    /**
+     * @var MessageInterface|MockObject
+     */
+    private $messageMock;
+
+    /**
+     * @var Quote|MockObject
+     */
+    private $quoteMock;
+
+    /**
+     * @return void
+     */
+    public function setUp(): void
+    {
+        $this->messageFactoryMock = $this->createMock(MessageFactory::class);
+        $this->giftMessageMock = $this->createMock(Message::class);
+        $this->observerMock = $this->createMock(Observer::class);
+        $this->eventMock = $this->getMockBuilder(Event::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getOrder', 'getQuote'])
+            ->getMock();
+        $this->orderMock = $this->getMockBuilder(Order::class)
+            ->setMethods(['getReordered', 'getStore', 'getGiftMessageId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->quoteMock = $this->getMockBuilder(Quote::class)
+            ->setMethods(['setGiftMessageId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->storeMock = $this->createMock(Store::class);
+        $this->messageMock = $this->createMock(MessageModel::class);
+
+        $this->observer = new SalesEventOrderToQuoteObserver(
+            $this->messageFactoryMock,
+            $this->giftMessageMock
+        );
+    }
+
+    /**
+     * Tests duplicating gift message from order to quote
+     *
+     * @dataProvider giftMessageDataProvider
+     *
+     * @param bool $orderIsReordered
+     * @param bool $isMessagesAllowed
+     */
+    public function testExecute(bool $orderIsReordered, bool $isMessagesAllowed): void
+    {
+        $giftMessageId = 1;
+        $newGiftMessageId = 2;
+
+        $this->eventMock
+            ->expects($this->atLeastOnce())
+            ->method('getOrder')
+            ->willReturn($this->orderMock);
+        $this->observerMock
+            ->expects($this->atLeastOnce())
+            ->method('getEvent')
+            ->willReturn($this->eventMock);
+
+        if (!$orderIsReordered && $isMessagesAllowed) {
+            $this->eventMock
+                ->expects($this->atLeastOnce())
+                ->method('getQuote')
+                ->willReturn($this->quoteMock);
+            $this->orderMock->expects($this->once())
+                ->method('getReordered')
+                ->willReturn($orderIsReordered);
+            $this->orderMock->expects($this->once())
+                ->method('getGiftMessageId')
+                ->willReturn($giftMessageId);
+            $this->giftMessageMock->expects($this->once())
+                ->method('isMessagesAllowed')
+                ->willReturn($isMessagesAllowed);
+            $this->messageFactoryMock->expects($this->once())
+                ->method('create')
+                ->willReturn($this->messageMock);
+            $this->messageMock->expects($this->once())
+                ->method('load')
+                ->with($giftMessageId)
+                ->willReturnSelf();
+            $this->messageMock->expects($this->once())
+                ->method('setId')
+                ->with(null)
+                ->willReturnSelf();
+            $this->messageMock->expects($this->once())
+                ->method('save')
+                ->willReturnSelf();
+            $this->messageMock->expects($this->once())
+                ->method('getId')
+                ->willReturn($newGiftMessageId);
+            $this->quoteMock->expects($this->once())
+                ->method('setGiftMessageId')
+                ->with($newGiftMessageId)
+                ->willReturnSelf();
+        }
+
+        $this->observer->execute($this->observerMock);
+    }
+
+    /**
+     * Providing gift message data
+     *
+     * @return array
+     */
+    public function giftMessageDataProvider(): array
+    {
+        return [
+            [false, true],
+            [true, true],
+            [false, true],
+            [false, false],
+        ];
+    }
+}
diff --git a/app/code/Magento/GiftMessage/Ui/DataProvider/Product/Modifier/GiftMessage.php b/app/code/Magento/GiftMessage/Ui/DataProvider/Product/Modifier/GiftMessage.php
index e3d617eac1cd2..fe2479d778992 100644
--- a/app/code/Magento/GiftMessage/Ui/DataProvider/Product/Modifier/GiftMessage.php
+++ b/app/code/Magento/GiftMessage/Ui/DataProvider/Product/Modifier/GiftMessage.php
@@ -53,7 +53,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {
@@ -73,7 +73,7 @@ public function modifyData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyMeta(array $meta)
     {
@@ -101,24 +101,28 @@ protected function customizeAllowGiftMessageField(array $meta)
             'children'
         );
         $fieldPath = $this->arrayManager->findPath(static::FIELD_MESSAGE_AVAILABLE, $meta, null, 'children');
-        $groupConfig = $this->arrayManager->get($containerPath, $meta);
         $fieldConfig = $this->arrayManager->get($fieldPath, $meta);
 
-        $meta = $this->arrayManager->merge($containerPath, $meta, [
-            'arguments' => [
-                'data' => [
-                    'config' => [
-                        'formElement' => 'container',
-                        'componentType' => 'container',
-                        'component' => 'Magento_Ui/js/form/components/group',
-                        'label' => $groupConfig['arguments']['data']['config']['label'],
-                        'breakLine' => false,
-                        'sortOrder' => $fieldConfig['arguments']['data']['config']['sortOrder'],
-                        'dataScope' => '',
+        $meta = $this->arrayManager->merge(
+            $containerPath,
+            $meta,
+            [
+                'arguments' => [
+                    'data' => [
+                        'config' => [
+                            'formElement' => 'container',
+                            'componentType' => 'container',
+                            'component' => 'Magento_Ui/js/form/components/group',
+                            'label' => false,
+                            'required' => false,
+                            'breakLine' => false,
+                            'sortOrder' => $fieldConfig['arguments']['data']['config']['sortOrder'],
+                            'dataScope' => '',
+                        ],
                     ],
                 ],
-            ],
-        ]);
+            ]
+        );
         $meta = $this->arrayManager->merge(
             $containerPath,
             $meta,
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
index 1aaad24837719..4d56514f365c1 100644
--- a/app/code/Magento/GiftMessage/composer.json
+++ b/app/code/Magento/GiftMessage/composer.json
@@ -17,6 +17,7 @@
         "magento/module-ui": "*"
     },
     "suggest": {
+        "magento/module-eav": "*",
         "magento/module-multishipping": "*"
     },
     "type": "magento2-module",
diff --git a/app/code/Magento/GiftMessage/etc/di.xml b/app/code/Magento/GiftMessage/etc/di.xml
index 1d03849d978b8..5333084c90b75 100644
--- a/app/code/Magento/GiftMessage/etc/di.xml
+++ b/app/code/Magento/GiftMessage/etc/di.xml
@@ -28,4 +28,13 @@
         <plugin name="save_gift_message" type="Magento\GiftMessage\Model\Plugin\OrderSave"/>
         <plugin name="get_gift_message" type="Magento\GiftMessage\Model\Plugin\OrderGet"/>
     </type>
+    <type name="Magento\Eav\Model\Config">
+        <arguments>
+            <argument name="attributesForPreload" xsi:type="array">
+                <item name="catalog_product" xsi:type="array">
+                    <item name="gift_message_available" xsi:type="string">catalog_product</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/GraphQl/etc/schema.graphqls b/app/code/Magento/GraphQl/etc/schema.graphqls
index 77bba5ea3a9d4..fccde015c3388 100644
--- a/app/code/Magento/GraphQl/etc/schema.graphqls
+++ b/app/code/Magento/GraphQl/etc/schema.graphqls
@@ -36,10 +36,10 @@ directive @resolver(class: String="") on QUERY
     | ENUM_VALUE
     | INPUT_OBJECT
     | INPUT_FIELD_DEFINITION
-    
+
 directive @typeResolver(class: String="") on INTERFACE | OBJECT
 
-directive @cache(cacheIdentity: String="" cachable: Boolean=true) on QUERY
+directive @cache(cacheIdentity: String="" cacheable: Boolean=true) on QUERY
 
 type Query {
 }
@@ -113,7 +113,7 @@ enum CurrencyEnum @doc(description: "The list of available currency codes") {
     BHD
     BDT
     BBD
-    BYR
+    BYN
     BZD
     BMD
     BTN
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Plugin.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Plugin.php
index 4777b2bae07a5..350edb5b8495e 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Plugin.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Plugin.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\GroupedProduct\Model\Product\Type;
 
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 
 /**
  * Plugin.
@@ -14,14 +14,14 @@
 class Plugin
 {
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
     /**
-     * @param ModuleManagerInterface $moduleManager
+     * @param Manager $moduleManager
      */
-    public function __construct(ModuleManagerInterface $moduleManager)
+    public function __construct(Manager $moduleManager)
     {
         $this->moduleManager = $moduleManager;
     }
diff --git a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollection.php b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollection.php
index 519da20510815..c492939232b15 100644
--- a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollection.php
+++ b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollection.php
@@ -41,7 +41,7 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\ResourceModel\
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @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
@@ -67,7 +67,7 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \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,
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/StorefrontAddGroupedProductWithTwoLinksToCartActionGroup.xml b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/StorefrontAddGroupedProductWithTwoLinksToCartActionGroup.xml
new file mode 100644
index 0000000000000..c1ba827f6ca8a
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/ActionGroup/StorefrontAddGroupedProductWithTwoLinksToCartActionGroup.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="StorefrontAddGroupedProductWithTwoLinksToCartActionGroup" extends="AddSimpleProductToCart">
+        <annotations>
+            <description>Adding to the Shopping Cart single Grouped product, with 2 associated from the Product page</description>
+        </annotations>
+        <arguments>
+            <argument name="linkedProduct1Name" type="string" defaultValue="{{_defaultProduct.name}}"/>
+            <argument name="linkedProduct2Name" type="string" defaultValue="{{_defaultProduct.name}}"/>
+            <argument name="linkedProduct1Qty" type="string" defaultValue="1"/>
+            <argument name="linkedProduct2Qty" type="string" defaultValue="1"/>
+        </arguments>
+        <fillField selector="{{StorefrontProductPageSection.qtyInputWithProduct(linkedProduct1Name)}}" userInput="{{linkedProduct1Qty}}" before="addToCart" stepKey="fillQuantityForFirsProduct"/>
+        <fillField selector="{{StorefrontProductPageSection.qtyInputWithProduct(linkedProduct2Name)}}" userInput="{{linkedProduct2Qty}}" after="fillQuantityForFirsProduct" stepKey="fillQuantityForSecondProduct"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
index ba3703e7b0edc..e6d7588289c39 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
@@ -28,6 +28,17 @@
         <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
+    <entity name="ApiGroupedProductAndUnderscoredSku" 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>
     <entity name="ApiGroupedProduct2" type="product3">
         <data key="sku" unique="suffix">apiGroupedProduct</data>
         <data key="type_id">grouped</data>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
index 5d65f82690235..f2cb2cc993a50 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
@@ -29,6 +29,9 @@
             </createData>
         </before>
         <after>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteGroupedProduct">
+                <argument name="sku" value="{{GroupedProduct.sku}}"/>
+            </actionGroup>
             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
             <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml
index 2a600d38250f8..4fd06ccaa27ec 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml
@@ -17,6 +17,42 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-141"/>
             <group value="GroupedProduct"/>
+            <group value="SearchEngineElasticsearch"/>
+        </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>
+        <see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
+        <see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
+        <see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
+    </test>
+    <test name="AdvanceCatalogSearchGroupedProductByNameMysqlTest" 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 using the MySQL search engine"/>
+            <description value="Guest customer should be able to advance search Grouped product with product name using the MySQL search engine"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-20464"/>
+            <group value="GroupedProduct"/>
+            <group value="SearchEngineMysql"/>
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
@@ -51,7 +87,7 @@
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
             <createData entity="ApiProductWithDescription" stepKey="simple2" before="product"/>
-            <createData entity="ApiGroupedProduct" stepKey="product"/>
+            <createData entity="ApiGroupedProductAndUnderscoredSku" stepKey="product"/>
             <createData entity="OneSimpleProductLink" stepKey="addProductOne">
                 <requiredEntity createDataKey="product"/>
                 <requiredEntity createDataKey="simple1"/>
@@ -77,6 +113,42 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-282"/>
             <group value="GroupedProduct"/>
+            <group value="SearchEngineElasticsearch"/>
+        </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>
+        <see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
+        <see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
+        <see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
+    </test>
+    <test name="AdvanceCatalogSearchGroupedProductByDescriptionMysqlTest" 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 using the MySQL search engine"/>
+            <description value="Guest customer should be able to advance search Grouped product with product description using the MYSQL search engine"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-20468"/>
+            <group value="GroupedProduct"/>
+            <group value="SearchEngineMysql"/>
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
@@ -107,6 +179,42 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-283"/>
             <group value="GroupedProduct"/>
+            <group value="SearchEngineElasticsearch"/>
+        </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>
+        <see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
+        <see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
+        <see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
+    </test>
+    <test name="AdvanceCatalogSearchGroupedProductByShortDescriptionMysqlTest" 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 using the MySQL search engine"/>
+            <description value="Guest customer should be able to advance search Grouped product with product short description using the MySQL search engine"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-20469"/>
+            <group value="GroupedProduct"/>
+            <group value="SearchEngineMysql"/>
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
@@ -137,6 +245,51 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-284"/>
             <group value="GroupedProduct"/>
+            <group value="SearchEngineElasticsearch"/>
+        </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>
+        <see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
+        <see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
+        <see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
+        <see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
+    </test>
+    <test name="AdvanceCatalogSearchGroupedProductByPriceMysqlTest" 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 using the MySQL search engine"/>
+            <description value="Guest customer should be able to advance search Grouped product with product price using the MySQL search engine"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-20470"/>
+            <group value="GroupedProduct"/>
+            <group value="SearchEngineMysql"/>
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchGroupedProductBySkuWithHyphenTest b/app/code/Magento/GroupedProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchGroupedProductBySkuWithHyphenTest
new file mode 100644
index 0000000000000..5220349a4aac3
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchGroupedProductBySkuWithHyphenTest
@@ -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="StorefrontAdvanceCatalogSearchGroupedProductBySkuWithHyphenTest" 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 that in camelCase format"/>
+            <description value="Guest customer should be able to advance search Grouped product with product sku that in camelCase format"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-20519"/>
+            <group value="GroupedProduct"/>
+            <group value="SearchEngineMysql"/>
+        </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>
+</tests>
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php
index cec7931c1c61f..78fa2445ff583 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php
@@ -30,7 +30,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $moduleManager;
 
@@ -159,14 +159,9 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->categoryIndexerMock = $this->getMockForAbstractClass(
-            \Magento\Framework\Indexer\IndexerInterface::class
-        );
+        $this->categoryIndexerMock = $this->getMockForAbstractClass(\Magento\Framework\Indexer\IndexerInterface::class);
 
-        $this->moduleManager = $this->createPartialMock(
-            \Magento\Framework\Module\ModuleManagerInterface::class,
-            ['isEnabled']
-        );
+        $this->moduleManager = $this->createPartialMock(\Magento\Framework\Module\Manager::class, ['isEnabled']);
         $this->stockItemFactoryMock = $this->createPartialMock(
             \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory::class,
             ['create']
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 d6b96a28afcc9..55992c92226af 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\ImportExport\Block\Adminhtml\Import\Edit;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
@@ -32,6 +33,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      */
     protected $_behaviorFactory;
 
+    /**
+     * @var Import\ImageDirectoryBaseProvider
+     */
+    private $imagesDirectoryProvider;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -40,6 +46,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\ImportExport\Model\Source\Import\EntityFactory $entityFactory
      * @param \Magento\ImportExport\Model\Source\Import\Behavior\Factory $behaviorFactory
      * @param array $data
+     * @param Import\ImageDirectoryBaseProvider|null $imageDirProvider
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -48,12 +55,15 @@ public function __construct(
         \Magento\ImportExport\Model\Import $importModel,
         \Magento\ImportExport\Model\Source\Import\EntityFactory $entityFactory,
         \Magento\ImportExport\Model\Source\Import\Behavior\Factory $behaviorFactory,
-        array $data = []
+        array $data = [],
+        ?Import\ImageDirectoryBaseProvider $imageDirProvider = null
     ) {
         $this->_entityFactory = $entityFactory;
         $this->_behaviorFactory = $behaviorFactory;
         parent::__construct($context, $registry, $formFactory, $data);
         $this->_importModel = $importModel;
+        $this->imagesDirectoryProvider = $imageDirProvider
+            ?? ObjectManager::getInstance()->get(Import\ImageDirectoryBaseProvider::class);
     }
 
     /**
@@ -231,8 +241,15 @@ protected function _prepareForm()
                 'required' => false,
                 'class' => 'input-text',
                 'note' => __(
-                    'For Type "Local Server" use relative path to Magento installation,
-                                e.g. var/export, var/import, var/export/some/dir'
+                    $this->escapeHtml(
+                        'For Type "Local Server" use relative path to &lt;Magento root directory&gt;/'
+                        .$this->imagesDirectoryProvider->getDirectoryRelativePath()
+                        .', e.g. <i>product_images</i>, <i>import_images/batch1</i>.<br><br>'
+                        .'For example, in case <i>product_images</i>, files should be placed into '
+                        .'<i>&lt;Magento root directory&gt;/'
+                        .$this->imagesDirectoryProvider->getDirectoryRelativePath() . '/product_images</i> folder.',
+                        ['i', 'br']
+                    )
                 ),
             ]
         );
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
index c5885f72474f9..dff6560ebf768 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\ImportExport\Controller\Adminhtml\Export;
 
 use Magento\Backend\App\Action\Context;
@@ -90,7 +92,10 @@ public function execute()
 
                 $this->messagePublisher->publish('import_export.export', $dataObject);
                 $this->messageManager->addSuccessMessage(
-                    __('Message is added to queue, wait to get your file soon')
+                    __(
+                        'Message is added to queue, wait to get your file soon.'
+                        . ' Make sure your cron job is running to export the file'
+                    )
                 );
             } catch (\Exception $e) {
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
index 10ae2dc5e58e1..1e9d194653c9c 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
@@ -67,6 +67,11 @@ public function execute()
             }
             $directory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_DIR);
             $path = $directory->getAbsolutePath() . 'export/' . $fileName;
+
+            if (!$directory->isFile($path)) {
+                throw new LocalizedException(__('Sorry, but the data is invalid or the file is not uploaded.'));
+            }
+
             $this->file->deleteFile($path);
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
index e850f6af86cf9..5f036e51f66c4 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
@@ -6,12 +6,15 @@
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\ImportExport\Controller\Adminhtml\ImportResult as ImportResultController;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\ImportExport\Model\Import;
 
 /**
- * Controller responsible for initiating the import process
+ * Controller responsible for initiating the import process.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Start extends ImportResultController implements HttpPostActionInterface
 {
@@ -25,25 +28,35 @@ class Start extends ImportResultController implements HttpPostActionInterface
      */
     private $exceptionMessageFactory;
 
+    /**
+     * @var Import\ImageDirectoryBaseProvider
+     */
+    private $imagesDirProvider;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\ImportExport\Model\Report\ReportProcessorInterface $reportProcessor
      * @param \Magento\ImportExport\Model\History $historyModel
      * @param \Magento\ImportExport\Helper\Report $reportHelper
-     * @param \Magento\ImportExport\Model\Import $importModel
+     * @param Import $importModel
      * @param \Magento\Framework\Message\ExceptionMessageFactoryInterface $exceptionMessageFactory
+     * @param Import\ImageDirectoryBaseProvider|null $imageDirectoryBaseProvider
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\ImportExport\Model\Report\ReportProcessorInterface $reportProcessor,
         \Magento\ImportExport\Model\History $historyModel,
         \Magento\ImportExport\Helper\Report $reportHelper,
-        \Magento\ImportExport\Model\Import $importModel,
-        \Magento\Framework\Message\ExceptionMessageFactoryInterface $exceptionMessageFactory
+        Import $importModel,
+        \Magento\Framework\Message\ExceptionMessageFactoryInterface $exceptionMessageFactory,
+        ?Import\ImageDirectoryBaseProvider $imageDirectoryBaseProvider = null
     ) {
         parent::__construct($context, $reportProcessor, $historyModel, $reportHelper);
+
         $this->importModel = $importModel;
         $this->exceptionMessageFactory = $exceptionMessageFactory;
+        $this->imagesDirProvider = $imageDirectoryBaseProvider
+            ?? ObjectManager::getInstance()->get(Import\ImageDirectoryBaseProvider::class);
     }
 
     /**
@@ -66,6 +79,8 @@ public function execute()
                 ->addAction('hide', ['edit_form', 'upload_button', 'messages']);
 
             $this->importModel->setData($data);
+            //Images can be read only from given directory.
+            $this->importModel->setData('images_base_directory', $this->imagesDirProvider->getDirectory());
             $errorAggregator = $this->importModel->getErrorAggregator();
             $errorAggregator->initValidationStrategy(
                 $this->importModel->getData(Import::FIELD_NAME_VALIDATION_STRATEGY),
diff --git a/app/code/Magento/ImportExport/Files/Sample/catalog_product.csv b/app/code/Magento/ImportExport/Files/Sample/catalog_product.csv
index 7ffd5b1dfb57c..c5d8df36b441c 100644
--- a/app/code/Magento/ImportExport/Files/Sample/catalog_product.csv
+++ b/app/code/Magento/ImportExport/Files/Sample/catalog_product.csv
@@ -1,7 +1,7 @@
-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,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,crosssell_skus,upsell_skus,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,associated_skus
-24-WG085,,Default,simple,"Default Category/Gear,Default Category/Gear/Fitness Equipment",base,Sprite Yoga Strap 6 foot,"<p>The Sprite Yoga Strap is your untiring partner in demanding stretches, holds and alignment routines. The strap's 100% organic cotton fabric is woven tightly to form a soft, textured yet non-slip surface. The plastic clasp buckle is easily adjustable, lightweight and urable under strain.</p><ul><li>100% soft and durable cotton.<li>Plastic cinch buckle is easy to use.<li>Three natural colors made from phthalate and heavy metal free dyes.</ul>",,1,1,Taxable Goods,"Catalog, Search",14,,,,sprite-yoga-strap-6-foot,Meta Title,"meta1, meta2, meta3",meta description,"2015-10-25 03:34:20","2015-10-25 03:34:20",,,Block after Info Column,,,,,,,,,,,Use config,,"has_options=1,quantity_and_stock_status=In Stock,required_options=0",100,0,1,0,0,1,1,0,0,1,1,,1,0,1,1,0,1,0,0,1,0,1,"24-WG087,24-WG086","24-WG087,24-WG086","24-WG087,24-WG086",,"name=Custom Yoga Option,type=drop_down,required=0,price=10.0000,price_type=fixed,sku=,option_title=Gold|name=Custom Yoga Option,type=drop_down,required=0,price=10.0000,price_type=fixed,sku=,option_title=Silver|name=Custom Yoga Option,type=drop_down,required=0,price=10.0000,price_type=fixed,sku=yoga3sku,option_title=Platinum",,,,,,
-24-WG086,,Default,simple,"Default Category/Gear,Default Category/Gear/Fitness Equipment",base,Sprite Yoga Strap 8 foot,"<p>The Sprite Yoga Strap is your untiring partner in demanding stretches, holds and alignment routines. The strap's 100% organic cotton fabric is woven tightly to form a soft, textured yet non-slip surface. The plastic clasp buckle is easily adjustable, lightweight and durable under strain.</p><ul><li>8' long x 1.0"" wide.<li>100% soft and durable cotton.<li>Plastic cinch buckle is easy to use.<li>Three natural colors made from phthalate and heavy metal free dyes.</ul>",,1,1,Taxable Goods,"Catalog, Search",17,,,,sprite-yoga-strap-8-foot,Meta Title,"meta1, meta2, meta4",meta description,"2015-10-25 03:34:20","2015-10-25 03:34:20",,,Block after Info Column,,,,,,,,,,,Use config,,"has_options=0,quantity_and_stock_status=In Stock,required_options=0",100,0,1,0,0,1,1,0,0,1,1,,1,0,1,1,0,1,0,0,1,0,1,24-WG087,24-WG087,24-WG087,,,,,,,,
-24-WG087,,Default,simple,"Default Category/Gear,Default Category/Gear/Fitness Equipment",base,Sprite Yoga Strap 10 foot,"<p>The Sprite Yoga Strap is your untiring partner in demanding stretches, holds and alignment routines. The strap's 100% organic cotton fabric is woven tightly to form a soft, textured yet non-slip surface. The plastic clasp buckle is easily adjustable, lightweight and durable under strain.</p><ul><li>10' long x 1.0"" wide.<li>100% soft and durable cotton.<li>Plastic cinch buckle is easy to use.<li>Three natural colors made from phthalate and heavy metal free dyes.</ul>",,1,1,Taxable Goods,"Catalog, Search",21,,,,sprite-yoga-strap-10-foot,Meta Title,"meta1, meta2, meta5",meta description,"2015-10-25 03:34:20","2015-10-25 03:34:20",,,Block after Info Column,,,,,,,,,,,Use config,,"has_options=0,quantity_and_stock_status=In Stock,required_options=0",100,0,1,0,0,1,1,0,0,1,1,,1,0,1,1,0,1,0,0,1,0,1,24-WG086,24-WG086,24-WG086,,,,,,,,
-24-WG085_Group,,Default,grouped,"Default Category/Gear,Default Category/Gear/Fitness Equipment",base,Set of Sprite Yoga Straps,"<p>Great set of Sprite Yoga Straps for every stretch and hold you need. There are three straps in this set: 6', 8' and 10'.</p><ul><li>100% soft and durable cotton.</li><li>Plastic cinch buckle is easy to use.</li><li>Choice of three natural colors made from phthalate and heavy metal free dyes.</li></ul>",,,1,,"Catalog, Search",,,,,set-of-sprite-yoga-straps,Meta Title,"meta1, meta2, meta6",meta description,"2015-10-25 03:34:20","2015-10-25 03:34:20",,,Block after Info Column,,,,,,,,,,,,,"has_options=0,quantity_and_stock_status=In Stock,required_options=0",0,0,1,0,0,1,1,0,0,1,1,,1,1,1,1,0,1,0,0,1,0,1,"24-WG087,24-WG086","24-WG087,24-WG086","24-WG087,24-WG086",,,,,,,,"24-WG085=5.0000,24-WG086=5.0000"
-24-WG085-bundle-dynamic,,Default,bundle,"Default Category/Gear,Default Category/Gear/Fitness Equipment",base,Sprite Yoga Strap Dynamic Bundle,"<p>The Sprite Yoga Strap is your untiring partner in demanding stretches, holds and alignment routines. The strap's 100% organic cotton fabric is woven tightly to form a soft, textured yet non-slip surface. The plastic clasp buckle is easily adjustable, lightweight and durable under strain.</p><ul><li>100% soft and durable cotton.<li>Plastic cinch buckle is easy to use.<li>Three natural colors made from phthalate and heavy metal free dyes.</ul>",,1,1,Taxable Goods,"Catalog, Search",14,,,,sprite-yoga-strap2,Meta Title,"meta1, meta2, meta8",meta description,"2015-10-25 03:34:20","2015-10-25 03:34:20",,,Block after Info Column,,,,,,,,,,,Use config,,"has_options=1,shipment_type=together,quantity_and_stock_status=In Stock,required_options=0",0,0,1,0,0,1,1,0,0,1,1,,1,0,1,1,0,1,0,0,1,0,1,"24-WG087,24-WG086","24-WG087,24-WG086","24-WG087,24-WG086",,,dynamic,dynamic,Price range,fixed,"name=Bundle Option One1,type=select,required=1,sku=24-WG085,price=15.0000,default=0,default_qty=1.0000,price_type=fixed|name=Bundle Option One1,type=select,required=1,sku=24-WG086,price=10.0000,default=1,default_qty=1.0000,price_type=fixed",
-24-WG085-bundle-fixed,,Default,bundle,"Default Category/Gear,Default Category/Gear/Fitness Equipment",base,Sprite Yoga Strap Fixed Bundle,"<p>The Sprite Yoga Strap is your untiring partner in demanding stretches, holds and alignment routines. The strap's 100% organic cotton fabric is woven tightly to form a soft, textured yet non-slip surface. The plastic clasp buckle is easily adjustable, lightweight and durable under strain.</p><ul><li>100% soft and durable cotton.<li>Plastic cinch buckle is easy to use.<li>Three natural colors made from phthalate and heavy metal free dyes.</ul>",,1,1,Taxable Goods,"Catalog, Search",14,,,,sprite-yoga-strap3,Meta Title,"meta1, meta2, meta9",meta description,"2015-10-25 03:34:20","2015-10-25 03:34:20",,,Block after Info Column,,,,,,,,,,,Use config,,"has_options=1,shipment_type=together,quantity_and_stock_status=In Stock,required_options=0",0,0,1,0,0,1,1,0,0,1,1,,1,0,1,1,0,1,0,0,1,0,1,"24-WG087,24-WG086","24-WG087,24-WG086","24-WG087,24-WG086",,,fixed,fixed,Price range,fixed,"name=Yoga Strap,type=radio,required=1,sku=24-WG086,price=0.0000,default=1,default_qty=3.0000,price_type=percent|name=Yoga Strap,type=radio,required=1,sku=24-WG085,price=0.0000,default=0,default_qty=3.0000,price_type=percent",
\ No newline at end of file
+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,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,crosssell_skus,upsell_skus,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,associated_skus
+24-WG085,,Default,simple,"Default Category/Gear,Default Category/Gear/Fitness Equipment",base,Sprite Yoga Strap 6 foot,"<p>The Sprite Yoga Strap is your untiring partner in demanding stretches, holds and alignment routines. The strap's 100% organic cotton fabric is woven tightly to form a soft, textured yet non-slip surface. The plastic clasp buckle is easily adjustable, lightweight and urable under strain.</p><ul><li>100% soft and durable cotton.<li>Plastic cinch buckle is easy to use.<li>Three natural colors made from phthalate and heavy metal free dyes.</ul>",,1.23,1,Taxable Goods,"Catalog, Search",14,,,,sprite-yoga-strap-6-foot,Meta Title,"meta1, meta2, meta3",meta description,2015-10-25 3:34:20,2015-10-25 3:34:20,,,Block after Info Column,,,,,,,,,,,Use config,,"has_options=1,quantity_and_stock_status=In Stock,required_options=0",100,0,1,0,0,1,1,0,0,1,1,,1,0,1,1,0,1,0,0,1,0,1,"24-WG087,24-WG086","24-WG087,24-WG086","24-WG087,24-WG086",,"name=Custom Yoga Option,type=drop_down,required=0,price=10.0000,price_type=fixed,sku=,option_title=Gold|name=Custom Yoga Option,type=drop_down,required=0,price=10.0000,price_type=fixed,sku=,option_title=Silver|name=Custom Yoga Option,type=drop_down,required=0,price=10.0000,price_type=fixed,sku=yoga3sku,option_title=Platinum",,,,,,
+24-WG086,,Default,simple,"Default Category/Gear,Default Category/Gear/Fitness Equipment",base,Sprite Yoga Strap 8 foot,"<p>The Sprite Yoga Strap is your untiring partner in demanding stretches, holds and alignment routines. The strap's 100% organic cotton fabric is woven tightly to form a soft, textured yet non-slip surface. The plastic clasp buckle is easily adjustable, lightweight and durable under strain.</p><ul><li>8' long x 1.0"" wide.<li>100% soft and durable cotton.<li>Plastic cinch buckle is easy to use.<li>Three natural colors made from phthalate and heavy metal free dyes.</ul>",,1,1,Taxable Goods,"Catalog, Search",17,,,,sprite-yoga-strap-8-foot,Meta Title,"meta1, meta2, meta4",meta description,2015-10-25 3:34:20,2015-10-25 3:34:20,,,Block after Info Column,,,,,,,,,,,Use config,,"has_options=0,quantity_and_stock_status=In Stock,required_options=0",100,0,1,0,0,1,1,0,0,1,1,,1,0,1,1,0,1,0,0,1,0,1,24-WG087,24-WG087,24-WG087,,,,,,,,
+24-WG087,,Default,simple,"Default Category/Gear,Default Category/Gear/Fitness Equipment",base,Sprite Yoga Strap 10 foot,"<p>The Sprite Yoga Strap is your untiring partner in demanding stretches, holds and alignment routines. The strap's 100% organic cotton fabric is woven tightly to form a soft, textured yet non-slip surface. The plastic clasp buckle is easily adjustable, lightweight and durable under strain.</p><ul><li>10' long x 1.0"" wide.<li>100% soft and durable cotton.<li>Plastic cinch buckle is easy to use.<li>Three natural colors made from phthalate and heavy metal free dyes.</ul>",,1,1,Taxable Goods,"Catalog, Search",21,,,,sprite-yoga-strap-10-foot,Meta Title,"meta1, meta2, meta5",meta description,2015-10-25 3:34:20,2015-10-25 3:34:20,,,Block after Info Column,,,,,,,,,,,Use config,,"has_options=0,quantity_and_stock_status=In Stock,required_options=0",100,0,1,0,0,1,1,0,0,1,1,,1,0,1,1,0,1,0,0,1,0,1,24-WG086,24-WG086,24-WG086,,,,,,,,
+24-WG085_Group,,Default,grouped,"Default Category/Gear,Default Category/Gear/Fitness Equipment",base,Set of Sprite Yoga Straps,"<p>Great set of Sprite Yoga Straps for every stretch and hold you need. There are three straps in this set: 6', 8' and 10'.</p><ul><li>100% soft and durable cotton.</li><li>Plastic cinch buckle is easy to use.</li><li>Choice of three natural colors made from phthalate and heavy metal free dyes.</li></ul>",,,1,,"Catalog, Search",,,,,set-of-sprite-yoga-straps,Meta Title,"meta1, meta2, meta6",meta description,2015-10-25 3:34:20,2015-10-25 3:34:20,,,Block after Info Column,,,,,,,,,,,,,"has_options=0,quantity_and_stock_status=In Stock,required_options=0",0,0,1,0,0,1,1,0,0,1,1,,1,1,1,1,0,1,0,0,1,0,1,"24-WG087,24-WG086","24-WG087,24-WG086","24-WG087,24-WG086",,,,,,,,"24-WG085=5.0000,24-WG086=5.0000"
+24-WG085-bundle-dynamic,,Default,bundle,"Default Category/Gear,Default Category/Gear/Fitness Equipment",base,Sprite Yoga Strap Dynamic Bundle,"<p>The Sprite Yoga Strap is your untiring partner in demanding stretches, holds and alignment routines. The strap's 100% organic cotton fabric is woven tightly to form a soft, textured yet non-slip surface. The plastic clasp buckle is easily adjustable, lightweight and durable under strain.</p><ul><li>100% soft and durable cotton.<li>Plastic cinch buckle is easy to use.<li>Three natural colors made from phthalate and heavy metal free dyes.</ul>",,1.12,1,Taxable Goods,"Catalog, Search",14,,,,sprite-yoga-strap2,Meta Title,"meta1, meta2, meta8",meta description,2015-10-25 3:34:20,2015-10-25 3:34:20,,,Block after Info Column,,,,,,,,,,,Use config,,"has_options=1,shipment_type=together,quantity_and_stock_status=In Stock,required_options=0",0,0,1,0,0,1,1,0,0,1,1,,1,0,1,1,0,1,0,0,1,0,1,"24-WG087,24-WG086","24-WG087,24-WG086","24-WG087,24-WG086",,,dynamic,dynamic,Price range,fixed,"name=Bundle Option One1,type=select,required=1,sku=24-WG085,price=15.0000,default=0,default_qty=1.0000,price_type=fixed|name=Bundle Option One1,type=select,required=1,sku=24-WG086,price=10.0000,default=1,default_qty=1.0000,price_type=fixed",
+24-WG085-bundle-fixed,,Default,bundle,"Default Category/Gear,Default Category/Gear/Fitness Equipment",base,Sprite Yoga Strap Fixed Bundle,"<p>The Sprite Yoga Strap is your untiring partner in demanding stretches, holds and alignment routines. The strap's 100% organic cotton fabric is woven tightly to form a soft, textured yet non-slip surface. The plastic clasp buckle is easily adjustable, lightweight and durable under strain.</p><ul><li>100% soft and durable cotton.<li>Plastic cinch buckle is easy to use.<li>Three natural colors made from phthalate and heavy metal free dyes.</ul>",,1,1,Taxable Goods,"Catalog, Search",14,,,,sprite-yoga-strap3,Meta Title,"meta1, meta2, meta9",meta description,2015-10-25 3:34:20,2015-10-25 3:34:20,,,Block after Info Column,,,,,,,,,,,Use config,,"has_options=1,shipment_type=together,quantity_and_stock_status=In Stock,required_options=0",0,0,1,0,0,1,1,0,0,1,1,,1,0,1,1,0,1,0,0,1,0,1,"24-WG087,24-WG086","24-WG087,24-WG086","24-WG087,24-WG086",,,fixed,fixed,Price range,fixed,"name=Yoga Strap,type=radio,required=1,sku=24-WG086,price=0.0000,default=1,default_qty=3.0000,price_type=percent|name=Yoga Strap,type=radio,required=1,sku=24-WG085,price=0.0000,default=0,default_qty=3.0000,price_type=percent",
\ No newline at end of file
diff --git a/app/code/Magento/ImportExport/Model/Export/Config/Converter.php b/app/code/Magento/ImportExport/Model/Export/Config/Converter.php
index 20ab81ec1cd5b..298f63d18f88d 100644
--- a/app/code/Magento/ImportExport/Model/Export/Config/Converter.php
+++ b/app/code/Magento/ImportExport/Model/Export/Config/Converter.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\ImportExport\Model\Export\Config;
 
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\Framework\App\Utility\Classes;
 
 /**
@@ -14,14 +14,14 @@
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
     /**
      * @param Manager $moduleManager
      */
-    public function __construct(ModuleManagerInterface $moduleManager)
+    public function __construct(Manager $moduleManager)
     {
         $this->moduleManager = $moduleManager;
     }
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index 04f4111d3a0a8..cf20001882c0d 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -13,6 +13,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\HTTP\Adapter\FileTransferFactory;
 use Magento\Framework\Indexer\IndexerRegistry;
@@ -107,7 +108,7 @@ class Import extends AbstractModel
     const DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR = ',';
 
     /**
-     * default empty attribute value constant
+     * Import empty attribute default value
      */
     const DEFAULT_EMPTY_ATTRIBUTE_VALUE_CONSTANT = '__EMPTY__VALUE__';
     const DEFAULT_SIZE = 50;
@@ -464,8 +465,28 @@ public function importSource()
     {
         $this->setData('entity', $this->getDataSourceModel()->getEntityTypeCode());
         $this->setData('behavior', $this->getDataSourceModel()->getBehavior());
-        $this->importHistoryModel->updateReport($this);
+        //Validating images temporary directory path if the constraint has been provided
+        if ($this->hasData('images_base_directory')
+            && $this->getData('images_base_directory') instanceof Filesystem\Directory\ReadInterface
+        ) {
+            /** @var Filesystem\Directory\ReadInterface $imagesDirectory */
+            $imagesDirectory = $this->getData('images_base_directory');
+            if (!$imagesDirectory->isReadable()) {
+                $rootWrite = $this->_filesystem->getDirectoryWrite(DirectoryList::ROOT);
+                $rootWrite->create($imagesDirectory->getAbsolutePath());
+            }
+            try {
+                $this->setData(
+                    self::FIELD_NAME_IMG_FILE_DIR,
+                    $imagesDirectory->getAbsolutePath($this->getData(self::FIELD_NAME_IMG_FILE_DIR))
+                );
+                $this->_getEntityAdapter()->setParameters($this->getData());
+            } catch (ValidatorException $exception) {
+                throw new LocalizedException(__('Images file directory is outside required directory'), $exception);
+            }
+        }
 
+        $this->importHistoryModel->updateReport($this);
         $this->addLogComment(__('Begin import of "%1" with "%2" behavior', $this->getEntity(), $this->getBehavior()));
 
         $result = $this->processImport();
@@ -547,9 +568,15 @@ public function uploadSource()
         $entity = $this->getEntity();
         /** @var $uploader Uploader */
         $uploader = $this->_uploaderFactory->create(['fileId' => self::FIELD_NAME_SOURCE_FILE]);
+        $uploader->setAllowedExtensions(['csv', 'zip']);
         $uploader->skipDbProcessing(true);
         $fileName = $this->random->getRandomString(32) . '.' . $uploader->getFileExtension();
-        $result = $uploader->save($this->getWorkingDir(), $fileName);
+        try {
+            $result = $uploader->save($this->getWorkingDir(), $fileName);
+        } catch (\Exception $e) {
+            throw new LocalizedException(__('The file cannot be uploaded.'));
+        }
+
         // phpcs:disable Magento2.Functions.DiscouragedFunction.Discouraged
         $extension = pathinfo($result['file'], PATHINFO_EXTENSION);
 
diff --git a/app/code/Magento/ImportExport/Model/Import/Config/Converter.php b/app/code/Magento/ImportExport/Model/Import/Config/Converter.php
index f2d1596ec3d9d..a1eb8470b4dd6 100644
--- a/app/code/Magento/ImportExport/Model/Import/Config/Converter.php
+++ b/app/code/Magento/ImportExport/Model/Import/Config/Converter.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\ImportExport\Model\Import\Config;
 
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\Framework\App\Utility\Classes;
 
 /**
@@ -14,14 +14,14 @@
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
     /**
-     * @param ModuleManagerInterface $moduleManager
+     * @param Manager $moduleManager
      */
-    public function __construct(ModuleManagerInterface $moduleManager)
+    public function __construct(Manager $moduleManager)
     {
         $this->moduleManager = $moduleManager;
     }
diff --git a/app/code/Magento/ImportExport/Model/Import/ImageDirectoryBaseProvider.php b/app/code/Magento/ImportExport/Model/Import/ImageDirectoryBaseProvider.php
new file mode 100644
index 0000000000000..9c90b57c30ea8
--- /dev/null
+++ b/app/code/Magento/ImportExport/Model/Import/ImageDirectoryBaseProvider.php
@@ -0,0 +1,64 @@
+<?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\App\Config\ScopeConfigInterface;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\Filesystem;
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Provides base directory to use for images when user imports entities.
+ */
+class ImageDirectoryBaseProvider
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @param ScopeConfigInterface $config
+     * @param Filesystem $filesystem
+     */
+    public function __construct(ScopeConfigInterface $config, Filesystem $filesystem)
+    {
+        $this->config = $config;
+        $this->filesystem = $filesystem;
+    }
+
+    /**
+     * Directory that users are allowed to place images for importing.
+     *
+     * @return ReadInterface
+     */
+    public function getDirectory(): ReadInterface
+    {
+        $path = $this->getDirectoryRelativePath();
+
+        return $this->filesystem->getDirectoryReadByPath(
+            $this->filesystem->getDirectoryRead(DirectoryList::ROOT)->getAbsolutePath($path)
+        );
+    }
+
+    /**
+     * The directory's path relative to Magento root.
+     *
+     * @return string
+     */
+    public function getDirectoryRelativePath(): string
+    {
+        return $this->config->getValue('general/file/import_images_base_dir');
+    }
+}
diff --git a/app/code/Magento/ImportExport/Model/Import/Source/Zip.php b/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
index 6fa87ab5d5c4d..7e69d837d6526 100644
--- a/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
+++ b/app/code/Magento/ImportExport/Model/Import/Source/Zip.php
@@ -33,6 +33,12 @@ public function __construct(
             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);
+
+        try {
+            parent::__construct($csvFile, $directory, $options);
+        } catch (\LogicException $e) {
+            $directory->delete($directory->getRelativePath($csvFile));
+            throw $e;
+        }
     }
 }
diff --git a/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminAssertVisiblePagerActionGroup.xml b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminAssertVisiblePagerActionGroup.xml
new file mode 100644
index 0000000000000..298be79a6ac9f
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminAssertVisiblePagerActionGroup.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="AdminAssertVisiblePagerActionGroup">
+        <seeElement selector="{{AdminExportGridPagerSection.pager}}" stepKey="seeGridPager"/>
+        <seeElement selector="{{AdminGridRowsPerPage.count}}" stepKey="seeCountPerPageElement"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminCheckDataForImportProductActionGroup.xml b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminCheckDataForImportProductActionGroup.xml
new file mode 100644
index 0000000000000..8628d246248b1
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminCheckDataForImportProductActionGroup.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="AdminCheckDataForImportProductActionGroup">
+        <arguments>
+            <argument name="behavior" type="string" defaultValue="Add/Update"/>
+            <argument name="importFile" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminImportIndexPage.url}}" stepKey="goToImportIndexPage"/>
+        <waitForPageLoad stepKey="adminImportMainSectionLoad"/>
+        <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
+        <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
+        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="{{behavior}}" stepKey="selectImportBehaviorOption"/>
+        <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="{{importFile}}" stepKey="attachFileForImport"/>
+        <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml
index 9063916e9f502..956822fc3cbef 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml
@@ -17,7 +17,7 @@
             <argument name="validationStrategy" type="string" defaultValue="Stop on Error"/>
             <argument name="allowedErrorsCount" type="string" defaultValue="10"/>
             <argument name="importFile" type="string"/>
-            <argument name="importNoticeMessage" type="string"/>
+            <argument name="importNoticeMessage" type="string" defaultValue=""/>
             <argument name="importMessageType" type="string" defaultValue="success"/>
             <argument name="importMessage" type="string" defaultValue="Import successfully done"/>
         </arguments>
@@ -36,28 +36,4 @@
         <see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="{{importNoticeMessage}}" stepKey="seeNoticeMessage"/>
         <see selector="{{AdminImportValidationMessagesSection.messageByType(importMessageType)}}" userInput="{{importMessage}}" stepKey="seeImportMessage"/>
     </actionGroup>
-
-    <actionGroup name="AdminImportProductsWithCheckValidationResultActionGroup" extends="AdminImportProductsActionGroup">
-        <arguments>
-            <argument name="validationNoticeMessage" type="string"/>
-            <argument name="validationMessage" type="string" defaultValue="File is valid! To start import process press &quot;Import&quot; button"/>
-        </arguments>
-        <waitForElementVisible selector="{{AdminImportValidationMessagesSection.notice}}" after="clickCheckDataButton" stepKey="waitForValidationNoticeMessage"/>
-        <see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="{{validationNoticeMessage}}" after="waitForValidationNoticeMessage" stepKey="seeValidationNoticeMessage"/>
-        <see selector="{{AdminImportValidationMessagesSection.success}}" userInput="{{validationMessage}}" after="seeValidationNoticeMessage" stepKey="seeValidationMessage"/>
-    </actionGroup>
-    <actionGroup name="AdminCheckDataForImportProductActionGroup">
-        <arguments>
-            <argument name="behavior" type="string" defaultValue="Add/Update"/>
-            <argument name="importFile" type="string"/>
-        </arguments>
-        <amOnPage url="{{AdminImportIndexPage.url}}" stepKey="goToImportIndexPage"/>
-        <waitForPageLoad stepKey="adminImportMainSectionLoad"/>
-        <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
-        <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
-        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="{{behavior}}" stepKey="selectImportBehaviorOption"/>
-        <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="{{importFile}}" stepKey="attachFileForImport"/>
-        <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithCheckValidationResultActionGroup.xml b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithCheckValidationResultActionGroup.xml
new file mode 100644
index 0000000000000..a631ec72a5a72
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsWithCheckValidationResultActionGroup.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="AdminImportProductsWithCheckValidationResultActionGroup" extends="AdminImportProductsActionGroup">
+        <arguments>
+            <argument name="validationNoticeMessage" type="string"/>
+            <argument name="validationMessage" type="string" defaultValue="File is valid! To start import process press &quot;Import&quot; button"/>
+        </arguments>
+        <waitForElementVisible selector="{{AdminImportValidationMessagesSection.notice}}" after="clickCheckDataButton" stepKey="waitForValidationNoticeMessage"/>
+        <see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="{{validationNoticeMessage}}" after="waitForValidationNoticeMessage" stepKey="seeValidationNoticeMessage"/>
+        <see selector="{{AdminImportValidationMessagesSection.success}}" userInput="{{validationMessage}}" after="seeValidationNoticeMessage" stepKey="seeValidationMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminNavigateToExportPageActionGroup.xml b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminNavigateToExportPageActionGroup.xml
new file mode 100644
index 0000000000000..1c3c241c7b0fa
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminNavigateToExportPageActionGroup.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="AdminNavigateToExportPageActionGroup">
+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="navigateToExportPage"/>
+        <waitForPageLoad stepKey="waitForExportPageOpened"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Page/AdminExportIndexPage.xml b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminExportIndexPage.xml
index 55ed3edd9bc79..3d0aff2e113ae 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Page/AdminExportIndexPage.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminExportIndexPage.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="AdminExportIndexPage" url="admin/export/" area="admin" module="Magento_ImportExport">
         <section name="AdminExportMainSection"/>
+        <section name="AdminExportGridPagerSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
index 528ad23aaf2bf..f9b07a59c8763 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
@@ -17,5 +17,6 @@
         <element name="selectByIndex" type="button" selector="//tr[@data-repeat-index='{{var}}']//button" parameterized="true" timeout="30"/>
         <element name="download" type="button" selector="//tr[@data-repeat-index='{{var}}']//a[text()='Download']" parameterized="true" timeout="30"/>
         <element name="delete" type="button" selector="//tr[@data-repeat-index='{{var}}']//a[text()='Delete']" parameterized="true" timeout="30"/>
+        <element name="exportFileNameByPosition" type="text" selector="[data-role='grid'] tr[data-repeat-index='{{position}}'] div.data-grid-cell-content" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/OrdersGridSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportGridPagerSection.xml
similarity index 54%
rename from app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/OrdersGridSection.xml
rename to app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportGridPagerSection.xml
index 7ae3dd0ffee89..8c4615c5926f0 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/OrdersGridSection.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportGridPagerSection.xml
@@ -8,7 +8,8 @@
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="OrdersGridSection">
-        <element name="viewMostRecentOrder" type="button" selector="#container div.admin__data-grid-wrap td:nth-of-type(10) a"/>
+    <section name="AdminExportGridPagerSection">
+        <element name="pager" type="text" selector=".admin__data-grid-header div.admin__data-grid-pager-wrap"/>
+        <element name="recordsLabel" type="text" selector=".admin__data-grid-header .admin__control-support-text"/>
     </section>
 </sections>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
index 748580be09406..c39ebbe04f2e1 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
@@ -10,5 +10,6 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminImportHeaderSection">
         <element name="checkDataButton" type="button" selector="#upload_button" timeout="30"/>
+        <element name="messageNote" type="text" selector="#import_file-note" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckThatSomeAttributesChangedValueToEmptyAfterImportTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckThatSomeAttributesChangedValueToEmptyAfterImportTest.xml
new file mode 100644
index 0000000000000..42516e5a5a363
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckThatSomeAttributesChangedValueToEmptyAfterImportTest.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="AdminCheckThatSomeAttributesChangedValueToEmptyAfterImportTest">
+        <annotations>
+            <features value="Import/Export"/>
+            <stories value="Attribute importing"/>
+            <title value="Check that some attributes changed the value to an empty after import CSV"/>
+            <description value="Check that some attributes changed the value to an empty after import CSV"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-11332"/>
+            <useCaseId value="MAGETWO-61593"/>
+            <group value="importExport"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndexPage"/>
+            <actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridToDefaultView"/>
+            <actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteAllProducts"/>
+            <createData entity="productDropDownAttribute" stepKey="productAttribute"/>
+            <createData entity="productAttributeOption2" stepKey="attributeOptionWithDefaultValue">
+                <requiredEntity createDataKey="productAttribute"/>
+            </createData>
+            <!--Create category-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+        </before>
+        <after>
+            <!--Delete Product and Category-->
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+            <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
+                <argument name="productName" value="simpleProductWithShortNameAndSku.name"/>
+            </actionGroup>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!--Delete attribute-->
+            <deleteData createDataKey="productAttribute" stepKey="deleteProductAttribute"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <!--Create product-->
+        <actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm"/>
+        <actionGroup ref="fillMainProductForm" stepKey="fillProductFieldsInAdmin">
+            <argument name="product" value="simpleProductWithShortNameAndSku"/>
+        </actionGroup>
+        <actionGroup ref="SetCategoryByName" stepKey="addCategoryToProduct">
+            <argument name="categoryName" value="$$createCategory.name$$"/>
+        </actionGroup>
+        <!--Select created attribute-->
+        <actionGroup ref="addProductAttributeInProductModal" stepKey="addAttributeToProduct">
+            <argument name="attributeCode" value="$$productAttribute.attribute_code$$"/>
+        </actionGroup>
+        <!--Check that attribute value is selected-->
+        <scrollTo selector="{{AdminProductFormSection.attributeTab}}" stepKey="scrollToAttributeTitle1"/>
+        <conditionalClick selector="{{AdminProductFormSection.attributeTab}}" dependentSelector="{{AdminProductAttributeSection.dropDownAttribute($$productAttribute.attribute_code$$)}}" visible="false" stepKey="expandAttributeTab1"/>
+        <seeOptionIsSelected selector="{{AdminProductAttributeSection.dropDownAttribute($$productAttribute.attribute_code$$)}}" userInput="option2" stepKey="seeAttributeValueIsSelected1"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        <!--Import product with add/update behavior-->
+        <actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProductsFirstTime">
+            <argument name="behavior" value="Add/Update"/>
+            <argument name="importFile" value="import_simple_product.csv"/>
+            <argument name="importNoticeMessage" value="Created: 0, Updated: 1, Deleted: 0"/>
+        </actionGroup>
+        <!--Check that attribute value is empty after import-->
+        <actionGroup ref="filterAndSelectProduct" stepKey="filterAndSelectTheProduct2">
+            <argument name="productSku" value="{{simpleProductWithShortNameAndSku.sku}}"/>
+        </actionGroup>
+        <scrollTo selector="{{AdminProductFormSection.attributeTab}}" stepKey="scrollToAttributeTitle2"/>
+        <conditionalClick selector="{{AdminProductFormSection.attributeTab}}" dependentSelector="{{AdminProductAttributeSection.dropDownAttribute($$productAttribute.attribute_code$$)}}" visible="false" stepKey="expandAttributeTab2"/>
+        <seeOptionIsSelected selector="{{AdminProductAttributeSection.dropDownAttribute($$productAttribute.attribute_code$$)}}" userInput="" stepKey="seeAttributeValueIsSelected2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminExportPagerGridTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminExportPagerGridTest.xml
new file mode 100644
index 0000000000000..b203a4d11a2d2
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminExportPagerGridTest.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="AdminExportPagerGridTest">
+        <annotations>
+            <features value="ImportExport"/>
+            <stories value="Export Grid"/>
+            <title value="Testing if the grid is present on export page"/>
+            <description value="Admin should be able to see the grid onn export page"/>
+            <severity value="CRITICAL"/>
+            <group value="importExport"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateToExportPageActionGroup" stepKey="navigateToExportPage"/>
+        <actionGroup ref="AdminAssertVisiblePagerActionGroup" stepKey="seeGridPager"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportCSVWithSpecialCharactersTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportCSVWithSpecialCharactersTest.xml
new file mode 100644
index 0000000000000..38c1a09dc534c
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportCSVWithSpecialCharactersTest.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminImportCSVWithSpecialCharactersTest">
+        <annotations>
+            <features value="Import/Export"/>
+            <stories value="Import CSV file"/>
+            <title value="Import CSV with special characters"/>
+            <description value="Import CSV with special characters"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-6416"/>
+            <useCaseId value="MAGETWO-91569"/>
+            <group value="importExport"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <actionGroup ref="AdminCheckDataForImportProductActionGroup" stepKey="adminImportProducts">
+            <argument name="behavior" value="Add/Update"/>
+            <argument name="importFile" value="importSpecChars.csv"/>
+        </actionGroup>
+        <see selector="{{AdminImportHeaderSection.messageNote}}" userInput='File must be saved in UTF-8 encoding for proper import' stepKey="seeNoteMessage"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput='File is valid! To start import process press "Import" button' stepKey="seeSuccessMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml
index 4cbb0603d9073..7ec48a3a7e8fd 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml
@@ -47,8 +47,8 @@
         <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="catalog_products.csv" stepKey="attachFileForImport"/>
         <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
         <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
-        <see selector="{{AdminMessagesSection.notice}}" userInput="Created: 0, Updated: 0, Deleted: 3" stepKey="assertNotice"/>
+        <see selector="{{AdminImportValidationMessagesSection.success}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
+        <see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="Created: 0, Updated: 0, Deleted: 3" stepKey="assertNotice"/>
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchSimpleProductOnBackend">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminProductImportCSVFileCorrectDifferentFilesTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminProductImportCSVFileCorrectDifferentFilesTest.xml
index eb84929ec8d93..56c1c43bc28d2 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminProductImportCSVFileCorrectDifferentFilesTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminProductImportCSVFileCorrectDifferentFilesTest.xml
@@ -12,6 +12,7 @@
         <annotations>
             <description value="Product import from CSV file correct from different files."/>
             <features value="Import/Export"/>
+            <stories value="Product Import"/>
             <title value="Product import from CSV file correct from different files."/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-17104"/>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminProductVisibilityDifferentStoreViewsAfterImportTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminProductVisibilityDifferentStoreViewsAfterImportTest.xml
new file mode 100644
index 0000000000000..0a1423ece71e0
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminProductVisibilityDifferentStoreViewsAfterImportTest.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="AdminProductVisibilityDifferentStoreViewsAfterImportTest">
+        <annotations>
+            <features value="Import/Export"/>
+            <stories value="Import Products"/>
+            <title value="Checking product visibility in different store views after product importing"/>
+            <description value="Checking product visibility in different store views after product importing"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-6406"/>
+            <useCaseId value="MAGETWO-59265"/>
+            <group value="importExport"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create English and Chinese store views-->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createEnglishStoreView">
+                <argument name="StoreGroup" value="_defaultStoreGroup"/>
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createChineseStoreView">
+                <argument name="StoreGroup" value="_defaultStoreGroup"/>
+                <argument name="customStore" value="storeViewChinese"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!--Delete all imported products-->
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductIndexPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
+            <actionGroup ref="adminDataGridSelectPerPage" stepKey="selectNumberOfProductsPerPage">
+                <argument name="perPage" value="100"/>
+            </actionGroup>
+            <actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteAllProducts"/>
+            <!--Delete store views-->
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteEnglishStoreView">
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteChineseStoreView">
+                <argument name="customStore" value="storeViewChinese"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <!--Import products from file-->
+        <actionGroup ref="AdminImportProductsActionGroup" stepKey="importProducts">
+            <argument name="behavior" value="Add/Update"/>
+            <argument name="importFile" value="import_productsoftwostoresdata.csv"/>
+            <argument name="importNoticeMessage" value="Created: 2, Updated: 0, Deleted: 0"/>
+        </actionGroup>
+        <!--Open imported name4 product-->
+        <actionGroup ref="filterAndSelectProduct" stepKey="openName4Product">
+            <argument name="productSku" value="name4"/>
+        </actionGroup>
+        <!--Switch Chinese store view and assert visibility field-->
+        <comment userInput="Switch Chinese store view and assert visibility field" stepKey="commentAssertVisibilityChineseView"/>
+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="switchToCustomStoreView">
+            <argument name="storeViewName" value="{{storeViewChinese.name}}"/>
+        </actionGroup>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="Catalog" stepKey="seeVisibilityFieldForChineseStore"/>
+        <!--Switch English store view and assert visibility field-->
+        <actionGroup ref="SwitchToTheNewStoreView" stepKey="switchToCustomEnglishView">
+            <argument name="storeViewName" value="{{customStoreEN.name}}"/>
+        </actionGroup>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="Catalog" stepKey="seeVisibilityFieldForEnglishView"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminURLKeyWorksWhenUpdatingProductThroughImportingCSVTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminURLKeyWorksWhenUpdatingProductThroughImportingCSVTest.xml
new file mode 100644
index 0000000000000..8d56d9d8dad9d
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminURLKeyWorksWhenUpdatingProductThroughImportingCSVTest.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="AdminURLKeyWorksWhenUpdatingProductThroughImportingCSVTest">
+        <annotations>
+            <features value="Import/Export"/>
+            <stories value="Import Products"/>
+            <title value="Check that new URL Key works after updating a product through importing CSV file"/>
+            <description value="Check that new URL Key works after updating a product through importing CSV file"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-6317"/>
+            <useCaseId value="MAGETWO-91544"/>
+            <group value="importExport"/>
+        </annotations>
+        <before>
+            <!--Create Product-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProductBeforeUpdate" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <!--Import product from CSV file-->
+        <actionGroup ref="AdminImportProductsActionGroup" stepKey="importProduct">
+            <argument name="behavior" value="Add/Update"/>
+            <argument name="importFile" value="simpleProductUpdate.csv"/>
+            <argument name="importNoticeMessage" value="Created: 0, Updated: 1, Deleted: 0"/>
+        </actionGroup>
+        <!--Assert product's updated url-->
+        <amOnPage url="{{StorefrontProductPage.url('simpleprod')}}" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <seeInCurrentUrl url="{{StorefrontProductPage.url('simpleprod')}}" stepKey="seeUpdatedUrl"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createProduct.name$$" stepKey="assertProductName"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createProduct.sku$$" stepKey="assertProductSku"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ImportExport/Test/Unit/Helper/DataTest.php b/app/code/Magento/ImportExport/Test/Unit/Helper/DataTest.php
new file mode 100644
index 0000000000000..85630d2106b45
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Unit/Helper/DataTest.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ImportExport\Test\Unit\Helper;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\File\Size as FileSize;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\ImportExport\Helper\Data as HelperData;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class to cover Data Helper
+ *
+ * Class \Magento\ImportExport\Test\Unit\Helper\DataTest
+ */
+class DataTest extends TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var FileSize|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileSizeMock;
+
+    /**
+     * @var Context|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var ScopeConfigInterface|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var HelperData|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $helperData;
+
+    /**
+     * Set up environment
+     */
+    protected function setUp()
+    {
+        $this->contextMock = $this->createMock(Context::class);
+        $this->fileSizeMock = $this->createMock(FileSize::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->contextMock->expects($this->any())->method('getScopeConfig')->willReturn($this->scopeConfigMock);
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->helperData = $this->objectManagerHelper->getObject(
+            HelperData::class,
+            [
+                'context' => $this->contextMock,
+                'fileSize' => $this->fileSizeMock
+            ]
+        );
+    }
+
+    /**
+     * Test getMaxUploadSizeMessage() with data provider below
+     *
+     * @param float $maxImageSize
+     * @param string $expected
+     * @return void
+     * @dataProvider getMaxUploadSizeMessageDataProvider
+     */
+    public function testGetMaxUploadSizeMessage($maxImageSize, $expected)
+    {
+        $this->fileSizeMock->expects($this->any())->method('getMaxFileSizeInMb')->willReturn($maxImageSize);
+        $this->assertEquals($expected, $this->helperData->getMaxUploadSizeMessage());
+    }
+
+    /**
+     * DataProvider for testGetMaxUploadSizeMessage() function
+     *
+     * @return array
+     */
+    public function getMaxUploadSizeMessageDataProvider()
+    {
+        return [
+            'Test with max image size = 10Mb' => [
+                'maxImageSize' => 10,
+                'expected' => 'Make sure your file isn\'t more than 10M.',
+            ],
+            'Test with max image size = 0' => [
+                'maxImageSize' => 0,
+                'expected' => 'We can\'t provide the upload settings right now.',
+            ]
+        ];
+    }
+
+    /**
+     * Test getLocalValidPaths()
+     *
+     * @return void
+     */
+    public function testGetLocalValidPaths()
+    {
+        $paths = [
+            'available' => [
+                'export_xml' => 'var/export/*/*.xml',
+                'export_csv' => 'var/export/*/*.csv',
+                'import_xml' => 'var/import/*/*.xml',
+                'import_csv' => 'var/import/*/*.csv',
+            ]
+        ];
+        $this->scopeConfigMock->expects($this->any())->method('getValue')
+            ->with(HelperData::XML_PATH_EXPORT_LOCAL_VALID_PATH)
+            ->willReturn($paths);
+
+        $this->assertEquals($paths, $this->helperData->getLocalValidPaths());
+    }
+
+    /**
+     * Test getBunchSize()
+     *
+     * @return void
+     */
+    public function testGetBunchSize()
+    {
+        $bunchSize = '100';
+
+        $this->scopeConfigMock->expects($this->any())->method('getValue')
+            ->with(HelperData::XML_PATH_BUNCH_SIZE)
+            ->willReturn($bunchSize);
+
+        $this->assertEquals(100, $this->helperData->getBunchSize());
+    }
+}
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/ConverterTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/ConverterTest.php
index c888c6b447348..e08f382d94003 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/ConverterTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/ConverterTest.php
@@ -21,7 +21,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
     protected $filePath;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $moduleManager;
 
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/ConverterTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/ConverterTest.php
index b29a04322ce4f..69118d2e2a319 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/ConverterTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/ConverterTest.php
@@ -21,7 +21,7 @@ class ConverterTest extends \PHPUnit\Framework\TestCase
     protected $filePath;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $moduleManager;
 
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php
index 50e71512c3d28..04a15179477d8 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php
@@ -640,6 +640,9 @@ public function testGetUnknownEntity($entity)
         $import->getEntity();
     }
 
+    /**
+     * @return array
+     */
     public function unknownEntitiesProvider()
     {
         return [
diff --git a/app/code/Magento/ImportExport/Ui/DataProvider/ExportFileDataProvider.php b/app/code/Magento/ImportExport/Ui/DataProvider/ExportFileDataProvider.php
index e64a6df430ea1..83203f1ad8aff 100644
--- a/app/code/Magento/ImportExport/Ui/DataProvider/ExportFileDataProvider.php
+++ b/app/code/Magento/ImportExport/Ui/DataProvider/ExportFileDataProvider.php
@@ -7,16 +7,23 @@
 
 namespace Magento\ImportExport\Ui\DataProvider;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider;
 use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Io\File;
 
 /**
  * Data provider for export grid.
  */
 class ExportFileDataProvider extends DataProvider
 {
+    /**
+     * @var File|null
+     */
+    private $fileIO;
+
     /**
      * @var DriverInterface
      */
@@ -37,6 +44,7 @@ class ExportFileDataProvider extends DataProvider
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
      * @param DriverInterface $file
      * @param Filesystem $filesystem
+     * @param File|null $fileIO
      * @param array $meta
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -51,6 +59,7 @@ public function __construct(
         \Magento\Framework\Api\FilterBuilder $filterBuilder,
         DriverInterface $file,
         Filesystem $filesystem,
+        File $fileIO = null,
         array $meta = [],
         array $data = []
     ) {
@@ -67,6 +76,8 @@ public function __construct(
             $meta,
             $data
         );
+
+        $this->fileIO = $fileIO ?: ObjectManager::getInstance()->get(File::class);
     }
 
     /**
@@ -83,17 +94,45 @@ public function getData()
             return $emptyResponse;
         }
 
-        $files = $this->file->readDirectoryRecursively($directory->getAbsolutePath() . 'export/');
+        $files = $this->getExportFiles($directory->getAbsolutePath() . 'export/');
         if (empty($files)) {
             return $emptyResponse;
         }
         $result = [];
         foreach ($files as $file) {
-            $result['items'][]['file_name'] = basename($file);
+            $result['items'][]['file_name'] = $this->fileIO->getPathInfo($file)['basename'];
         }
 
+        $pageSize = (int) $this->request->getParam('paging')['pageSize'];
+        $pageCurrent = (int) $this->request->getParam('paging')['current'];
+        $pageOffset = ($pageCurrent - 1) * $pageSize;
         $result['totalRecords'] = count($result['items']);
+        $result['items'] = array_slice($result['items'], $pageOffset, $pageSize);
 
         return $result;
     }
+
+    /**
+     * Get files from directory path, sort them by date modified and return sorted array of full path to files
+     *
+     * @param string $directoryPath
+     * @return array
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    private function getExportFiles(string $directoryPath): array
+    {
+        $sortedFiles = [];
+        $files = $this->file->readDirectoryRecursively($directoryPath);
+        if (empty($files)) {
+            return [];
+        }
+        foreach ($files as $filePath) {
+            //phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $sortedFiles[filemtime($filePath)] = $filePath;
+        }
+        //sort array elements using key value
+        krsort($sortedFiles);
+
+        return $sortedFiles;
+    }
 }
diff --git a/app/code/Magento/ImportExport/etc/config.xml b/app/code/Magento/ImportExport/etc/config.xml
index 7aee9bdd2fd6d..b8ce1c70ee16d 100644
--- a/app/code/Magento/ImportExport/etc/config.xml
+++ b/app/code/Magento/ImportExport/etc/config.xml
@@ -18,6 +18,7 @@
                     </available>
                 </importexport_local_valid_paths>
                 <bunch_size>100</bunch_size>
+                <import_images_base_dir>var/import/images</import_images_base_dir>
             </file>
         </general>
         <import>
diff --git a/app/code/Magento/ImportExport/i18n/en_US.csv b/app/code/Magento/ImportExport/i18n/en_US.csv
index 5787d6f7d02b6..fae93c78baa09 100644
--- a/app/code/Magento/ImportExport/i18n/en_US.csv
+++ b/app/code/Magento/ImportExport/i18n/en_US.csv
@@ -29,9 +29,7 @@ Import,Import
 "File to Import","File to Import"
 "Select File to Import","Select File to Import"
 "Images File Directory","Images File Directory"
-"For Type ""Local Server"" use relative path to Magento installation,
-                                e.g. var/export, var/import, var/export/some/dir","For Type ""Local Server"" use relative path to Magento installation,
-                                e.g. var/export, var/import, var/export/some/dir"
+"For Type ""Local Server"" use relative path to &lt;Magento root directory&gt;/var/import/images, e.g. <i>product_images</i>, <i>import_images/batch1</i>.<br><br>For example, in case <i>product_images</i>, files should be placed into <i>&lt;Magento root directory&gt;/var/import/images/product_images</i> folder.","For Type ""Local Server"" use relative path to &lt;Magento root directory&gt;/var/import/images, e.g. <i>product_images</i>, <i>import_images/batch1</i>.<br><br>For example, in case <i>product_images</i>, files should be placed into <i>&lt;Magento root directory&gt;/var/import/images/product_images</i> folder."
 "Download Sample File","Download Sample File"
 "Please correct the data sent value.","Please correct the data sent value."
 Import/Export,Import/Export
@@ -123,5 +121,6 @@ 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."
+"Message is added to queue, wait to get your file soon. Make sure your cron job is running to export the file","Message is added to queue, wait to get your file soon. Make sure your cron job is running to export the file"
 "Invalid data","Invalid data"
-"Invalid response","Invalid response"
\ No newline at end of file
+"Invalid response","Invalid response"
diff --git a/app/code/Magento/ImportExport/view/adminhtml/ui_component/export_grid.xml b/app/code/Magento/ImportExport/view/adminhtml/ui_component/export_grid.xml
index 2b160bc9f6f40..1922f58ed47a0 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/ui_component/export_grid.xml
+++ b/app/code/Magento/ImportExport/view/adminhtml/ui_component/export_grid.xml
@@ -34,6 +34,9 @@
             </settings>
         </dataProvider>
     </dataSource>
+    <listingToolbar name="listing_top">
+        <paging name="listing_paging"/>
+    </listingToolbar>
     <columns name="export_grid_columns">
         <column name="file_name">
             <settings>
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
index cefb070f60b74..26feb38392e5f 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Indexer\Console\Command;
 
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Magento\Framework\Indexer;
 use Magento\Framework\Mview;
 use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Command for displaying status of indexers.
@@ -17,7 +17,7 @@
 class IndexerStatusCommand extends AbstractIndexerManageCommand
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
@@ -29,12 +29,14 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     * @param InputInterface $input
+     * @param OutputInterface $output
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $table = new Table($output);
-        $table->setHeaders(['Title', 'Status', 'Update On', 'Schedule Status', 'Schedule Updated']);
+        $table->setHeaders(['ID', 'Title', 'Status', 'Update On', 'Schedule Status', 'Schedule Updated']);
 
         $rows = [];
 
@@ -43,6 +45,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $view = $indexer->getView();
 
             $rowData = [
+                'ID'                => $indexer->getId(),
                 'Title'             => $indexer->getTitle(),
                 'Status'            => $this->getStatus($indexer),
                 'Update On'         => $indexer->isScheduled() ? 'Schedule' : 'Save',
@@ -59,15 +62,20 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $rows[] = $rowData;
         }
 
-        usort($rows, function ($comp1, $comp2) {
-            return strcmp($comp1['Title'], $comp2['Title']);
-        });
+        usort(
+            $rows,
+            function (array $comp1, array $comp2) {
+                return strcmp($comp1['Title'], $comp2['Title']);
+            }
+        );
 
         $table->addRows($rows);
         $table->render();
     }
 
     /**
+     * Returns the current status of the indexer
+     *
      * @param Indexer\IndexerInterface $indexer
      * @return string
      */
@@ -89,6 +97,8 @@ private function getStatus(Indexer\IndexerInterface $indexer)
     }
 
     /**
+     * Returns the pending count of the view
+     *
      * @param Mview\ViewInterface $view
      * @return string
      */
diff --git a/app/code/Magento/Indexer/Model/Indexer/DependencyDecorator.php b/app/code/Magento/Indexer/Model/Indexer/DependencyDecorator.php
index 829df74a1b0ed..fcfdce4f58620 100644
--- a/app/code/Magento/Indexer/Model/Indexer/DependencyDecorator.php
+++ b/app/code/Magento/Indexer/Model/Indexer/DependencyDecorator.php
@@ -55,11 +55,15 @@ public function __construct(
      */
     public function __call(string $method, array $args)
     {
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
         return call_user_func_array([$this->indexer, $method], $args);
     }
 
     /**
+     * Sleep magic.
+     *
      * @return array
+     * @SuppressWarnings(PHPMD.SerializationAware)
      */
     public function __sleep()
     {
@@ -218,9 +222,16 @@ public function isWorking(): bool
     public function invalidate()
     {
         $this->indexer->invalidate();
-        $dependentIndexerIds = $this->dependencyInfoProvider->getIndexerIdsToRunAfter($this->indexer->getId());
-        foreach ($dependentIndexerIds as $indexerId) {
-            $this->indexerRegistry->get($indexerId)->invalidate();
+        $currentIndexerId = $this->indexer->getId();
+        $idsToRunBefore = $this->dependencyInfoProvider->getIndexerIdsToRunBefore($currentIndexerId);
+        $idsToRunAfter = $this->dependencyInfoProvider->getIndexerIdsToRunAfter($currentIndexerId);
+
+        $indexersToInvalidate = array_unique(array_merge($idsToRunBefore, $idsToRunAfter));
+        foreach ($indexersToInvalidate as $indexerId) {
+            $indexer = $this->indexerRegistry->get($indexerId);
+            if (!$indexer->isInvalid()) {
+                $indexer->invalidate();
+            }
         }
     }
 
diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminReindexAndFlushCacheActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminReindexAndFlushCacheActionGroup.xml
new file mode 100644
index 0000000000000..d474094dcd54b
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminReindexAndFlushCacheActionGroup.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="AdminReindexAndFlushCache">
+        <annotations>
+            <description>Run reindex and flush cache.</description>
+        </annotations>
+
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php
index 4877ceaaec85b..bdfeff8a89eb9 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Indexer\Test\Unit\Console\Command;
 
 use Magento\Framework\Console\Cli;
@@ -85,23 +86,31 @@ public function testGetOptions()
         $this->stateMock->expects($this->never())->method('setAreaCode');
         $this->command = new IndexerReindexCommand($this->objectManagerFactory);
         $optionsList = $this->command->getInputList();
-        $this->assertSame(1, sizeof($optionsList));
+        $this->assertSame(1, count($optionsList));
         $this->assertSame('index', $optionsList[0]->getName());
     }
 
     public function testExecuteAll()
     {
-        $this->configMock->expects($this->once())->method('getIndexer')->will($this->returnValue([
-            'title' => 'Title_indexerOne',
-            'shared_index' => null
-        ]));
+        $this->configMock->expects($this->once())
+            ->method('getIndexer')
+            ->will(
+                $this->returnValue(
+                    [
+                        'title' => 'Title_indexerOne',
+                        'shared_index' => null
+                    ]
+                )
+            );
         $this->configureAdminArea();
-        $this->initIndexerCollectionByItems([
-            $this->getIndexerMock(
-                ['reindexAll', 'getStatus'],
-                ['indexer_id' => 'id_indexerOne', 'title' => 'Title_indexerOne']
-            )
-        ]);
+        $this->initIndexerCollectionByItems(
+            [
+                $this->getIndexerMock(
+                    ['reindexAll', 'getStatus'],
+                    ['indexer_id' => 'id_indexerOne', 'title' => 'Title_indexerOne']
+                )
+            ]
+        );
         $this->indexerFactory->expects($this->never())->method('create');
         $this->command = new IndexerReindexCommand($this->objectManagerFactory);
         $commandTester = new CommandTester($this->command);
@@ -118,6 +127,7 @@ public function testExecuteAll()
      * @param array $reindexAllCallMatchers
      * @param array $executedIndexers
      * @param array $executedSharedIndexers
+     *
      * @dataProvider executeWithIndexDataProvider
      */
     public function testExecuteWithIndex(
@@ -210,6 +220,7 @@ private function addAllIndexersToConfigMock(array $indexers)
     /**
      * @param array|null $methods
      * @param array $data
+     *
      * @return \PHPUnit_Framework_MockObject_MockObject|StateInterface
      */
     private function getStateMock(array $methods = null, array $data = [])
@@ -329,7 +340,7 @@ public function executeWithIndexDataProvider()
                     'indexer_5' => $this->once(),
                 ],
                 'executed_indexers' => ['indexer_3', 'indexer_1', 'indexer_5'],
-                'executed_shared_indexers' => [['indexer_2'],['indexer_3']],
+                'executed_shared_indexers' => [['indexer_2'], ['indexer_3']],
             ],
             'With dependencies and multiple indexers in request' => [
                 'inputIndexers' => [
@@ -445,13 +456,16 @@ public function testExecuteWithExceptionInGetIndexers()
             "The following requested index types are not supported: '"
             . join("', '", $inputIndexers)
             . "'." . PHP_EOL . 'Supported types: '
-            . join(", ", array_map(
-                function ($item) {
-                    /** @var IndexerInterface $item */
-                    $item->getId();
-                },
-                $this->indexerCollectionMock->getItems()
-            ))
+            . join(
+                ", ",
+                array_map(
+                    function ($item) {
+                        /** @var IndexerInterface $item */
+                        $item->getId();
+                    },
+                    $this->indexerCollectionMock->getItems()
+                )
+            )
         );
         $this->command = new IndexerReindexCommand($this->objectManagerFactory);
         $commandTester = new CommandTester($this->command);
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetModeCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetModeCommandTest.php
index ad3ae88816db4..da47753970169 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetModeCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetModeCommandTest.php
@@ -26,7 +26,7 @@ public function testGetOptions()
         $this->stateMock->expects($this->never())->method('setAreaCode')->with(FrontNameResolver::AREA_CODE);
         $this->command = new IndexerSetModeCommand($this->objectManagerFactory);
         $optionsList = $this->command->getInputList();
-        $this->assertSame(2, sizeof($optionsList));
+        $this->assertSame(2, count($optionsList));
         $this->assertSame('mode', $optionsList[0]->getName());
         $this->assertSame('index', $optionsList[1]->getName());
     }
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowModeCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowModeCommandTest.php
index fe6020cb07167..ef8fb58c1ef41 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowModeCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowModeCommandTest.php
@@ -23,7 +23,7 @@ public function testGetOptions()
         $this->stateMock->expects($this->never())->method('setAreaCode')->with(FrontNameResolver::AREA_CODE);
         $this->command = new IndexerShowModeCommand($this->objectManagerFactory);
         $optionsList = $this->command->getInputList();
-        $this->assertSame(1, sizeof($optionsList));
+        $this->assertSame(1, count($optionsList));
         $this->assertSame('index', $optionsList[0]->getName());
     }
 
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 8498bd183af21..963a0b21c1f96 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php
@@ -96,7 +96,8 @@ public function testExecuteAll(array $indexers)
 
         $linesOutput = array_filter(explode(PHP_EOL, $commandTester->getDisplay()));
 
-        $spacer = '+----------------+------------------+-----------+-------------------------+---------------------+';
+        $spacer = '+-----------+----------------+------------------+-----------+-------------------------+'
+            . '---------------------+';
 
         $this->assertCount(8, $linesOutput, 'There should be 8 lines output. 3 Spacers, 1 header, 4 content.');
         $this->assertEquals($linesOutput[0], $spacer, "Lines 0, 2, 7 should be spacer lines");
@@ -104,39 +105,44 @@ public function testExecuteAll(array $indexers)
         $this->assertEquals($linesOutput[7], $spacer, "Lines 0, 2, 7 should be spacer lines");
 
         $headerValues = array_values(array_filter(explode('|', $linesOutput[1])));
-        $this->assertEquals('Title', trim($headerValues[0]));
-        $this->assertEquals('Status', trim($headerValues[1]));
-        $this->assertEquals('Update On', trim($headerValues[2]));
-        $this->assertEquals('Schedule Status', trim($headerValues[3]));
-        $this->assertEquals('Schedule Updated', trim($headerValues[4]));
+        $this->assertEquals('ID', trim($headerValues[0]));
+        $this->assertEquals('Title', trim($headerValues[1]));
+        $this->assertEquals('Status', trim($headerValues[2]));
+        $this->assertEquals('Update On', trim($headerValues[3]));
+        $this->assertEquals('Schedule Status', trim($headerValues[4]));
+        $this->assertEquals('Schedule Updated', trim($headerValues[5]));
 
         $indexer1 = array_values(array_filter(explode('|', $linesOutput[3])));
-        $this->assertEquals('Title_indexer1', trim($indexer1[0]));
-        $this->assertEquals('Ready', trim($indexer1[1]));
-        $this->assertEquals('Schedule', trim($indexer1[2]));
-        $this->assertEquals('idle (10 in backlog)', trim($indexer1[3]));
-        $this->assertEquals('2017-01-01 11:11:11', trim($indexer1[4]));
+        $this->assertEquals('indexer_1', trim($indexer1[0]));
+        $this->assertEquals('Title_indexer1', trim($indexer1[1]));
+        $this->assertEquals('Ready', trim($indexer1[2]));
+        $this->assertEquals('Schedule', trim($indexer1[3]));
+        $this->assertEquals('idle (10 in backlog)', trim($indexer1[4]));
+        $this->assertEquals('2017-01-01 11:11:11', trim($indexer1[5]));
 
         $indexer2 = array_values(array_filter(explode('|', $linesOutput[4])));
-        $this->assertEquals('Title_indexer2', trim($indexer2[0]));
-        $this->assertEquals('Reindex required', trim($indexer2[1]));
-        $this->assertEquals('Save', trim($indexer2[2]));
-        $this->assertEquals('', trim($indexer2[3]));
+        $this->assertEquals('indexer_2', trim($indexer2[0]));
+        $this->assertEquals('Title_indexer2', trim($indexer2[1]));
+        $this->assertEquals('Reindex required', trim($indexer2[2]));
+        $this->assertEquals('Save', trim($indexer2[3]));
         $this->assertEquals('', trim($indexer2[4]));
+        $this->assertEquals('', trim($indexer2[5]));
 
         $indexer3 = array_values(array_filter(explode('|', $linesOutput[5])));
-        $this->assertEquals('Title_indexer3', trim($indexer3[0]));
-        $this->assertEquals('Processing', trim($indexer3[1]));
-        $this->assertEquals('Schedule', trim($indexer3[2]));
-        $this->assertEquals('idle (100 in backlog)', trim($indexer3[3]));
-        $this->assertEquals('2017-01-01 11:11:11', trim($indexer3[4]));
+        $this->assertEquals('indexer_3', trim($indexer3[0]));
+        $this->assertEquals('Title_indexer3', trim($indexer3[1]));
+        $this->assertEquals('Processing', trim($indexer3[2]));
+        $this->assertEquals('Schedule', trim($indexer3[3]));
+        $this->assertEquals('idle (100 in backlog)', trim($indexer3[4]));
+        $this->assertEquals('2017-01-01 11:11:11', trim($indexer3[5]));
 
         $indexer4 = array_values(array_filter(explode('|', $linesOutput[6])));
-        $this->assertEquals('Title_indexer4', trim($indexer4[0]));
-        $this->assertEquals('unknown', trim($indexer4[1]));
-        $this->assertEquals('Schedule', trim($indexer4[2]));
-        $this->assertEquals('running (20 in backlog)', trim($indexer4[3]));
-        $this->assertEquals('2017-01-01 11:11:11', trim($indexer4[4]));
+        $this->assertEquals('indexer_4', trim($indexer4[0]));
+        $this->assertEquals('Title_indexer4', trim($indexer4[1]));
+        $this->assertEquals('unknown', trim($indexer4[2]));
+        $this->assertEquals('Schedule', trim($indexer4[3]));
+        $this->assertEquals('running (20 in backlog)', trim($indexer4[4]));
+        $this->assertEquals('2017-01-01 11:11:11', trim($indexer4[5]));
     }
 
     /**
diff --git a/app/code/Magento/InstantPurchase/Test/Unit/Block/ButtonTest.php b/app/code/Magento/InstantPurchase/Test/Unit/Block/ButtonTest.php
new file mode 100644
index 0000000000000..37d2729cd2a28
--- /dev/null
+++ b/app/code/Magento/InstantPurchase/Test/Unit/Block/ButtonTest.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\InstantPurchase\Test\Unit\Block;
+
+use Magento\InstantPurchase\Block\Button;
+use Magento\InstantPurchase\Model\Config;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Api\Data\StoreInterface;
+
+/**
+ * Test class for button block
+ *
+ * Class \Magento\InstantPurchase\Test\Unit\Block\ButtonTest
+ */
+class ButtonTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Button | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $block;
+
+    /**
+     * @var Config | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $config;
+
+    /**
+     * @var StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var StoreInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $store;
+
+    /**
+     * @var Context | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $context;
+
+    /**
+     * Setup environment for testing
+     */
+    protected function setUp()
+    {
+        $this->context = $this->createMock(Context::class);
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
+        $this->store = $this->createMock(StoreInterface::class);
+
+        $this->storeManager->expects($this->any())->method('getStore')
+            ->willReturn($this->store);
+
+        $this->config = $this->createMock(Config::class);
+
+        $this->context->expects($this->any())->method('getStoreManager')
+            ->willReturn($this->storeManager);
+
+        $this->block = $this->getMockBuilder(Button::class)
+            ->setConstructorArgs(
+                [
+                    'context' => $this->context,
+                    'instantPurchaseConfig' => $this->config
+                ]
+            )
+            ->setMethods(['getUrl'])
+            ->getMock();
+    }
+
+    /**
+     * Test isEnabled() function
+     *
+     * @param $currentStoreId
+     * @param $isModuleEnabled
+     * @param $expected
+     * @dataProvider isEnabledDataProvider
+     */
+    public function testIsEnabled($currentStoreId, $isModuleEnabled, $expected)
+    {
+        $this->store->expects($this->any())->method('getId')
+            ->willReturn($currentStoreId);
+
+        $this->config->expects($this->any())->method('isModuleEnabled')
+            ->willReturn($isModuleEnabled);
+
+        $this->assertEquals($expected, $this->block->isEnabled());
+    }
+
+    /**
+     * Data Provider for test isEnabled()
+     *
+     * @return array
+     */
+    public function isEnabledDataProvider()
+    {
+        return [
+            'Store With ID = 1 and enable module' => [
+                1,
+                true,
+                true
+            ],
+            'Store With ID = 1 and disable module' => [
+                1,
+                false,
+                false
+            ]
+        ];
+    }
+
+    /**
+     * Test getJsLayout() function
+     */
+    public function testGetJsLayout()
+    {
+        $currentStoreId = 1;
+        $buttonText = 'Instant Purchased';
+        $url = 'https://magento2.com/instantpurchase/button/placeOrder';
+        $expected = '{"components":{"instant-purchase":{"config":{"buttonText":"Instant Purchased",' .
+            '"purchaseUrl":"https:\/\/magento2.com\/instantpurchase\/button\/placeOrder"}}}}';
+
+        $this->store->expects($this->any())->method('getId')
+            ->willReturn($currentStoreId);
+        $this->config->expects($this->any())->method('getButtonText')
+            ->willReturn($buttonText);
+        $this->block->expects($this->any())->method('getUrl')
+            ->with('instantpurchase/button/placeOrder', ['_secure' => true])
+            ->willReturn($url);
+
+        $this->assertEquals($expected, $this->block->getJsLayout());
+    }
+}
diff --git a/app/code/Magento/InstantPurchase/Test/Unit/CustomerData/InstantPurchaseTest.php b/app/code/Magento/InstantPurchase/Test/Unit/CustomerData/InstantPurchaseTest.php
new file mode 100644
index 0000000000000..c608338fd10c5
--- /dev/null
+++ b/app/code/Magento/InstantPurchase/Test/Unit/CustomerData/InstantPurchaseTest.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\InstantPurchase\Test\Unit\CustomerData;
+
+use Magento\InstantPurchase\CustomerData\InstantPurchase as CustomerData;
+use Magento\Customer\Model\Session;
+use Magento\InstantPurchase\Model\InstantPurchaseInterface as InstantPurchaseModel;
+use Magento\InstantPurchase\Model\Ui\CustomerAddressesFormatter;
+use Magento\InstantPurchase\Model\Ui\PaymentTokenFormatter;
+use Magento\InstantPurchase\Model\Ui\ShippingMethodFormatter;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Store;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\InstantPurchase\Model\InstantPurchaseOption;
+use Magento\Customer\Model\Customer;
+
+/**
+ * Test class for InstantPurchase Customer Data
+ *
+ * Class \Magento\InstantPurchase\Test\Unit\CustomerData\InstantPurchaseTest
+ */
+class InstantPurchaseTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var objectManagerHelper
+     */
+    private $objectManager;
+
+    /**
+     * @var CustomerData | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerData;
+
+    /**
+     * @var Session | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerSession;
+
+    /**
+     * @var StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var InstantPurchaseModel | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $instantPurchase;
+
+    /**
+     * @var PaymentTokenFormatter | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paymentTokenFormatter;
+
+    /**
+     * @var CustomerAddressesFormatter | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerAddressesFormatter;
+
+    /**
+     * @var ShippingMethodFormatter | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $shippingMethodFormatter;
+
+    /**
+     * @var Store | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $store;
+
+    /**
+     * @var Customer | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customer;
+
+    /**
+     * @var InstantPurchaseOption | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $instantPurchaseOption;
+
+    /**
+     * Setup environment for testing
+     */
+    protected function setUp()
+    {
+        $this->customerSession = $this->createMock(Session::class);
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
+        $this->instantPurchase = $this->createMock(InstantPurchaseModel::class);
+        $this->paymentTokenFormatter = $this->createMock(PaymentTokenFormatter::class);
+        $this->customerAddressesFormatter = $this->createMock(CustomerAddressesFormatter::class);
+        $this->shippingMethodFormatter = $this->createMock(ShippingMethodFormatter::class);
+        $this->store = $this->createMock(Store::class);
+        $this->customer = $this->createMock(Customer::class);
+        $this->instantPurchaseOption = $this->createMock(InstantPurchaseOption::class);
+
+        $this->objectManager = new ObjectManagerHelper($this);
+        $this->customerData = $this->objectManager->getObject(
+            CustomerData::class,
+            [
+                'customerSession' => $this->customerSession,
+                'storeManager' => $this->storeManager,
+                'instantPurchase' => $this->instantPurchase,
+                'paymentTokenFormatter' => $this->paymentTokenFormatter,
+                'customerAddressesFormatter' => $this->customerAddressesFormatter,
+                'shippingMethodFormatter' => $this->shippingMethodFormatter
+            ]
+        );
+    }
+
+    /**
+     * Test getSectionData()
+     *
+     * @param $isLogin
+     * @param $isAvailable
+     * @param $expected
+     * @dataProvider getSectionDataProvider
+     */
+    public function testGetSectionData($isLogin, $isAvailable, $expected)
+    {
+        $this->customerSession->expects($this->any())->method('isLoggedIn')->willReturn($isLogin);
+
+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($this->store);
+
+        $this->customerSession->expects($this->any())->method('getCustomer')
+            ->willReturn($this->customer);
+
+        $this->instantPurchase->expects($this->any())->method('getOption')
+            ->with($this->store, $this->customer)
+            ->willReturn($this->instantPurchaseOption);
+
+        $this->instantPurchaseOption->expects($this->any())->method('isAvailable')
+            ->willReturn($isAvailable);
+
+        $this->assertEquals($expected, $this->customerData->getSectionData());
+    }
+
+    /**
+     * Data Provider for test getSectionData()
+     *
+     * @return array
+     */
+    public function getSectionDataProvider()
+    {
+        return [
+            'No Login and available instant purchase' => [
+                false,
+                true,
+                ['available' => false]
+            ],
+
+            'Login and no available instant purchase option' => [
+                true,
+                false,
+                ['available' => false]
+            ],
+
+            'Login and available instant purchase option' => [
+                true,
+                true,
+                [
+                    'available' => true,
+                    'paymentToken' => [
+                        'publicHash' => '',
+                        'summary' => ''
+                    ],
+                    'shippingAddress' => [
+                        'id' => null,
+                        'summary' => ''
+                    ],
+                    'billingAddress' => [
+                        'id' => null,
+                        'summary' => ''
+                    ],
+                    'shippingMethod' => [
+                        'carrier' => null,
+                        'method' => null,
+                        'summary' => ''
+                    ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/InstantPurchase/Test/Unit/Model/Ui/CustomerAddressesFormatterTest.php b/app/code/Magento/InstantPurchase/Test/Unit/Model/Ui/CustomerAddressesFormatterTest.php
new file mode 100644
index 0000000000000..2a53a36a46cd6
--- /dev/null
+++ b/app/code/Magento/InstantPurchase/Test/Unit/Model/Ui/CustomerAddressesFormatterTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InstantPurchase\Test\Unit\Model\Ui;
+
+use Magento\InstantPurchase\Model\Ui\CustomerAddressesFormatter;
+use Magento\Customer\Model\Address;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Directory\Model\Country;
+use PHPUnit\Framework\TestCase;
+
+class CustomerAddressesFormatterTest extends TestCase
+{
+    /**
+     * @var CustomerAddressesFormatter|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerAddressesFormatter;
+
+    /**
+     * Setup environment for testing
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManagerHelper($this);
+        $this->customerAddressesFormatter = $objectManager->getObject(CustomerAddressesFormatter::class);
+    }
+
+    /**
+     * Test format()
+     */
+    public function testFormat()
+    {
+        $addressMock = $this->createPartialMock(
+            Address::class,
+            ['getName', 'getStreetFull', 'getCity', 'getRegion', 'getPostcode', 'getCountryModel']
+        );
+        $countryMock = $this->createMock(Country::class);
+
+        $countryMock->expects($this->any())->method('getName')->willReturn('USA');
+        $addressMock->expects($this->any())->method('getName')->willReturn('Address Name');
+        $addressMock->expects($this->any())->method('getStreetFull')->willReturn('Address Street Full');
+        $addressMock->expects($this->any())->method('getCity')->willReturn('Address City');
+        $addressMock->expects($this->any())->method('getRegion')->willReturn('California');
+        $addressMock->expects($this->any())->method('getPostcode')->willReturn('12345');
+        $addressMock->expects($this->any())->method('getCountryModel')->willReturn($countryMock);
+
+        $this->assertEquals(
+            'Address Name, Address Street Full, Address City, California 12345, USA',
+            $this->customerAddressesFormatter->format($addressMock)
+        );
+    }
+}
diff --git a/app/code/Magento/InstantPurchase/Test/Unit/Model/Ui/ShippingMethodFormatterTest.php b/app/code/Magento/InstantPurchase/Test/Unit/Model/Ui/ShippingMethodFormatterTest.php
new file mode 100644
index 0000000000000..632392bcb35e3
--- /dev/null
+++ b/app/code/Magento/InstantPurchase/Test/Unit/Model/Ui/ShippingMethodFormatterTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InstantPurchase\Test\Unit\Model\Ui;
+
+use Magento\InstantPurchase\Model\Ui\ShippingMethodFormatter;
+use Magento\Quote\Api\Data\ShippingMethodInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\TestCase;
+
+class ShippingMethodFormatterTest extends TestCase
+{
+    /**
+     * @var ShippingMethodFormatter|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $shippingMethodFormatter;
+
+    /**
+     * Setup environment for testing
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManagerHelper($this);
+        $this->shippingMethodFormatter = $objectManager->getObject(ShippingMethodFormatter::class);
+    }
+
+    /**
+     * Test format()
+     */
+    public function testFormat()
+    {
+        $shippingMethodMock = $this->createMock(ShippingMethodInterface::class, ['getCarrierTitle', 'getMethodTitle']);
+
+        $shippingMethodMock->expects($this->any())->method('getCarrierTitle')->willReturn('flatrate');
+        $shippingMethodMock->expects($this->any())->method('getMethodTitle')->willReturn('flatrate');
+
+        $this->assertEquals(
+            'flatrate - flatrate',
+            $this->shippingMethodFormatter->format($shippingMethodMock)
+        );
+    }
+}
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 4042c2ebde87d..89cad471933e6 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
@@ -179,7 +179,7 @@ protected function _addGeneralFieldset($form, $integrationData)
                 'label' => __('Your Password'),
                 'id' => self::DATA_CONSUMER_PASSWORD,
                 'title' => __('Your Password'),
-                'class' => 'input-text validate-current-password required-entry',
+                'class' => 'validate-current-password required-entry',
                 'required' => true
             ]
         );
diff --git a/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminCreatesNewIntegrationActionGroup.xml b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminCreatesNewIntegrationActionGroup.xml
new file mode 100644
index 0000000000000..c039a70293269
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminCreatesNewIntegrationActionGroup.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">
+
+    <!--Fill Required Fields -->
+    <actionGroup name="AdminCreatesNewIntegrationActionGroup">
+        <arguments>
+            <argument name="name" type="string"/>
+            <argument name="password" type="string"/>
+        </arguments>
+        <fillField stepKey="fillNameField" selector="{{AdminNewIntegrationSection.name}}" userInput="{{name}}"/>
+        <fillField stepKey="fillAdminPasswordField" selector="{{AdminNewIntegrationSection.password}}" userInput="{{password}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminDeleteIntegrationEntityActionGroup.xml b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminDeleteIntegrationEntityActionGroup.xml
new file mode 100644
index 0000000000000..4a73f6ce4b8df
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminDeleteIntegrationEntityActionGroup.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="AdminDeleteIntegrationEntityActionGroup">
+        <click stepKey="clickRemoveButon" selector="{{AdminIntegrationsGridSection.remove}}"/>
+        <waitForElementVisible selector="{{AdminIntegrationsGridSection.submitButton}}" stepKey="waitForConfirmButtonVisible"/>
+        <click stepKey="clickSubmitButton" selector="{{AdminIntegrationsGridSection.submitButton}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminNavigateToCreateIntegrationPageActionGroup.xml b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminNavigateToCreateIntegrationPageActionGroup.xml
new file mode 100644
index 0000000000000..18deddb3170aa
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminNavigateToCreateIntegrationPageActionGroup.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">
+
+    <!--Click the "Add New Integration" Button -->
+
+    <actionGroup name="AdminNavigateToCreateIntegrationPageActionGroup">
+        <click stepKey="clickAddNewIntegrationButton" selector="{{AdminIntegrationsGridSection.add}}"/>
+        <waitForPageLoad stepKey="waitForNewNIntegrationPageLoaded"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminSearchIntegrationInGridActionGroup.xml b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminSearchIntegrationInGridActionGroup.xml
new file mode 100644
index 0000000000000..dcd60a0479db4
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminSearchIntegrationInGridActionGroup.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="AdminSearchIntegrationInGridActionGroup">
+        <arguments>
+            <argument name="name" type="string"/>
+        </arguments>
+        <!--Reset Search Filters -->
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <!--Fill Integration Name Field -->
+        <fillField selector="{{AdminIntegrationsGridSection.name}}" userInput="{{name}}" stepKey="filterByName"/>
+        <!--Click "Search" Button -->
+        <click selector="{{AdminIntegrationsGridSection.search}}" stepKey="doFilter"/>
+        <waitForPageLoad stepKey="waitForSitemapPageLoadedAfterFiltering"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminSubmitNewIntegrationFormActionGroup.xml b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminSubmitNewIntegrationFormActionGroup.xml
new file mode 100644
index 0000000000000..f1dcd5da77c85
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminSubmitNewIntegrationFormActionGroup.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="AdminSubmitNewIntegrationFormActionGroup">
+        <!--Click the "Save" Button -->
+        <click stepKey="clickSaveButton" selector="{{AdminNewIntegrationSection.saveButton}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Integration/Test/Mftf/ActionGroup/AssertAdminMessageCreateIntegrationEntityActionGroup.xml b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AssertAdminMessageCreateIntegrationEntityActionGroup.xml
new file mode 100644
index 0000000000000..f233c1d9a7f74
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AssertAdminMessageCreateIntegrationEntityActionGroup.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="AssertAdminMessageCreateIntegrationEntityActionGroup">
+        <arguments>
+            <argument name="message" type="string" defaultValue="The integration '{{name}}' has been saved."/>
+            <argument name="messageType" type="string" defaultValue="success"/>
+        </arguments>
+        <waitForElementVisible selector="{{AdminIntegrationsGridSection.messageByType(messageType)}}" stepKey="waitForMessage"/>
+        <see userInput="{{message}}" selector="{{AdminIntegrationsGridSection.messageByType(messageType)}}" stepKey="verifyMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Integration/Test/Mftf/ActionGroup/AssertDeletedIntegrationIsNotInGridActionGroup.xml b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AssertDeletedIntegrationIsNotInGridActionGroup.xml
new file mode 100644
index 0000000000000..a4438b1eb70a7
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AssertDeletedIntegrationIsNotInGridActionGroup.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="AssertDeletedIntegrationIsNotInGridActionGroup">
+        <arguments>
+            <argument name="name" type="string"/>
+        </arguments>
+        <dontSee userInput="{{name}}" selector="{{AdminIntegrationsGridSection.rowByIndex('1')}}" stepKey="donSeeIntegration"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Integration/Test/Mftf/Section/AdminIntegrationsGridSection.xml b/app/code/Magento/Integration/Test/Mftf/Section/AdminIntegrationsGridSection.xml
new file mode 100644
index 0000000000000..ae601542f3b37
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/Section/AdminIntegrationsGridSection.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="AdminIntegrationsGridSection">
+        <element name="add" type="button" selector=".page-actions .add"/>
+        <element name="messageByType" type="block" selector="#messages .message-{{messageType}}" parameterized="true"/>
+        <element name="name" type="input" selector=".data-grid-filters #integrationGrid_filter_name"/>
+        <element name="search" type="input" selector=".admin__filter-actions button[title=Search]"/>
+        <element name="remove" type="button" selector=".data-grid .delete"/>
+        <element name="submitButton" type="button" selector=".action-primary.action-accept" timeout="30"/>
+        <element name="rowByIndex" type="text" selector="tr[data-role='row']:nth-of-type({{var1}})" parameterized="true" timeout="30"/>
+        <element name="edit" type="button" selector=".data-grid .edit"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Integration/Test/Mftf/Section/AdminNewIntegrationSection.xml b/app/code/Magento/Integration/Test/Mftf/Section/AdminNewIntegrationSection.xml
new file mode 100644
index 0000000000000..3e7214784c2b5
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/Section/AdminNewIntegrationSection.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="AdminNewIntegrationSection">
+        <element name="name" type="input" selector="#integration_properties_name"/>
+        <element name="password" type="input" selector="#integration_properties_current_password"/>
+        <element name="saveButton" type="button" selector=".page-actions #save-split-button-button"/>
+        <element name="endpoint" type="input" selector="#integration_properties_endpoint"/>
+        <element name="linkUrl" type="input" selector="#integration_properties_identity_link_url"/>
+        <element name="save" type="button" selector=".page-actions-buttons .save"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Integration/Test/Mftf/Test/AdminDeleteIntegrationEntityTest.xml b/app/code/Magento/Integration/Test/Mftf/Test/AdminDeleteIntegrationEntityTest.xml
new file mode 100644
index 0000000000000..6f46bbf99d218
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/Test/AdminDeleteIntegrationEntityTest.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="AdminDeleteIntegrationEntityTest">
+        <annotations>
+            <features value="Integration"/>
+            <stories value="System Integration"/>
+            <title value="Admin system integration"/>
+            <description value="Admin Deletes Created Integration"/>
+            <group value="integration"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Login As Admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <!-- Navigate To Integrations Page -->
+            <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToIntegrationsPage">
+                <argument name="menuUiId" value="{{AdminMenuSystem.dataUiId}}"/>
+                <argument name="submenuUiId" value="{{AdminMenuSystemExtensionsIntegrations.dataUiId}}"/>
+            </actionGroup>
+            <!-- Click the "Add New Integration" button -->
+            <actionGroup ref="AdminNavigateToCreateIntegrationPageActionGroup" stepKey="clickAddNewIntegrationButton"/>
+            <!-- Create New Integration -->
+            <actionGroup ref="AdminCreatesNewIntegrationActionGroup" stepKey="createIntegration">
+                <argument name="name" value="Integration1"/>
+                <argument name="password" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+            </actionGroup>
+            <!-- Submit The Form -->
+            <actionGroup ref="AdminSubmitNewIntegrationFormActionGroup" stepKey="submitTheForm"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- TEST BODY -->
+            <!-- Find Created Integration In Grid -->
+            <actionGroup ref="AdminSearchIntegrationInGridActionGroup" stepKey="findCreatedIntegration">
+                <argument name="name" value="Integration1"/>
+            </actionGroup>
+            <!-- Delete Created Integration Entity -->
+            <actionGroup ref="AdminDeleteIntegrationEntityActionGroup" stepKey="deleteIntegration"/>
+            <!-- Assert Success Message -->
+            <actionGroup ref="AssertAdminMessageCreateIntegrationEntityActionGroup" stepKey="seeSuccessMessage">
+                <argument name="message" value="The integration 'Integration1' has been deleted."/>
+                <argument value="success" name="messageType"/>
+            </actionGroup>
+            <!-- Assert Deleted Integration Is Not In Grid -->
+            <actionGroup ref="AdminSearchIntegrationInGridActionGroup" stepKey="findDeletedIntegration">
+                <argument name="name" value="Integration1"/>
+            </actionGroup>
+            <actionGroup ref="AssertDeletedIntegrationIsNotInGridActionGroup" stepKey="dontSeeIntegration">
+                <argument name="name" value="Integration1"/>
+            </actionGroup>
+        <!-- END TEST BODY -->
+    </test>
+</tests>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
index 7d6c27954d836..1737f66ce4a1b 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
@@ -38,13 +38,13 @@
         <label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
 
         <div class="control">
-            <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?= /* @noEscape */
-                $block->getJsonSerializer()->serialize([
+            <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?=
+                $block->escapeHtmlAttr($block->getJsonSerializer()->serialize([
                     'rolesTree' => [
                         "treeInitData" => $block->getTree(),
                         "treeInitSelectedData" => $block->getSelectedResources(),
                     ],
-                ]); ?>'>
+                ])); ?>'>
             </div>
         </div>
     </div>
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 0b9cb377d1d08..ce618f97883b0 100644
--- a/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php
+++ b/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php
@@ -8,7 +8,7 @@
 namespace Magento\LayeredNavigation\Observer\Edit\Tab\Front;
 
 use Magento\Config\Model\Config\Source;
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\Framework\Event\ObserverInterface;
 
 /**
@@ -22,15 +22,15 @@ class ProductAttributeFormBuildFrontTabObserver implements ObserverInterface
     protected $optionList;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
     /**
-     * @param ModuleManagerInterface $moduleManager
+     * @param Manager $moduleManager
      * @param Source\Yesno $optionList
      */
-    public function __construct(ModuleManagerInterface $moduleManager, Source\Yesno $optionList)
+    public function __construct(Manager $moduleManager, Source\Yesno $optionList)
     {
         $this->optionList = $optionList;
         $this->moduleManager = $moduleManager;
diff --git a/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php b/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php
index b98230c1ebe3c..57a20cf17371d 100644
--- a/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php
+++ b/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php
@@ -7,7 +7,7 @@
  */
 namespace Magento\LayeredNavigation\Observer\Grid;
 
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\Framework\Event\ObserverInterface;
 
 /**
@@ -16,16 +16,16 @@
 class ProductAttributeGridBuildObserver implements ObserverInterface
 {
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
     /**
      * Construct.
      *
-     * @param ModuleManagerInterface $moduleManager
+     * @param Manager $moduleManager
      */
-    public function __construct(ModuleManagerInterface $moduleManager)
+    public function __construct(Manager $moduleManager)
     {
         $this->moduleManager = $moduleManager;
     }
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml
index 1e4137beacd88..b3e0c430b12e7 100644
--- a/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml
@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="LayeredNavigationSection">
+        <element name="filterOptionContent" type="text" selector="//div[contains(text(), '{{attribute}}')]//following-sibling::div//a[contains(text(), '{{option}}')]" parameterized="true"/>
         <element name="layeredNavigation" type="select" selector="#catalog_layered_navigation-head"/>
         <element name="layeredNavigationBlock" type="block" selector="#catalog_layered_navigation"/>
         <element name="CheckIfTabExpand" type="button" selector="#catalog_layered_navigation-head:not(.open)"/>
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml
new file mode 100644
index 0000000000000..7b78b5193ef7c
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCheckResultsOfColorAndOtherFiltersTest">
+        <!-- Open a category on storefront -->
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" after="flushCache" stepKey="goToCategoryPage">
+            <argument name="categoryName" value="$$createCategory.name$$"/>
+        </actionGroup>
+        <!-- Choose First attribute filter -->
+        <waitForElementVisible selector="{{StorefrontCategorySidebarSection.filterOptionTitle('$$createConfigProductAttribute.default_frontend_label$$')}}" stepKey="waitForCartRuleButton"/>
+        <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle('$$createConfigProductAttribute.default_frontend_label$$')}}" stepKey="expandFirstAttribute"/>
+        <waitForPageLoad stepKey="waitForFilterLoad"/>
+        <click selector="{{LayeredNavigationSection.filterOptionContent('$$createConfigProductAttribute.default_frontend_label$$','option2')}}" stepKey="expandFirstAttributeOption"/>
+        <waitForPageLoad stepKey="waitForAttributeOption"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createFirstConfigurableProduct.name$$)}}" stepKey="seeFirstProduct"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createSecondConfigurableProduct.name$$)}}" stepKey="seeSecondProduct"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createThirdConfigurableProduct.name$$)}}" stepKey="seeSimpleProduct"/>
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="goToCategoryPageAgain">
+            <argument name="categoryName" value="$$createCategory.name$$"/>
+        </actionGroup>
+        <!-- Choose Second attribute filter -->
+        <click selector="{{StorefrontCategorySidebarSection.filterOptionTitle('$$createConfigProductAttribute2.default_frontend_label$$')}}" stepKey="expandSecondAttributeOption"/>
+        <waitForPageLoad stepKey="waitForFilterPageLoad"/>
+        <click selector="{{LayeredNavigationSection.filterOptionContent('$$createConfigProductAttribute2.default_frontend_label$$','option1')}}" stepKey="expandSecondAttribute"/>
+        <waitForPageLoad stepKey="waitForProductListLoad"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createFirstConfigurableProduct.name$$)}}" stepKey="seeFourthProduct"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createSecondConfigurableProduct.name$$)}}" stepKey="seeFifthProduct"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml
index 721942f58f7cc..6d182d0b7a5e2 100644
--- a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobile.xml
@@ -17,6 +17,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-6092"/>
             <group value="LayeredNavigation"/>
+            <group value="SearchEngineMysql"/>
         </annotations>
         <before>
             <createData entity="productDropDownAttribute" stepKey="attribute"/>
diff --git a/app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php b/app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php
index f0243784dd618..34627fbb286ed 100644
--- a/app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php
+++ b/app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php
@@ -100,7 +100,7 @@ public function testCanShowBlock()
             ->method('isEnabled')
             ->with($this->catalogLayerMock, $filters)
             ->will($this->returnValue($enabled));
-        
+
         $category = $this->createMock(Category::class);
         $this->catalogLayerMock->expects($this->atLeastOnce())->method('getCurrentCategory')->willReturn($category);
         $category->expects($this->once())->method('getDisplayMode')->willReturn(Category::DM_PRODUCT);
@@ -119,12 +119,12 @@ public function testCanShowBlock()
     public function testCanShowBlockWithDifferentDisplayModes(string $mode, bool $result)
     {
         $filters = ['To' => 'be', 'or' => 'not', 'to' => 'be'];
-        
+
         $this->filterListMock->expects($this->atLeastOnce())->method('getFilters')
             ->with($this->catalogLayerMock)
             ->will($this->returnValue($filters));
         $this->assertEquals($filters, $this->model->getFilters());
-        
+
         $this->visibilityFlagMock
             ->expects($this->any())
             ->method('isEnabled')
@@ -137,6 +137,9 @@ public function testCanShowBlockWithDifferentDisplayModes(string $mode, bool $re
         $this->assertEquals($result, $this->model->canShowBlock());
     }
 
+    /**
+     * @return array
+     */
     public function canShowBlockDataProvider()
     {
         return [
diff --git a/app/code/Magento/MediaGallery/LICENSE.txt b/app/code/Magento/MediaGallery/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaGallery/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/MediaGallery/LICENSE_AFL.txt b/app/code/Magento/MediaGallery/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGallery/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/MediaGallery/Model/Asset.php b/app/code/Magento/MediaGallery/Model/Asset.php
new file mode 100644
index 0000000000000..f6e1c00044a79
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Model/Asset.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Model;
+
+use Magento\MediaGalleryApi\Api\Data\AssetExtensionInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\Framework\Model\AbstractExtensibleModel;
+
+/**
+ * Media Gallery Asset
+ */
+class Asset extends AbstractExtensibleModel implements AssetInterface
+{
+    private const ID = 'id';
+    private const PATH = 'path';
+    private const TITLE = 'title';
+    private const SOURCE = 'source';
+    private const CONTENT_TYPE = 'content_type';
+    private const WIDTH = 'width';
+    private const HEIGHT = 'height';
+    private const CREATED_AT = 'created_at';
+    private const UPDATED_AT = 'updated_at';
+
+    /**
+     * @inheritdoc
+     */
+    public function getId(): ?int
+    {
+        $id = $this->getData(self::ID);
+
+        if (!$id) {
+            return null;
+        }
+
+        return (int) $id;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPath(): string
+    {
+        return (string) $this->getData(self::PATH);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTitle(): ?string
+    {
+        return $this->getData(self::TITLE);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSource(): ?string
+    {
+        return $this->getData(self::SOURCE);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getContentType(): string
+    {
+        return (string) $this->getData(self::CONTENT_TYPE);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWidth(): int
+    {
+        return (int) $this->getData(self::WIDTH);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getHeight(): int
+    {
+        return (int) $this->getData(self::HEIGHT);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCreatedAt(): string
+    {
+        return (string) $this->getData(self::CREATED_AT);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getUpdatedAt(): string
+    {
+        return (string) $this->getData(self::UPDATED_AT);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getExtensionAttributes(): AssetExtensionInterface
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setExtensionAttributes(AssetExtensionInterface $extensionAttributes): void
+    {
+        $this->_setExtensionAttributes($extensionAttributes);
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Model/Asset/Command/DeleteByPath.php b/app/code/Magento/MediaGallery/Model/Asset/Command/DeleteByPath.php
new file mode 100644
index 0000000000000..c05a08149bfca
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Model/Asset/Command/DeleteByPath.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Model\Asset\Command;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\MediaGalleryApi\Model\Asset\Command\DeleteByPathInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class DeleteByPath
+ */
+class DeleteByPath implements DeleteByPathInterface
+{
+    private const TABLE_MEDIA_GALLERY_ASSET = 'media_gallery_asset';
+
+    private const MEDIA_GALLERY_ASSET_PATH = 'path';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * DeleteById constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        LoggerInterface $logger
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Delete media asset by path
+     *
+     * @param string $mediaAssetPath
+     *
+     * @return void
+     * @throws CouldNotDeleteException
+     */
+    public function execute(string $mediaAssetPath): void
+    {
+        try {
+            /** @var AdapterInterface $connection */
+            $connection = $this->resourceConnection->getConnection();
+            $tableName = $this->resourceConnection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET);
+            $connection->delete($tableName, [self::MEDIA_GALLERY_ASSET_PATH . ' = ?' => $mediaAssetPath]);
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            $message = __(
+                'Could not delete media asset with path %path: %error',
+                ['path' => $mediaAssetPath, 'error' => $exception->getMessage()]
+            );
+            throw new CouldNotDeleteException($message, $exception);
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Model/Asset/Command/GetById.php b/app/code/Magento/MediaGallery/Model/Asset/Command/GetById.php
new file mode 100644
index 0000000000000..6be11610ac197
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Model/Asset/Command/GetById.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Model\Asset\Command;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Exception\IntegrationException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
+use Magento\MediaGalleryApi\Model\Asset\Command\GetByIdInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class GetById
+ */
+class GetById implements GetByIdInterface
+{
+    private const TABLE_MEDIA_GALLERY_ASSET = 'media_gallery_asset';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var AssetInterface
+     */
+    private $assetFactory;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * GetById constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     * @param AssetInterfaceFactory $assetFactory
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        AssetInterfaceFactory $assetFactory,
+        LoggerInterface $logger
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->assetFactory = $assetFactory;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Get media asset.
+     *
+     * @param int $mediaAssetId
+     *
+     * @return AssetInterface
+     * @throws NoSuchEntityException
+     * @throws IntegrationException
+     */
+    public function execute(int $mediaAssetId): AssetInterface
+    {
+        try {
+            $mediaAssetTable = $this->resourceConnection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET);
+            $connection = $this->resourceConnection->getConnection();
+            $select = $connection->select()
+                ->from(['amg' => $mediaAssetTable])
+                ->where('amg.id = ?', $mediaAssetId);
+            $mediaAssetData = $connection->query($select)->fetch();
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            $message = __(
+                'En error occurred during get media asset data by id %id: %error',
+                ['id' => $mediaAssetId, 'error' => $exception->getMessage()]
+            );
+            throw new IntegrationException($message, $exception);
+        }
+
+        if (empty($mediaAssetData)) {
+            $message = __('There is no such media asset with id %id', ['id' => $mediaAssetId]);
+            throw new NoSuchEntityException($message);
+        }
+
+        try {
+            return $this->assetFactory->create(['data' => $mediaAssetData]);
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            $message = __(
+                'En error occurred during initialize media asset with id %id: %error',
+                ['id' => $mediaAssetId, 'error' => $exception->getMessage()]
+            );
+            throw new IntegrationException($message, $exception);
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Model/Asset/Command/GetByPath.php b/app/code/Magento/MediaGallery/Model/Asset/Command/GetByPath.php
new file mode 100644
index 0000000000000..db8482d3399ba
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Model/Asset/Command/GetByPath.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Model\Asset\Command;
+
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
+use Magento\MediaGalleryApi\Model\Asset\Command\GetByPathInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Exception\IntegrationException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class GetListByIds
+ */
+class GetByPath implements GetByPathInterface
+{
+    private const TABLE_MEDIA_GALLERY_ASSET = 'media_gallery_asset';
+
+    private const MEDIA_GALLERY_ASSET_PATH = 'path';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var AssetInterface
+     */
+    private $mediaAssetFactory;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * GetByPath constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     * @param AssetInterfaceFactory $mediaAssetFactory
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        AssetInterfaceFactory $mediaAssetFactory,
+        LoggerInterface $logger
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->mediaAssetFactory = $mediaAssetFactory;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Return media asset asset list
+     *
+     * @param string $mediaFilePath
+     *
+     * @return AssetInterface
+     * @throws IntegrationException
+     */
+    public function execute(string $mediaFilePath): AssetInterface
+    {
+        try {
+            $connection = $this->resourceConnection->getConnection();
+            $select = $connection->select()
+                ->from($this->resourceConnection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET))
+                ->where(self::MEDIA_GALLERY_ASSET_PATH . ' = ?', $mediaFilePath);
+            $data = $connection->query($select)->fetch();
+
+            if (empty($data)) {
+                $message = __('There is no such media asset with path "%1"', $mediaFilePath);
+                throw new NoSuchEntityException($message);
+            }
+
+            $mediaAssets = $this->mediaAssetFactory->create(['data' => $data]);
+
+            return $mediaAssets;
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            $message = __('An error occurred during get media asset list: %1', $exception->getMessage());
+            throw new IntegrationException($message, $exception);
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Model/Asset/Command/Save.php b/app/code/Magento/MediaGallery/Model/Asset/Command/Save.php
new file mode 100644
index 0000000000000..7cb2f73169642
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Model/Asset/Command/Save.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Model\Asset\Command;
+
+use Magento\MediaGalleryApi\Model\DataExtractorInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Model\Asset\Command\SaveInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class Save
+ */
+class Save implements SaveInterface
+{
+    private const TABLE_MEDIA_GALLERY_ASSET = 'media_gallery_asset';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var DataExtractorInterface
+     */
+    private $extractor;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * Save constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     * @param DataExtractorInterface $extractor
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        DataExtractorInterface $extractor,
+        LoggerInterface $logger
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->extractor = $extractor;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Save media assets
+     *
+     * @param AssetInterface $mediaAsset
+     *
+     * @return int
+     * @throws CouldNotSaveException
+     */
+    public function execute(AssetInterface $mediaAsset): int
+    {
+        try {
+            /** @var \Magento\Framework\DB\Adapter\Pdo\Mysql $connection */
+            $connection = $this->resourceConnection->getConnection();
+            $tableName = $this->resourceConnection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET);
+
+            $connection->insertOnDuplicate($tableName, $this->extractor->extract($mediaAsset, AssetInterface::class));
+            return (int) $connection->lastInsertId($tableName);
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            $message = __('An error occurred during media asset save: %1', $exception->getMessage());
+            throw new CouldNotSaveException($message, $exception);
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Model/DataExtractor.php b/app/code/Magento/MediaGallery/Model/DataExtractor.php
new file mode 100644
index 0000000000000..92cf237022c28
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Model/DataExtractor.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Model;
+
+use Magento\MediaGalleryApi\Model\DataExtractorInterface;
+
+/**
+ * Extract data from an object using available getters
+ */
+class DataExtractor implements DataExtractorInterface
+{
+    /**
+     * Extract data from an object using available getters (does not process extension attributes)
+     *
+     * @param object $object
+     * @param string|null $interface
+     *
+     * @return array
+     * @throws \ReflectionException
+     */
+    public function extract($object, string $interface = null): array
+    {
+        $data = [];
+
+        $reflectionClass = new \ReflectionClass($interface ?? $object);
+
+        foreach ($reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
+            $methodName = $method->getName();
+            if (strpos($methodName, 'get') !== 0
+                || !empty($method->getParameters())
+                || strpos($methodName, 'getExtensionAttributes') !== false
+            ) {
+                continue;
+            }
+            $value = $object->$methodName();
+            if (!empty($value)) {
+                $key = strtolower(preg_replace("/([a-z])([A-Z])/", "$1_$2", substr($methodName, 3)));
+                $data[$key] = $value;
+            }
+        }
+        return $data;
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Model/Keyword.php b/app/code/Magento/MediaGallery/Model/Keyword.php
new file mode 100644
index 0000000000000..c5c60d3152846
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Model/Keyword.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Model;
+
+use Magento\MediaGalleryApi\Api\Data\KeywordExtensionInterface;
+use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
+use Magento\Framework\Model\AbstractExtensibleModel;
+
+/**
+ * Asset's Keyword
+ */
+class Keyword extends AbstractExtensibleModel implements KeywordInterface
+{
+    private const ID = 'id';
+
+    private const KEYWORD = 'keyword';
+
+    /**
+     * @inheritdoc
+     */
+    public function getId(): ?int
+    {
+        $id = $this->getData(self::ID);
+
+        if (!$id) {
+            return null;
+        }
+
+        return (int) $id;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getKeyword(): string
+    {
+        return (string)$this->getData(self::KEYWORD);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getExtensionAttributes(): KeywordExtensionInterface
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setExtensionAttributes(KeywordExtensionInterface $extensionAttributes): void
+    {
+        $this->_setExtensionAttributes($extensionAttributes);
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Model/Keyword/Command/GetAssetKeywords.php b/app/code/Magento/MediaGallery/Model/Keyword/Command/GetAssetKeywords.php
new file mode 100644
index 0000000000000..5b826a26e937d
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Model/Keyword/Command/GetAssetKeywords.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Model\Keyword\Command;
+
+use Magento\Framework\Exception\IntegrationException;
+use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
+use Magento\MediaGalleryApi\Api\Data\KeywordInterfaceFactory;
+use Magento\MediaGalleryApi\Model\Keyword\Command\GetAssetKeywordsInterface;
+use Magento\Framework\App\ResourceConnection;
+use Psr\Log\LoggerInterface;
+
+/**
+ * ClassGetAssetKeywords
+ */
+class GetAssetKeywords implements GetAssetKeywordsInterface
+{
+    private const TABLE_KEYWORD = 'media_gallery_keyword';
+    private const TABLE_ASSET_KEYWORD = 'media_gallery_asset_keyword';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var KeywordInterfaceFactory
+     */
+    private $assetKeywordFactory;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * GetAssetKeywords constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     * @param KeywordInterfaceFactory $assetKeywordFactory
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        KeywordInterfaceFactory $assetKeywordFactory,
+        LoggerInterface $logger
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->assetKeywordFactory = $assetKeywordFactory;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Get asset related keywords.
+     *
+     * @param int $assetId
+     *
+     * @return KeywordInterface[]|[]
+     * @throws IntegrationException
+     */
+    public function execute(int $assetId): array
+    {
+        try {
+            $connection = $this->resourceConnection->getConnection();
+
+            $select = $connection->select()
+                ->from(['k' => $this->resourceConnection->getTableName(self::TABLE_KEYWORD)])
+                ->join(['ak' => self::TABLE_ASSET_KEYWORD], 'k.id = ak.keyword_id')
+                ->where('ak.asset_id = ?', $assetId);
+            $data = $connection->query($select)->fetchAll();
+
+            $keywords = [];
+            foreach ($data as $keywordData) {
+                $keywords[] = $this->assetKeywordFactory->create(['data' => $keywordData]);
+            }
+
+            return $keywords;
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            $message = __('An error occurred during get asset keywords: %1', $exception->getMessage());
+            throw new IntegrationException($message, $exception);
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Model/Keyword/Command/SaveAssetKeywords.php b/app/code/Magento/MediaGallery/Model/Keyword/Command/SaveAssetKeywords.php
new file mode 100644
index 0000000000000..b355a9a651cd4
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Model/Keyword/Command/SaveAssetKeywords.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Model\Keyword\Command;
+
+use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
+use Magento\MediaGalleryApi\Model\Keyword\Command\SaveAssetKeywordsInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Adapter\Pdo\Mysql;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class SaveAssetKeywords
+ */
+class SaveAssetKeywords implements SaveAssetKeywordsInterface
+{
+    private const TABLE_KEYWORD = 'media_gallery_keyword';
+    private const ID = 'id';
+    private const KEYWORD = 'keyword';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var SaveAssetLinks
+     */
+    private $saveAssetLinks;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * SaveAssetKeywords constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     * @param SaveAssetLinks $saveAssetLinks
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        SaveAssetLinks $saveAssetLinks,
+        LoggerInterface $logger
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->saveAssetLinks = $saveAssetLinks;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Save asset keywords.
+     *
+     * @param KeywordInterface[] $keywords
+     * @param int $assetId
+     * @throws CouldNotSaveException
+     */
+    public function execute(array $keywords, int $assetId): void
+    {
+        try {
+            $data = [];
+            /** @var KeywordInterface $keyword */
+            foreach ($keywords as $keyword) {
+                $data[] = $keyword->getKeyword();
+            }
+
+            if (!empty($data)) {
+                /** @var Mysql $connection */
+                $connection = $this->resourceConnection->getConnection();
+                $connection->insertArray(
+                    $this->resourceConnection->getTableName(self::TABLE_KEYWORD),
+                    [self::KEYWORD],
+                    $data,
+                    AdapterInterface::INSERT_IGNORE
+                );
+
+                $this->saveAssetLinks->execute($assetId, $this->getKeywordIds($data));
+            }
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            $message = __('An error occurred during save asset keyword: %1', $exception->getMessage());
+            throw new CouldNotSaveException($message, $exception);
+        }
+    }
+
+    /**
+     * Select keywords by names
+     *
+     * @param string[] $keywords
+     *
+     * @return int[]
+     */
+    private function getKeywordIds(array $keywords): array
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $select = $connection->select()
+            ->from(['k' => $this->resourceConnection->getTableName(self::TABLE_KEYWORD)])
+            ->columns(self::ID)
+            ->where('k.' . self::KEYWORD . ' in (?)', $keywords);
+
+        return $connection->fetchCol($select);
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Model/Keyword/Command/SaveAssetLinks.php b/app/code/Magento/MediaGallery/Model/Keyword/Command/SaveAssetLinks.php
new file mode 100644
index 0000000000000..4d3fd2bb5c30d
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Model/Keyword/Command/SaveAssetLinks.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Model\Keyword\Command;
+
+use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
+use Magento\MediaGalleryApi\Model\Keyword\Command\SaveAssetLinksInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Adapter\Pdo\Mysql;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class SaveAssetLinks
+ */
+class SaveAssetLinks
+{
+    private const TABLE_ASSET_KEYWORD = 'media_gallery_asset_keyword';
+    private const FIELD_ASSET_ID = 'asset_id';
+    private const FIELD_KEYWORD_ID = 'keyword_id';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * SaveAssetLinks constructor.
+     *
+     * @param ResourceConnection $resourceConnection
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        LoggerInterface $logger
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Save asset keywords links
+     *
+     * @param int $assetId
+     * @param KeywordInterface[] $keywordIds
+     *
+     * @throws CouldNotSaveException
+     */
+    public function execute(int $assetId, array $keywordIds): void
+    {
+        try {
+            $values = [];
+            foreach ($keywordIds as $keywordId) {
+                $values[] = [$assetId, $keywordId];
+            }
+
+            if (!empty($values)) {
+                /** @var Mysql $connection */
+                $connection = $this->resourceConnection->getConnection();
+                $connection->insertArray(
+                    $this->resourceConnection->getTableName(self::TABLE_ASSET_KEYWORD),
+                    [self::FIELD_ASSET_ID, self::FIELD_KEYWORD_ID],
+                    $values,
+                    AdapterInterface::INSERT_IGNORE
+                );
+            }
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            $message = __('An error occurred during save asset keyword links: %1', $exception->getMessage());
+            throw new CouldNotSaveException($message, $exception);
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Plugin/Product/Gallery/Processor.php b/app/code/Magento/MediaGallery/Plugin/Product/Gallery/Processor.php
new file mode 100644
index 0000000000000..3fbe4e3a91a2b
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Plugin/Product/Gallery/Processor.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Plugin\Product\Gallery;
+
+use Magento\MediaGalleryApi\Model\Asset\Command\DeleteByPathInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Gallery\Processor as ProcessorSubject;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Ensures that metadata is removed from the database when a product image has been deleted.
+ */
+class Processor
+{
+    /**
+     * @var DeleteByPathInterface
+     */
+    private $deleteMediaAssetByPath;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * Processor constructor.
+     *
+     * @param DeleteByPathInterface $deleteMediaAssetByPath
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        DeleteByPathInterface $deleteMediaAssetByPath,
+        LoggerInterface $logger
+    ) {
+        $this->deleteMediaAssetByPath = $deleteMediaAssetByPath;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Remove media asset image after the product gallery image remove
+     *
+     * @param ProcessorSubject $subject
+     * @param ProcessorSubject $result
+     * @param Product $product
+     * @param string $file
+     *
+     * @return ProcessorSubject
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterRemoveImage(
+        ProcessorSubject $subject,
+        ProcessorSubject $result,
+        Product $product,
+        $file
+    ): ProcessorSubject {
+        if (!is_string($file)) {
+            return $result;
+        }
+
+        try {
+            $this->deleteMediaAssetByPath->execute($file);
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Plugin/Wysiwyg/Images/Storage.php b/app/code/Magento/MediaGallery/Plugin/Wysiwyg/Images/Storage.php
new file mode 100644
index 0000000000000..ff0e1528e0597
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Plugin/Wysiwyg/Images/Storage.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Plugin\Wysiwyg\Images;
+
+use Magento\MediaGalleryApi\Model\Asset\Command\GetByPathInterface;
+use Magento\MediaGalleryApi\Model\Asset\Command\DeleteByPathInterface;
+use Magento\Cms\Model\Wysiwyg\Images\Storage as StorageSubject;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Exception\ValidatorException;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Ensures that metadata is removed from the database when a file is deleted and it is an image
+ */
+class Storage
+{
+    /**
+     * @var GetByPathInterface
+     */
+    private $getMediaAssetByPath;
+
+    /**
+     * @var DeleteByPathInterface
+     */
+    private $deleteMediaAssetByPath;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * Storage constructor.
+     *
+     * @param GetByPathInterface $getMediaAssetByPath
+     * @param DeleteByPathInterface $deleteMediaAssetByPath
+     * @param Filesystem $filesystem
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        GetByPathInterface $getMediaAssetByPath,
+        DeleteByPathInterface $deleteMediaAssetByPath,
+        Filesystem $filesystem,
+        LoggerInterface $logger
+    ) {
+        $this->getMediaAssetByPath = $getMediaAssetByPath;
+        $this->deleteMediaAssetByPath = $deleteMediaAssetByPath;
+        $this->filesystem = $filesystem;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Delete media data after the image delete action from Wysiwyg
+     *
+     * @param StorageSubject $subject
+     * @param StorageSubject $result
+     * @param string $target
+     *
+     * @return StorageSubject
+     * @throws ValidatorException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDeleteFile(StorageSubject $subject, StorageSubject $result, $target): StorageSubject
+    {
+        if (!is_string($target)) {
+            return $result;
+        }
+
+        $relativePath = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->getRelativePath($target);
+        if (!$relativePath) {
+            return $result;
+        }
+
+        try {
+            $this->deleteMediaAssetByPath->execute($relativePath);
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/MediaGallery/README.md b/app/code/Magento/MediaGallery/README.md
new file mode 100644
index 0000000000000..ed97b5df98fc2
--- /dev/null
+++ b/app/code/Magento/MediaGallery/README.md
@@ -0,0 +1,23 @@
+# Magento_MediaGallery module
+
+The Magento_MediaGallery module is responsible for storing and managing media gallery assets attributes.
+
+## Installation details
+
+The Magento_MediaGallery module creates the following tables in the database:
+
+- `media_gallery_asset`
+- `media_gallery_keyword`
+- `media_gallery_asset_keyword`
+
+For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaGallery module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaGallery module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/DeleteByPathTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/DeleteByPathTest.php
new file mode 100644
index 0000000000000..e6de7232ac153
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/DeleteByPathTest.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Test\Unit\Model\Asset\Command;
+
+use Magento\MediaGallery\Model\Asset\Command\DeleteByPath;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Exception\CouldNotDeleteException;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Test the DeleteByPath command model
+ */
+class DeleteByPathTest extends TestCase
+{
+    private const TABLE_NAME = 'media_gallery_asset';
+    private const FILE_PATH = 'test-file-path/test.jpg';
+
+    /**
+     * @var DeleteByPath
+     */
+    private $deleteMediaAssetByPath;
+
+    /**
+     * @var AdapterInterface|MockObject
+     */
+    private $adapter;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * Initialize basic test class mocks
+     */
+    protected function setUp(): void
+    {
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $resourceConnection = $this->createMock(ResourceConnection::class);
+
+        $this->deleteMediaAssetByPath = (new ObjectManager($this))->getObject(
+            DeleteByPath::class,
+            [
+                'resourceConnection' => $resourceConnection,
+                'logger' =>  $this->logger,
+            ]
+        );
+
+        $this->adapter = $this->createMock(AdapterInterface::class);
+        $resourceConnection->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->adapter);
+        $resourceConnection->expects($this->once())
+            ->method('getTableName')
+            ->with(self::TABLE_NAME)
+            ->willReturn('prefix_' . self::TABLE_NAME);
+    }
+
+    /**
+     * Test delete media asset by path command
+     */
+    public function testSuccessfulDeleteByIdExecution(): void
+    {
+        $this->adapter->expects($this->once())
+            ->method('delete')
+            ->with('prefix_' . self::TABLE_NAME, ['path = ?' => self::FILE_PATH]);
+
+        $this->deleteMediaAssetByPath->execute(self::FILE_PATH);
+    }
+
+    /**
+     * Assume that delete action will thrown an Exception
+     */
+    public function testExceptionOnDeleteExecution(): void
+    {
+        $this->adapter->expects($this->once())
+            ->method('delete')
+            ->with('prefix_' . self::TABLE_NAME, ['path = ?' => self::FILE_PATH])
+            ->willThrowException(new \Exception());
+
+        $this->expectException(CouldNotDeleteException::class);
+        $this->logger->expects($this->once())
+            ->method('critical')
+            ->willReturnSelf();
+        $this->deleteMediaAssetByPath->execute(self::FILE_PATH);
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionDuringMediaAssetInitializationTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionDuringMediaAssetInitializationTest.php
new file mode 100644
index 0000000000000..0d0bfc510b518
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionDuringMediaAssetInitializationTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Test\Unit\Model\Asset\Command;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Exception\IntegrationException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\MediaGallery\Model\Asset\Command\GetById;
+use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
+use Zend\Db\Adapter\Driver\Pdo\Statement;
+
+/**
+ * Test the GetById command with exception during media asset initialization
+ */
+class GetByIdExceptionDuringMediaAssetInitializationTest extends \PHPUnit\Framework\TestCase
+{
+    private const MEDIA_ASSET_STUB_ID = 1;
+
+    private const MEDIA_ASSET_DATA = ['id' => 1];
+
+    /**
+     * @var GetById|MockObject
+     */
+    private $getMediaAssetById;
+
+    /**
+     * @var AssetInterfaceFactory|MockObject
+     */
+    private $assetFactory;
+
+    /**
+     * @var AdapterInterface|MockObject
+     */
+    private $adapter;
+
+    /**
+     * @var Select|MockObject
+     */
+    private $selectStub;
+
+    /**
+     * @var Statement|MockObject
+     */
+    private $statementMock;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * Initialize basic test class mocks
+     */
+    protected function setUp(): void
+    {
+        $resourceConnection = $this->createMock(ResourceConnection::class);
+        $this->assetFactory = $this->createMock(AssetInterfaceFactory::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+
+        $this->getMediaAssetById = (new ObjectManager($this))->getObject(
+            GetById::class,
+            [
+                'resourceConnection' => $resourceConnection,
+                'assetFactory' => $this->assetFactory,
+                'logger' =>  $this->logger,
+            ]
+        );
+        $this->adapter = $this->createMock(AdapterInterface::class);
+        $resourceConnection->method('getConnection')->willReturn($this->adapter);
+
+        $this->selectStub = $this->createMock(Select::class);
+        $this->selectStub->method('from')->willReturnSelf();
+        $this->selectStub->method('where')->willReturnSelf();
+        $this->adapter->method('select')->willReturn($this->selectStub);
+
+        $this->statementMock = $this->getMockBuilder(\Zend_Db_Statement_Interface::class)->getMock();
+    }
+
+    /**
+     * Test case when a problem occurred during asset initialization from received data.
+     */
+    public function testErrorDuringMediaAssetInitializationException(): void
+    {
+        $this->statementMock->method('fetch')->willReturn(self::MEDIA_ASSET_DATA);
+        $this->adapter->method('query')->willReturn($this->statementMock);
+
+        $this->assetFactory->expects($this->once())->method('create')->willThrowException(new \Exception());
+
+        $this->expectException(IntegrationException::class);
+        $this->logger->expects($this->any())
+            ->method('critical')
+            ->willReturnSelf();
+
+        $this->getMediaAssetById->execute(self::MEDIA_ASSET_STUB_ID);
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionNoSuchEntityTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionNoSuchEntityTest.php
new file mode 100644
index 0000000000000..0ca9b3a3ffc8a
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionNoSuchEntityTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Test\Unit\Model\Asset\Command;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\MediaGallery\Model\Asset\Command\GetById;
+use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
+use Zend\Db\Adapter\Driver\Pdo\Statement;
+
+/**
+ * Test the GetById command with exception thrown in case when there is no such entity
+ */
+class GetByIdExceptionNoSuchEntityTest extends \PHPUnit\Framework\TestCase
+{
+    private const MEDIA_ASSET_STUB_ID = 1;
+
+    /**
+     * @var GetById|MockObject
+     */
+    private $getMediaAssetById;
+
+    /**
+     * @var AssetInterfaceFactory|MockObject
+     */
+    private $assetFactory;
+
+    /**
+     * @var AdapterInterface|MockObject
+     */
+    private $adapter;
+
+    /**
+     * @var Select|MockObject
+     */
+    private $selectStub;
+
+    /**
+     * @var Statement|MockObject
+     */
+    private $statementMock;
+
+    /**
+     * Initialize basic test class mocks
+     */
+    protected function setUp(): void
+    {
+        $resourceConnection = $this->createMock(ResourceConnection::class);
+        $this->assetFactory = $this->createMock(AssetInterfaceFactory::class);
+        $logger = $this->createMock(LoggerInterface::class);
+
+        $this->getMediaAssetById = (new ObjectManager($this))->getObject(
+            GetById::class,
+            [
+                'resourceConnection' => $resourceConnection,
+                'assetFactory' => $this->assetFactory,
+                'logger' =>  $logger,
+            ]
+        );
+        $this->adapter = $this->createMock(AdapterInterface::class);
+        $resourceConnection->method('getConnection')->willReturn($this->adapter);
+
+        $this->selectStub = $this->createMock(Select::class);
+        $this->selectStub->method('from')->willReturnSelf();
+        $this->selectStub->method('where')->willReturnSelf();
+        $this->adapter->method('select')->willReturn($this->selectStub);
+
+        $this->statementMock = $this->getMockBuilder(\Zend_Db_Statement_Interface::class)->getMock();
+    }
+
+    /**
+     * Test case when there is no found media asset by id.
+     */
+    public function testNotFoundMediaAssetException(): void
+    {
+        $this->statementMock->method('fetch')->willReturn([]);
+        $this->adapter->method('query')->willReturn($this->statementMock);
+
+        $this->expectException(NoSuchEntityException::class);
+
+        $this->getMediaAssetById->execute(self::MEDIA_ASSET_STUB_ID);
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionOnGetDataTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionOnGetDataTest.php
new file mode 100644
index 0000000000000..a709c2d214bda
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionOnGetDataTest.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Test\Unit\Model\Asset\Command;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Exception\IntegrationException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\MediaGallery\Model\Asset\Command\GetById;
+use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
+use Zend\Db\Adapter\Driver\Pdo\Statement;
+
+/**
+ * Test the GetById command with exception during get media data
+ */
+class GetByIdExceptionOnGetDataTest extends \PHPUnit\Framework\TestCase
+{
+    private const MEDIA_ASSET_STUB_ID = 1;
+
+    private const MEDIA_ASSET_DATA = ['id' => 1];
+
+    /**
+     * @var GetById|MockObject
+     */
+    private $getMediaAssetById;
+    /**
+     * @var AdapterInterface|MockObject
+     */
+    private $adapter;
+
+    /**
+     * @var Select|MockObject
+     */
+    private $selectStub;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * @var Statement|MockObject
+     */
+    private $statementMock;
+
+    /**
+     * Initialize basic test class mocks
+     */
+    protected function setUp(): void
+    {
+        $resourceConnection = $this->createMock(ResourceConnection::class);
+        $assetFactory = $this->createMock(AssetInterfaceFactory::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+
+        $this->getMediaAssetById = (new ObjectManager($this))->getObject(
+            GetById::class,
+            [
+                'resourceConnection' => $resourceConnection,
+                'assetFactory' => $assetFactory,
+                'logger' =>  $this->logger,
+            ]
+        );
+        $this->adapter = $this->createMock(AdapterInterface::class);
+        $resourceConnection->method('getConnection')->willReturn($this->adapter);
+
+        $this->selectStub = $this->createMock(Select::class);
+        $this->selectStub->method('from')->willReturnSelf();
+        $this->selectStub->method('where')->willReturnSelf();
+        $this->adapter->method('select')->willReturn($this->selectStub);
+
+        $this->statementMock = $this->getMockBuilder(\Zend_Db_Statement_Interface::class)->getMock();
+    }
+
+    /**
+     * Test an exception during the get asset data query.
+     */
+    public function testExceptionDuringGetMediaAssetData(): void
+    {
+        $this->statementMock->method('fetch')->willReturn(self::MEDIA_ASSET_DATA);
+        $this->adapter->method('query')->willThrowException(new \Exception());
+
+        $this->expectException(IntegrationException::class);
+        $this->logger->expects($this->any())
+            ->method('critical')
+            ->willReturnSelf();
+
+        $this->getMediaAssetById->execute(self::MEDIA_ASSET_STUB_ID);
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdSuccessfulTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdSuccessfulTest.php
new file mode 100644
index 0000000000000..c300d4f121bd2
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdSuccessfulTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Test\Unit\Model\Asset\Command;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\MediaGallery\Model\Asset\Command\GetById;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
+use Zend\Db\Adapter\Driver\Pdo\Statement;
+
+/**
+ * Test the GetById command successful scenario
+ */
+class GetByIdSuccessfulTest extends \PHPUnit\Framework\TestCase
+{
+    private const MEDIA_ASSET_STUB_ID = 1;
+
+    private const MEDIA_ASSET_DATA = ['id' => 1];
+
+    /**
+     * @var GetById|MockObject
+     */
+    private $getMediaAssetById;
+
+    /**
+     * @var AssetInterfaceFactory|MockObject
+     */
+    private $assetFactory;
+
+    /**
+     * @var AdapterInterface|MockObject
+     */
+    private $adapter;
+
+    /**
+     * @var Select|MockObject
+     */
+    private $selectStub;
+
+    /**
+     * @var Statement|MockObject
+     */
+    private $statementMock;
+
+    /**
+     * Initialize basic test class mocks
+     */
+    protected function setUp(): void
+    {
+        $resourceConnection = $this->createMock(ResourceConnection::class);
+        $this->assetFactory = $this->createMock(AssetInterfaceFactory::class);
+        $logger = $this->createMock(LoggerInterface::class);
+
+        $this->getMediaAssetById = (new ObjectManager($this))->getObject(
+            GetById::class,
+            [
+                'resourceConnection' => $resourceConnection,
+                'assetFactory' => $this->assetFactory,
+                'logger' =>  $logger,
+            ]
+        );
+        $this->adapter = $this->createMock(AdapterInterface::class);
+        $resourceConnection->method('getConnection')->willReturn($this->adapter);
+
+        $this->selectStub = $this->createMock(Select::class);
+        $this->selectStub->method('from')->willReturnSelf();
+        $this->selectStub->method('where')->willReturnSelf();
+        $this->adapter->method('select')->willReturn($this->selectStub);
+
+        $this->statementMock = $this->getMockBuilder(\Zend_Db_Statement_Interface::class)->getMock();
+    }
+
+    /**
+     * Test successful get media asset by id command execution.
+     */
+    public function testSuccessfulGetByIdExecution(): void
+    {
+        $this->statementMock->method('fetch')->willReturn(self::MEDIA_ASSET_DATA);
+        $this->adapter->method('query')->willReturn($this->statementMock);
+
+        $mediaAssetStub = $this->getMockBuilder(AssetInterface::class)->getMock();
+        $this->assetFactory->expects($this->once())->method('create')->willReturn($mediaAssetStub);
+
+        $this->assertEquals(
+            $mediaAssetStub,
+            $this->getMediaAssetById->execute(self::MEDIA_ASSET_STUB_ID)
+        );
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/SaveTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/SaveTest.php
new file mode 100644
index 0000000000000..2f736fb832eac
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/SaveTest.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Test\Unit\Model\Asset\Command;
+
+use Magento\MediaGallery\Model\Asset\Command\Save;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Model\DataExtractorInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Adapter\Pdo\Mysql;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Tests the Save model using PHPUnit
+ */
+class SaveTest extends TestCase
+{
+
+    /**
+     * Constant for tablename of media gallery assets
+     */
+    private const TABLE_MEDIA_GALLERY_ASSET = 'media_gallery_asset';
+
+    /**
+     * Constant for prefixed tablename of media gallery assets
+     */
+    private const PREFIXED_TABLE_MEDIA_GALLERY_ASSET = 'prefix_' . self::TABLE_MEDIA_GALLERY_ASSET;
+
+    /**
+     * Constant for last ID generated after data insertion
+     */
+    private const INSERT_ID = '1';
+
+    /**
+     * Constant for affected rows count after data insertion
+     */
+    private const AFFECTED_ROWS = 1;
+
+    /**
+     * Constant for image data
+     */
+    private const IMAGE_DATA = [
+        'path' => '/test/path',
+        'title' => 'Test Title',
+        'source' => 'Adobe Stock',
+        'content_type' => 'image/jpeg',
+        'height' => 4863,
+        'width' => 12129
+    ];
+
+    /**
+     * @var MockObject | ResourceConnection
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var MockObject | DataExtractorInterface
+     */
+    private $loggerMock;
+
+    /**
+     * @var MockObject | LoggerInterface
+     */
+    private $extractorMock;
+
+    /**
+     * @var MockObject | AdapterInterface
+     */
+    private $adapterMock;
+
+    /**
+     * @var MockObject | AssetInterface
+     */
+    private $mediaAssetMock;
+
+    /**
+     * @var Save
+     */
+    private $save;
+
+    /**
+     * Set up test mocks
+     */
+    protected function setUp(): void
+    {
+        /* Intermediary mocks */
+        $this->adapterMock = $this->createMock(Mysql::class);
+        $this->mediaAssetMock = $this->createMock(AssetInterface::class);
+
+        /* Save constructor mocks */
+        $this->extractorMock = $this->createMock(DataExtractorInterface::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->resourceConnectionMock = $this->createConfiguredMock(
+            ResourceConnection::class,
+            [
+                'getConnection' => $this->adapterMock,
+                'getTableName'  => self::PREFIXED_TABLE_MEDIA_GALLERY_ASSET
+            ]
+        );
+
+        /* Create Save instance with mocks */
+        $this->save = (new ObjectManager($this))->getObject(
+            Save::class,
+            [
+                'resourceConnection' => $this->resourceConnectionMock,
+                'extractor'          => $this->extractorMock,
+                'logger'             => $this->loggerMock
+            ]
+        );
+    }
+
+    /**
+     * Tests a successful Save::execute method
+     */
+    public function testSuccessfulExecute(): void
+    {
+        $this->resourceConnectionMock->expects(self::once())->method('getConnection');
+        $this->resourceConnectionMock->expects(self::once())->method('getTableName');
+
+        $this->extractorMock
+            ->expects(self::once())
+            ->method('extract')
+            ->with($this->mediaAssetMock, AssetInterface::class)
+            ->willReturn(self::IMAGE_DATA);
+
+        $this->adapterMock
+            ->expects(self::once())
+            ->method('insertOnDuplicate')
+            ->with(self::PREFIXED_TABLE_MEDIA_GALLERY_ASSET, self::IMAGE_DATA)
+            ->willReturn(self::AFFECTED_ROWS);
+
+        $this->adapterMock
+            ->expects(self::once())
+            ->method('lastInsertId')
+            ->with(self::PREFIXED_TABLE_MEDIA_GALLERY_ASSET)
+            ->willReturn(self::INSERT_ID);
+
+        $this->save->execute($this->mediaAssetMock);
+    }
+
+    /**
+     * Tests Save::execute method with an exception thrown
+     */
+    public function testExceptionExecute(): void
+    {
+        $this->resourceConnectionMock->expects(self::once())->method('getConnection');
+        $this->resourceConnectionMock->expects(self::once())->method('getTableName');
+
+        $this->extractorMock
+            ->expects(self::once())
+            ->method('extract')
+            ->with($this->mediaAssetMock, AssetInterface::class)
+            ->willReturn(self::IMAGE_DATA);
+
+        $this->adapterMock
+            ->expects(self::once())
+            ->method('insertOnDuplicate')
+            ->with(self::PREFIXED_TABLE_MEDIA_GALLERY_ASSET, self::IMAGE_DATA)
+            ->willThrowException(new \Zend_Db_Exception());
+
+        $this->loggerMock
+            ->expects(self::once())
+            ->method('critical')
+            ->willReturnSelf();
+
+        $this->expectException(CouldNotSaveException::class);
+
+        $this->save->execute($this->mediaAssetMock);
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/DataExtractorTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/DataExtractorTest.php
new file mode 100644
index 0000000000000..7d57f32449f56
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/DataExtractorTest.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Test\Unit\Model;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\MediaGallery\Model\Asset;
+use Magento\MediaGallery\Model\Keyword;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
+use Magento\MediaGallery\Model\DataExtractor;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class DataExtractorTest extends TestCase
+{
+    /**
+     * @var DataExtractor|MockObject
+     */
+    private $dataExtractor;
+
+    /**
+     * Initialize basic test class mocks
+     */
+    protected function setUp(): void
+    {
+        $this->dataExtractor = new DataExtractor();
+    }
+
+    /**
+     * Test extract object data by interface
+     *
+     * @dataProvider assetProvider
+     *
+     * @param string $class
+     * @param string|null $interfaceClass
+     * @param array $expectedData
+     *
+     * @throws \ReflectionException
+     */
+    public function testExtractData(string $class, $interfaceClass, array $expectedData): void
+    {
+        $data = [];
+        foreach ($expectedData as $expectedDataKey => $expectedDataItem) {
+            $data[$expectedDataKey] = $expectedDataItem['value'];
+        }
+        $model = (new ObjectManager($this))->getObject(
+            $class,
+            [
+                'data' => $data,
+            ]
+        );
+        $receivedData = $this->dataExtractor->extract($model, $interfaceClass);
+        $this->checkValues($expectedData, $receivedData, $model);
+    }
+
+    /**
+     * @param array $expectedData
+     * @param array $data
+     * @param object $model
+     */
+    protected function checkValues(array $expectedData, array $data, $model)
+    {
+        foreach ($expectedData as $expectedDataKey => $expectedDataItem) {
+            $this->assertEquals($data[$expectedDataKey] ?? null, $model->{$expectedDataItem['method']}());
+            $this->assertEquals($data[$expectedDataKey] ?? null, $expectedDataItem['value']);
+        }
+        $this->assertEquals(array_keys($expectedData), array_keys($expectedData));
+    }
+
+    /**
+     * @return array
+     */
+    public function assetProvider()
+    {
+        return [
+            'Asset conversion with interface' => [
+                Asset::class,
+                AssetInterface::class,
+                [
+                    'id' => [
+                        'value' => 2,
+                        'method' => 'getId',
+                    ],
+                    'path' => [
+                        'value' => 'path',
+                        'method' => 'getPath',
+                    ],
+                    'title' => [
+                        'value' => 'title',
+                        'method' => 'getTitle',
+                    ],
+                    'source' => [
+                        'value' => 'source',
+                        'method' => 'getSource',
+                    ],
+                    'content_type' => [
+                        'value' => 'content_type',
+                        'method' => 'getContentType',
+                    ],
+                    'width' => [
+                        'value' => 3,
+                        'method' => 'getWidth',
+                    ],
+                    'height' => [
+                        'value' => 4,
+                        'method' => 'getHeight',
+                    ],
+                    'created_at' => [
+                        'value' => '2019-11-28 10:40:09',
+                        'method' => 'getCreatedAt',
+                    ],
+                    'updated_at' => [
+                        'value' => '2019-11-28 10:41:08',
+                        'method' => 'getUpdatedAt',
+                    ],
+                ],
+            ],
+            'Keyword conversion without interface' => [
+                Keyword::class,
+                null,
+                [
+                    'id' => [
+                        'value' => 2,
+                        'method' => 'getId',
+                    ],
+                    'keyword' => [
+                        'value' => 'keyword',
+                        'method' => 'getKeyword',
+                    ],
+                ],
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/GetAssetKeywordsTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/GetAssetKeywordsTest.php
new file mode 100644
index 0000000000000..2ccac4eac8343
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/GetAssetKeywordsTest.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Test\Unit\Model\Keyword\Command;
+
+use Magento\Framework\Exception\IntegrationException;
+use Magento\MediaGallery\Model\Keyword\Command\GetAssetKeywords;
+use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
+use Magento\MediaGalleryApi\Api\Data\KeywordInterfaceFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+/**
+ * GetAssetKeywordsTest
+ */
+class GetAssetKeywordsTest extends TestCase
+{
+    /**
+     * @var GetAssetKeywords
+     */
+    private $sut;
+
+    /**
+     * @var ResourceConnection | MockObject
+     */
+    private $resourceConnectionStub;
+
+    /**
+     * @var KeywordInterfaceFactory | MockObject
+     */
+    private $assetKeywordFactoryStub;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $loggerMock;
+
+    protected function setUp(): void
+    {
+        $this->resourceConnectionStub = $this->createMock(ResourceConnection::class);
+        $this->assetKeywordFactoryStub = $this->createMock(KeywordInterfaceFactory::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+
+        $this->sut = new GetAssetKeywords(
+            $this->resourceConnectionStub,
+            $this->assetKeywordFactoryStub,
+            $this->loggerMock
+        );
+    }
+
+    /**
+     * Posive test for the main case
+     *
+     * @dataProvider casesProvider()
+     * @param array $databaseQueryResult
+     * @param int $expectedNumberOfFoundKeywords
+     */
+    public function testFind(array $databaseQueryResult, int $expectedNumberOfFoundKeywords): void
+    {
+        $randomAssetId = 12345;
+        $this->configureResourceConnectionStub($databaseQueryResult);
+        $this->configureAssetKeywordFactoryStub();
+
+        /** @var KeywordInterface[] $keywords */
+        $keywords = $this->sut->execute($randomAssetId);
+
+        $this->assertCount($expectedNumberOfFoundKeywords, $keywords);
+    }
+
+    /**
+     * Data provider for testFind
+     *
+     * @return array
+     */
+    public function casesProvider(): array
+    {
+        return [
+            'not_found' => [[],0],
+            'find_one_keyword' => [['keywordRawData'],1],
+            'find_several_keywords' => [['keywordRawData', 'keywordRawData'],2],
+        ];
+    }
+
+    /**
+     * Test case when an error occured during get data request.
+     *
+     * @throws IntegrationException
+     */
+    public function testNotFoundBecauseOfError(): void
+    {
+        $randomAssetId = 1;
+
+        $this->resourceConnectionStub
+            ->method('getConnection')
+            ->willThrowException((new \Exception()));
+
+        $this->expectException(IntegrationException::class);
+        $this->loggerMock->expects($this->once())
+            ->method('critical')
+            ->willReturnSelf();
+
+        $this->sut->execute($randomAssetId);
+    }
+
+    /**
+     * Very fragile and coupled to the implementation
+     *
+     * @param array $queryResult
+     */
+    private function configureResourceConnectionStub(array $queryResult): void
+    {
+        $statementMock = $this->getMockBuilder(\Zend_Db_Statement_Interface::class)->getMock();
+        $statementMock
+            ->method('fetchAll')
+            ->willReturn($queryResult);
+
+        $selectStub = $this->createMock(Select::class);
+        $selectStub->method('from')->willReturnSelf();
+        $selectStub->method('join')->willReturnSelf();
+        $selectStub->method('where')->willReturnSelf();
+
+        $connectionMock = $this->getMockBuilder(AdapterInterface::class)->getMock();
+        $connectionMock
+            ->method('select')
+            ->willReturn($selectStub);
+        $connectionMock
+            ->method('query')
+            ->willReturn($statementMock);
+
+        $this->resourceConnectionStub
+            ->method('getConnection')
+            ->willReturn($connectionMock);
+    }
+
+    private function configureAssetKeywordFactoryStub(): void
+    {
+        $keywordStub = $this->getMockBuilder(KeywordInterface::class)->getMock();
+        $this->assetKeywordFactoryStub
+            ->method('create')
+            ->willReturn($keywordStub);
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/SaveAssetKeywordsTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/SaveAssetKeywordsTest.php
new file mode 100644
index 0000000000000..a55c60024c08d
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/SaveAssetKeywordsTest.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Test\Unit\Model\Keyword\Command;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DataObject;
+use Magento\Framework\DB\Adapter\Pdo\Mysql;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\MediaGallery\Model\Keyword\Command\SaveAssetKeywords;
+use Magento\MediaGallery\Model\Keyword\Command\SaveAssetLinks;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+/**
+ * SaveAssetKeywordsTest.
+ */
+class SaveAssetKeywordsTest extends TestCase
+{
+    /**
+     * @var SaveAssetKeywords
+     */
+    private $sut;
+
+    /**
+     * @var ResourceConnection|MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var Mysql|MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var SaveAssetLinks|MockObject
+     */
+    private $saveAssetLinksMock;
+
+    /**
+     * @var Select|MockObject
+     */
+    private $selectMock;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * SetUp
+     */
+    public function setUp(): void
+    {
+        $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
+        $this->saveAssetLinksMock = $this->createMock(SaveAssetLinks::class);
+        $this->connectionMock = $this->getMockBuilder(Mysql::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->selectMock = $this->createMock(Select::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+
+        $this->sut = new SaveAssetKeywords(
+            $this->resourceConnectionMock,
+            $this->saveAssetLinksMock,
+            $this->loggerMock
+        );
+    }
+
+    /**
+     * Test saving the asset keywords
+     *
+     * @dataProvider assetKeywordsDataProvider
+     *
+     * @param array $keywords
+     * @param int $assetId
+     * @param array $items
+     */
+    public function testAssetKeywordsSave(array $keywords, int $assetId, array $items): void
+    {
+        $expectedCalls = (int) (count($keywords));
+
+        if ($expectedCalls) {
+            $this->prepareResourceConnection();
+            $this->connectionMock->expects($this->once())
+                ->method('insertArray')
+                ->with(
+                    'prefix_media_gallery_keyword',
+                    ['keyword'],
+                    $items,
+                    2
+                );
+        }
+
+        $this->sut->execute($keywords, $assetId);
+    }
+
+    /**
+     * Testing throwing exception handling
+     *
+     * @throws CouldNotSaveException
+     */
+    public function testAssetNotSavingCausedByError(): void
+    {
+        $keyword = new DataObject(['keyword' => 'keyword-1']);
+
+        $this->resourceConnectionMock
+            ->method('getConnection')
+            ->willThrowException((new \Exception()));
+        $this->expectException(CouldNotSaveException::class);
+        $this->loggerMock->expects($this->once())
+            ->method('critical')
+            ->willReturnSelf();
+
+        $this->sut->execute([$keyword], 1);
+    }
+
+    /**
+     * Preparing the resource connection
+     */
+    private function prepareResourceConnection(): void
+    {
+        $this->selectMock->method('from')->willReturnSelf();
+        $this->selectMock->method('columns')->with('id')->willReturnSelf();
+        $this->selectMock->method('where')->willReturnSelf();
+
+        $this->connectionMock
+            ->method('select')
+            ->willReturn($this->selectMock);
+        $this->connectionMock
+            ->method('fetchCol')
+            ->willReturn([['id'=> 1], ['id' => 2]]);
+        $this->resourceConnectionMock->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+        $this->resourceConnectionMock->expects($this->any())
+            ->method('getTableName')
+            ->with('media_gallery_keyword')
+            ->willReturn('prefix_media_gallery_keyword');
+    }
+
+    /**
+     * Providing asset keywords
+     *
+     * @return array
+     */
+    public function assetKeywordsDataProvider(): array
+    {
+        return [
+            [
+                [],
+                1,
+                []
+            ], [
+                [
+                    new DataObject(['keyword' => 'keyword-1']),
+                    new DataObject(['keyword' => 'keyword-2']),
+                ],
+                1,
+                ['keyword-1', 'keyword-2']
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/SaveAssetLinksTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/SaveAssetLinksTest.php
new file mode 100644
index 0000000000000..2981c534586e2
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/SaveAssetLinksTest.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Test\Unit\Model\Keyword\Command;
+
+use Magento\MediaGallery\Model\Keyword\Command\SaveAssetLinks;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Exception\CouldNotSaveException;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+/**
+ * SaveAssetLinksTest.
+ */
+class SaveAssetLinksTest extends TestCase
+{
+    /**
+     * @var SaveAssetLinks
+     */
+    private $sut;
+
+    /**
+     * @var AdapterInterface|MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var ResourceConnection|MockObject
+     */
+    private $resourceConnectionMock;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * Prepare test objects.
+     */
+    public function setUp(): void
+    {
+        $this->connectionMock = $this->createMock(AdapterInterface::class);
+        $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+
+        $this->sut = new SaveAssetLinks(
+            $this->resourceConnectionMock,
+            $this->loggerMock
+        );
+    }
+
+    /**
+     * Test saving the asset keyword links
+     *
+     * @dataProvider assetLinksDataProvider
+     *
+     * @param int $assetId
+     * @param array $keywordIds
+     * @param array $values
+     */
+    public function testAssetKeywordsSave(int $assetId, array $keywordIds, array $values): void
+    {
+        $expectedCalls = (int) (count($keywordIds));
+
+        if ($expectedCalls) {
+            $this->resourceConnectionMock->expects($this->once())
+                ->method('getConnection')
+                ->willReturn($this->connectionMock);
+            $this->resourceConnectionMock->expects($this->once())
+                ->method('getTableName')
+                ->with('media_gallery_asset_keyword')
+                ->willReturn('prefix_media_gallery_asset_keyword');
+            $this->connectionMock->expects($this->once())
+                ->method('insertArray')
+                ->with(
+                    'prefix_media_gallery_asset_keyword',
+                    ['asset_id', 'keyword_id'],
+                    $values,
+                    2
+                );
+        }
+
+        $this->sut->execute($assetId, $keywordIds);
+    }
+
+    /**
+     * Testing throwing exception handling
+     *
+     * @throws CouldNotSaveException
+     */
+    public function testAssetNotSavingCausedByError(): void
+    {
+        $this->resourceConnectionMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+        $this->connectionMock->expects($this->once())
+            ->method('insertArray')
+            ->willThrowException((new \Exception()));
+        $this->expectException(CouldNotSaveException::class);
+        $this->loggerMock->expects($this->once())
+            ->method('critical')
+            ->willReturnSelf();
+
+        $this->sut->execute(1, [1, 2]);
+    }
+
+    /**
+     * Providing asset links
+     *
+     * @return array
+     */
+    public function assetLinksDataProvider(): array
+    {
+        return [
+            [
+                12,
+                [],
+                []
+            ],
+            [
+                12,
+                [1],
+                [
+                    [12, 1]
+                ]
+            ], [
+                12,
+                [1, 2],
+                [
+                    [12, 1],
+                    [12, 2],
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/MediaGallery/composer.json b/app/code/Magento/MediaGallery/composer.json
new file mode 100644
index 0000000000000..977277d993061
--- /dev/null
+++ b/app/code/Magento/MediaGallery/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/module-media-gallery",
+    "description": "Magento module responsible for media handling",
+    "require": {
+        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "magento/framework": "*",
+        "magento/module-media-gallery-api": "*",
+        "magento/module-cms": "*",
+        "magento/module-catalog": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGallery\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGallery/etc/db_schema.xml b/app/code/Magento/MediaGallery/etc/db_schema.xml
new file mode 100644
index 0000000000000..fac1342528f2c
--- /dev/null
+++ b/app/code/Magento/MediaGallery/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="media_gallery_asset" resource="default" engine="innodb" comment="Media Gallery Asset">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Entity ID"/>
+        <column xsi:type="varchar" name="path" length="255" nullable="true" comment="Path"/>
+        <column xsi:type="varchar" name="title" length="255" nullable="true" comment="Title"/>
+        <column xsi:type="varchar" name="source" length="255" nullable="true" comment="Source"/>
+        <column xsi:type="varchar" name="content_type" length="255" nullable="true" comment="Content Type"/>
+        <column xsi:type="int" name="width" padding="10" unsigned="true" nullable="false" identity="false" default="0" comment="Width"/>
+        <column xsi:type="int" name="height" padding="10" unsigned="true" nullable="false" identity="false" default="0" comment="Height"/>
+        <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="id"/>
+        </constraint>
+        <index referenceId="MEDIA_GALLERY_ID" indexType="btree">
+            <column name="id"/>
+        </index>
+        <constraint xsi:type="unique" referenceId="MEDIA_GALLERY_ID_PATH_TITLE_CONTENT_TYPE_WIDTH_HEIGHT">
+            <column name="path"/>
+        </constraint>
+    </table>
+    <table name="media_gallery_keyword" resource="default" engine="innodb" comment="Media Gallery Keyword">
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Keyword ID"/>
+        <column xsi:type="varchar" length="255" name="keyword" nullable="false" comment="Keyword"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+        <index referenceId="MEDIA_GALLERY_KEYWORD" indexType="btree">
+            <column name="id"/>
+        </index>
+        <constraint xsi:type="unique" referenceId="MEDIA_GALLERY_KEYWORD_KEYWORD_UNIQUE">
+            <column name="keyword"/>
+        </constraint>
+    </table>
+    <table name="media_gallery_asset_keyword" resource="default" engine="innodb" comment="Media Gallery Asset Keyword">
+        <column xsi:type="int" name="keyword_id" padding="10" unsigned="true" nullable="false" identity="false" comment="Keyword Id"/>
+        <column xsi:type="int" name="asset_id" padding="10" unsigned="true" nullable="false" identity="false" comment="Asset ID"/>
+        <index referenceId="MEDIA_GALLERY_ASSET_KEYWORD_ASSET_ID_INDEX" indexType="btree">
+            <column name="asset_id"/>
+        </index>
+        <index referenceId="MEDIA_GALLERY_ASSET_KEYWORD_KEYWORD_ID_INDEX" indexType="btree">
+            <column name="keyword_id"/>
+        </index>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="keyword_id"/>
+            <column name="asset_id"/>
+        </constraint>
+        <constraint xsi:type="foreign" referenceId="MEDIA_GALLERY_KEYWORD_KEYWORD_ID_MEDIA_GALLERY_KEYWORD_ID" table="media_gallery_asset_keyword" column="keyword_id" referenceTable="media_gallery_keyword" referenceColumn="id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="MEDIA_GALLERY_KEYWORD_ASSET_ID_ASSET_ID" table="media_gallery_asset_keyword" column="asset_id" referenceTable="media_gallery_asset" referenceColumn="id" onDelete="CASCADE"/>
+    </table>
+</schema>
diff --git a/app/code/Magento/MediaGallery/etc/db_schema_whitelist.json b/app/code/Magento/MediaGallery/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..10db10d5dd5db
--- /dev/null
+++ b/app/code/Magento/MediaGallery/etc/db_schema_whitelist.json
@@ -0,0 +1,56 @@
+{
+    "media_gallery_asset": {
+        "column": {
+            "id": true,
+            "path": true,
+            "title": true,
+            "source": true,
+            "content_type": true,
+            "width": true,
+            "height": true,
+            "created_at": true,
+            "updated_at": true
+        },
+        "index": {
+            "MEDIA_GALLERY_ID": true,
+            "MEDIA_GALLERY_ASSET_ID": true
+        },
+        "constraint": {
+            "MEDIA_GALLERY_ID_PATH_TITLE_CONTENT_TYPE_WIDTH_HEIGHT": true,
+            "PRIMARY": true,
+            "MEDIA_GALLERY_ASSET_PATH": true
+        }
+    },
+    "media_gallery_keyword": {
+        "column": {
+            "id": true,
+            "keyword": true
+        },
+        "index": {
+            "MEDIA_GALLERY_KEYWORD_ID": true
+        },
+        "constraint": {
+            "MEDIA_GALLERY_KEYWORD_KEYWORD": true,
+            "PRIMARY": true
+        }
+    },
+    "media_gallery_asset_keyword": {
+        "column": {
+            "keyword_id": true,
+            "asset_id": true
+        },
+        "index": {
+            "MEDIA_GALLERY_ASSET_KEYWORD_ASSET_ID_INDEX": true,
+            "MEDIA_GALLERY_ASSET_KEYWORD_KEYWORD_ID_INDEX": true,
+            "MEDIA_GALLERY_ASSET_KEYWORD_ASSET_ID": true,
+            "MEDIA_GALLERY_ASSET_KEYWORD_KEYWORD_ID": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "MEDIA_GALLERY_KEYWORD_KEYWORD_ID_MEDIA_GALLERY_KEYWORD_ID": true,
+            "MEDIA_GALLERY_KEYWORD_ASSET_ID_ASSET_ID": true,
+            "MEDIA_GALLERY_ASSET_KEYWORD_KEYWORD_ID_MEDIA_GALLERY_KEYWORD_ID": true,
+            "MEDIA_GALLERY_ASSET_KEYWORD_ASSET_ID_MEDIA_GALLERY_ASSET_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/MediaGallery/etc/di.xml b/app/code/Magento/MediaGallery/etc/di.xml
new file mode 100644
index 0000000000000..8c4a856852e1a
--- /dev/null
+++ b/app/code/Magento/MediaGallery/etc/di.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:ObjectManager/etc/config.xsd">
+    <preference for="Magento\MediaGalleryApi\Api\Data\KeywordInterface" type="Magento\MediaGallery\Model\Keyword"/>
+    <preference for="Magento\MediaGalleryApi\Api\Data\AssetInterface" type="Magento\MediaGallery\Model\Asset"/>
+
+    <preference for="Magento\MediaGalleryApi\Model\Asset\Command\GetByIdInterface" type="Magento\MediaGallery\Model\Asset\Command\GetById"/>
+    <preference for="Magento\MediaGalleryApi\Model\Asset\Command\SaveInterface" type="Magento\MediaGallery\Model\Asset\Command\Save"/>
+    <preference for="Magento\MediaGalleryApi\Model\Asset\Command\GetByPathInterface" type="Magento\MediaGallery\Model\Asset\Command\GetByPath"/>
+    <preference for="Magento\MediaGalleryApi\Model\Asset\Command\DeleteByPathInterface" type="Magento\MediaGallery\Model\Asset\Command\DeleteByPath"/>
+
+    <preference for="Magento\MediaGalleryApi\Model\Keyword\Command\GetAssetKeywordsInterface" type="Magento\MediaGallery\Model\Keyword\Command\GetAssetKeywords"/>
+    <preference for="Magento\MediaGalleryApi\Model\Keyword\Command\SaveAssetKeywordsInterface" type="Magento\MediaGallery\Model\Keyword\Command\SaveAssetKeywords"/>
+    <preference for="Magento\MediaGalleryApi\Model\Keyword\Command\SaveAssetLinksInterface" type="Magento\MediaGallery\Model\Keyword\Command\SaveAssetLinks"/>
+
+    <preference for="Magento\MediaGalleryApi\Model\DataExtractorInterface" type="Magento\MediaGallery\Model\DataExtractor"/>
+
+    <type name="Magento\Catalog\Model\Product\Gallery\Processor">
+        <plugin name="media_gallery_image_remove_metadata" type="Magento\MediaGallery\Plugin\Product\Gallery\Processor"
+                sortOrder="10" disabled="false"/>
+    </type>
+    <type name="Magento\Cms\Model\Wysiwyg\Images\Storage">
+        <plugin name="media_gallery_image_remove_metadata_after_wysiwyg" type="Magento\MediaGallery\Plugin\Wysiwyg\Images\Storage"
+                sortOrder="10" disabled="false"/>
+    </type>
+</config>
diff --git a/app/code/Magento/MediaGallery/etc/module.xml b/app/code/Magento/MediaGallery/etc/module.xml
new file mode 100644
index 0000000000000..bf731d899c15b
--- /dev/null
+++ b/app/code/Magento/MediaGallery/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_MediaGallery"/>
+</config>
diff --git a/app/code/Magento/MediaGallery/registration.php b/app/code/Magento/MediaGallery/registration.php
new file mode 100644
index 0000000000000..a243eee924894
--- /dev/null
+++ b/app/code/Magento/MediaGallery/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_MediaGallery', __DIR__);
diff --git a/app/code/Magento/MediaGalleryApi/Api/Data/AssetInterface.php b/app/code/Magento/MediaGalleryApi/Api/Data/AssetInterface.php
new file mode 100644
index 0000000000000..affae296ca530
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/Api/Data/AssetInterface.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryApi\Api\Data;
+
+use Magento\Framework\Api\ExtensibleDataInterface;
+
+/**
+ * Represents a media gallery asset which contains information about a media asset entity such
+ * as path to the media storage, media asset title and its content type, etc.
+ */
+interface AssetInterface extends ExtensibleDataInterface
+{
+    /**
+     * Get ID
+     *
+     * @return int|null
+     */
+    public function getId(): ?int;
+
+    /**
+     * Get Path
+     *
+     * @return string
+     */
+    public function getPath(): string;
+
+    /**
+     * Get title
+     *
+     * @return string|null
+     */
+    public function getTitle(): ?string;
+
+    /**
+     * Get source of the file
+     *
+     * @return string|null
+     */
+    public function getSource(): ?string;
+
+    /**
+     * Get content type
+     *
+     * @return string
+     */
+    public function getContentType(): string;
+
+    /**
+     * Retrieve full licensed asset's height
+     *
+     * @return int
+     */
+    public function getHeight(): int;
+
+    /**
+     * Retrieve full licensed asset's width
+     *
+     * @return int
+     */
+    public function getWidth(): int;
+
+    /**
+     * Get created at
+     *
+     * @return string
+     */
+    public function getCreatedAt(): string;
+
+    /**
+     * Get updated at
+     *
+     * @return string
+     */
+    public function getUpdatedAt(): string;
+
+    /**
+     * Retrieve existing extension attributes object or create a new one.
+     *
+     * @return \Magento\MediaGalleryApi\Api\Data\AssetExtensionInterface|null
+     */
+    public function getExtensionAttributes(): AssetExtensionInterface;
+
+    /**
+     * Set extension attributes
+     *
+     * @param \Magento\MediaGalleryApi\Api\Data\AssetExtensionInterface $extensionAttributes
+     * @return void
+     */
+    public function setExtensionAttributes(AssetExtensionInterface $extensionAttributes): void;
+}
diff --git a/app/code/Magento/MediaGalleryApi/Api/Data/KeywordInterface.php b/app/code/Magento/MediaGalleryApi/Api/Data/KeywordInterface.php
new file mode 100644
index 0000000000000..ae3b7dbd76291
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/Api/Data/KeywordInterface.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryApi\Api\Data;
+
+use Magento\Framework\Api\ExtensibleDataInterface;
+
+/**
+ * Represents a media gallery keyword. This object contains information about a media asset keyword entity.
+ */
+interface KeywordInterface extends ExtensibleDataInterface
+{
+    /**
+     * Get ID
+     *
+     * @return int|null
+     */
+    public function getId(): ?int;
+
+    /**
+     * Get the keyword
+     *
+     * @return string
+     */
+    public function getKeyword(): string;
+
+    /**
+     * Get extension attributes
+     *
+     * @return \Magento\MediaGalleryApi\Api\Data\KeywordExtensionInterface|null
+     */
+    public function getExtensionAttributes(): KeywordExtensionInterface;
+
+    /**
+     * Set extension attributes
+     *
+     * @param \Magento\MediaGalleryApi\Api\Data\KeywordExtensionInterface $extensionAttributes
+     * @return void
+     */
+    public function setExtensionAttributes(KeywordExtensionInterface $extensionAttributes): void;
+}
diff --git a/app/code/Magento/MediaGalleryApi/LICENSE.txt b/app/code/Magento/MediaGalleryApi/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/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/MediaGalleryApi/LICENSE_AFL.txt b/app/code/Magento/MediaGalleryApi/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/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/MediaGalleryApi/Model/Asset/Command/DeleteByPathInterface.php b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/DeleteByPathInterface.php
new file mode 100644
index 0000000000000..b3612a67ed536
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/DeleteByPathInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryApi\Model\Asset\Command;
+
+/**
+ * A command represents the media gallery asset delete action. A media gallery asset is filtered by path value.
+ */
+interface DeleteByPathInterface
+{
+    /**
+     * Delete media asset by path
+     *
+     * @param string $mediaAssetPath
+     *
+     * @return void
+     */
+    public function execute(string $mediaAssetPath): void;
+}
diff --git a/app/code/Magento/MediaGalleryApi/Model/Asset/Command/GetByIdInterface.php b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/GetByIdInterface.php
new file mode 100644
index 0000000000000..ef2ceb5ffbfe6
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/GetByIdInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryApi\Model\Asset\Command;
+
+/**
+ * A command represents the get media gallery asset by using media gallery asset id as a filter parameter.
+ */
+interface GetByIdInterface
+{
+    /**
+     * Get media asset by id
+     *
+     * @param int $mediaAssetId
+     *
+     * @return \Magento\MediaGalleryApi\Api\Data\AssetInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\IntegrationException
+     */
+    public function execute(int $mediaAssetId): \Magento\MediaGalleryApi\Api\Data\AssetInterface;
+}
diff --git a/app/code/Magento/MediaGalleryApi/Model/Asset/Command/GetByPathInterface.php b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/GetByPathInterface.php
new file mode 100644
index 0000000000000..547b0dc695dae
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/GetByPathInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryApi\Model\Asset\Command;
+
+/**
+ * A command represents the get media gallery asset by using media gallery asset path as a filter parameter.
+ */
+interface GetByPathInterface
+{
+    /**
+     * Get media asset list
+     *
+     * @param string $mediaFilePath
+     *
+     * @return \Magento\MediaGalleryApi\Api\Data\AssetInterface
+     */
+    public function execute(string $mediaFilePath): \Magento\MediaGalleryApi\Api\Data\AssetInterface;
+}
diff --git a/app/code/Magento/MediaGalleryApi/Model/Asset/Command/SaveInterface.php b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/SaveInterface.php
new file mode 100644
index 0000000000000..b3e3607e6e822
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/SaveInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryApi\Model\Asset\Command;
+
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+
+/**
+ * A command which executes the media gallery asset save operation.
+ */
+interface SaveInterface
+{
+    /**
+     * Save media asset
+     *
+     * @param \Magento\MediaGalleryApi\Api\Data\AssetInterface $mediaAsset
+     *
+     * @return int
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     */
+    public function execute(AssetInterface $mediaAsset): int;
+}
diff --git a/app/code/Magento/MediaGalleryApi/Model/DataExtractorInterface.php b/app/code/Magento/MediaGalleryApi/Model/DataExtractorInterface.php
new file mode 100644
index 0000000000000..6570cd2235412
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/Model/DataExtractorInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryApi\Model;
+
+/**
+ * Extract data from an object using available getters
+ */
+interface DataExtractorInterface
+{
+    /**
+     * Extract data from an object using available getters (does not process extension attributes)
+     *
+     * @param object $object
+     * @param string|null $interface
+     * @return array
+     */
+    public function extract($object, string $interface = null): array;
+}
diff --git a/app/code/Magento/MediaGalleryApi/Model/Keyword/Command/GetAssetKeywordsInterface.php b/app/code/Magento/MediaGalleryApi/Model/Keyword/Command/GetAssetKeywordsInterface.php
new file mode 100644
index 0000000000000..d449df5684c4b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/Model/Keyword/Command/GetAssetKeywordsInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryApi\Model\Keyword\Command;
+
+/**
+ * A command represents functionality to get a media gallery asset keywords filtered by media gallery asset id.
+ */
+interface GetAssetKeywordsInterface
+{
+    /**
+     * Get asset related keywords.
+     *
+     * @param int $assetId
+     *
+     * @return \Magento\MediaGalleryApi\Api\Data\KeywordInterface[]
+     */
+    public function execute(int $assetId): array;
+}
diff --git a/app/code/Magento/MediaGalleryApi/Model/Keyword/Command/SaveAssetKeywordsInterface.php b/app/code/Magento/MediaGalleryApi/Model/Keyword/Command/SaveAssetKeywordsInterface.php
new file mode 100644
index 0000000000000..9c0d89c3456f8
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/Model/Keyword/Command/SaveAssetKeywordsInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryApi\Model\Keyword\Command;
+
+/**
+ * A command represents the media gallery asset keywords save operation.
+ */
+interface SaveAssetKeywordsInterface
+{
+    /**
+     * Save asset keywords.
+     *
+     * @param \Magento\MediaGalleryApi\Api\Data\KeywordInterface[] $keywords
+     * @param int $assetId
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     */
+    public function execute(array $keywords, int $assetId): void;
+}
diff --git a/app/code/Magento/MediaGalleryApi/README.md b/app/code/Magento/MediaGalleryApi/README.md
new file mode 100644
index 0000000000000..978a14691597b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/README.md
@@ -0,0 +1,13 @@
+# Magento_MediaGalleryApi module
+
+The Magento_MediaGalleryApi module serves as application program interface (API) responsible for storing and managing media gallery asset attributes.
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaGallery module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaGalleryApi module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaGalleryApi/composer.json b/app/code/Magento/MediaGalleryApi/composer.json
new file mode 100644
index 0000000000000..33ba72c3f98dd
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/module-media-gallery-api",
+    "description": "Magento module responsible for media gallery asset attributes storage and management",
+    "require": {
+        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "magento/framework": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGalleryApi\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryApi/etc/module.xml b/app/code/Magento/MediaGalleryApi/etc/module.xml
new file mode 100644
index 0000000000000..36da50a22b8bc
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/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_MediaGalleryApi" />
+</config>
diff --git a/app/code/Magento/MediaGalleryApi/registration.php b/app/code/Magento/MediaGalleryApi/registration.php
new file mode 100644
index 0000000000000..11b0200b46e30
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/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_MediaGalleryApi', __DIR__);
diff --git a/app/code/Magento/MediaStorage/Console/Command/ImagesResizeCommand.php b/app/code/Magento/MediaStorage/Console/Command/ImagesResizeCommand.php
index ba12d60cb0bc8..4ed84829c2ad0 100644
--- a/app/code/Magento/MediaStorage/Console/Command/ImagesResizeCommand.php
+++ b/app/code/Magento/MediaStorage/Console/Command/ImagesResizeCommand.php
@@ -8,26 +8,37 @@
 namespace Magento\MediaStorage\Console\Command;
 
 use Magento\Framework\App\Area;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\State;
-use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Console\Cli;
 use Magento\MediaStorage\Service\ImageResize;
+use Magento\MediaStorage\Service\ImageResizeScheduler;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Helper\ProgressBarFactory;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Command\Command;
+use Magento\Catalog\Model\ResourceModel\Product\Image as ProductImage;
 
 /**
  * Resizes product images according to theme view definitions.
- *
- * @package Magento\MediaStorage\Console\Command
  */
-class ImagesResizeCommand extends \Symfony\Component\Console\Command\Command
+class ImagesResizeCommand extends Command
 {
+    /**
+     * Asynchronous image resize mode
+     */
+    const ASYNC_RESIZE = 'async';
+
+    /**
+     * @var ImageResizeScheduler
+     */
+    private $imageResizeScheduler;
+
     /**
      * @var ImageResize
      */
-    private $resize;
+    private $imageResize;
 
     /**
      * @var State
@@ -39,24 +50,32 @@ class ImagesResizeCommand extends \Symfony\Component\Console\Command\Command
      */
     private $progressBarFactory;
 
+    /**
+     * @var ProductImage
+     */
+    private $productImage;
+
     /**
      * @param State $appState
-     * @param ImageResize $resize
-     * @param ObjectManagerInterface $objectManager
+     * @param ImageResize $imageResize
+     * @param ImageResizeScheduler $imageResizeScheduler
      * @param ProgressBarFactory $progressBarFactory
+     * @param ProductImage $productImage
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         State $appState,
-        ImageResize $resize,
-        ObjectManagerInterface $objectManager,
-        ProgressBarFactory $progressBarFactory = null
+        ImageResize $imageResize,
+        ImageResizeScheduler $imageResizeScheduler,
+        ProgressBarFactory $progressBarFactory,
+        ProductImage $productImage
     ) {
         parent::__construct();
-        $this->resize = $resize;
         $this->appState = $appState;
-        $this->progressBarFactory = $progressBarFactory
-            ?: ObjectManager::getInstance()->get(ProgressBarFactory::class);
+        $this->imageResize = $imageResize;
+        $this->imageResizeScheduler = $imageResizeScheduler;
+        $this->progressBarFactory = $progressBarFactory;
+        $this->productImage = $productImage;
     }
 
     /**
@@ -65,7 +84,25 @@ public function __construct(
     protected function configure()
     {
         $this->setName('catalog:images:resize')
-            ->setDescription('Creates resized product images');
+            ->setDescription('Creates resized product images')
+            ->setDefinition($this->getOptionsList());
+    }
+
+    /**
+     * Image resize command options list
+     *
+     * @return array
+     */
+    private function getOptionsList() : array
+    {
+        return [
+            new InputOption(
+                self::ASYNC_RESIZE,
+                'a',
+                InputOption::VALUE_NONE,
+                'Resize image in asynchronous mode'
+            ),
+        ];
     }
 
     /**
@@ -74,11 +111,25 @@ protected function configure()
      * @param OutputInterface $output
      */
     protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $result = $input->getOption(self::ASYNC_RESIZE) ?
+            $this->executeAsync($output) : $this->executeSync($output);
+
+        return $result;
+    }
+
+    /**
+     * Run resize in synchronous mode
+     *
+     * @param OutputInterface $output
+     * @return int
+     */
+    private function executeSync(OutputInterface $output): int
     {
         try {
             $errors = [];
             $this->appState->setAreaCode(Area::AREA_GLOBAL);
-            $generator = $this->resize->resizeFromThemes();
+            $generator = $this->imageResize->resizeFromThemes();
 
             /** @var ProgressBar $progress */
             $progress = $this->progressBarFactory->create(
@@ -111,7 +162,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } 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;
+            return Cli::RETURN_FAILURE;
         }
 
         $output->write(PHP_EOL);
@@ -124,6 +175,62 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->writeln("<info>Product images resized successfully</info>");
         }
 
-        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+        return Cli::RETURN_SUCCESS;
+    }
+
+    /**
+     * Schedule asynchronous image resizing
+     *
+     * @param OutputInterface $output
+     * @return int
+     */
+    private function executeAsync(OutputInterface $output): int
+    {
+        try {
+            $errors = [];
+            $this->appState->setAreaCode(Area::AREA_GLOBAL);
+
+            /** @var ProgressBar $progress */
+            $progress = $this->progressBarFactory->create(
+                [
+                    'output' => $output,
+                    'max' => $this->productImage->getCountUsedProductImages()
+                ]
+            );
+            $progress->setFormat(
+                "%current%/%max% [%bar%] %percent:3s%% %elapsed% %memory:6s% \t| <info>%message%</info>"
+            );
+
+            if ($output->getVerbosity() !== OutputInterface::VERBOSITY_NORMAL) {
+                $progress->setOverwrite(false);
+            }
+
+            $productImages = $this->productImage->getUsedProductImages();
+            foreach ($productImages as $image) {
+                $result = $this->imageResizeScheduler->schedule($image['filepath']);
+
+                if (!$result) {
+                    $errors[$image['filepath']] = 'Error image scheduling: ' . $image['filepath'];
+                }
+                $progress->setMessage($image['filepath']);
+                $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 Cli::RETURN_FAILURE;
+        }
+
+        $output->write(PHP_EOL);
+        if (count($errors)) {
+            $output->writeln("<info>Product images resized with errors:</info>");
+            foreach ($errors as $error) {
+                $output->writeln("<error>{$error}</error>");
+            }
+        } else {
+            $output->writeln("<info>Product images scheduled successfully</info>");
+        }
+
+        return Cli::RETURN_SUCCESS;
     }
 }
diff --git a/app/code/Magento/MediaStorage/Model/ConsumerImageResize.php b/app/code/Magento/MediaStorage/Model/ConsumerImageResize.php
new file mode 100644
index 0000000000000..43f3e1d7767ce
--- /dev/null
+++ b/app/code/Magento/MediaStorage/Model/ConsumerImageResize.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaStorage\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\Framework\Serialize\SerializerInterface;
+use Psr\Log\LoggerInterface;
+use Magento\MediaStorage\Service\ImageResize;
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\Exception\NotFoundException;
+
+/**
+ * Consumer for image resize
+ */
+class ConsumerImageResize
+{
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var ImageResize
+     */
+    private $resize;
+
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @param ImageResize $resize
+     * @param LoggerInterface $logger
+     * @param SerializerInterface $serializer
+     * @param EntityManager $entityManager
+     */
+    public function __construct(
+        ImageResize $resize,
+        LoggerInterface $logger,
+        SerializerInterface $serializer,
+        EntityManager $entityManager
+    ) {
+        $this->resize = $resize;
+        $this->logger = $logger;
+        $this->serializer = $serializer;
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * Image resize
+     *
+     * @param OperationInterface $operation
+     * @return void
+     * @throws \Exception
+     */
+    public function process(OperationInterface $operation): void
+    {
+        try {
+            $serializedData = $operation->getSerializedData();
+            $data = $this->serializer->unserialize($serializedData);
+            $this->resize->resizeFromImageName($data['filename']);
+        } catch (NotFoundException $e) {
+            $this->logger->critical($e->getMessage());
+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $message = $e->getMessage();
+        } catch (\Exception $e) {
+            $this->logger->critical($e->getMessage());
+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $message = __('Sorry, something went wrong during image resize. Please see log for details.');
+        }
+
+        $operation->setStatus($status ?? OperationInterface::STATUS_TYPE_COMPLETE)
+            ->setErrorCode($errorCode ?? null)
+            ->setResultMessage($message ?? null);
+
+        $this->entityManager->save($operation);
+    }
+}
diff --git a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/File.php b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/File.php
index 8dfce40419b4a..8c9fe7b848fad 100644
--- a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/File.php
+++ b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/File.php
@@ -6,12 +6,20 @@
 namespace Magento\MediaStorage\Model\ResourceModel\File\Storage;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem\Io\File as FileIo;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class File
  */
 class File
 {
+    /**
+     * @var FileIo
+     */
+    private $fileIo;
+
     /**
      * @var \Magento\Framework\Filesystem
      */
@@ -25,11 +33,16 @@ class File
     /**
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Psr\Log\LoggerInterface $log
+     * @param FileIo $fileIo
      */
-    public function __construct(\Magento\Framework\Filesystem $filesystem, \Psr\Log\LoggerInterface $log)
-    {
+    public function __construct(
+        \Magento\Framework\Filesystem $filesystem,
+        \Psr\Log\LoggerInterface $log,
+        FileIo $fileIo = null
+    ) {
         $this->_logger = $log;
         $this->_filesystem = $filesystem;
+        $this->fileIo = $fileIo ?? ObjectManager::getInstance()->get(FileIo::class);
     }
 
     /**
@@ -45,14 +58,15 @@ public function getStorageData($dir = '/')
         $directoryInstance = $this->_filesystem->getDirectoryRead(DirectoryList::MEDIA);
         if ($directoryInstance->isDirectory($dir)) {
             foreach ($directoryInstance->readRecursively($dir) as $path) {
-                $itemName = basename($path);
+                $pathInfo = $this->fileIo->getPathInfo($path);
+                $itemName = $pathInfo['basename'];
                 if ($itemName == '.svn' || $itemName == '.htaccess') {
                     continue;
                 }
                 if ($directoryInstance->isDirectory($path)) {
                     $directories[] = [
                         'name' => $itemName,
-                        'path' => dirname($path) == '.' ? '/' : dirname($path),
+                        'path' => $pathInfo['dirname'] === '.' ? '/' : $pathInfo['dirname'],
                     ];
                 } else {
                     $files[] = $path;
@@ -64,7 +78,7 @@ public function getStorageData($dir = '/')
     }
 
     /**
-     * Clear files and directories in storage
+     * Clear all files in storage $dir
      *
      * @param string $dir
      * @return $this
@@ -73,8 +87,17 @@ public function clear($dir = '')
     {
         $directoryInstance = $this->_filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         if ($directoryInstance->isDirectory($dir)) {
-            foreach ($directoryInstance->read($dir) as $path) {
-                $directoryInstance->delete($path);
+            $paths = $directoryInstance->readRecursively($dir);
+            foreach ($paths as $path) {
+                if ($directoryInstance->isDirectory($path)) {
+                    continue;
+                }
+
+                $pathInfo = $this->fileIo->getPathInfo($path);
+
+                if ($pathInfo['basename'] !== '.htaccess') {
+                    $directoryInstance->delete($path);
+                }
             }
         }
 
@@ -127,7 +150,7 @@ public function saveFile($filePath, $content, $overwrite = false)
             }
         } catch (\Magento\Framework\Exception\FileSystemException $e) {
             $this->_logger->info($e->getMessage());
-            throw new \Magento\Framework\Exception\LocalizedException(__('Unable to save file: %1', $filePath));
+            throw new LocalizedException(__('Unable to save file: %1', $filePath));
         }
 
         return false;
diff --git a/app/code/Magento/MediaStorage/Service/ImageResize.php b/app/code/Magento/MediaStorage/Service/ImageResize.php
index 63353b2536a5a..d061ddbd3dc46 100644
--- a/app/code/Magento/MediaStorage/Service/ImageResize.php
+++ b/app/code/Magento/MediaStorage/Service/ImageResize.php
@@ -311,6 +311,10 @@ private function resize(array $imageParams, string $originalImagePath, string $o
             ]
         );
 
+        if ($imageParams['image_width'] !== null && $imageParams['image_height'] !== null) {
+            $image->resize($imageParams['image_width'], $imageParams['image_height']);
+        }
+
         if (isset($imageParams['watermark_file'])) {
             if ($imageParams['watermark_height'] !== null) {
                 $image->setWatermarkHeight($imageParams['watermark_height']);
@@ -331,9 +335,6 @@ private function resize(array $imageParams, string $originalImagePath, string $o
             $image->watermark($this->getWatermarkFilePath($imageParams['watermark_file']));
         }
 
-        if ($imageParams['image_width'] !== null && $imageParams['image_height'] !== null) {
-            $image->resize($imageParams['image_width'], $imageParams['image_height']);
-        }
         $image->save($imageAsset->getPath());
 
         if ($this->fileStorageDatabase->checkDbUsage()) {
diff --git a/app/code/Magento/MediaStorage/Service/ImageResizeScheduler.php b/app/code/Magento/MediaStorage/Service/ImageResizeScheduler.php
new file mode 100644
index 0000000000000..900bb026dc5b3
--- /dev/null
+++ b/app/code/Magento/MediaStorage/Service/ImageResizeScheduler.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaStorage\Service;
+
+use Magento\Framework\Bulk\BulkManagementInterface;
+use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
+use Magento\Framework\DataObject\IdentityGeneratorInterface;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\Bulk\OperationInterface;
+use Magento\Authorization\Model\UserContextInterface;
+
+/**
+ * Scheduler for image resize queue
+ */
+class ImageResizeScheduler
+{
+    /**
+     * @var BulkManagementInterface
+     */
+    private $bulkManagement;
+
+    /**
+     * @var OperationInterfaceFactory
+     */
+    private $operationFactory;
+
+    /**
+     * @var IdentityGeneratorInterface
+     */
+    private $identityService;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * @param BulkManagementInterface $bulkManagement
+     * @param OperationInterfaceFactory $operartionFactory
+     * @param IdentityGeneratorInterface $identityService
+     * @param SerializerInterface $serializer
+     * @param UserContextInterface $userContext
+     */
+    public function __construct(
+        BulkManagementInterface $bulkManagement,
+        OperationInterfaceFactory $operartionFactory,
+        IdentityGeneratorInterface $identityService,
+        SerializerInterface $serializer,
+        UserContextInterface $userContext
+    ) {
+        $this->bulkManagement = $bulkManagement;
+        $this->operationFactory = $operartionFactory;
+        $this->identityService = $identityService;
+        $this->serializer = $serializer;
+        $this->userContext = $userContext;
+    }
+
+    /**
+     * Schedule image resize based on original image.
+     *
+     * @param string $imageName
+     * @return boolean
+     */
+    public function schedule(string $imageName): bool
+    {
+        $bulkUuid = $this->identityService->generateId();
+        $bulkDescription = __('Image resize: %1', $imageName);
+        $dataToEncode = ['filename' => $imageName];
+
+        $data = [
+            'data' => [
+                'bulk_uuid' => $bulkUuid,
+                'topic_name' => 'media.storage.catalog.image.resize',
+                'serialized_data' => $this->serializer->serialize($dataToEncode),
+                'status' => OperationInterface::STATUS_TYPE_OPEN,
+            ]
+        ];
+        $operation = $this->operationFactory->create($data);
+
+        return $this->bulkManagement->scheduleBulk(
+            $bulkUuid,
+            [$operation],
+            $bulkDescription,
+            $this->userContext->getUserId()
+        );
+    }
+}
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Model/ResourceModel/File/Storage/FileTest.php b/app/code/Magento/MediaStorage/Test/Unit/Model/ResourceModel/File/Storage/FileTest.php
index 97dffbe0e39a9..adc045cd0bed5 100644
--- a/app/code/Magento/MediaStorage/Test/Unit/Model/ResourceModel/File/Storage/FileTest.php
+++ b/app/code/Magento/MediaStorage/Test/Unit/Model/ResourceModel/File/Storage/FileTest.php
@@ -6,12 +6,18 @@
 namespace Magento\MediaStorage\Test\Unit\Model\ResourceModel\File\Storage;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class FileTest
  */
 class FileTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\Filesystem\Io\File
+     */
+    private $fileIoMock;
+
     /**
      * @var \Magento\MediaStorage\Model\ResourceModel\File\Storage\File
      */
@@ -44,9 +50,17 @@ protected function setUp()
             ['isDirectory', 'readRecursively']
         );
 
-        $this->storageFile = new \Magento\MediaStorage\Model\ResourceModel\File\Storage\File(
-            $this->filesystemMock,
-            $this->loggerMock
+        $this->fileIoMock = $this->createPartialMock(\Magento\Framework\Filesystem\Io\File::class, ['getPathInfo']);
+
+        $objectManager = new ObjectManager($this);
+
+        $this->storageFile = $objectManager->getObject(
+            \Magento\MediaStorage\Model\ResourceModel\File\Storage\File::class,
+            [
+                'filesystem' => $this->filesystemMock,
+                'log' => $this->loggerMock,
+                'fileIo' => $this->fileIoMock
+            ]
         );
     }
 
@@ -98,6 +112,20 @@ public function testGetStorageData()
             'folder_one/folder_two/.htaccess',
             'folder_one/folder_two/file_two.txt',
         ];
+
+        $pathInfos = array_map(
+            function ($path) {
+                return [$path, pathinfo($path)];
+            },
+            $paths
+        );
+
+        $this->fileIoMock->expects(
+            $this->any()
+        )->method(
+            'getPathInfo'
+        )->will($this->returnValueMap($pathInfos));
+
         sort($paths);
         $this->directoryReadMock->expects(
             $this->once()
diff --git a/app/code/Magento/MediaStorage/composer.json b/app/code/Magento/MediaStorage/composer.json
index 95c48f3fdc581..ce97eec97f7c3 100644
--- a/app/code/Magento/MediaStorage/composer.json
+++ b/app/code/Magento/MediaStorage/composer.json
@@ -11,7 +11,9 @@
         "magento/module-config": "*",
         "magento/module-store": "*",
         "magento/module-catalog": "*",
-        "magento/module-theme": "*"
+        "magento/module-theme": "*",
+        "magento/module-asynchronous-operations": "*",
+        "magento/module-authorization": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/MediaStorage/etc/communication.xml b/app/code/Magento/MediaStorage/etc/communication.xml
new file mode 100644
index 0000000000000..c9630b24ba336
--- /dev/null
+++ b/app/code/Magento/MediaStorage/etc/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="media.storage.catalog.image.resize" request="Magento\AsynchronousOperations\Api\Data\OperationInterface">
+        <handler name="media.storage.catalog.image.resize" type="Magento\MediaStorage\Model\ConsumerImageResize" method="process" />
+    </topic>
+</config>
diff --git a/app/code/Magento/MediaStorage/etc/di.xml b/app/code/Magento/MediaStorage/etc/di.xml
index 2b9317787463d..5cdcbb3b2b9a9 100644
--- a/app/code/Magento/MediaStorage/etc/di.xml
+++ b/app/code/Magento/MediaStorage/etc/di.xml
@@ -26,4 +26,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\MediaStorage\Console\Command\ImagesResizeCommand">
+        <arguments>
+            <argument name="imageResizeScheduler" xsi:type="object">Magento\MediaStorage\Service\ImageResizeScheduler\Proxy</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/MediaStorage/etc/queue.xml b/app/code/Magento/MediaStorage/etc/queue.xml
new file mode 100644
index 0000000000000..3e4ffbf8ec9e2
--- /dev/null
+++ b/app/code/Magento/MediaStorage/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="media.storage.catalog.image.resize" exchange="magento-db" type="db">
+        <queue name="media.storage.catalog.image.resize" consumer="media.storage.catalog.image.resize" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\MediaStorage\Model\ConsumerImageResize::process" />
+    </broker>
+</config>
diff --git a/app/code/Magento/MediaStorage/etc/queue_consumer.xml b/app/code/Magento/MediaStorage/etc/queue_consumer.xml
new file mode 100644
index 0000000000000..e4c06a47f314e
--- /dev/null
+++ b/app/code/Magento/MediaStorage/etc/queue_consumer.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-message-queue:etc/consumer.xsd">
+    <consumer name="media.storage.catalog.image.resize" queue="media.storage.catalog.image.resize" connection="db" maxMessages="100" consumerInstance="Magento\Framework\MessageQueue\Consumer" handler="Magento\MediaStorage\Model\ConsumerImageResize::process" />
+</config>
diff --git a/app/code/Magento/MediaStorage/etc/queue_publisher.xml b/app/code/Magento/MediaStorage/etc/queue_publisher.xml
new file mode 100644
index 0000000000000..dab99e2c307f8
--- /dev/null
+++ b/app/code/Magento/MediaStorage/etc/queue_publisher.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="media.storage.catalog.image.resize">
+        <connection name="db" exchange="magento-db" />
+    </publisher>
+</config>
diff --git a/app/code/Magento/MediaStorage/etc/queue_topology.xml b/app/code/Magento/MediaStorage/etc/queue_topology.xml
new file mode 100644
index 0000000000000..9bb1ca5cef90e
--- /dev/null
+++ b/app/code/Magento/MediaStorage/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-db" type="topic" connection="db">
+        <binding id="imageResizeBinding" topic="media.storage.catalog.image.resize" destinationType="queue" destination="media.storage.catalog.image.resize"/>
+    </exchange>
+</config>
diff --git a/app/code/Magento/Msrp/Test/Unit/Pricing/MsrpPriceCalculatorTest.php b/app/code/Magento/Msrp/Test/Unit/Pricing/MsrpPriceCalculatorTest.php
new file mode 100644
index 0000000000000..24e10207ff14c
--- /dev/null
+++ b/app/code/Magento/Msrp/Test/Unit/Pricing/MsrpPriceCalculatorTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Msrp\Test\Unit\Pricing;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type as ProductType;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\GroupedProduct\Model\Product\Type\Grouped as GroupedType;
+use Magento\Msrp\Pricing\MsrpPriceCalculator;
+use Magento\MsrpGroupedProduct\Pricing\MsrpPriceCalculator as MsrpGroupedCalculator;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class MsrpPriceCalculatorTest extends TestCase
+{
+    /**
+     * @var MsrpPriceCalculator
+     */
+    private $pricing;
+
+    /**
+     * @var MsrpGroupedCalculator|MockObject
+     */
+    private $msrpGroupedCalculatorMock;
+
+    /**
+     * Prepare environment to test
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->msrpGroupedCalculatorMock = $this->createMock(MsrpGroupedCalculator::class);
+        $this->pricing = $objectManager->getObject(
+            MsrpPriceCalculator::class,
+            [
+                'msrpPriceCalculators' => [
+                    [
+                        'productType' => GroupedType::TYPE_CODE,
+                        'priceCalculator' => $this->msrpGroupedCalculatorMock
+                    ]
+                ]
+            ]
+        );
+    }
+
+    /**
+     * Test getMrspPriceValue() with the data provider below
+     *
+     * @param array $msrpPriceCalculators
+     * @param Product $productMock
+     * @param float $expected
+     * @dataProvider getMsrpPriceValueDataProvider
+     */
+    public function testGetMsrpPriceValue($msrpPriceCalculatorPrice, $productMock, $expected)
+    {
+        $this->msrpGroupedCalculatorMock->expects($this->any())
+            ->method('getMsrpPriceValue')->willReturn($msrpPriceCalculatorPrice);
+
+        $this->assertEquals($expected, $this->pricing->getMsrpPriceValue($productMock));
+    }
+
+    /**
+     * Data Provider for test getMrspPriceValue()
+     *
+     * @return array
+     */
+    public function getMsrpPriceValueDataProvider()
+    {
+        return [
+            'Get Mrsp Price with product and msrp calculator and the same product type' => [
+                23.50,
+                $this->createProductMock(GroupedType::TYPE_CODE, 0),
+                23.50
+            ],
+            'Get Mrsp Price with product and msrp calculator and the different product type' => [
+                24.88,
+                $this->createProductMock(ProductType::TYPE_SIMPLE, 24.88),
+                24.88
+            ]
+        ];
+    }
+
+    /**
+     * Create Product Mock
+     *
+     * @param string $typeId
+     * @param float $msrp
+     * @return MockObject
+     */
+    private function createProductMock($typeId, $msrp)
+    {
+        $productMock = $this->createPartialMock(Product::class, ['getTypeId', 'getMsrp']);
+        $productMock->expects($this->any())->method('getTypeId')->willReturn($typeId);
+        $productMock->expects($this->any())->method('getMsrp')->willReturn($msrp);
+        return $productMock;
+    }
+}
diff --git a/app/code/Magento/Msrp/etc/di.xml b/app/code/Magento/Msrp/etc/di.xml
index b8392b0bb0fe4..e617e153fd951 100644
--- a/app/code/Magento/Msrp/etc/di.xml
+++ b/app/code/Magento/Msrp/etc/di.xml
@@ -53,4 +53,14 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Eav\Model\Config">
+        <arguments>
+            <argument name="attributesForPreload" xsi:type="array">
+                <item name="catalog_product" xsi:type="array">
+                    <item name="msrp" xsi:type="string">catalog_product</item>
+                    <item name="msrp_display_actual_price_type" xsi:type="string">catalog_product</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Msrp/view/base/web/js/msrp.js b/app/code/Magento/Msrp/view/base/web/js/msrp.js
index 2789491137bc1..65af87d85de51 100644
--- a/app/code/Magento/Msrp/view/base/web/js/msrp.js
+++ b/app/code/Magento/Msrp/view/base/web/js/msrp.js
@@ -352,8 +352,11 @@ define([
             $(this.options.mapInfoLinks).show();
 
             if (useDefaultPrice || !this.wasOpened) {
-                this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
-                this.$popup.find(this.options.priceLabelId).html(options.realPrice);
+                if (this.$popup) {
+                    this.$popup.find(this.options.msrpLabelId).html(options.msrpPrice);
+                    this.$popup.find(this.options.priceLabelId).html(options.realPrice);
+                }
+
                 $(this.options.displayPriceElement).html(msrpPrice);
                 this.wasOpened = true;
             }
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Plugin.php b/app/code/Magento/Multishipping/Controller/Checkout/Plugin.php
deleted file mode 100644
index f88cdfc26fa9f..0000000000000
--- a/app/code/Magento/Multishipping/Controller/Checkout/Plugin.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Multishipping\Controller\Checkout;
-
-/**
- * Turns Off Multishipping mode for Quote.
- */
-class Plugin
-{
-    /**
-     * @var \Magento\Checkout\Model\Cart
-     */
-    protected $cart;
-
-    /**
-     * @param \Magento\Checkout\Model\Cart $cart
-     */
-    public function __construct(\Magento\Checkout\Model\Cart $cart)
-    {
-        $this->cart = $cart;
-    }
-
-    /**
-     * Disable multishipping
-     *
-     * @param \Magento\Framework\App\Action\Action $subject
-     * @return void
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function beforeExecute(\Magento\Framework\App\Action\Action $subject)
-    {
-        $quote = $this->cart->getQuote();
-        if ($quote->getIsMultiShipping()) {
-            $quote->setIsMultiShipping(0);
-            $this->cart->saveQuote();
-        }
-    }
-}
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index 7105fd4e9d26d..7fa674505461e 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -625,6 +625,7 @@ public function setShippingMethods($methods)
             $addressId = $address->getId();
             if (isset($methods[$addressId])) {
                 $address->setShippingMethod($methods[$addressId]);
+                $address->setCollectShippingRates(true);
             } elseif (!$address->getShippingMethod()) {
                 throw new \Magento\Framework\Exception\LocalizedException(
                     __('Set shipping methods for all addresses. Verify the shipping methods and try again.')
@@ -662,7 +663,9 @@ public function setPaymentMethod($payment)
         $quote->getPayment()->importData($payment);
         // shipping totals may be affected by payment method
         if (!$quote->isVirtual() && $quote->getShippingAddress()) {
-            $quote->getShippingAddress()->setCollectShippingRates(true);
+            foreach ($quote->getAllShippingAddresses() as $shippingAddress) {
+                $shippingAddress->setCollectShippingRates(true);
+            }
             $quote->setTotalsCollectedFlag(false)->collectTotals();
         }
         $this->quoteRepository->save($quote);
@@ -691,6 +694,19 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
             $this->quoteAddressToOrder->convert($address)
         );
 
+        $shippingMethodCode = $address->getShippingMethod();
+        if (isset($shippingMethodCode) && !empty($shippingMethodCode)) {
+            $rate = $address->getShippingRateByCode($shippingMethodCode);
+            $shippingPrice = $rate->getPrice();
+        } else {
+            $shippingPrice = $order->getShippingAmount();
+        }
+        $store = $order->getStore();
+        $amountPrice = $store->getBaseCurrency()
+            ->convert($shippingPrice, $store->getCurrentCurrencyCode());
+        $order->setBaseShippingAmount($shippingPrice);
+        $order->setShippingAmount($amountPrice);
+
         $order->setQuote($quote);
         $order->setBillingAddress($this->quoteAddressToOrderAddress->convert($quote->getBillingAddress()));
 
diff --git a/app/code/Magento/Multishipping/Plugin/DisableMultishippingMode.php b/app/code/Magento/Multishipping/Plugin/DisableMultishippingMode.php
new file mode 100644
index 0000000000000..fff2346d76240
--- /dev/null
+++ b/app/code/Magento/Multishipping/Plugin/DisableMultishippingMode.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Plugin;
+
+use Magento\Checkout\Model\Cart;
+use Magento\Framework\App\Action\Action;
+
+/**
+ * Turns Off Multishipping mode for Quote.
+ */
+class DisableMultishippingMode
+{
+    /**
+     * @var Cart
+     */
+    private $cart;
+
+    /**
+     * @param Cart $cart
+     */
+    public function __construct(
+        Cart $cart
+    ) {
+        $this->cart = $cart;
+    }
+
+    /**
+     * Disable multishipping
+     *
+     * @param Action $subject
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeExecute(Action $subject)
+    {
+        $quote = $this->cart->getQuote();
+        if ($quote->getIsMultiShipping()) {
+            $quote->setIsMultiShipping(0);
+            $extensionAttributes = $quote->getExtensionAttributes();
+            if ($extensionAttributes && $extensionAttributes->getShippingAssignments()) {
+                $extensionAttributes->setShippingAssignments([]);
+            }
+            $this->cart->saveQuote();
+        }
+    }
+}
diff --git a/app/code/Magento/Multishipping/Plugin/MultishippingQuoteRepository.php b/app/code/Magento/Multishipping/Plugin/MultishippingQuoteRepository.php
new file mode 100644
index 0000000000000..af19e4bc91f51
--- /dev/null
+++ b/app/code/Magento/Multishipping/Plugin/MultishippingQuoteRepository.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Plugin;
+
+use Magento\Framework\Api\SearchResultsInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\ShippingAssignment\ShippingProcessor;
+use Magento\Quote\Model\ShippingAssignmentFactory;
+
+/**
+ * Plugin for multishipping quote processing.
+ */
+class MultishippingQuoteRepository
+{
+    /**
+     * @var ShippingAssignmentFactory
+     */
+    private $shippingAssignmentFactory;
+
+    /**
+     * @var ShippingProcessor
+     */
+    private $shippingProcessor;
+
+    /**
+     * @param ShippingAssignmentFactory $shippingAssignmentFactory
+     * @param ShippingProcessor $shippingProcessor
+     */
+    public function __construct(
+        ShippingAssignmentFactory $shippingAssignmentFactory,
+        ShippingProcessor $shippingProcessor
+    ) {
+        $this->shippingAssignmentFactory = $shippingAssignmentFactory;
+        $this->shippingProcessor = $shippingProcessor;
+    }
+
+    /**
+     * Process multishipping quote for get.
+     *
+     * @param CartRepositoryInterface $subject
+     * @param CartInterface $result
+     * @return CartInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGet(
+        CartRepositoryInterface $subject,
+        CartInterface $result
+    ) {
+        return $this->processQuote($result);
+    }
+
+    /**
+     * Process multishipping quote for get list.
+     *
+     * @param CartRepositoryInterface $subject
+     * @param SearchResultsInterface $result
+     *
+     * @return SearchResultsInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetList(
+        CartRepositoryInterface $subject,
+        SearchResultsInterface $result
+    ) {
+        $items = [];
+        foreach ($result->getItems() as $item) {
+            $items[] = $this->processQuote($item);
+        }
+        $result->setItems($items);
+
+        return $result;
+    }
+
+    /**
+     * Remove shipping assignments for multishipping quote.
+     *
+     * @param CartRepositoryInterface $subject
+     * @param CartInterface $quote
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeSave(CartRepositoryInterface $subject, CartInterface $quote)
+    {
+        $extensionAttributes = $quote->getExtensionAttributes();
+        if ($quote->getIsMultiShipping() && $extensionAttributes && $extensionAttributes->getShippingAssignments()) {
+            $quote->getExtensionAttributes()->setShippingAssignments([]);
+        }
+
+        return [$quote];
+    }
+
+    /**
+     * Set shipping assignments for multishipping quote according to customer selection.
+     *
+     * @param CartInterface $quote
+     * @return CartInterface
+     */
+    private function processQuote(CartInterface $quote): CartInterface
+    {
+        if (!$quote->getIsMultiShipping() || !$quote instanceof Quote) {
+            return $quote;
+        }
+
+        if ($quote->getExtensionAttributes() && $quote->getExtensionAttributes()->getShippingAssignments()) {
+            $shippingAssignments = [];
+            $addresses = $quote->getAllAddresses();
+
+            foreach ($addresses as $address) {
+                $quoteItems = $this->getQuoteItems($quote, $address);
+                if (!empty($quoteItems)) {
+                    $shippingAssignment = $this->shippingAssignmentFactory->create();
+                    $shippingAssignment->setItems($quoteItems);
+                    $shippingAssignment->setShipping($this->shippingProcessor->create($address));
+                    $shippingAssignments[] = $shippingAssignment;
+                }
+            }
+
+            if (!empty($shippingAssignments)) {
+                $quote->getExtensionAttributes()->setShippingAssignments($shippingAssignments);
+            }
+        }
+
+        return $quote;
+    }
+
+    /**
+     * Returns quote items assigned to address.
+     *
+     * @param Quote $quote
+     * @param Quote\Address $address
+     * @return Quote\Item[]
+     */
+    private function getQuoteItems(Quote $quote, Quote\Address $address): array
+    {
+        $quoteItems = [];
+        foreach ($address->getItemsCollection() as $addressItem) {
+            $quoteItem = $quote->getItemById($addressItem->getQuoteItemId());
+            if ($quoteItem) {
+                $multishippingQuoteItem = clone $quoteItem;
+                $qty = $addressItem->getQty();
+                $sku = $multishippingQuoteItem->getSku();
+                if (isset($quoteItems[$sku])) {
+                    $qty += $quoteItems[$sku]->getQty();
+                }
+                $multishippingQuoteItem->setQty($qty);
+                $quoteItems[$sku] = $multishippingQuoteItem;
+            }
+        }
+
+        return array_values($quoteItems);
+    }
+}
diff --git a/app/code/Magento/Multishipping/Plugin/ResetShippingAssigment.php b/app/code/Magento/Multishipping/Plugin/ResetShippingAssigment.php
new file mode 100644
index 0000000000000..deac19e23a23a
--- /dev/null
+++ b/app/code/Magento/Multishipping/Plugin/ResetShippingAssigment.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\Plugin;
+
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentProcessor;
+
+/**
+ * Resets quote shipping assignments when item is removed from multishipping quote.
+ */
+class ResetShippingAssigment
+{
+    /**
+     * @var ShippingAssignmentProcessor
+     */
+    private $shippingAssignmentProcessor;
+
+    /**
+     * @param ShippingAssignmentProcessor $shippingAssignmentProcessor
+     */
+    public function __construct(
+        ShippingAssignmentProcessor $shippingAssignmentProcessor
+    ) {
+        $this->shippingAssignmentProcessor = $shippingAssignmentProcessor;
+    }
+
+    /**
+     * Resets quote shipping assignments when item is removed from multishipping quote.
+     *
+     * @param Quote $subject
+     * @param mixed $itemId
+     *
+     * @return array
+     */
+    public function beforeRemoveItem(Quote $subject, $itemId): array
+    {
+        if ($subject->getIsMultiShipping()) {
+            $extensionAttributes = $subject->getExtensionAttributes();
+            if ($extensionAttributes && $extensionAttributes->getShippingAssignments()) {
+                $shippingAssignment = $this->shippingAssignmentProcessor->create($subject);
+                $extensionAttributes->setShippingAssignments([$shippingAssignment]);
+            }
+        }
+
+        return [$itemId];
+    }
+}
diff --git a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/AdminSalesOrderActionGroup.xml b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/AdminSalesOrderActionGroup.xml
new file mode 100644
index 0000000000000..dcd8bfd8d141b
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/AdminSalesOrderActionGroup.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/testSchema.xsd">
+    <actionGroup name="AdminSalesOrderActionGroup">
+        <scrollTo selector="{{AdminOrderTotalSection.subTotal}}" stepKey="scrollToOrderTotalSection"/>
+        <grabTextFrom selector="{{AdminOrderTotalSection.subTotal}}" stepKey="grabValueForSubtotal"/>
+        <grabTextFrom selector="{{AdminOrderTotalSection.shippingAndHandling}}" stepKey="grabValueForShippingHandling"/>
+        <grabTextFrom selector="{{AdminOrderTotalSection.grandTotal}}" stepKey="grabValueForGrandTotal"/>
+        <executeJS function="
+        var grandTotal = '{$grabValueForGrandTotal}'.substr(1);
+        return (grandTotal);" stepKey="grandTotalValue"/>
+        <executeJS function="
+               var subtotal = '{$grabValueForSubtotal}'.substr(1);
+               var handling = '{$grabValueForShippingHandling}'.substr(1);
+               var subtotalHandling = (parseFloat(subtotal) + parseFloat(handling)).toFixed(2);
+               return (subtotalHandling);" stepKey="sumTotalValue"/>
+        <assertEquals stepKey="assertSubTotalPrice">
+            <expectedResult type="variable">$sumTotalValue</expectedResult>
+            <actualResult type="variable">$grandTotalValue</actualResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/AssertStorefrontSalesOrderMatchesGrandTotalActionGroup.xml b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/AssertStorefrontSalesOrderMatchesGrandTotalActionGroup.xml
new file mode 100644
index 0000000000000..559d759e0468d
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/AssertStorefrontSalesOrderMatchesGrandTotalActionGroup.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/testSchema.xsd">
+    <actionGroup name="AssertStorefrontSalesOrderMatchesGrandTotalActionGroup">
+        <arguments>
+            <argument name="dataHref" type="string"/>
+        </arguments>
+        <!--Click on View Order Link-->
+        <click selector="{{StorefrontSalesOrderSection.viewOrderLink(dataHref)}}" stepKey="viewOrderAction"/>
+        <waitForPageLoad stepKey="waitForViewOrderPageToLoad"/>
+        <grabTextFrom selector="{{StorefrontSalesOrderSection.salesOrderPrice('subtotal')}}" stepKey="grabValueForSubtotal"/>
+        <grabTextFrom selector="{{StorefrontSalesOrderSection.salesOrderPrice('shipping')}}" stepKey="grabValueForShippingHandling"/>
+        <grabTextFrom selector="{{StorefrontSalesOrderSection.salesOrderPrice('grand_total')}}" stepKey="grabValueForGrandTotal"/>
+        <executeJS function="
+        var grandTotal = '{$grabValueForGrandTotal}'.substr(1);
+        return (grandTotal);" stepKey="grandTotalValue"/>
+        <executeJS function="
+               var subtotal = '{$grabValueForSubtotal}'.substr(1);
+               var handling = '{$grabValueForShippingHandling}'.substr(1);
+               var subtotalHandling = (parseFloat(subtotal) + parseFloat(handling)).toFixed(2);
+               return (subtotalHandling);" stepKey="sumTotalValue"/>
+        <assertEquals stepKey="assertSubTotalPrice">
+            <expectedResult type="variable">$sumTotalValue</expectedResult>
+            <actualResult type="variable">$grandTotalValue</actualResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/CheckingWithMinicartActionGroup.xml b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/CheckingWithMinicartActionGroup.xml
index f648c1026b539..35c42225d458b 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/CheckingWithMinicartActionGroup.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/CheckingWithMinicartActionGroup.xml
@@ -9,9 +9,8 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <actionGroup name="CheckingWithMinicartActionGroup">
-        <waitForPageLoad stepKey="waitForCheckoutCartPageLoad"/>
-        <click stepKey="clickOnCollapsibleDiv" selector="{{MinicartSection.clickOnCollapsibleDiv}}"/>
-        <click stepKey="clickOnShippingMethodRadioButton" selector="{{MinicartSection.shippingMethodRadioButton}}"/>
+        <click selector="{{MinicartSection.clickOnCollapsibleDiv}}" stepKey="clickOnCollapsibleDiv"/>
+        <click selector="{{MinicartSection.shippingMethodRadioButton}}" stepKey="clickOnShippingMethodRadioButton"/>
         <waitForPageLoad stepKey="waitForShippingPriceToBeChanged"/>
         <grabTextFrom selector="{{MinicartSection.shippingMethodRadioText}}" stepKey="shippingMethodRadioText"/>
         <grabTextFrom selector="{{MinicartSection.shippingMethodSubtotalPrice}}" stepKey="shippingMethodSubtotalPrice"/>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/CheckingWithMultipleAddressesActionGroup.xml b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/CheckingWithMultipleAddressesActionGroup.xml
index 861b97427b44d..34ce38bd0d935 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/CheckingWithMultipleAddressesActionGroup.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/CheckingWithMultipleAddressesActionGroup.xml
@@ -9,19 +9,23 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <actionGroup name="CheckingWithSingleAddressActionGroup">
-        <click stepKey="clickOnCheckoutWithMultipleAddresses" selector="{{SingleShippingSection.checkoutWithMultipleAddresses}}"/>
+        <click selector="{{SingleShippingSection.checkoutWithMultipleAddresses}}" stepKey="clickOnCheckoutWithMultipleAddresses"/>
         <waitForPageLoad stepKey="waitForMultipleAddressPageLoad"/>
-        <click stepKey="goToShippingInformation" selector="{{SingleShippingSection.goToShippingInfo}}"/>
+        <click selector="{{SingleShippingSection.goToShippingInfo}}" stepKey="goToShippingInformation"/>
         <waitForPageLoad stepKey="waitForShippingPageLoad"/>
     </actionGroup>
     <actionGroup name="CheckingWithMultipleAddressesActionGroup" extends="CheckingWithSingleAddressActionGroup">
-        <grabTextFrom stepKey="firstShippingAddressValue" selector="{{MultishippingSection.firstShippingAddressValue}}" after="waitForMultipleAddressPageLoad" />
-        <selectOption selector="{{MultishippingSection.firstShippingAddressOption}}" userInput="{$firstShippingAddressValue}" stepKey="selectFirstShippingMethod" after="firstShippingAddressValue" />
-        <waitForPageLoad stepKey="waitForSecondShippingAddresses" after="selectFirstShippingMethod" />
-        <grabTextFrom stepKey="secondShippingAddressValue" selector="{{MultishippingSection.secondShippingAddressValue}}" after="waitForSecondShippingAddresses" />
-        <selectOption selector="{{MultishippingSection.secondShippingAddressOption}}" userInput="{$secondShippingAddressValue}" stepKey="selectSecondShippingMethod" after="secondShippingAddressValue" />
-        <click stepKey="clickOnUpdateAddress" selector="{{SingleShippingSection.updateAddress}}" after="selectSecondShippingMethod" />
-        <waitForPageLoad stepKey="waitForShippingInformation" after="clickOnUpdateAddress" />
+        <arguments>
+            <argument name="addressOption1" type="string" defaultValue="1"/>
+            <argument name="addressOption2" type="string" defaultValue="2"/>
+        </arguments>
+        <grabTextFrom selector="{{MultishippingSection.shippingAddressOptions(addressOption1,addressOption1)}}" after="waitForMultipleAddressPageLoad" stepKey="firstShippingAddressValue"/>
+        <selectOption selector="{{MultishippingSection.shippingAddressSelector(addressOption1)}}" userInput="{$firstShippingAddressValue}" after="firstShippingAddressValue" stepKey="selectFirstShippingMethod"/>
+        <waitForPageLoad after="selectFirstShippingMethod" stepKey="waitForSecondShippingAddresses"/>
+        <grabTextFrom selector="{{MultishippingSection.shippingAddressOptions(addressOption2,addressOption2)}}" after="waitForSecondShippingAddresses" stepKey="secondShippingAddressValue"/>
+        <selectOption selector="{{MultishippingSection.shippingAddressSelector(addressOption2)}}" userInput="{$secondShippingAddressValue}" after="secondShippingAddressValue" stepKey="selectSecondShippingMethod"/>
+        <click selector="{{SingleShippingSection.updateAddress}}" after="selectSecondShippingMethod" stepKey="clickOnUpdateAddress"/>
+        <waitForPageLoad after="clickOnUpdateAddress" stepKey="waitForShippingInformation"/>
     </actionGroup>
     <actionGroup name="StorefrontCheckoutWithMultipleAddressesActionGroup">
         <click selector="{{SingleShippingSection.checkoutWithMultipleAddresses}}" stepKey="clickOnCheckoutWithMultipleAddresses"/>
@@ -35,9 +39,9 @@
         <selectOption selector="{{MultishippingSection.selectShippingAddress(sequenceNumber)}}" userInput="{{option}}" stepKey="selectShippingAddress"/>
     </actionGroup>
     <actionGroup name="StorefrontSaveAddressActionGroup">
-        <click stepKey="clickOnUpdateAddress" selector="{{SingleShippingSection.updateAddress}}"/>
-        <waitForPageLoad stepKey="waitForShippingInformationAfterUpdated" time="90"/>
-        <click stepKey="goToShippingInformation" selector="{{SingleShippingSection.goToShippingInfo}}"/>
+        <click selector="{{SingleShippingSection.updateAddress}}" stepKey="clickOnUpdateAddress"/>
+        <waitForPageLoad time="90" stepKey="waitForShippingInformationAfterUpdated"/>
+        <click selector="{{SingleShippingSection.goToShippingInfo}}" stepKey="goToShippingInformation"/>
         <waitForPageLoad stepKey="waitForShippingPageLoad"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/PlaceOrderActionGroup.xml b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/PlaceOrderActionGroup.xml
index efb860e314780..871c71de522c7 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/PlaceOrderActionGroup.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/PlaceOrderActionGroup.xml
@@ -9,12 +9,18 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <actionGroup name="PlaceOrderActionGroup">
-        <waitForPageLoad stepKey="waitForPlaceOrderPageLoad"/>
-        <!--        place order and check the order number-->
-        <click stepKey="checkoutMultishipmentPlaceOrder" selector="{{SingleShippingSection.placeOrder}}" />
+        <click selector="{{SingleShippingSection.placeOrder}}"  stepKey="checkoutMultiShipmentPlaceOrder"/>
         <waitForPageLoad stepKey="waitForSuccessfullyPlacedOrder"/>
         <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
-
+    </actionGroup>
+    <actionGroup name="StorefrontPlaceOrderForMultipleAddressesActionGroup" extends="PlaceOrderActionGroup">
+        <arguments>
+            <argument name="firstOrderPosition" type="string" defaultValue="1"/>
+            <argument name="secondOrderPosition" type="string" defaultValue="2"/>
+        </arguments>
+        <grabTextFrom selector="{{StorefrontSalesOrderSection.orderLinkByPosition(firstOrderPosition)}}" after="waitForLoadSuccessPage" stepKey="getFirstOrderId"/>
+        <grabAttributeFrom selector="{{StorefrontSalesOrderSection.orderLinkByPosition(firstOrderPosition)}}" userInput="href" after="getFirstOrderId" stepKey="dataHrefForFirstOrder"/>
+        <grabTextFrom selector="{{StorefrontSalesOrderSection.orderLinkByPosition(secondOrderPosition)}}" after="dataHrefForFirstOrder" stepKey="getSecondOrderId"/>
+        <grabAttributeFrom selector="{{StorefrontSalesOrderSection.orderLinkByPosition(secondOrderPosition)}}" userInput="href" after="getSecondOrderId" stepKey="dataHrefForSecondOrder"/>
     </actionGroup>
 </actionGroups>
-
diff --git a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/ReviewOrderActionGroup.xml b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/ReviewOrderActionGroup.xml
index af7d897910ca3..638c5dd8dde61 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/ReviewOrderActionGroup.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/ReviewOrderActionGroup.xml
@@ -9,31 +9,37 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <actionGroup name="ReviewOrderForSingleShipmentActionGroup">
-        <waitForPageLoad stepKey="waitForReviewOrderPageLoad"/>
-        <grabTextFrom selector="{{ReviewOrderSection.shippingMethodBasePrice}}" stepKey="shippingMethodBasePrice"/>
-        <grabTextFrom selector="{{ReviewOrderSection.shippingMethodSubtotalPrice}}" stepKey="shippingMethodSubtotalPrice"/>
+        <arguments>
+            <argument name="totalName" type="string" defaultValue="Shipping &amp; Handling"/>
+            <argument name="totalPosition" type="string" defaultValue="1"/>
+        </arguments>
+        <grabTextFrom selector="{{ReviewOrderSection.shippingMethodBasePrice(totalPosition)}}" stepKey="shippingMethodBasePrice"/>
+        <grabTextFrom selector="{{ReviewOrderSection.shippingMethodSubtotalPrice(totalPosition,totalName)}}" stepKey="shippingMethodSubtotalPrice"/>
         <assertEquals stepKey="assertShippingMethodPrice">
             <expectedResult type="string">$shippingMethodSubtotalPrice</expectedResult>
             <actualResult type="string">$shippingMethodBasePrice</actualResult>
         </assertEquals>
     </actionGroup>
     <actionGroup name="ReviewOrderForMultiShipmentActionGroup">
-        <waitForPageLoad stepKey="waitForFirstShippingMethod" />
+        <arguments>
+            <argument name="totalNameForFirstOrder" type="string" defaultValue="Shipping &amp; Handling"/>
+            <argument name="totalPositionForFirstOrder" type="string" defaultValue="1"/>
+            <argument name="totalNameForSecondOrder" type="string" defaultValue="Shipping &amp; Handling"/>
+            <argument name="totalPositionForSecondOrder" type="string" defaultValue="2"/>
+        </arguments>
         <!--Check First Shipping Method Price-->
-        <grabTextFrom selector="{{ReviewOrderSection.firstShippingMethodBasePrice}}" stepKey="firstShippingMethodBasePrice"/>
-        <grabTextFrom selector="{{ReviewOrderSection.firstShippingMethodSubtotalPrice}}" stepKey="firstShippingMethodSubtotalPrice"/>
+        <grabTextFrom selector="{{ReviewOrderSection.shippingMethodBasePrice(totalPositionForFirstOrder)}}" stepKey="firstShippingMethodBasePrice"/>
+        <grabTextFrom selector="{{ReviewOrderSection.shippingMethodSubtotalPrice(totalPositionForFirstOrder,totalNameForFirstOrder)}}" stepKey="firstShippingMethodSubtotalPrice"/>
         <assertEquals stepKey="assertShippingMethodPrice">
             <expectedResult type="string">$firstShippingMethodSubtotalPrice</expectedResult>
             <actualResult type="string">$firstShippingMethodBasePrice</actualResult>
         </assertEquals>
         <!--Check Second Shipping Method Price-->
-        <grabTextFrom selector="{{ReviewOrderSection.secondShippingMethodBasePrice}}" stepKey="secondShippingMethodBasePrice" />
-        <grabTextFrom selector="{{ReviewOrderSection.secondShippingMethodSubtotalPrice}}" stepKey="secondShippingMethodSubtotalPrice" />
+        <grabTextFrom selector="{{ReviewOrderSection.shippingMethodBasePrice(totalPositionForSecondOrder)}}" stepKey="secondShippingMethodBasePrice"/>
+        <grabTextFrom selector="{{ReviewOrderSection.shippingMethodSubtotalPrice(totalPositionForSecondOrder,totalNameForSecondOrder)}}" stepKey="secondShippingMethodSubtotalPrice"/>
         <assertEquals stepKey="assertSecondShippingMethodPrice" >
             <expectedResult type="string">$secondShippingMethodSubtotalPrice</expectedResult>
             <actualResult type="string">$secondShippingMethodBasePrice</actualResult>
         </assertEquals>
-
     </actionGroup>
 </actionGroups>
-
diff --git a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/SelectBillingInfoActionGroup.xml b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/SelectBillingInfoActionGroup.xml
index 3f7578953df70..63fbaea72cc50 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/SelectBillingInfoActionGroup.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/SelectBillingInfoActionGroup.xml
@@ -10,7 +10,6 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <actionGroup name="SelectBillingInfoActionGroup">
         <waitForPageLoad stepKey="waitForBillingInfoPageLoad"/>
-        <click stepKey="goToReviewOrder" selector="{{PaymentMethodSection.goToReviewOrder}}"/>
+        <click selector="{{PaymentMethodSection.goToReviewOrder}}" stepKey="goToReviewOrder"/>
     </actionGroup>
 </actionGroups>
-
diff --git a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/SelectShippingInfoActionGroup.xml b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/SelectShippingInfoActionGroup.xml
index bcaeb8ba4800c..a5aac6b32011b 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/SelectShippingInfoActionGroup.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/SelectShippingInfoActionGroup.xml
@@ -12,26 +12,26 @@
         <arguments>
             <argument name="shippingMethodType" type="string" defaultValue="Fixed"/>
         </arguments>
-        <waitForPageLoad stepKey="waitForShippingInfoPageLoad"/>
         <selectOption selector="{{ShippingMethodSection.shippingMethodRadioButton}}" userInput="{{shippingMethodType}}" stepKey="selectShippingMethod"/>
         <waitForPageLoad stepKey="waitForRadioOptions"/>
-        <click stepKey="goToBillingInformation" selector="{{ShippingMethodSection.goToBillingInfo}}"/>
+        <click selector="{{ShippingMethodSection.goToBillingInfo}}" stepKey="goToBillingInformation"/>
     </actionGroup>
     <actionGroup name="SelectMultiShippingInfoActionGroup">
         <arguments>
+            <argument name="shippingMethodPosition1" type="string" defaultValue="1"/>
+            <argument name="shippingMethodPosition2" type="string" defaultValue="2"/>
             <argument name="shippingMethodType1" type="string" defaultValue="Fixed"/>
             <argument name="shippingMethodType2" type="string" defaultValue="Free"/>
         </arguments>
-        <waitForPageLoad stepKey="waitForShippingInfoPageLoad"/>
-        <selectOption selector="{{ShippingMethodSection.firstShippingMethodRadioButton}}" userInput="{{shippingMethodType1}}" stepKey="selectShippingMethod1"/>
+        <selectOption selector="{{ShippingMethodSection.selectShippingMethod(shippingMethodPosition1,shippingMethodPosition1)}}" userInput="{{shippingMethodType1}}" stepKey="selectShippingMethod1"/>
         <waitForPageLoad stepKey="waitForSecondShippingMethod"/>
-        <selectOption selector="{{ShippingMethodSection.secondShippingMethodRadioButton}}" userInput="{{shippingMethodType2}}" stepKey="selectShippingMethod2"/>
+        <selectOption selector="{{ShippingMethodSection.selectShippingMethod(shippingMethodPosition2,shippingMethodPosition2)}}" userInput="{{shippingMethodType2}}" stepKey="selectShippingMethod2"/>
         <waitForPageLoad stepKey="waitForRadioOptions"/>
-        <click stepKey="goToBillingInformation" selector="{{ShippingMethodSection.goToBillingInfo}}"/>
+        <click selector="{{ShippingMethodSection.goToBillingInfo}}" stepKey="goToBillingInformation"/>
     </actionGroup>
     <actionGroup name="StorefrontLeaveDefaultShippingMethodsAndGoToBillingInfoActionGroup">
         <waitForPageLoad stepKey="waitForShippingInfo"/>
-        <click stepKey="goToBillingInformation" selector="{{ShippingMethodSection.goToBillingInfo}}"/>
+        <click selector="{{ShippingMethodSection.goToBillingInfo}}" stepKey="goToBillingInformation"/>
     </actionGroup>
 </actionGroups>
 
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Data/MultishippingSalesRuleData.xml b/app/code/Magento/Multishipping/Test/Mftf/Data/MultishippingSalesRuleData.xml
new file mode 100644
index 0000000000000..7c79081245fd6
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/Data/MultishippingSalesRuleData.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="CartPriceRuleConditionForSubtotalForMultiShipping" extends="CartPriceRuleConditionAppliedForSubtotal">
+        <data key="apply">Percent of product price discount</data>
+        <data key="customerGroups">'NOT LOGGED IN', 'General', 'Wholesale', 'Retailer'</data>
+        <data key="subtotal">50</data>
+        <data key="apply_to_shipping">1</data>
+        <data key="simple_free_shipping">For matching items only</data>
+        <data key="condition1">Subtotal</data>
+        <data key="condition2">Shipping Method</data>
+        <data key="rule1">equals or greater than</data>
+        <data key="shippingMethod">[flatrate] Fixed</data>
+        <data key="ruleToChange1">is</data>
+   </entity>
+</entities>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Page/MultishippingCheckoutPage.xml b/app/code/Magento/Multishipping/Test/Mftf/Page/MultishippingCheckoutPage.xml
index 001002e98271c..beee76a632b22 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Page/MultishippingCheckoutPage.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Page/MultishippingCheckoutPage.xml
@@ -15,4 +15,4 @@
         <section name="PaymentMethodSection"/>
         <section name="ReviewOrderSection"/>
     </page>
-</pages>
+</pages>
\ No newline at end of file
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection.xml b/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection.xml
index e6f3282493718..cd408f5600e3d 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection.xml
@@ -17,10 +17,8 @@
     <section name="MultishippingSection">
         <element name="checkoutWithMultipleAddresses" type="button" selector="//span[text()='Check Out with Multiple Addresses']"/>
         <element name="shippingMultipleCheckout" type="button" selector=".action.multicheckout"/>
-        <element name="firstShippingAddressValue" type="select" selector="//table//tbody//tr[position()=1]//td[position()=3]//div//select//option[2]"/>
-        <element name="firstShippingAddressOption" type="select" selector="//table//tbody//tr[position()=1]//td[position()=3]//div//select"/>
-        <element name="secondShippingAddressValue" type="select" selector="//table//tbody//tr[position()=2]//td[position()=3]//div//select//option[1]"/>
-        <element name="secondShippingAddressOption" type="select" selector="//table//tbody//tr[position()=2]//td[position()=3]//div//select"/>
+        <element name="shippingAddressSelector" type="select" selector="//tr[position()={{addressPosition}}]//td[@data-th='Send To']//select" parameterized="true"/>
+        <element name="shippingAddressOptions" type="select" selector="#multiship-addresses-table tbody tr:nth-of-type({{addressPosition}}) .col.address select option:nth-of-type({{optionIndex}})" parameterized="true"/>
         <element name="selectShippingAddress" type="select" selector="(//table[@id='multiship-addresses-table'] //div[@class='field address'] //select)[{{sequenceNumber}}]" parameterized="true"/>
     </section>
     <section name="StorefrontMultipleShippingMethodSection">
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Section/PaymentMethodSection.xml b/app/code/Magento/Multishipping/Test/Mftf/Section/PaymentMethodSection.xml
index 4e7f4a497ad4d..2d47b54d84b9c 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Section/PaymentMethodSection.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Section/PaymentMethodSection.xml
@@ -9,6 +9,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <section name="PaymentMethodSection">
-        <element name="goToReviewOrder" type="button" selector="//span[text()='Go to Review Your Order']"/>
+        <element name="goToReviewOrder" type="button" selector="#payment-continue"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Section/ReviewOrderSection.xml b/app/code/Magento/Multishipping/Test/Mftf/Section/ReviewOrderSection.xml
index e13f28929dcc8..de33c28bfb1f2 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Section/ReviewOrderSection.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Section/ReviewOrderSection.xml
@@ -9,19 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <section name="ReviewOrderSection">
-        <element name="shippingMethodBasePrice" type="text" selector="//div[@class='block block-shipping'][position()=1]//div[@class='block-content'][position()=1]//div[@class='box box-shipping-method']//div[@class='box-content']//span[@class='price']"/>
-        <element name="shippingMethodSubtotalPrice" type="text" selector="//div[@class='block-content'][position()=1]//table[position()=1]//tr[position()=2]//td[@class='amount']//span[@class='price']"/>
-        <element name="firstShippingMethodBasePrice" type="text" selector="//div[@class='block block-shipping'][position()=1]//div[@class='block-content'][position()=1]//div[@class='box box-shipping-method']//div[@class='box-content']//span[@class='price']"/>
-        <element name="secondShippingMethodBasePrice" type="text" selector="//div[@class='block block-shipping'][position()=1]//div[@class='block-content'][position()=2]//div[@class='box box-shipping-method']//div[@class='box-content']//span[@class='price']"/>
-        <element name="firstShippingMethodSubtotalPrice" type="text" selector="//div[@class='block-content'][position()=1]//table[position()=1]//tr[position()=2]//td//span[@class='price']"/>
-        <element name="secondShippingMethodSubtotalPrice" type="text" selector="//div[@class='block-content'][position()=2]//table[position()=1]//tr[position()=2]//td//span[@class='price']"/>
-        <element name="firstOrderSubtotalPrice" type="text" selector="//div[@class='block-content'][position()=1]//table[position()=1]//tr[@class='totals sub'][position()=1]//td[@data-th='Subtotal']//span[@class='price']"/>
-        <element name="secondOrderSubtotalPrice" type="text" selector="//div[@class='block-content'][position()=2]//table[position()=1]//tr[@class='totals sub'][position()=1]//td[@data-th='Subtotal']//span[@class='price']"/>
-        <element name="firstOrderTaxPrice" type="text" selector="//div[@class='block-content'][position()=1]//table[position()=1]//tr[@class='totals-tax'][position()=1]//td[@data-th='Tax']//span[@class='price']"/>
-        <element name="secondOrderTaxPrice" type="text" selector="//div[@class='block-content'][position()=2]//table[position()=1]//tr[@class='totals-tax'][position()=1]//td[@data-th='Tax']//span[@class='price']"/>
-        <element name="firstOrderTotalPrice" type="text" selector="//div[@class='block-content'][position()=1]//table[position()=1]//tr[@class='grand totals'][position()=1]//td//span[@class='price']"/>
-        <element name="secondOrderTotalPrice" type="text" selector="//div[@class='block-content'][position()=2]//table[position()=1]//tr[@class='grand totals'][position()=1]//td//span[@class='price']"/>
-        <element name="grandTotalPrice" type="text" selector="//div[@class='checkout-review']//div[@class='grand totals']//span[@class='price']"/>
+        <element name="shippingMethodBasePrice" type="text" selector="//div[@class='block-content'][position()={{shippingMethodPosition}}]//div[@class='box box-shipping-method'][position()=1]//span[@class='price']" parameterized="true"/>
+        <element name="shippingMethodSubtotalPrice" type="text" selector="//div[@class='block-content'][position()={{shippingMethodPosition}}]//td[@class='amount'][contains(@data-th,'{{priceType}}')]//span[@class='price']" parameterized="true"/>
     </section>
 </sections>
-
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Section/ShippingMethodSection.xml b/app/code/Magento/Multishipping/Test/Mftf/Section/ShippingMethodSection.xml
index 6a2290bcf1a43..c4dd2494f7fe8 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Section/ShippingMethodSection.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Section/ShippingMethodSection.xml
@@ -10,9 +10,7 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <section name="ShippingMethodSection">
         <element name="shippingMethodRadioButton" type="select" selector="//input[@class='radio']"/>
-        <element name="firstShippingMethodRadioButton" type="select" selector="//div[@class='block block-shipping'][position()=1]//div[@class='block-content']//div[@class='box box-shipping-method']//div[@class='box-content']//dl//dd[position()=1]//fieldset//div//div//input[@class='radio']"/>
-        <element name="secondShippingMethodRadioButton" type="select" selector="//div[@class='block block-shipping'][position()=2]//div[@class='block-content']//div[@class='box box-shipping-method']//div[@class='box-content']//dl//dd[position()=2]//fieldset//div//div//input[@class='radio']"/>
-        <element name="goToBillingInfo" type="button" selector="//span[text()='Continue to Billing Information']"/>
+        <element name="selectShippingMethod" type="radio" selector="//div[@class='block block-shipping'][position()={{shippingBlockPosition}}]//dd[position()={{shippingMethodPosition}}]//input[@class='radio']" parameterized="true" timeout="5"/>
+        <element name="goToBillingInfo" type="button" selector=".action.primary.continue"/>
     </section>
 </sections>
-
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Section/StorefrontSalesOrderSection.xml b/app/code/Magento/Multishipping/Test/Mftf/Section/StorefrontSalesOrderSection.xml
new file mode 100644
index 0000000000000..94546dcfef9a0
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/Section/StorefrontSalesOrderSection.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:Test/etc/testSchema.xsd">
+    <section name="StorefrontSalesOrderSection">
+        <element name="orderLinkByPosition" type="text" selector="//li[@class='shipping-list'][position()={{orderLinkPosition}}]//a" parameterized="true"/>
+        <element name="viewOrderLink" type="text" selector="//td[@data-th='Actions']//a[contains(@href,'{{orderLink}}')]//span[text()='View Order']"  parameterized="true" timeout="5"/>
+        <element name="salesOrderPrice" type="text" selector="//div[@class='order-details-items ordered']//tr[@class='{{priceType}}']//td[@class='amount']//span[@class='price']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontMinicartWithMultishipmentTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontMinicartWithMultishipmentTest.xml
index d52ddb11212aa..c2fd978cf3137 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontMinicartWithMultishipmentTest.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontMinicartWithMultishipmentTest.xml
@@ -38,12 +38,12 @@
         </before>
 
         <after>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
             <deleteData stepKey="deleteCategory" createDataKey="category"/>
             <deleteData stepKey="deleteProduct1" createDataKey="product1"/>
             <deleteData stepKey="deleteProduct2" createDataKey="product2"/>
             <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
             <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShipping"/>
-            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
             <actionGroup ref="logout" stepKey="logoutAdmin"/>
         </after>
 
@@ -62,6 +62,7 @@
         <actionGroup ref="ReviewOrderForMultiShipmentActionGroup" stepKey="reviewOrderForMultiShipment"/>
         <amOnPage url="/checkout/cart/index/" stepKey="amOnCheckoutCartIndexPage"/>
         <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCartAgain"/>
+        <waitForPageLoad stepKey="waitForMinicartPageLoad"/>
         <actionGroup ref="CheckingWithMinicartActionGroup" stepKey="checkoutWithMinicart"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontMyAccountWithMultishipmentTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontMyAccountWithMultishipmentTest.xml
new file mode 100644
index 0000000000000..eec8a40877bb3
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontMyAccountWithMultishipmentTest.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="StorefrontMyAccountWithMultishipmentTest">
+        <annotations>
+            <features value="Multishipping"/>
+            <stories value="Shipping price shows 0 on Order view page after multiple address checkout"/>
+            <title value="Verify Shipping price for Storefront after multiple address checkout"/>
+            <description value="Verify that shipping price on My account matches with shipping method prices after multiple addresses checkout (Order view page)"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-19303"/>
+            <group value="multishipping"/>
+            <skip>
+                <issueId value="MC-22683"/>
+            </skip>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <createData entity="SimpleProduct" stepKey="product1">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="product2">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="Simple_US_Customer_Two_Addresses" stepKey="customer"/>
+            <!-- Set configurations -->
+            <magentoCLI command="config:set {{EnableMultiShippingCheckoutMultiple.path}} {{EnableMultiShippingCheckoutMultiple.value}}" stepKey="allowShippingToMultipleAddresses"/>
+            <magentoCLI command="config:set {{EnableFreeShippingMethod.path}} {{EnableFreeShippingMethod.value}}" stepKey="enableFreeShipping"/>
+            <magentoCLI command="config:set {{EnableFlatRateShippingMethod.path}} {{EnableFlatRateShippingMethod.value}}" stepKey="enableFlatRateShipping"/>
+            <magentoCLI command="config:set {{EnableCheckMoneyOrderPaymentMethod.path}} {{EnableCheckMoneyOrderPaymentMethod.value}}" stepKey="enableCheckMoneyOrderPaymentMethod"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+                <argument name="Customer" value="$$customer$$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="StorefrontSignOutActionGroup" stepKey="customerLogout"/>
+            <magentoCLI command="config:set {{DisableMultiShippingCheckoutMultiple.path}} {{DisableMultiShippingCheckoutMultiple.value}}" stepKey="withdrawShippingToMultipleAddresses"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <deleteData createDataKey="product1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="product2" stepKey="deleteProduct2"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <magentoCLI command="config:set {{DisableFreeShippingMethod.path}} {{DisableFreeShippingMethod.value}}" stepKey="disableFreeShipping"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearAllFilters"/>
+            <actionGroup ref="logout" stepKey="logoutAdmin"/>
+        </after>
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSimpleProduct1ToCart">
+            <argument name="product" value="$$product1$$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForSecondProductPageLoad"/>
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addSimpleProduct2ToCart">
+            <argument name="product" value="$$product2$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
+        <actionGroup ref="CheckingWithMultipleAddressesActionGroup" stepKey="checkoutWithMultipleAddresses"/>
+        <waitForPageLoad stepKey="waitForShippingInfoPageLoad"/>
+        <actionGroup ref="SelectMultiShippingInfoActionGroup" stepKey="checkoutWithMultipleShipping"/>
+        <!--Select Check / Money order Payment method-->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+        <actionGroup ref="SelectBillingInfoActionGroup" stepKey="checkoutWithPaymentMethod"/>
+        <waitForPageLoad stepKey="waitForReviewOrderPageLoad"/>
+        <actionGroup ref="ReviewOrderForMultiShipmentActionGroup" stepKey="reviewOrderForMultiShipment">
+            <argument name="totalNameForFirstOrder" value="Shipping &amp; Handling"/>
+            <argument name="totalPositionForFirstOrder" value="1"/>
+            <argument name="totalNameForSecondOrder" value="Shipping &amp; Handling"/>
+            <argument name="totalPositionForSecondOrder" value="2"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForPlaceOrderPageLoad"/>
+        <actionGroup ref="StorefrontPlaceOrderForMultipleAddressesActionGroup" stepKey="placeOrder">
+            <argument name="firstOrderPosition" value="1"/>
+            <argument name="secondOrderPosition" value="2"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
+        <amOnPage url="{{StorefrontCustomerOrdersHistoryPage.url}}" stepKey="goToSalesOrder"/>
+        <actionGroup ref="AssertStorefrontSalesOrderMatchesGrandTotalActionGroup" stepKey="checkSalesOrderForFirstOrder">
+            <argument name="dataHref" value="$dataHrefForFirstOrderPlaceOrder"/>
+        </actionGroup>
+        <amOnPage url="{{StorefrontCustomerOrdersHistoryPage.url}}" stepKey="goToSalesOrder2"/>
+        <waitForPageLoad stepKey="waitForOrderPageLoad2"/>
+        <actionGroup ref="AssertStorefrontSalesOrderMatchesGrandTotalActionGroup" stepKey="checkSalesOrderForSecondOrder">
+            <argument name="dataHref" value="$dataHrefForSecondOrderPlaceOrder"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForAdminPageToLoad"/>
+        <!-- Go to Stores > Configuration > Sales > Orders -->
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onAdminOrdersPage"/>
+        <waitForPageLoad stepKey="waitForOrderPageLoad3"/>
+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
+        <!--Assert order in orders grid -->
+        <!-- Go to order page -->
+        <actionGroup ref="OpenOrderById" stepKey="openFirstOrderPage">
+            <argument name="orderId" value="{$getFirstOrderIdPlaceOrder}"/>
+        </actionGroup>
+        <!-- Check status -->
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeFirstOrderPendingStatus"/>
+        <actionGroup ref="AdminSalesOrderActionGroup" stepKey="validateOrderTotalsForFirstOrder"/>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onAdminOrdersPage2"/>
+        <waitForPageLoad stepKey="waitForOrderPageLoad4"/>
+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters2"/>
+        <!-- Go to order page -->
+        <actionGroup ref="OpenOrderById" stepKey="openSecondOrderPage">
+            <argument name="orderId" value="{$getSecondOrderIdPlaceOrder}"/>
+        </actionGroup>
+        <!-- Check status -->
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeSecondOrderPendingStatus"/>
+        <actionGroup ref="AdminSalesOrderActionGroup" stepKey="validateOrderTotalsForSecondOrder"/>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="gotToHomePage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckingWithCartPriceRuleMatchingSubtotalForMultiShipmentTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckingWithCartPriceRuleMatchingSubtotalForMultiShipmentTest.xml
new file mode 100644
index 0000000000000..02187658a8781
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckingWithCartPriceRuleMatchingSubtotalForMultiShipmentTest.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCheckingWithCartPriceRuleMatchingSubtotalForMultiShipmentTest" extends="StoreFrontCheckingWithMultishipmentTest">
+        <annotations>
+            <features value="Multi shipment and Cart Price Rule"/>
+            <stories value="Checking cart price rule for multi shipment with multiple shipment addresses on front end order page"/>
+            <title value="Checking sub total amount and free shipping is applied with multiple shipment addresses on front end order page"/>
+            <description value="Cart Price Rules not working and free shipping not applied for Multi shipping "/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-21738"/>
+            <group value="Multishipment"/>
+            <group value="SalesRule"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set multishipping/options/checkout_multiple 1" stepKey="allowShippingToMultipleAddresses"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set multishipping/options/checkout_multiple 0" stepKey="disableShippingToMultipleAddresses"/>
+        </after>
+        <actionGroup ref="AdminCreateCartPriceRuleActionsWithSubtotalActionGroup" before="goToProduct1" stepKey="createSubtotalCartPriceRuleActionsSection">
+            <argument name="ruleName" value="CartPriceRuleConditionForSubtotalForMultiShipping"/>
+         </actionGroup>
+        <actionGroup ref="DeleteCartPriceRuleByName" after="placeOrder" stepKey="deleteCreatedCartPriceRule">
+            <argument name="ruleName" value="{$getSubtotalRuleCreateSubtotalCartPriceRuleActionsSection}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/PluginTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/PluginTest.php
deleted file mode 100644
index a26f2661ebab1..0000000000000
--- a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/PluginTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\Multishipping\Test\Unit\Controller\Checkout;
-
-use Magento\Multishipping\Controller\Checkout\Plugin;
-
-class PluginTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $cartMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $quoteMock;
-
-    /**
-     * @var Plugin
-     */
-    protected $object;
-
-    protected function setUp()
-    {
-        $this->cartMock = $this->createMock(\Magento\Checkout\Model\Cart::class);
-        $this->quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
-            ['__wakeUp', 'setIsMultiShipping', 'getIsMultiShipping']
-        );
-        $this->cartMock->expects($this->once())->method('getQuote')->will($this->returnValue($this->quoteMock));
-        $this->object = new \Magento\Multishipping\Controller\Checkout\Plugin($this->cartMock);
-    }
-
-    public function testExecuteTurnsOffMultishippingModeOnMultishippingQuote(): void
-    {
-        $subject = $this->createMock(\Magento\Checkout\Controller\Index\Index::class);
-        $this->quoteMock->expects($this->once())->method('getIsMultiShipping')->willReturn(1);
-        $this->quoteMock->expects($this->once())->method('setIsMultiShipping')->with(0);
-        $this->cartMock->expects($this->once())->method('saveQuote');
-        $this->object->beforeExecute($subject);
-    }
-
-    public function testExecuteTurnsOffMultishippingModeOnNotMultishippingQuote(): void
-    {
-        $subject = $this->createMock(\Magento\Checkout\Controller\Index\Index::class);
-        $this->quoteMock->expects($this->once())->method('getIsMultiShipping')->willReturn(0);
-        $this->quoteMock->expects($this->never())->method('setIsMultiShipping');
-        $this->cartMock->expects($this->never())->method('saveQuote');
-        $this->object->beforeExecute($subject);
-    }
-}
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 02bc966873774..fba3245bec68d 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
@@ -11,6 +11,7 @@
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\AddressSearchResultsInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Directory\Model\Currency;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderDefault;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderFactory;
 use Magento\Quote\Model\Quote\Address;
@@ -44,6 +45,7 @@
 use Magento\Quote\Model\ShippingAssignment;
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 use Magento\Sales\Model\OrderFactory;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit_Framework_MockObject_MockObject;
 use \PHPUnit\Framework\TestCase;
@@ -418,13 +420,16 @@ public function testSetShippingMethods()
         $methodsArray = [1 => 'flatrate_flatrate', 2 => 'tablerate_bestway'];
         $addressId = 1;
         $addressMock = $this->getMockBuilder(QuoteAddress::class)
-            ->setMethods(['getId', 'setShippingMethod'])
+            ->setMethods(['getId', 'setShippingMethod', 'setCollectShippingRates'])
             ->disableOriginalConstructor()
             ->getMock();
 
         $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]);
+        $addressMock->expects($this->once())
+            ->method('setCollectShippingRates')
+            ->with(true);
         $this->quoteMock->expects($this->once())
             ->method('__call')
             ->with('setTotalsCollectedFlag', [false])
@@ -453,7 +458,8 @@ public function testCreateOrders(): void
         ];
         $quoteItemId = 1;
         $paymentProviderCode = 'checkmo';
-
+        $shippingPrice = '0.00';
+        $currencyCode = 'USD';
         $simpleProductTypeMock = $this->getMockBuilder(\Magento\Catalog\Model\Product\Type\Simple::class)
             ->disableOriginalConstructor()
             ->setMethods(['getOrderOptions'])
@@ -467,6 +473,17 @@ public function testCreateOrders(): void
             $this->getQuoteAddressesMock($quoteAddressItemMock, $addressTotal);
         $this->setQuoteMockData($paymentProviderCode, $shippingAddressMock, $billingAddressMock);
 
+        $currencyMock = $this->getMockBuilder(Currency::class)
+            ->disableOriginalConstructor()
+            ->setMethods([ 'convert' ])
+            ->getMock();
+        $currencyMock->method('convert')->willReturn($shippingPrice);
+        $storeMock = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBaseCurrency','getCurrentCurrencyCode' ])
+            ->getMock();
+        $storeMock->method('getBaseCurrency')->willReturn($currencyMock);
+        $storeMock->method('getCurrentCurrencyCode')->willReturn($currencyCode);
         $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)
@@ -476,6 +493,9 @@ public function testCreateOrders(): void
         $orderItemMock->method('getQuoteItemId')->willReturn($quoteItemId);
         $orderMock = $this->getOrderMock($orderAddressMock, $orderPaymentMock, $orderItemMock);
 
+        $orderMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $orderMock->expects($this->once())->method('setBaseShippingAmount')->with($shippingPrice)->willReturnSelf();
+        $orderMock->expects($this->once())->method('setShippingAmount')->with($shippingPrice)->willReturnSelf();
         $this->orderFactoryMock->expects($this->once())->method('create')->willReturn($orderMock);
         $this->dataObjectHelperMock->expects($this->once())->method('mergeDataObjects')
             ->with(
@@ -608,12 +628,18 @@ private function getQuoteAddressesMock($quoteAddressItemMock, int $addressTotal)
             )->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);
 
+        $shippingRateMock = $this->getMockBuilder(Address\Rate::class)
+            ->disableOriginalConstructor()
+            ->setMethods([ 'getPrice' ])
+            ->getMock();
+        $shippingRateMock->method('getPrice')->willReturn('0.00');
+        $shippingAddressMock->method('getShippingRateByCode')->willReturn($shippingRateMock);
+
         $billingAddressMock = $this->getMockBuilder(Address::class)
             ->disableOriginalConstructor()
             ->setMethods(['validate'])
@@ -673,6 +699,9 @@ private function getOrderMock(
                     'getCanSendNewEmailFlag',
                     'getItems',
                     'setShippingMethod',
+                    'getStore',
+                    'setShippingAmount',
+                    'setBaseShippingAmount'
                 ]
             )->getMock();
         $orderMock->method('setQuote')->with($this->quoteMock);
diff --git a/app/code/Magento/Multishipping/Test/Unit/Plugin/DisableMultishippingModeTest.php b/app/code/Magento/Multishipping/Test/Unit/Plugin/DisableMultishippingModeTest.php
new file mode 100644
index 0000000000000..02ae1a70ce801
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Unit/Plugin/DisableMultishippingModeTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Test\Unit\Plugin;
+
+use Magento\Checkout\Controller\Index\Index;
+use Magento\Checkout\Model\Cart;
+use Magento\Multishipping\Plugin\DisableMultishippingMode;
+use Magento\Quote\Api\Data\CartExtensionInterface;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Class DisableMultishippingModeTest
+ */
+class DisableMultishippingModeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cartMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $quoteMock;
+
+    /**
+     * @var DisableMultishippingMode
+     */
+    private $object;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->cartMock = $this->createMock(Cart::class);
+        $this->quoteMock = $this->createPartialMock(
+            Quote::class,
+            ['__wakeUp', 'setIsMultiShipping', 'getIsMultiShipping', 'getExtensionAttributes']
+        );
+        $this->cartMock->expects($this->once())
+            ->method('getQuote')
+            ->will($this->returnValue($this->quoteMock));
+        $this->object = new DisableMultishippingMode($this->cartMock);
+    }
+
+    /**
+     * Tests turn off multishipping on multishipping quote.
+     *
+     * @return void
+     */
+    public function testExecuteTurnsOffMultishippingModeOnMultishippingQuote(): void
+    {
+        $subject = $this->createMock(Index::class);
+        $extensionAttributes = $this->createPartialMock(
+            CartExtensionInterface::class,
+            ['setShippingAssignments', 'getShippingAssignments']
+        );
+        $extensionAttributes->method('getShippingAssignments')
+            ->willReturn(
+                $this->createMock(ShippingAssignmentInterface::class)
+            );
+        $extensionAttributes->expects($this->once())
+            ->method('setShippingAssignments')
+            ->with([]);
+        $this->quoteMock->method('getExtensionAttributes')
+            ->willReturn($extensionAttributes);
+        $this->quoteMock->expects($this->once())
+            ->method('getIsMultiShipping')->willReturn(1);
+        $this->quoteMock->expects($this->once())
+            ->method('setIsMultiShipping')
+            ->with(0);
+        $this->cartMock->expects($this->once())
+            ->method('saveQuote');
+
+        $this->object->beforeExecute($subject);
+    }
+
+    /**
+     * Tests turn off multishipping on non-multishipping quote.
+     *
+     * @return void
+     */
+    public function testExecuteTurnsOffMultishippingModeOnNotMultishippingQuote(): void
+    {
+        $subject = $this->createMock(Index::class);
+        $this->quoteMock->expects($this->once())->method('getIsMultiShipping')->willReturn(0);
+        $this->quoteMock->expects($this->never())->method('setIsMultiShipping');
+        $this->cartMock->expects($this->never())->method('saveQuote');
+        $this->object->beforeExecute($subject);
+    }
+}
diff --git a/app/code/Magento/Multishipping/etc/di.xml b/app/code/Magento/Multishipping/etc/di.xml
index 3bccf0b74bcd8..ad0d341d6b2e9 100644
--- a/app/code/Magento/Multishipping/etc/di.xml
+++ b/app/code/Magento/Multishipping/etc/di.xml
@@ -9,4 +9,7 @@
     <type name="Magento\Quote\Model\Cart\CartTotalRepository">
         <plugin name="multishipping_shipping_addresses" type="Magento\Multishipping\Model\Cart\CartTotalRepositoryPlugin" />
     </type>
+    <type name="Magento\Quote\Model\QuoteRepository">
+        <plugin name="multishipping_quote_repository" type="Magento\Multishipping\Plugin\MultishippingQuoteRepository" />
+    </type>
 </config>
diff --git a/app/code/Magento/Multishipping/etc/frontend/di.xml b/app/code/Magento/Multishipping/etc/frontend/di.xml
index 0c2daaf45043e..481b95280a4a4 100644
--- a/app/code/Magento/Multishipping/etc/frontend/di.xml
+++ b/app/code/Magento/Multishipping/etc/frontend/di.xml
@@ -31,13 +31,13 @@
         </arguments>
     </type>
     <type name="Magento\Checkout\Controller\Cart\Add">
-        <plugin name="multishipping_disabler" type="Magento\Multishipping\Controller\Checkout\Plugin" sortOrder="50" />
+        <plugin name="multishipping_disabler" type="Magento\Multishipping\Plugin\DisableMultishippingMode" sortOrder="50" />
     </type>
     <type name="Magento\Checkout\Controller\Cart\UpdatePost">
-        <plugin name="multishipping_disabler" type="Magento\Multishipping\Controller\Checkout\Plugin" sortOrder="50" />
+        <plugin name="multishipping_disabler" type="Magento\Multishipping\Plugin\DisableMultishippingMode" sortOrder="50" />
     </type>
     <type name="Magento\Checkout\Controller\Index\Index">
-        <plugin name="multishipping_disabler" type="Magento\Multishipping\Controller\Checkout\Plugin" sortOrder="50" />
+        <plugin name="multishipping_disabler" type="Magento\Multishipping\Plugin\DisableMultishippingMode" sortOrder="50" />
     </type>
     <type name="Magento\Checkout\Model\Cart">
         <plugin name="multishipping_session_mapper" type="Magento\Multishipping\Model\Checkout\Type\Multishipping\Plugin" sortOrder="50" />
@@ -45,4 +45,7 @@
     <type name="Magento\Checkout\Controller\Cart">
         <plugin name="multishipping_clear_addresses" type="Magento\Multishipping\Model\Cart\Controller\CartPlugin" sortOrder="50" />
     </type>
+    <type name="Magento\Quote\Model\Quote">
+        <plugin name="multishipping_reset_shipping_assigment" type="Magento\Multishipping\Plugin\ResetShippingAssigment"/>
+    </type>
 </config>
diff --git a/app/code/Magento/MysqlMq/Model/Driver/Bulk/Exchange.php b/app/code/Magento/MysqlMq/Model/Driver/Bulk/Exchange.php
index 247a44667be06..718fba0a1a1ad 100644
--- a/app/code/Magento/MysqlMq/Model/Driver/Bulk/Exchange.php
+++ b/app/code/Magento/MysqlMq/Model/Driver/Bulk/Exchange.php
@@ -3,10 +3,12 @@
  * 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\Framework\MessageQueue\Topology\ConfigInterface as MessageQueueConfig;
+use Magento\MysqlMq\Model\ConnectionTypeResolver;
 use Magento\MysqlMq\Model\QueueManagement;
 
 /**
@@ -14,6 +16,11 @@
  */
 class Exchange implements ExchangeInterface
 {
+    /**
+     * @var ConnectionTypeResolver
+     */
+    private $connectionTypeResolver;
+
     /**
      * @var MessageQueueConfig
      */
@@ -27,13 +34,18 @@ class Exchange implements ExchangeInterface
     /**
      * Initialize dependencies.
      *
+     * @param ConnectionTypeResolver $connectionTypeResolver
      * @param MessageQueueConfig $messageQueueConfig
      * @param QueueManagement $queueManagement
      */
-    public function __construct(MessageQueueConfig $messageQueueConfig, QueueManagement $queueManagement)
-    {
+    public function __construct(
+        ConnectionTypeResolver $connectionTypeResolver,
+        MessageQueueConfig $messageQueueConfig,
+        QueueManagement $queueManagement
+    ) {
         $this->messageQueueConfig = $messageQueueConfig;
         $this->queueManagement = $queueManagement;
+        $this->connectionTypeResolver = $connectionTypeResolver;
     }
 
     /**
@@ -41,7 +53,20 @@ public function __construct(MessageQueueConfig $messageQueueConfig, QueueManagem
      */
     public function enqueue($topic, array $envelopes)
     {
-        $queueNames = $this->messageQueueConfig->getQueuesByTopic($topic);
+        $queueNames = [];
+        $exchanges = $this->messageQueueConfig->getExchanges();
+        foreach ($exchanges as $exchange) {
+            $connection = $exchange->getConnection();
+            if ($this->connectionTypeResolver->getConnectionType($connection)) {
+                foreach ($exchange->getBindings() as $binding) {
+                    // This only supports exact matching of topics.
+                    if ($binding->getTopic() === $topic) {
+                        $queueNames[] = $binding->getDestination();
+                    }
+                }
+            }
+        }
+
         $messages = array_map(
             function ($envelope) {
                 return $envelope->getBody();
diff --git a/app/code/Magento/MysqlMq/Model/Driver/Exchange.php b/app/code/Magento/MysqlMq/Model/Driver/Exchange.php
index b6050c6b3d0b6..3e9b131fa8d1c 100644
--- a/app/code/Magento/MysqlMq/Model/Driver/Exchange.php
+++ b/app/code/Magento/MysqlMq/Model/Driver/Exchange.php
@@ -3,15 +3,25 @@
  * 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\Framework\MessageQueue\Topology\ConfigInterface as MessageQueueConfig;
+use Magento\MysqlMq\Model\ConnectionTypeResolver;
 use Magento\MysqlMq\Model\QueueManagement;
 
+/**
+ * Class Exchange
+ */
 class Exchange implements ExchangeInterface
 {
+    /**
+     * @var ConnectionTypeResolver
+     */
+    private $connectionTypeResolver;
+
     /**
      * @var MessageQueueConfig
      */
@@ -25,13 +35,18 @@ class Exchange implements ExchangeInterface
     /**
      * Initialize dependencies.
      *
+     * @param ConnectionTypeResolver $connectionTypeResolver
      * @param MessageQueueConfig $messageQueueConfig
      * @param QueueManagement $queueManagement
      */
-    public function __construct(MessageQueueConfig $messageQueueConfig, QueueManagement $queueManagement)
-    {
+    public function __construct(
+        ConnectionTypeResolver $connectionTypeResolver,
+        MessageQueueConfig $messageQueueConfig,
+        QueueManagement $queueManagement
+    ) {
         $this->messageQueueConfig = $messageQueueConfig;
         $this->queueManagement = $queueManagement;
+        $this->connectionTypeResolver = $connectionTypeResolver;
     }
 
     /**
@@ -43,7 +58,18 @@ public function __construct(MessageQueueConfig $messageQueueConfig, QueueManagem
      */
     public function enqueue($topic, EnvelopeInterface $envelope)
     {
-        $queueNames = $this->messageQueueConfig->getQueuesByTopic($topic);
+        $queueNames = [];
+        $exchanges = $this->messageQueueConfig->getExchanges();
+        foreach ($exchanges as $exchange) {
+            $connection = $exchange->getConnection();
+            if ($this->connectionTypeResolver->getConnectionType($connection)) {
+                foreach ($exchange->getBindings() as $binding) {
+                    if ($binding->getTopic() == $topic) {
+                        $queueNames[] = $binding->getDestination();
+                    }
+                }
+            }
+        }
         $this->queueManagement->addMessageToQueues($topic, $envelope->getBody(), $queueNames);
         return null;
     }
diff --git a/app/code/Magento/MysqlMq/Model/ResourceModel/Queue.php b/app/code/Magento/MysqlMq/Model/ResourceModel/Queue.php
index d50ed851b64a9..2a45eafc63f24 100644
--- a/app/code/Magento/MysqlMq/Model/ResourceModel/Queue.php
+++ b/app/code/Magento/MysqlMq/Model/ResourceModel/Queue.php
@@ -151,7 +151,7 @@ public function getMessages($queueName, $limit = null)
                 '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');
+            ->order(['queue_message_status.updated_at ASC', 'queue_message_status.id ASC']);
 
         if ($limit) {
             $select->limit($limit);
diff --git a/app/code/Magento/MysqlMq/Setup/Recurring.php b/app/code/Magento/MysqlMq/Setup/Recurring.php
index db3a39bf5fbd0..57f3931cee8d8 100644
--- a/app/code/Magento/MysqlMq/Setup/Recurring.php
+++ b/app/code/Magento/MysqlMq/Setup/Recurring.php
@@ -3,12 +3,13 @@
  * 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;
+use Magento\Framework\MessageQueue\Topology\ConfigInterface as MessageQueueConfig;
 
 /**
  * Class Recurring
@@ -29,17 +30,17 @@ public function __construct(MessageQueueConfig $messageQueueConfig)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
         $setup->startSetup();
 
-        $binds = $this->messageQueueConfig->getBinds();
         $queues = [];
-        foreach ($binds as $bind) {
-            $queues[] = $bind[MessageQueueConfig::BIND_QUEUE];
+        foreach ($this->messageQueueConfig->getQueues() as $queue) {
+            $queues[] = $queue->getName();
         }
+
         $connection = $setup->getConnection();
         $existingQueues = $connection->fetchCol($connection->select()->from($setup->getTable('queue'), 'name'));
         $queues = array_unique(array_diff($queues, $existingQueues));
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
index 452825058c9d8..2f4b1350568d1 100644
--- a/app/code/Magento/MysqlMq/Test/Unit/Model/Driver/Bulk/ExchangeTest.php
+++ b/app/code/Magento/MysqlMq/Test/Unit/Model/Driver/Bulk/ExchangeTest.php
@@ -25,6 +25,10 @@ class ExchangeTest extends \PHPUnit\Framework\TestCase
      * @var \Magento\MysqlMq\Model\Driver\Bulk\Exchange
      */
     private $exchange;
+    /**
+     * @var \Magento\MysqlMq\Model\ConnectionTypeResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connnectionTypeResolver;
 
     /**
      * Set up.
@@ -33,15 +37,20 @@ class ExchangeTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->messageQueueConfig = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConfigInterface::class)
+        $this->messageQueueConfig = $this->getMockBuilder(
+            \Magento\Framework\MessageQueue\Topology\ConfigInterface::class
+        )
             ->disableOriginalConstructor()->getMock();
         $this->queueManagement = $this->getMockBuilder(\Magento\MysqlMq\Model\QueueManagement::class)
             ->disableOriginalConstructor()->getMock();
+        $this->connnectionTypeResolver = $this->getMockBuilder(\Magento\MysqlMq\Model\ConnectionTypeResolver::class)
+            ->disableOriginalConstructor()->getMock();
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->exchange = $objectManager->getObject(
             \Magento\MysqlMq\Model\Driver\Bulk\Exchange::class,
             [
+                'connectionTypeResolver' => $this->connnectionTypeResolver,
                 'messageQueueConfig' => $this->messageQueueConfig,
                 'queueManagement' => $this->queueManagement,
             ]
@@ -56,10 +65,46 @@ protected function setUp()
     public function testEnqueue()
     {
         $topicName = 'topic.name';
-        $queueNames = ['queue0', 'queue1'];
+        $queueNames = ['queue0'];
+        $binding1 = $this->createMock(
+            \Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface::class
+        );
+        $binding1->expects($this->once())
+            ->method('getTopic')
+            ->willReturn($topicName);
+        $binding1->expects($this->once())
+            ->method('getDestination')
+            ->willReturn($queueNames[0]);
+        $binding2 = $this->createMock(
+            \Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItem\BindingInterface::class
+        );
+        $binding2->expects($this->once())
+            ->method('getTopic')
+            ->willReturn('different.topic');
+        $binding2->expects($this->never())
+            ->method('getDestination');
+        $exchange1 = $this->createMock(
+            \Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItemInterface::class
+        );
+        $exchange1->expects($this->once())
+            ->method('getConnection')
+            ->willReturn('db');
+        $exchange1->expects($this->once())
+            ->method('getBindings')
+            ->willReturn([$binding1, $binding2]);
+        $exchange2 = $this->createMock(
+            \Magento\Framework\MessageQueue\Topology\Config\ExchangeConfigItemInterface::class
+        );
+        $exchange2->expects($this->once())
+            ->method('getConnection')
+            ->willReturn('amqp');
+        $exchange2->expects($this->never())
+            ->method('getBindings');
+
+        $this->connnectionTypeResolver->method('getConnectionType')->willReturnOnConsecutiveCalls(['db', null]);
         $envelopeBody = 'serializedMessage';
         $this->messageQueueConfig->expects($this->once())
-            ->method('getQueuesByTopic')->with($topicName)->willReturn($queueNames);
+            ->method('getExchanges')->willReturn([$exchange1, $exchange2]);
         $envelope = $this->getMockBuilder(\Magento\Framework\MessageQueue\EnvelopeInterface::class)
             ->disableOriginalConstructor()->getMock();
         $envelope->expects($this->once())->method('getBody')->willReturn($envelopeBody);
diff --git a/app/code/Magento/MysqlMq/Test/Unit/Model/ResourceModel/QueueTest.php b/app/code/Magento/MysqlMq/Test/Unit/Model/ResourceModel/QueueTest.php
index d3fe09a712945..e3c6e6d9aee2a 100644
--- a/app/code/Magento/MysqlMq/Test/Unit/Model/ResourceModel/QueueTest.php
+++ b/app/code/Magento/MysqlMq/Test/Unit/Model/ResourceModel/QueueTest.php
@@ -206,7 +206,9 @@ public function testGetMessages()
             ]
         )->willReturnSelf();
         $select->expects($this->once())
-            ->method('order')->with('queue_message_status.updated_at ASC')->willReturnSelf();
+            ->method('order')
+            ->with(['queue_message_status.updated_at ASC', 'queue_message_status.id 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));
diff --git a/app/code/Magento/MysqlMq/Test/Unit/Setup/RecurringTest.php b/app/code/Magento/MysqlMq/Test/Unit/Setup/RecurringTest.php
index e2e7ad3c4c92d..ccbe41a4bd705 100644
--- a/app/code/Magento/MysqlMq/Test/Unit/Setup/RecurringTest.php
+++ b/app/code/Magento/MysqlMq/Test/Unit/Setup/RecurringTest.php
@@ -34,7 +34,9 @@ class RecurringTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
-        $this->messageQueueConfig = $this->getMockBuilder(\Magento\Framework\MessageQueue\ConfigInterface::class)
+        $this->messageQueueConfig = $this->getMockBuilder(
+            \Magento\Framework\MessageQueue\Topology\ConfigInterface::class
+        )
             ->getMockForAbstractClass();
         $this->model = $this->objectManager->getObject(
             \Magento\MysqlMq\Setup\Recurring::class,
@@ -49,23 +51,14 @@ protected function setUp()
      */
     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'
-            ]
-        ];
+        for ($i = 1; $i <= 3; $i++) {
+            $queue = $this->createMock(\Magento\Framework\MessageQueue\Topology\Config\QueueConfigItemInterface::class);
+            $queue->expects($this->once())
+                ->method('getName')
+                ->willReturn('queue_name_' . $i);
+            $queues[] = $queue;
+        }
+
         $dbQueues = [
             'queue_name_1',
             'queue_name_2',
@@ -81,7 +74,7 @@ public function testInstall()
             ->getMockForAbstractClass();
 
         $setup->expects($this->once())->method('startSetup')->willReturnSelf();
-        $this->messageQueueConfig->expects($this->once())->method('getBinds')->willReturn($binds);
+        $this->messageQueueConfig->expects($this->once())->method('getQueues')->willReturn($queues);
         $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
             ->getMockForAbstractClass();
         $setup->expects($this->once())->method('getConnection')->willReturn($connection);
diff --git a/app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php b/app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php
index bacdd3e4a81fe..99d3f4d406adc 100644
--- a/app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php
+++ b/app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php
@@ -7,6 +7,9 @@
 
 use \Magento\Framework\HTTP\ZendClient;
 
+/**
+ * Performs the request to make the deployment
+ */
 class Deployments
 {
     /**
@@ -88,7 +91,7 @@ public function setDeployment($description, $change = false, $user = false)
             return false;
         }
 
-        if (($response->getStatus() < 200 || $response->getStatus() > 210)) {
+        if ($response->getStatus() < 200 || $response->getStatus() > 210) {
             $this->logger->warning('Deployment marker request did not send a 200 status code.');
             return false;
         }
diff --git a/app/code/Magento/NewRelicReporting/Model/Module/Collect.php b/app/code/Magento/NewRelicReporting/Model/Module/Collect.php
index 0d8a94fbed940..fe5389e258aa5 100644
--- a/app/code/Magento/NewRelicReporting/Model/Module/Collect.php
+++ b/app/code/Magento/NewRelicReporting/Model/Module/Collect.php
@@ -6,7 +6,7 @@
 namespace Magento\NewRelicReporting\Model\Module;
 
 use Magento\Framework\Module\FullModuleList;
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\Framework\Module\ModuleListInterface;
 use Magento\NewRelicReporting\Model\Config;
 use Magento\NewRelicReporting\Model\Module;
@@ -22,7 +22,7 @@ class Collect
     protected $moduleList;
 
     /**
-     * @var ModuleManagerInterface
+     * @var Manager
      */
     protected $moduleManager;
 
@@ -46,14 +46,14 @@ class Collect
      *
      * @param ModuleListInterface $moduleList
      * @param FullModuleList $fullModuleList
-     * @param ModuleManagerInterface $moduleManager
+     * @param Manager $moduleManager
      * @param \Magento\NewRelicReporting\Model\ModuleFactory $moduleFactory
      * @param \Magento\NewRelicReporting\Model\ResourceModel\Module\CollectionFactory $moduleCollectionFactory
      */
     public function __construct(
         ModuleListInterface $moduleList,
         FullModuleList $fullModuleList,
-        ModuleManagerInterface $moduleManager,
+        Manager $moduleManager,
         \Magento\NewRelicReporting\Model\ModuleFactory $moduleFactory,
         \Magento\NewRelicReporting\Model\ResourceModel\Module\CollectionFactory $moduleCollectionFactory
     ) {
diff --git a/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AdminNavigateToNewRelicConfigurationActionGroup.xml b/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AdminNavigateToNewRelicConfigurationActionGroup.xml
new file mode 100644
index 0000000000000..9e8314792b0bd
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AdminNavigateToNewRelicConfigurationActionGroup.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="AdminNavigateToNewRelicConfigurationActionGroup">
+        <amOnPage url="{{AdminNewRelicConfigPage.url}}" stepKey="navigateToNewRelicConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AdminToggleNewRelicReportingEnabledActionGroup.xml b/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AdminToggleNewRelicReportingEnabledActionGroup.xml
new file mode 100644
index 0000000000000..602484189dda4
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AdminToggleNewRelicReportingEnabledActionGroup.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="AdminToggleNewRelicReportingEnabledActionGroup">
+        <arguments>
+            <argument name="state" type="string"/>
+        </arguments>
+        <selectOption selector="{{AdminNewRelicConfigSystemSection.status}}" userInput="{{state}}" stepKey="switchActiveState"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AdminUncheckNewRelicUseSystemValueActionGroup.xml b/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AdminUncheckNewRelicUseSystemValueActionGroup.xml
new file mode 100644
index 0000000000000..41f18f0f90d8d
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AdminUncheckNewRelicUseSystemValueActionGroup.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="AdminUncheckUseSystemValueActionGroup">
+        <arguments>
+            <argument name="rowId" type="string"/>
+        </arguments>
+
+        <uncheckOption selector="{{AdminConfigSection.useSystemValue(rowId)}}" stepKey="uncheckCheckbox"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AssertAdminNewRelicConfigFieldIsNotVisibleActionGroup.xml b/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AssertAdminNewRelicConfigFieldIsNotVisibleActionGroup.xml
new file mode 100644
index 0000000000000..1c347512c1737
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AssertAdminNewRelicConfigFieldIsNotVisibleActionGroup.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="AssertAdminNewRelicConfigFieldIsNotVisibleActionGroup">
+        <arguments>
+            <argument name="config" type="string"/>
+        </arguments>
+        <dontSeeElement selector="{{config}}" stepKey="dontSeeConfigField"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AssertAdminNewRelicConfigFieldIsVisibleActionGroup.xml b/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AssertAdminNewRelicConfigFieldIsVisibleActionGroup.xml
new file mode 100644
index 0000000000000..fd3b3e47719c0
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Test/Mftf/ActionGroup/AssertAdminNewRelicConfigFieldIsVisibleActionGroup.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="AssertAdminNewRelicConfigFieldIsVisibleActionGroup">
+        <arguments>
+            <argument name="config" type="string"/>
+        </arguments>
+        <seeElement selector="{{config}}" stepKey="seeConfigField"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/NewRelicReporting/Test/Mftf/Page/AdminNewRelicConfigPage.xml b/app/code/Magento/NewRelicReporting/Test/Mftf/Page/AdminNewRelicConfigPage.xml
new file mode 100644
index 0000000000000..fda7d0ef336b1
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Test/Mftf/Page/AdminNewRelicConfigPage.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="AdminNewRelicConfigPage" url="admin/system_config/edit/section/newrelicreporting/" area="admin" module="Magento_Config">
+        <section name="AdminNewRelicConfigSystemSection"/>
+    </page>
+</pages>
\ No newline at end of file
diff --git a/app/code/Magento/NewRelicReporting/Test/Mftf/Section/AdminNewRelicConfigSystemSection.xml b/app/code/Magento/NewRelicReporting/Test/Mftf/Section/AdminNewRelicConfigSystemSection.xml
new file mode 100644
index 0000000000000..5bf849cd0134e
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Test/Mftf/Section/AdminNewRelicConfigSystemSection.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="AdminNewRelicConfigSystemSection">
+        <element name="status" type="select" selector="#row_newrelicreporting_general_enable [data-ui-id='select-groups-general-fields-enable-value']"/>
+        <element name="apiUrl" type="input" selector="input#newrelicreporting_general_api_url"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/NewRelicReporting/Test/Mftf/Test/AdminCheckNewRelicSystemConfigDependencyTest.xml b/app/code/Magento/NewRelicReporting/Test/Mftf/Test/AdminCheckNewRelicSystemConfigDependencyTest.xml
new file mode 100644
index 0000000000000..c343f93de2c58
--- /dev/null
+++ b/app/code/Magento/NewRelicReporting/Test/Mftf/Test/AdminCheckNewRelicSystemConfigDependencyTest.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="AdminCheckNewRelicSystemConfigDependencyTest">
+        <annotations>
+            <features value="NewRelicReporting"/>
+            <stories value="Admin is able to see the configuration fields only after enabling the feature"/>
+            <title value="Admin can see the configuration fields only after enabling the feature"/>
+            <description value="The system configs should be available only after enabling the New Relic feature."/>
+            <severity value="MINOR"/>
+            <group value="NewRelicReporting"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminNavigateToNewRelicConfigurationActionGroup" stepKey="goToConfigPage"/>
+            <actionGroup ref="AdminExpandConfigSectionActionGroup" stepKey="expandingGeneralSection">
+                <argument name="sectionName" value="General"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <actionGroup ref="AssertAdminNewRelicConfigFieldIsNotVisibleActionGroup" stepKey="checkingIfApiUrlIsNotVisible">
+            <argument name="config" value="{{AdminNewRelicConfigSystemSection.apiUrl}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValue">
+            <argument name="rowId" value="row_newrelicreporting_general_enable"/>
+        </actionGroup>
+        <actionGroup ref="AdminToggleNewRelicReportingEnabledActionGroup" stepKey="enablingNewRelicReporting">
+            <argument name="state" value="Yes"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminNewRelicConfigFieldIsVisibleActionGroup" stepKey="checkingIfApiUrlIsVisible">
+            <argument name="config" value="{{AdminNewRelicConfigSystemSection.apiUrl}}"/>
+        </actionGroup>
+    </test>
+</tests>
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 3c30d95b77de0..4286406d6e9ab 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
@@ -8,6 +8,7 @@
 use Magento\NewRelicReporting\Model\Module\Collect;
 use Magento\Framework\Module\FullModuleList;
 use Magento\Framework\Module\ModuleListInterface;
+use Magento\Framework\Module\Manager;
 use Magento\NewRelicReporting\Model\Module;
 
 /**
diff --git a/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml b/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml
index 98f9c55adbdf0..60c52164021d9 100644
--- a/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml
+++ b/app/code/Magento/NewRelicReporting/etc/adminhtml/system.xml
@@ -19,37 +19,61 @@
                 </field>
                 <field id="api_url" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>New Relic API URL</label>
+                    <depends>
+                        <field id="enable">1</field>
+                    </depends>
                 </field>
                 <field id="insights_api_url" translate="label comment" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Insights API URL</label>
                     <comment>Use %s to replace the account ID in the URL</comment>
+                    <depends>
+                        <field id="enable">1</field>
+                    </depends>
                 </field>
                 <field id="account_id" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>New Relic Account ID</label>
                     <comment><![CDATA["Need a New Relic account? <a href="http://www.newrelic.com/magento" target="_blank">Click here to get one]]></comment>
+                    <depends>
+                        <field id="enable">1</field>
+                    </depends>
                 </field>
                 <field id="app_id" translate="label comment" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>New Relic Application ID</label>
                     <comment>This can commonly be found at the end of the URL when viewing the APM after "/applications/"</comment>
+                    <depends>
+                        <field id="enable">1</field>
+                    </depends>
                 </field>
                 <field id="api" translate="label comment" type="obscure" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>New Relic API Key</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <comment>This is located by navigating to Events -> Deployments from the New Relic APM website</comment>
+                    <depends>
+                        <field id="enable">1</field>
+                    </depends>
                 </field>
                 <field id="insights_insert_key" translate="label comment" type="obscure" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Insights API Key</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <comment>Generated under Insights in Manage data -> API Keys -> Insert Keys</comment>
+                    <depends>
+                        <field id="enable">1</field>
+                    </depends>
                 </field>
                 <field id="app_name" translate="label comment" type="text" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>New Relic Application Name</label>
                     <comment>This is located by navigating to Settings from the New Relic APM website</comment>
+                    <depends>
+                        <field id="enable">1</field>
+                    </depends>
                 </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>
+                    <depends>
+                        <field id="enable">1</field>
+                    </depends>
                 </field>
             </group>
             <group id="cron" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
index 9fd9f4335b5c5..c5ed6fb55c48b 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
@@ -6,12 +6,14 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Template;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Newsletter\Controller\Adminhtml\Template;
 
 /**
  * View a rendered template.
  */
-class Preview extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpGetActionInterface
+class Preview extends Template implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * Preview Newsletter template
@@ -25,7 +27,7 @@ public function execute()
         $data = $this->getRequest()->getParams();
         $isEmptyRequestData = empty($data) || !isset($data['id']);
         $isEmptyPreviewData = !$this->_getSession()->hasPreviewData() || empty($this->_getSession()->getPreviewData());
-        
+
         if ($isEmptyRequestData && $isEmptyPreviewData) {
             $this->_forward('noroute');
             return $this;
diff --git a/app/code/Magento/Newsletter/Controller/Manage/Save.php b/app/code/Magento/Newsletter/Controller/Manage/Save.php
index d7d511e2d1906..01012e39a992a 100644
--- a/app/code/Magento/Newsletter/Controller/Manage/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Manage/Save.php
@@ -12,6 +12,7 @@
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Newsletter\Model\Subscriber;
+use Magento\Newsletter\Model\SubscriptionManagerInterface;
 
 /**
  * Customers newsletter subscription save controller
@@ -34,9 +35,9 @@ class Save extends \Magento\Newsletter\Controller\Manage implements HttpPostActi
     protected $customerRepository;
 
     /**
-     * @var \Magento\Newsletter\Model\SubscriberFactory
+     * @var SubscriptionManagerInterface
      */
-    protected $subscriberFactory;
+    private $subscriptionManager;
 
     /**
      * Initialize dependencies.
@@ -46,7 +47,7 @@ class Save extends \Magento\Newsletter\Controller\Manage implements HttpPostActi
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param CustomerRepository $customerRepository
-     * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
+     * @param SubscriptionManagerInterface $subscriptionManager
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -54,13 +55,13 @@ public function __construct(
         \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         CustomerRepository $customerRepository,
-        \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
+        SubscriptionManagerInterface $subscriptionManager
     ) {
         $this->storeManager = $storeManager;
         $this->formKeyValidator = $formKeyValidator;
         $this->customerRepository = $customerRepository;
-        $this->subscriberFactory = $subscriberFactory;
         parent::__construct($context, $customerSession);
+        $this->subscriptionManager = $subscriptionManager;
     }
 
     /**
@@ -80,28 +81,24 @@ public function execute()
         } else {
             try {
                 $customer = $this->customerRepository->getById($customerId);
-                $storeId = $this->storeManager->getStore()->getId();
+                $storeId = (int)$this->storeManager->getStore()->getId();
                 $customer->setStoreId($storeId);
-                $isSubscribedState = $customer->getExtensionAttributes()
-                    ->getIsSubscribed();
-                $isSubscribedParam = (boolean)$this->getRequest()
-                    ->getParam('is_subscribed', false);
+                $isSubscribedState = $customer->getExtensionAttributes()->getIsSubscribed();
+                $isSubscribedParam = (boolean)$this->getRequest()->getParam('is_subscribed', false);
                 if ($isSubscribedParam !== $isSubscribedState) {
                     // No need to validate customer and customer address while saving subscription preferences
                     $this->setIgnoreValidationFlag($customer);
                     $this->customerRepository->save($customer);
                     if ($isSubscribedParam) {
-                        $subscribeModel = $this->subscriberFactory->create()
-                            ->subscribeCustomerById($customerId);
-                        $subscribeStatus = $subscribeModel->getStatus();
-                        if ($subscribeStatus == Subscriber::STATUS_SUBSCRIBED) {
+                        $subscribeModel = $this->subscriptionManager->subscribeCustomer((int)$customerId, $storeId);
+                        $subscribeStatus = (int)$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->subscriptionManager->unsubscribeCustomer((int)$customerId, $storeId);
                         $this->messageManager->addSuccess(__('We have removed your newsletter subscription.'));
                     }
                 } else {
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
index 7557f1610b4f4..ea52ae8aaa864 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
@@ -4,7 +4,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Newsletter\Controller\Subscriber;
 
 use Magento\Customer\Api\AccountManagementInterface as CustomerAccountManagement;
@@ -14,11 +13,14 @@
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\ResultFactory;
 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\Newsletter\Model\SubscriptionManagerInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Newsletter\Model\SubscriberFactory;
@@ -40,6 +42,11 @@ class NewAction extends SubscriberController implements HttpPostActionInterface
      */
     private $emailValidator;
 
+    /**
+     * @var SubscriptionManagerInterface
+     */
+    private $subscriptionManager;
+
     /**
      * Initialize dependencies.
      *
@@ -49,6 +56,7 @@ class NewAction extends SubscriberController implements HttpPostActionInterface
      * @param StoreManagerInterface $storeManager
      * @param CustomerUrl $customerUrl
      * @param CustomerAccountManagement $customerAccountManagement
+     * @param SubscriptionManagerInterface $subscriptionManager
      * @param EmailValidator $emailValidator
      */
     public function __construct(
@@ -58,9 +66,11 @@ public function __construct(
         StoreManagerInterface $storeManager,
         CustomerUrl $customerUrl,
         CustomerAccountManagement $customerAccountManagement,
+        SubscriptionManagerInterface $subscriptionManager,
         EmailValidator $emailValidator = null
     ) {
         $this->customerAccountManagement = $customerAccountManagement;
+        $this->subscriptionManager = $subscriptionManager;
         $this->emailValidator = $emailValidator ?: ObjectManager::getInstance()->get(EmailValidator::class);
         parent::__construct(
             $context,
@@ -132,7 +142,7 @@ protected function validateEmailFormat($email)
     /**
      * New subscription action
      *
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @return Redirect
      */
     public function execute()
     {
@@ -144,29 +154,55 @@ public function execute()
                 $this->validateGuestSubscription();
                 $this->validateEmailAvailable($email);
 
-                $subscriber = $this->_subscriberFactory->create()->loadByEmail($email);
+                $websiteId = (int)$this->_storeManager->getStore()->getWebsiteId();
+                /** @var Subscriber $subscriber */
+                $subscriber = $this->_subscriberFactory->create()->loadBySubscriberEmail($email, $websiteId);
                 if ($subscriber->getId()
-                    && (int) $subscriber->getSubscriberStatus() === Subscriber::STATUS_SUBSCRIBED
-                ) {
+                    && (int)$subscriber->getSubscriberStatus() === Subscriber::STATUS_SUBSCRIBED) {
                     throw new LocalizedException(
                         __('This email address is already subscribed.')
                     );
                 }
 
-                $status = (int) $this->_subscriberFactory->create()->subscribe($email);
-                $this->messageManager->addSuccessMessage($this->getSuccessMessage($status));
+                $storeId = (int)$this->_storeManager->getStore()->getId();
+                $currentCustomerId = $this->getSessionCustomerId($email);
+                $subscriber = $currentCustomerId
+                    ? $this->subscriptionManager->subscribeCustomer($currentCustomerId, $storeId)
+                    : $this->subscriptionManager->subscribe($email, $storeId);
+                $message = $this->getSuccessMessage((int)$subscriber->getSubscriberStatus());
+                $this->messageManager->addSuccessMessage($message);
             } catch (LocalizedException $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addExceptionMessage($e, __('Something went wrong with the subscription.'));
             }
         }
-        /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
-        $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
+        /** @var Redirect $redirect */
+        $redirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $redirectUrl = $this->_redirect->getRedirectUrl();
         return $redirect->setUrl($redirectUrl);
     }
 
+    /**
+     * Get customer id from session if he is owner of the email
+     *
+     * @param string $email
+     * @return int|null
+     */
+    private function getSessionCustomerId(string $email): ?int
+    {
+        if (!$this->_customerSession->isLoggedIn()) {
+            return null;
+        }
+
+        $customer = $this->_customerSession->getCustomerDataObject();
+        if ($customer->getEmail() !== $email) {
+            return null;
+        }
+
+        return (int)$this->_customerSession->getId();
+    }
+
     /**
      * Get success message
      *
diff --git a/app/code/Magento/Newsletter/Model/Observer.php b/app/code/Magento/Newsletter/Model/Observer.php
index d77371569601f..a6f8ffd461d08 100644
--- a/app/code/Magento/Newsletter/Model/Observer.php
+++ b/app/code/Magento/Newsletter/Model/Observer.php
@@ -3,8 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Newsletter\Model;
 
+use Magento\Newsletter\Model\ResourceModel\Queue\Collection;
+use Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory;
+
 /**
  * Newsletter module observer
  *
@@ -12,20 +18,35 @@
  */
 class Observer
 {
+    /**
+     * Number of queue
+     */
+    private const COUNT_OF_QUEUE = 3;
+
+    /**
+     * Number of subscriptions
+     */
+    private const COUNT_OF_SUBSCRIPTIONS = 20;
+
+    /**
+     * First page in collection
+     */
+    private const FIRST_PAGE = 1;
+
     /**
      * Queue collection factory
      *
-     * @var \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory
+     * @var CollectionFactory
      */
     protected $_queueCollectionFactory;
 
     /**
      * Construct
      *
-     * @param \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory $queueCollectionFactory
+     * @param CollectionFactory $queueCollectionFactory
      */
     public function __construct(
-        \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory $queueCollectionFactory
+        CollectionFactory $queueCollectionFactory
     ) {
         $this->_queueCollectionFactory = $queueCollectionFactory;
     }
@@ -37,13 +58,11 @@ public function __construct(
      */
     public function scheduledSend()
     {
-        $countOfQueue  = 3;
-        $countOfSubscriptions = 20;
-
-        /** @var \Magento\Newsletter\Model\ResourceModel\Queue\Collection $collection */
+        /** @var Collection $collection */
         $collection = $this->_queueCollectionFactory->create();
-        $collection->setPageSize($countOfQueue)->setCurPage(1)->addOnlyForSendingFilter()->load();
+        $collection->setPageSize(self::COUNT_OF_QUEUE)
+            ->setCurPage(self::FIRST_PAGE)->addOnlyForSendingFilter()->load();
 
-        $collection->walk('sendPerSubscriber', [$countOfSubscriptions]);
+        $collection->walk('sendPerSubscriber', [self::COUNT_OF_SUBSCRIPTIONS]);
     }
 }
diff --git a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
index 309bfadab41b3..60b279b659ca6 100644
--- a/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
+++ b/app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php
@@ -5,55 +5,92 @@
  */
 namespace Magento\Newsletter\Model\Plugin;
 
-use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Customer\Model\Config\Share;
 use Magento\Framework\Api\ExtensionAttributesFactory;
-use Magento\Newsletter\Model\ResourceModel\Subscriber;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Newsletter\Model\Subscriber;
+use Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory;
 use Magento\Customer\Api\Data\CustomerExtensionInterface;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Newsletter\Model\SubscriptionManagerInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * Newsletter Plugin for customer
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CustomerPlugin
 {
     /**
-     * Factory used for manipulating newsletter subscriptions
-     *
-     * @var SubscriberFactory
+     * @var ExtensionAttributesFactory
      */
-    private $subscriberFactory;
+    private $extensionFactory;
 
     /**
-     * @var ExtensionAttributesFactory
+     * @var CollectionFactory
      */
-    private $extensionFactory;
+    private $collectionFactory;
+
+    /**
+     * @var SubscriptionManagerInterface
+     */
+    private $subscriptionManager;
 
     /**
-     * @var Subscriber
+     * @var Share
      */
-    private $subscriberResource;
+    private $shareConfig;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
 
     /**
      * @var array
      */
-    private $customerSubscriptionStatus = [];
+    private $customerSubscriber = [];
+
+    /**
+     * @var SubscriberFactory
+     */
+    private $subscriberFactory;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
 
     /**
-     * Initialize dependencies.
-     *
      * @param SubscriberFactory $subscriberFactory
      * @param ExtensionAttributesFactory $extensionFactory
-     * @param Subscriber $subscriberResource
+     * @param CollectionFactory $collectionFactory
+     * @param SubscriptionManagerInterface $subscriptionManager
+     * @param Share $shareConfig
+     * @param StoreManagerInterface $storeManager
+     * @param LoggerInterface $logger
      */
     public function __construct(
         SubscriberFactory $subscriberFactory,
         ExtensionAttributesFactory $extensionFactory,
-        Subscriber $subscriberResource
+        CollectionFactory $collectionFactory,
+        SubscriptionManagerInterface $subscriptionManager,
+        Share $shareConfig,
+        StoreManagerInterface $storeManager,
+        LoggerInterface $logger
     ) {
         $this->subscriberFactory = $subscriberFactory;
         $this->extensionFactory = $extensionFactory;
-        $this->subscriberResource = $subscriberResource;
+        $this->collectionFactory = $collectionFactory;
+        $this->subscriptionManager = $subscriptionManager;
+        $this->shareConfig = $shareConfig;
+        $this->storeManager = $storeManager;
+        $this->logger = $logger;
     }
 
     /**
@@ -61,128 +98,231 @@ public function __construct(
      *
      * If we have extension attribute (is_subscribed) we need to subscribe that customer
      *
-     * @param CustomerRepository $subject
+     * @param CustomerRepositoryInterface $subject
      * @param CustomerInterface $result
      * @param CustomerInterface $customer
      * @return CustomerInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterSave(CustomerRepository $subject, CustomerInterface $result, CustomerInterface $customer)
-    {
-        $resultId = $result->getId();
-        /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
-        $subscriber = $this->subscriberFactory->create();
+    public function afterSave(
+        CustomerRepositoryInterface $subject,
+        CustomerInterface $result,
+        CustomerInterface $customer
+    ) {
+        $subscriber = $this->getSubscriber($result);
+        $subscribeStatus = $this->getIsSubscribedFromExtensionAttr($customer) ?? $subscriber->isSubscribed();
+        $needToUpdate = $this->isSubscriptionChanged($result, $subscriber, $subscribeStatus);
 
-        $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);
+        /**
+         * If subscriber is waiting to confirm customer registration
+         * and customer is already confirmed registration
+         * than need to subscribe customer
+         */
+        if ((int)$subscriber->getStatus() === Subscriber::STATUS_UNCONFIRMED && empty($result->getConfirmation())) {
+            $needToUpdate = true;
+            $subscribeStatus = true;
         }
+        if ($needToUpdate) {
+            $storeId = $this->getCurrentStoreId($result);
+            $subscriber = $subscribeStatus
+                ? $this->subscriptionManager->subscribeCustomer((int)$result->getId(), $storeId)
+                : $this->subscriptionManager->unsubscribeCustomer((int)$result->getId(), $storeId);
+            $this->customerSubscriber[(int)$result->getId()] = $subscriber;
+        }
+        $this->addIsSubscribedExtensionAttr($result, $subscriber->isSubscribed());
+
+        return $result;
+    }
 
+    /**
+     * Get subscription status from extension customer attribute
+     *
+     * @param CustomerInterface $customer
+     * @return bool|null
+     */
+    private function getIsSubscribedFromExtensionAttr(CustomerInterface $customer): ?bool
+    {
         $newExtensionAttributes = $customer->getExtensionAttributes();
-        if ($newExtensionAttributes
-            && $initialExtensionAttributes->getIsSubscribed() !== $newExtensionAttributes->getIsSubscribed()
-        ) {
-            if ($newExtensionAttributes->getIsSubscribed()) {
-                $subscriber->subscribeCustomerById($resultId);
-            } else {
-                $subscriber->unsubscribeCustomerById($resultId);
-            }
+        if ($newExtensionAttributes === null || $newExtensionAttributes->getIsSubscribed() === null) {
+            return null;
         }
 
-        $isSubscribed = $subscriber->isSubscribed();
-        $this->customerSubscriptionStatus[$resultId] = $isSubscribed;
-        $initialExtensionAttributes->setIsSubscribed($isSubscribed);
+        return (bool)$newExtensionAttributes->getIsSubscribed();
+    }
 
-        return $result;
+    /**
+     * Get is customer subscription changed
+     *
+     * @param CustomerInterface $customer
+     * @param Subscriber $subscriber
+     * @param bool $newStatus
+     * @return bool
+     */
+    private function isSubscriptionChanged(CustomerInterface $customer, Subscriber $subscriber, bool $newStatus): bool
+    {
+        if ($subscriber->isSubscribed() !== $newStatus) {
+            return true;
+        }
+
+        if (!$subscriber->getId()) {
+            return false;
+        }
+
+        /**
+         * If customer has changed email or subscriber was loaded by email
+         * than need to update customer subscription
+         */
+        return $customer->getEmail() !== $subscriber->getEmail() || (int)$subscriber->getCustomerId() === 0;
     }
 
     /**
      * Plugin around delete customer that updates any newsletter subscription that may have existed.
      *
-     * @param CustomerRepository $subject
+     * @param CustomerRepositoryInterface $subject
      * @param callable $deleteCustomerById Function we are wrapping around
      * @param int $customerId Input to the function
      * @return bool
      */
     public function aroundDeleteById(
-        CustomerRepository $subject,
+        CustomerRepositoryInterface $subject,
         callable $deleteCustomerById,
         $customerId
     ) {
         $customer = $subject->getById($customerId);
         $result = $deleteCustomerById($customerId);
-        /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
-        $subscriber = $this->subscriberFactory->create();
-        $subscriber->loadByEmail($customer->getEmail());
-        if ($subscriber->getId()) {
-            $subscriber->delete();
-        }
+        $this->deleteSubscriptionsAfterCustomerDelete($customer);
+
         return $result;
     }
 
     /**
      * Plugin after delete customer that updates any newsletter subscription that may have existed.
      *
-     * @param CustomerRepository $subject
+     * @param CustomerRepositoryInterface $subject
      * @param bool $result
      * @param CustomerInterface $customer
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterDelete(CustomerRepository $subject, $result, CustomerInterface $customer)
+    public function afterDelete(CustomerRepositoryInterface $subject, $result, CustomerInterface $customer)
     {
-        $subscriber = $this->subscriberFactory->create();
-        $subscriber->loadByEmail($customer->getEmail());
-        if ($subscriber->getId()) {
-            $subscriber->delete();
-        }
+        $this->deleteSubscriptionsAfterCustomerDelete($customer);
         return $result;
     }
 
     /**
      * Plugin after getById customer that obtains newsletter subscription status for given customer.
      *
-     * @param CustomerRepository $subject
+     * @param CustomerRepositoryInterface $subject
      * @param CustomerInterface $customer
      * @return CustomerInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterGetById(CustomerRepository $subject, CustomerInterface $customer)
+    public function afterGetById(CustomerRepositoryInterface $subject, CustomerInterface $customer)
     {
         $extensionAttributes = $customer->getExtensionAttributes();
+        if ($extensionAttributes === null || $extensionAttributes->getIsSubscribed() === null) {
+            $isSubscribed = $this->getSubscriber($customer)->isSubscribed();
+            $this->addIsSubscribedExtensionAttr($customer, $isSubscribed);
+        }
+
+        return $customer;
+    }
 
+    /**
+     * Set Is Subscribed extension attribute
+     *
+     * @param CustomerInterface $customer
+     * @param bool $isSubscribed
+     */
+    private function addIsSubscribedExtensionAttr(CustomerInterface $customer, bool $isSubscribed): void
+    {
+        $extensionAttributes = $customer->getExtensionAttributes();
         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);
+        $extensionAttributes->setIsSubscribed($isSubscribed);
+    }
+
+    /**
+     * Delete customer subscriptions
+     *
+     * @param CustomerInterface $customer
+     * @return void
+     */
+    private function deleteSubscriptionsAfterCustomerDelete(CustomerInterface $customer): void
+    {
+        $collection = $this->collectionFactory->create();
+        $collection->addFieldToFilter('subscriber_email', $customer->getEmail());
+        if ($this->shareConfig->isWebsiteScope()) {
+            try {
+                $storeIds = $this->storeManager->getWebsite($customer->getWebsiteId())->getStoreIds();
+                $collection->addFieldToFilter('store_id', ['in' => $storeIds]);
+            } catch (NoSuchEntityException $exception) {
+                $this->logger->error($exception);
+            }
+        }
+        /** @var Subscriber $subscriber */
+        foreach ($collection as $subscriber) {
+            $subscriber->delete();
         }
+    }
 
-        return $customer;
+    /**
+     * Get Subscriber model by customer
+     *
+     * @param CustomerInterface $customer
+     * @return Subscriber
+     */
+    private function getSubscriber(CustomerInterface $customer): Subscriber
+    {
+        $customerId = (int)$customer->getId();
+        if (isset($this->customerSubscriber[$customerId])) {
+            return $this->customerSubscriber[$customerId];
+        }
+
+        /** @var Subscriber $subscriber */
+        $subscriber = $this->subscriberFactory->create();
+        $websiteId = $this->getCurrentWebsiteId($customer);
+        $subscriber->loadByCustomer((int)$customer->getId(), $websiteId);
+        /**
+         * If subscriber was't found by customer id then try to find subscriber by customer email.
+         * It need when the customer is creating and he has already subscribed as guest by same email.
+         */
+        if (!$subscriber->getId()) {
+            $subscriber->loadBySubscriberEmail((string)$customer->getEmail(), $websiteId);
+        }
+        $this->customerSubscriber[$customerId] = $subscriber;
+
+        return $subscriber;
     }
 
     /**
-     * This method returns newsletters subscription status for given customer.
+     * Retrieve current website id
      *
      * @param CustomerInterface $customer
-     * @return bool
+     * @return int
+     */
+    private function getCurrentWebsiteId(CustomerInterface $customer): int
+    {
+        return (int)$this->storeManager->getStore($this->getCurrentStoreId($customer))->getWebsiteId();
+    }
+
+    /**
+     * Retrieve current store id
+     *
+     * @param CustomerInterface $customer
+     * @return int
      */
-    private function isSubscribed(CustomerInterface $customer)
+    private function getCurrentStoreId(CustomerInterface $customer): int
     {
-        $customerId = $customer->getId();
-        if (!isset($this->customerSubscriptionStatus[$customerId])) {
-            $subscriber = $this->subscriberResource->loadByCustomerData($customer);
-            $this->customerSubscriptionStatus[$customerId] = isset($subscriber['subscriber_status'])
-                && $subscriber['subscriber_status'] == 1;
+        $storeId = (int)$this->storeManager->getStore()->getId();
+        if ($storeId === Store::DEFAULT_STORE_ID) {
+            $storeId = (int)$customer->getStoreId();
         }
 
-        return $this->customerSubscriptionStatus[$customerId];
+        return $storeId;
     }
 }
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
index 52009dad6614b..33c539fbba84f 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
@@ -208,6 +208,31 @@ public function addSubscriberFilter($subscriberId)
         return $this;
     }
 
+    /**
+     * Set filter for queue by customer
+     *
+     * @param int $customerId
+     * @return $this
+     */
+    public function addCustomerFilter(int $customerId): Collection
+    {
+        $this->getSelect()
+            ->join(
+                ['link' => $this->getTable('newsletter_queue_link')],
+                'main_table.queue_id=link.queue_id',
+                ['letter_sent_at']
+            )->join(
+                ['subscriber' => $this->getTable('newsletter_subscriber')],
+                'link.subscriber_id=subscriber.subscriber_id',
+                ['subscriber_store_id' => 'subscriber.store_id']
+            )->where(
+                'subscriber.customer_id = ?',
+                $customerId
+            );
+
+        return $this;
+    }
+
     /**
      * Add filter by only ready for sending item
      *
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
index 8ca489d89c1df..6391219e23c7e 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
@@ -5,23 +5,30 @@
  */
 namespace Magento\Newsletter\Model\ResourceModel;
 
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Math\Random;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Newsletter\Model\Subscriber as SubscriberModel;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Newsletter subscriber resource model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
- *
+ * @author Magento Core Team <core@magentocommerce.com>
  * @api
  * @since 100.0.2
  */
-class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+class Subscriber extends AbstractDb
 {
     /**
      * DB connection
      *
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     * @var AdapterInterface
      */
     protected $connection;
 
@@ -42,12 +49,12 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     /**
      * Date
      *
-     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     * @var DateTime
      */
     protected $_date;
 
     /**
-     * @var \Magento\Framework\Math\Random
+     * @var Random
      */
     protected $mathRandom;
 
@@ -61,16 +68,16 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     /**
      * Construct
      *
-     * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
-     * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
-     * @param \Magento\Framework\Math\Random $mathRandom
+     * @param Context $context
+     * @param DateTime $date
+     * @param 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,
+        Context $context,
+        DateTime $date,
+        Random $mathRandom,
         $connectionName = null,
         StoreManagerInterface $storeManager = null
     ) {
@@ -104,65 +111,51 @@ public function setMessagesScope($scope)
     }
 
     /**
-     * Load subscriber from DB by email
+     * Load by subscriber email
      *
-     * @param string $subscriberEmail
+     * @param string $email
+     * @param int $websiteId
      * @return array
      */
-    public function loadByEmail($subscriberEmail)
+    public function loadBySubscriberEmail(string $email, int $websiteId): array
     {
-        $select = $this->connection->select()->from($this->getMainTable())->where('subscriber_email=:subscriber_email');
-
-        $result = $this->connection->fetchRow($select, ['subscriber_email' => $subscriberEmail]);
-
-        if (!$result) {
+        $storeIds = $this->storeManager->getWebsite($websiteId)->getStoreIds();
+        $select = $this->connection->select()
+            ->from($this->getMainTable())
+            ->where('subscriber_email = ?', $email)
+            ->where('store_id IN (?)', $storeIds)
+            ->limit(1);
+
+        $data = $this->connection->fetchRow($select);
+        if (!$data) {
             return [];
         }
 
-        return $result;
+        return $data;
     }
 
     /**
-     * Load subscriber by customer
+     * Load by customer id
      *
-     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
+     * @param int $customerId
+     * @param int $websiteId
      * @return array
      */
-    public function loadByCustomerData(\Magento\Customer\Api\Data\CustomerInterface $customer)
+    public function loadByCustomerId(int $customerId, int $websiteId): array
     {
-        $storeIds = $this->storeManager->getWebsite()->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);
-
-            if ($result) {
-                return $result;
-            }
-        }
-
-        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);
-
-            if ($result) {
-                return $result;
-            }
+        $storeIds = $this->storeManager->getWebsite($websiteId)->getStoreIds();
+        $select = $this->connection->select()
+            ->from($this->getMainTable())
+            ->where('customer_id = ?', $customerId)
+            ->where('store_id IN (?)', $storeIds)
+            ->limit(1);
+
+        $data = $this->connection->fetchRow($select);
+        if (!$data) {
+            return [];
         }
 
-        return [];
+        return $data;
     }
 
     /**
@@ -178,12 +171,12 @@ protected function _generateRandomCode()
     /**
      * Updates data when subscriber received
      *
-     * @param \Magento\Newsletter\Model\Subscriber $subscriber
+     * @param SubscriberModel $subscriber
      * @param \Magento\Newsletter\Model\Queue $queue
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
-    public function received(\Magento\Newsletter\Model\Subscriber $subscriber, \Magento\Newsletter\Model\Queue $queue)
+    public function received(SubscriberModel $subscriber, \Magento\Newsletter\Model\Queue $queue)
     {
         $this->connection->beginTransaction();
         try {
@@ -196,8 +189,41 @@ public function received(\Magento\Newsletter\Model\Subscriber $subscriber, \Mage
             $this->connection->commit();
         } catch (\Exception $e) {
             $this->connection->rollBack();
-            throw new \Magento\Framework\Exception\LocalizedException(__('We cannot mark as received subscriber.'));
+            throw new LocalizedException(__('We cannot mark as received subscriber.'));
         }
         return $this;
     }
+
+    /**
+     * Load subscriber from DB by email
+     *
+     * @param string $subscriberEmail
+     * @return array
+     * @deprecated The subscription should be loaded by website id
+     * @see loadBySubscriberEmail
+     */
+    public function loadByEmail($subscriberEmail)
+    {
+        $websiteId = (int)$this->storeManager->getWebsite()->getId();
+        return $this->loadBySubscriberEmail((string)$subscriberEmail, $websiteId);
+    }
+
+    /**
+     * Load subscriber by customer
+     *
+     * @param CustomerInterface $customer
+     * @return array
+     * @deprecated The subscription should be loaded by website id
+     * @see loadByCustomerId
+     */
+    public function loadByCustomerData(CustomerInterface $customer)
+    {
+        $websiteId = (int)$this->storeManager->getWebsite()->getId();
+        $data = $this->loadByCustomerId((int)$customer->getId(), $websiteId);
+        if (empty($data)) {
+            $data = $this->loadBySubscriberEmail((string)$customer->getEmail(), $websiteId);
+        }
+
+        return $data;
+    }
 }
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index c5eee5e3cf771..5c573f47aa0bf 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -9,9 +9,23 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Exception\MailException;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Framework\Math\Random;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\Translate\Inline\StateInterface;
+use Magento\Newsletter\Helper\Data;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Subscriber model
@@ -33,12 +47,11 @@
  *
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.CyclomaticComplexity)
  *
  * @api
  * @since 100.0.2
  */
-class Subscriber extends \Magento\Framework\Model\AbstractModel
+class Subscriber extends AbstractModel
 {
     const STATUS_SUBSCRIBED = 1;
     const STATUS_NOT_ACTIVE = 2;
@@ -80,14 +93,14 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
     /**
      * Newsletter data
      *
-     * @var \Magento\Newsletter\Helper\Data
+     * @var Data
      */
     protected $_newsletterData = null;
 
     /**
      * Core store config
      *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
     protected $_scopeConfig;
 
@@ -100,14 +113,14 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
 
     /**
      * Date
-     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     * @var DateTime
      */
     private $dateTime;
 
     /**
      * Store manager
      *
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -122,12 +135,12 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
     protected $customerAccountManagement;
 
     /**
-     * @var \Magento\Framework\Mail\Template\TransportBuilder
+     * @var TransportBuilder
      */
     protected $_transportBuilder;
 
     /**
-     * @var \Magento\Framework\Translate\Inline\StateInterface
+     * @var StateInterface
      */
     protected $inlineTranslation;
 
@@ -142,51 +155,56 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
     private $dataObjectHelper;
 
     /**
-     * Initialize dependencies.
-     *
-     * @param \Magento\Framework\Model\Context $context
-     * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Newsletter\Helper\Data $newsletterData
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @var SubscriptionManagerInterface
+     */
+    private $subscriptionManager;
+
+    /**
+     * @param Context $context
+     * @param Registry $registry
+     * @param Data $newsletterData
+     * @param ScopeConfigInterface $scopeConfig
+     * @param TransportBuilder $transportBuilder
+     * @param StoreManagerInterface $storeManager
      * @param \Magento\Customer\Model\Session $customerSession
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $customerAccountManagement
-     * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
+     * @param StateInterface $inlineTranslation
+     * @param AbstractResource|null $resource
+     * @param AbstractDb|null $resourceCollection
      * @param array $data
-     * @param \Magento\Framework\Stdlib\DateTime\DateTime|null $dateTime
+     * @param DateTime|null $dateTime
      * @param CustomerInterfaceFactory|null $customerFactory
      * @param DataObjectHelper|null $dataObjectHelper
+     * @param SubscriptionManagerInterface|null $subscriptionManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\Model\Context $context,
-        \Magento\Framework\Registry $registry,
-        \Magento\Newsletter\Helper\Data $newsletterData,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        Context $context,
+        Registry $registry,
+        Data $newsletterData,
+        ScopeConfigInterface $scopeConfig,
+        TransportBuilder $transportBuilder,
+        StoreManagerInterface $storeManager,
         \Magento\Customer\Model\Session $customerSession,
         CustomerRepositoryInterface $customerRepository,
         AccountManagementInterface $customerAccountManagement,
-        \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
-        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        StateInterface $inlineTranslation,
+        AbstractResource $resource = null,
+        AbstractDb $resourceCollection = null,
         array $data = [],
-        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime = null,
+        DateTime $dateTime = null,
         CustomerInterfaceFactory $customerFactory = null,
-        DataObjectHelper $dataObjectHelper = null
+        DataObjectHelper $dataObjectHelper = null,
+        SubscriptionManagerInterface $subscriptionManager = 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->dateTime = $dateTime ?: ObjectManager::getInstance()->get(
+            DateTime::class
         );
         $this->customerFactory = $customerFactory ?: ObjectManager::getInstance()
             ->get(CustomerInterfaceFactory::class);
@@ -195,6 +213,8 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->customerAccountManagement = $customerAccountManagement;
         $this->inlineTranslation = $inlineTranslation;
+        $this->subscriptionManager = $subscriptionManager ?: ObjectManager::getInstance()
+            ->get(SubscriptionManagerInterface::class);
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -205,7 +225,7 @@ public function __construct(
      */
     protected function _construct()
     {
-        $this->_init(\Magento\Newsletter\Model\ResourceModel\Subscriber::class);
+        $this->_init(ResourceModel\Subscriber::class);
     }
 
     /**
@@ -357,51 +377,38 @@ public function isSubscribed()
     }
 
     /**
-     * Load subscriber data from resource model by email
+     * Load by subscriber email
      *
-     * @param string $subscriberEmail
+     * @param string $email
+     * @param int $websiteId
      * @return $this
      */
-    public function loadByEmail($subscriberEmail)
+    public function loadBySubscriberEmail(string $email, int $websiteId): Subscriber
     {
-        $storeId = $this->_storeManager->getStore()->getId();
-        $customerData = ['store_id' => $storeId, 'email'=> $subscriberEmail];
+        /** @var ResourceModel\Subscriber $resource */
+        $resource = $this->getResource();
+        $data = $resource->loadBySubscriberEmail($email, $websiteId);
+        $this->addData($data);
+        $this->setOrigData();
 
-        /** @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;
     }
 
     /**
-     * Load subscriber info by customerId
+     * Load by customer id
      *
      * @param int $customerId
+     * @param int $websiteId
      * @return $this
      */
-    public function loadByCustomerId($customerId)
+    public function loadByCustomer(int $customerId, int $websiteId): Subscriber
     {
-        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()) {
-                $this->setCustomerId($customerData->getId());
-                $this->setSubscriberConfirmCode($this->randomSequence());
-                $this->save();
-            }
-            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-        } catch (NoSuchEntityException $e) {
-        }
+        /** @var ResourceModel\Subscriber $resource */
+        $resource = $this->getResource();
+        $data = $resource->loadByCustomerId($customerId, $websiteId);
+        $this->addData($data);
+        $this->setOrigData();
+
         return $this;
     }
 
@@ -418,95 +425,23 @@ public function randomSequence($length = 32)
         $char = array_merge(range('a', 'z'), range(0, 9));
         $charLen = count($char) - 1;
         for ($i = 0; $i < $length; $i++) {
-            $disc = \Magento\Framework\Math\Random::getRandomNumber(0, $charLen);
+            $disc = Random::getRandomNumber(0, $charLen);
             $par[$i] = $char[$disc];
             $id = $id . $char[$disc];
         }
         return $id;
     }
 
-    /**
-     * Subscribes by email
-     *
-     * @param string $email
-     * @throws \Exception
-     * @return int
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    public function subscribe($email)
-    {
-        $this->loadByEmail($email);
-
-        if ($this->getId() && $this->getStatus() == self::STATUS_SUBSCRIBED) {
-            return $this->getStatus();
-        }
-
-        if (!$this->getId()) {
-            $this->setSubscriberConfirmCode($this->randomSequence());
-        }
-
-        $isConfirmNeed = $this->_scopeConfig->getValue(
-            self::XML_PATH_CONFIRMATION_FLAG,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) == 1 ? true : false;
-
-        $isSubscribeOwnEmail = $this->_customerSession->isLoggedIn()
-            && $this->_customerSession->getCustomerDataObject()->getEmail() == $email;
-
-        if (!$this->getId() || $this->getStatus() == self::STATUS_UNSUBSCRIBED
-            || $this->getStatus() == self::STATUS_NOT_ACTIVE
-        ) {
-            if ($isConfirmNeed === true) {
-                $this->setStatus(self::STATUS_NOT_ACTIVE);
-            } else {
-                $this->setStatus(self::STATUS_SUBSCRIBED);
-            }
-            $this->setSubscriberEmail($email);
-        }
-
-        if ($isSubscribeOwnEmail) {
-            try {
-                $customer = $this->customerRepository->getById($this->_customerSession->getCustomerId());
-                $this->setStoreId($customer->getStoreId());
-                $this->setCustomerId($customer->getId());
-            } catch (NoSuchEntityException $e) {
-                $this->setStoreId($this->_storeManager->getStore()->getId());
-                $this->setCustomerId(0);
-            }
-        } else {
-            $this->setStoreId($this->_storeManager->getStore()->getId());
-            $this->setCustomerId(0);
-        }
-
-        $this->setStatusChanged(true);
-
-        try {
-            /* Save model before sending out email */
-            $this->save();
-            if ($isConfirmNeed === true) {
-                $this->sendConfirmationRequestEmail();
-            } else {
-                $this->sendConfirmationSuccessEmail();
-            }
-            return $this->getStatus();
-        } catch (\Exception $e) {
-            // phpcs:ignore Magento2.Exceptions.DirectThrow
-            throw new \Exception($e->getMessage());
-        }
-    }
-
     /**
      * Unsubscribes loaded subscription
      *
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @return $this
      */
     public function unsubscribe()
     {
         if ($this->hasCheckCode() && $this->getCode() != $this->getCheckCode()) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __('This is an invalid subscription confirmation code.')
             );
         }
@@ -518,149 +453,6 @@ public function unsubscribe()
         return $this;
     }
 
-    /**
-     * Subscribe the customer with the id provided
-     *
-     * @param int $customerId
-     * @return $this
-     */
-    public function subscribeCustomerById($customerId)
-    {
-        return $this->_updateCustomerSubscription($customerId, true);
-    }
-
-    /**
-     * Unsubscribe the customer with the id provided
-     *
-     * @param int $customerId
-     * @return $this
-     */
-    public function unsubscribeCustomerById($customerId)
-    {
-        return $this->_updateCustomerSubscription($customerId, false);
-    }
-
-    /**
-     * Update the subscription based on latest information of associated customer.
-     *
-     * @param int $customerId
-     * @return $this
-     */
-    public function updateSubscription($customerId)
-    {
-        $this->loadByCustomerId($customerId);
-        $this->_updateCustomerSubscription($customerId, $this->isSubscribed());
-        return $this;
-    }
-
-    /**
-     * Saving customer subscription status
-     *
-     * @param int $customerId
-     * @param bool $subscribe indicates whether the customer should be subscribed or unsubscribed
-     * @return $this
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    protected function _updateCustomerSubscription($customerId, $subscribe)
-    {
-        try {
-            $customerData = $this->customerRepository->getById($customerId);
-        } catch (NoSuchEntityException $e) {
-            return $this;
-        }
-
-        $this->loadByCustomerId($customerId);
-        if (!$subscribe && !$this->getId()) {
-            return $this;
-        }
-
-        if (!$this->getId()) {
-            $this->setSubscriberConfirmCode($this->randomSequence());
-        }
-
-        $sendInformationEmail = false;
-        $status = self::STATUS_SUBSCRIBED;
-        $isConfirmNeed = $this->_scopeConfig->getValue(
-            self::XML_PATH_CONFIRMATION_FLAG,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) == 1 ? true : false;
-        if ($subscribe) {
-            if (AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED
-                == $this->customerAccountManagement->getConfirmationStatus($customerId)
-            ) {
-                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) {
-                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;
-        }
-        /**
-         * If subscription status has been changed then send email to the customer
-         */
-        if ($status != self::STATUS_UNCONFIRMED && $status != $this->getStatus()) {
-            $sendInformationEmail = true;
-        }
-
-        if ($status != $this->getStatus()) {
-            $this->setStatusChanged(true);
-        }
-
-        $this->setStatus($status);
-
-        $storeId = $customerData->getStoreId();
-        if ((int)$customerData->getStoreId() === 0) {
-            $storeId = $this->_storeManager->getWebsite($customerData->getWebsiteId())->getDefaultStore()->getId();
-        }
-
-        if (!$this->getId()) {
-            $this->setStoreId($storeId)
-                ->setCustomerId($customerData->getId())
-                ->setEmail($customerData->getEmail());
-        } else {
-            $this->setStoreId($storeId)
-                ->setEmail($customerData->getEmail());
-        }
-
-        $this->save();
-        $sendSubscription = $sendInformationEmail;
-        if ($sendSubscription === null xor $sendSubscription && $this->isStatusChanged()) {
-            try {
-                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
-                $this->_logger->critical($e);
-            }
-        }
-        return $this;
-    }
-
     /**
      * Confirms subscriber newsletter
      *
@@ -684,10 +476,10 @@ public function confirm($code)
     /**
      * Mark receiving subscriber of queue newsletter
      *
-     * @param  \Magento\Newsletter\Model\Queue $queue
+     * @param Queue $queue
      * @return Subscriber
      */
-    public function received(\Magento\Newsletter\Model\Queue $queue)
+    public function received(Queue $queue)
     {
         $this->getResource()->received($this, $queue);
         return $this;
@@ -700,48 +492,13 @@ public function received(\Magento\Newsletter\Model\Queue $queue)
      */
     public function sendConfirmationRequestEmail()
     {
-        if ($this->getImportMode()) {
-            return $this;
-        }
-
-        if (!$this->_scopeConfig->getValue(
-            self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) || !$this->_scopeConfig->getValue(
-            self::XML_PATH_CONFIRM_EMAIL_IDENTITY,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        )
-        ) {
-            return $this;
-        }
-
-        $this->inlineTranslation->suspend();
-
-        $this->_transportBuilder->setTemplateIdentifier(
-            $this->_scopeConfig->getValue(
-                self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            )
-        )->setTemplateOptions(
-            [
-                'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
-                'store' => $this->_storeManager->getStore()->getId(),
-            ]
-        )->setTemplateVars(
-            ['subscriber' => $this, 'store' => $this->_storeManager->getStore()]
-        )->setFrom(
-            $this->_scopeConfig->getValue(
-                self::XML_PATH_CONFIRM_EMAIL_IDENTITY,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            )
-        )->addTo(
-            $this->getEmail(),
-            $this->getName()
-        );
-        $transport = $this->_transportBuilder->getTransport();
-        $transport->sendMessage();
-
-        $this->inlineTranslation->resume();
+        $vars = [
+            'store' => $this->_storeManager->getStore($this->getStoreId()),
+            'subscriber_data' => [
+                'confirmation_link' => $this->getConfirmationLink(),
+            ],
+        ];
+        $this->sendEmail(self::XML_PATH_CONFIRM_EMAIL_TEMPLATE, self::XML_PATH_CONFIRM_EMAIL_IDENTITY, $vars);
 
         return $this;
     }
@@ -753,48 +510,7 @@ public function sendConfirmationRequestEmail()
      */
     public function sendConfirmationSuccessEmail()
     {
-        if ($this->getImportMode()) {
-            return $this;
-        }
-
-        if (!$this->_scopeConfig->getValue(
-            self::XML_PATH_SUCCESS_EMAIL_TEMPLATE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) || !$this->_scopeConfig->getValue(
-            self::XML_PATH_SUCCESS_EMAIL_IDENTITY,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        )
-        ) {
-            return $this;
-        }
-
-        $this->inlineTranslation->suspend();
-
-        $this->_transportBuilder->setTemplateIdentifier(
-            $this->_scopeConfig->getValue(
-                self::XML_PATH_SUCCESS_EMAIL_TEMPLATE,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            )
-        )->setTemplateOptions(
-            [
-                'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
-                'store' => $this->_storeManager->getStore()->getId(),
-            ]
-        )->setTemplateVars(
-            ['subscriber' => $this]
-        )->setFrom(
-            $this->_scopeConfig->getValue(
-                self::XML_PATH_SUCCESS_EMAIL_IDENTITY,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            )
-        )->addTo(
-            $this->getEmail(),
-            $this->getName()
-        );
-        $transport = $this->_transportBuilder->getTransport();
-        $transport->sendMessage();
-
-        $this->inlineTranslation->resume();
+        $this->sendEmail(self::XML_PATH_SUCCESS_EMAIL_TEMPLATE, self::XML_PATH_SUCCESS_EMAIL_IDENTITY);
 
         return $this;
     }
@@ -805,40 +521,45 @@ public function sendConfirmationSuccessEmail()
      * @return $this
      */
     public function sendUnsubscriptionEmail()
+    {
+        $this->sendEmail(self::XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE, self::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY);
+
+        return $this;
+    }
+
+    /**
+     * Send email about change status
+     *
+     * @param string $emailTemplatePath
+     * @param string $emailIdentityPath
+     * @param array $templateVars
+     * @return void
+     */
+    private function sendEmail(string $emailTemplatePath, string $emailIdentityPath, array $templateVars = []): void
     {
         if ($this->getImportMode()) {
-            return $this;
+            return;
         }
-        if (!$this->_scopeConfig->getValue(
-            self::XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) || !$this->_scopeConfig->getValue(
-            self::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        )
-        ) {
-            return $this;
+
+        $template = $this->_scopeConfig->getValue($emailTemplatePath, ScopeInterface::SCOPE_STORE, $this->getStoreId());
+        $identity = $this->_scopeConfig->getValue($emailIdentityPath, ScopeInterface::SCOPE_STORE, $this->getStoreId());
+        if (!$template || !$identity) {
+            return;
         }
 
+        $templateVars += ['subscriber' => $this];
         $this->inlineTranslation->suspend();
-
         $this->_transportBuilder->setTemplateIdentifier(
-            $this->_scopeConfig->getValue(
-                self::XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            )
+            $template
         )->setTemplateOptions(
             [
-                'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
-                'store' => $this->_storeManager->getStore()->getId(),
+                'area' => Area::AREA_FRONTEND,
+                'store' => $this->getStoreId(),
             ]
         )->setTemplateVars(
-            ['subscriber' => $this]
+            $templateVars
         )->setFrom(
-            $this->_scopeConfig->getValue(
-                self::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            )
+            $identity
         )->addTo(
             $this->getEmail(),
             $this->getName()
@@ -847,8 +568,6 @@ public function sendUnsubscriptionEmail()
         $transport->sendMessage();
 
         $this->inlineTranslation->resume();
-
-        return $this;
     }
 
     /**
@@ -878,4 +597,125 @@ public function beforeSave()
         }
         return $this;
     }
+
+    /**
+     * Load subscriber data from resource model by email
+     *
+     * @param string $subscriberEmail
+     * @return $this
+     * @deprecated The subscription should be loaded by website id
+     * @see loadBySubscriberEmail
+     */
+    public function loadByEmail($subscriberEmail)
+    {
+        $websiteId = (int)$this->_storeManager->getStore()->getWebsiteId();
+        $this->loadBySubscriberEmail($subscriberEmail, $websiteId);
+
+        return $this;
+    }
+
+    /**
+     * Load subscriber info by customerId
+     *
+     * @param int $customerId
+     * @return $this
+     * @deprecated The subscription should be loaded by website id
+     * @see loadByCustomer
+     */
+    public function loadByCustomerId($customerId)
+    {
+        try {
+            $customer = $this->customerRepository->getById($customerId);
+            $websiteId = (int)$this->_storeManager->getStore()->getWebsiteId();
+            $this->loadByCustomer((int)$customerId, $websiteId);
+            if ($this->getId() && $customer->getId() && !$this->getCustomerId()) {
+                $this->setCustomerId($customer->getId());
+                $this->setSubscriberConfirmCode($this->randomSequence());
+                $this->save();
+            }
+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
+        } catch (NoSuchEntityException $e) {
+        }
+        return $this;
+    }
+
+    /**
+     * Subscribes by email
+     *
+     * @param string $email
+     * @return int
+     * @deprecated The subscription should be updated by store id
+     * @see \Magento\Newsletter\Model\SubscriptionManager::subscribe
+     */
+    public function subscribe($email)
+    {
+        $storeId = (int)$this->_storeManager->getStore()->getId();
+        $subscriber = $this->subscriptionManager->subscribe($email, $storeId);
+        $this->addData($subscriber->getData());
+
+        return $this->getStatus();
+    }
+
+    /**
+     * Subscribe the customer with the id provided
+     *
+     * @param int $customerId
+     * @return $this
+     * @deprecated The subscription should be updated by store id
+     * @see \Magento\Newsletter\Model\SubscriptionManager::subscribeCustomer
+     */
+    public function subscribeCustomerById($customerId)
+    {
+        return $this->_updateCustomerSubscription($customerId, true);
+    }
+
+    /**
+     * Unsubscribe the customer with the id provided
+     *
+     * @param int $customerId
+     * @return $this
+     * @deprecated The subscription should be updated by store id
+     * @see \Magento\Newsletter\Model\SubscriptionManager::unsubscribeCustomer
+     */
+    public function unsubscribeCustomerById($customerId)
+    {
+        return $this->_updateCustomerSubscription($customerId, false);
+    }
+
+    /**
+     * Update the subscription based on latest information of associated customer.
+     *
+     * @param int $customerId
+     * @return $this
+     * @deprecated The subscription should be updated by store id
+     * @see \Magento\Newsletter\Model\SubscriptionManager::subscribeCustomer
+     */
+    public function updateSubscription($customerId)
+    {
+        $this->loadByCustomerId($customerId);
+        $this->_updateCustomerSubscription($customerId, $this->isSubscribed());
+        return $this;
+    }
+
+    /**
+     * Saving customer subscription status
+     *
+     * @param int $customerId
+     * @param bool $subscribe indicates whether the customer should be subscribed or unsubscribed
+     * @return $this
+     * @deprecated The subscription should be updated by store id
+     * @see \Magento\Newsletter\Model\SubscriptionManager::subscribeCustomer
+     */
+    protected function _updateCustomerSubscription($customerId, $subscribe)
+    {
+        $storeId = (int)$this->_storeManager->getStore()->getId();
+        if ($subscribe) {
+            $subscriber = $this->subscriptionManager->subscribeCustomer((int)$customerId, $storeId);
+        } else {
+            $subscriber = $this->subscriptionManager->unsubscribeCustomer((int)$customerId, $storeId);
+        }
+        $this->addData($subscriber->getData());
+
+        return $this;
+    }
 }
diff --git a/app/code/Magento/Newsletter/Model/SubscriptionManager.php b/app/code/Magento/Newsletter/Model/SubscriptionManager.php
new file mode 100644
index 0000000000000..846d095625e0c
--- /dev/null
+++ b/app/code/Magento/Newsletter/Model/SubscriptionManager.php
@@ -0,0 +1,314 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Newsletter\Model;
+
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\MailException;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class to update newsletter subscription status
+ */
+class SubscriptionManager implements SubscriptionManagerInterface
+{
+    /**
+     * @var SubscriberFactory
+     */
+    private $subscriberFactory;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var AccountManagementInterface
+     */
+    private $customerAccountManagement;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @param SubscriberFactory $subscriberFactory
+     * @param LoggerInterface $logger
+     * @param StoreManagerInterface $storeManager
+     * @param ScopeConfigInterface $scopeConfig
+     * @param AccountManagementInterface $customerAccountManagement
+     * @param CustomerRepositoryInterface $customerRepository
+     */
+    public function __construct(
+        SubscriberFactory $subscriberFactory,
+        LoggerInterface $logger,
+        StoreManagerInterface $storeManager,
+        ScopeConfigInterface $scopeConfig,
+        AccountManagementInterface $customerAccountManagement,
+        CustomerRepositoryInterface $customerRepository
+    ) {
+        $this->subscriberFactory = $subscriberFactory;
+        $this->logger = $logger;
+        $this->storeManager = $storeManager;
+        $this->scopeConfig = $scopeConfig;
+        $this->customerAccountManagement = $customerAccountManagement;
+        $this->customerRepository = $customerRepository;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function subscribe(string $email, int $storeId): Subscriber
+    {
+        $websiteId = (int)$this->storeManager->getStore($storeId)->getWebsiteId();
+        $subscriber = $this->subscriberFactory->create()->loadBySubscriberEmail($email, $websiteId);
+        $currentStatus = (int)$subscriber->getStatus();
+        if ($currentStatus === Subscriber::STATUS_SUBSCRIBED) {
+            return $subscriber;
+        }
+
+        $status = $this->isConfirmNeed($storeId) ? Subscriber::STATUS_NOT_ACTIVE : Subscriber::STATUS_SUBSCRIBED;
+        if (!$subscriber->getId()) {
+            $subscriber->setSubscriberConfirmCode($subscriber->randomSequence());
+            $subscriber->setSubscriberEmail($email);
+        }
+        $subscriber->setStatus($status)
+            ->setStoreId($storeId)
+            ->save();
+
+        $this->sendEmailAfterChangeStatus($subscriber);
+
+        return $subscriber;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function unsubscribe(string $email, int $storeId, string $confirmCode): Subscriber
+    {
+        $websiteId = (int)$this->storeManager->getStore($storeId)->getWebsiteId();
+        /** @var Subscriber $subscriber */
+        $subscriber = $this->subscriberFactory->create()->loadBySubscriberEmail($email, $websiteId);
+        if (!$subscriber->getId()) {
+            return $subscriber;
+        }
+        $subscriber->setCheckCode($confirmCode);
+        $subscriber->unsubscribe();
+
+        return $subscriber;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function subscribeCustomer(int $customerId, int $storeId): Subscriber
+    {
+        return $this->updateCustomerSubscription($customerId, $storeId, true);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function unsubscribeCustomer(int $customerId, int $storeId): Subscriber
+    {
+        return $this->updateCustomerSubscription($customerId, $storeId, false);
+    }
+
+    /**
+     * Update customer newsletter subscription
+     *
+     * @param int $customerId
+     * @param int $storeId
+     * @param bool $status
+     * @return Subscriber
+     */
+    private function updateCustomerSubscription(int $customerId, int $storeId, bool $status): Subscriber
+    {
+        $customer = $this->customerRepository->getById($customerId);
+        $websiteId = (int)$this->storeManager->getStore($storeId)->getWebsiteId();
+        $subscriber = $this->loadSubscriberByCustomer($customer, $websiteId);
+        if (!$status && !$subscriber->getId()) {
+            return $subscriber;
+        }
+
+        $newStatus = $this->getNewSubscriptionStatus($subscriber, $customer, $storeId, $status);
+        $needToSendLetter = $this->saveSubscriber($subscriber, $customer, $storeId, $newStatus);
+        if ($needToSendLetter) {
+            $this->sendEmailAfterChangeStatus($subscriber);
+        }
+
+        return $subscriber;
+    }
+
+    /**
+     * Load subscriber model by customer
+     *
+     * @param CustomerInterface $customer
+     * @param int $websiteId
+     * @return Subscriber
+     */
+    private function loadSubscriberByCustomer(CustomerInterface $customer, int $websiteId): Subscriber
+    {
+        $subscriber = $this->subscriberFactory->create();
+        $subscriber->loadByCustomer((int)$customer->getId(), $websiteId);
+        if (!$subscriber->getId()) {
+            $subscriber->loadBySubscriberEmail((string)$customer->getEmail(), $websiteId);
+        }
+
+        return $subscriber;
+    }
+
+    /**
+     * Save Subscriber model
+     *
+     * @param Subscriber $subscriber
+     * @param CustomerInterface $customer
+     * @param int $storeId
+     * @param int $status
+     * @return bool Need to send email
+     */
+    private function saveSubscriber(
+        Subscriber $subscriber,
+        CustomerInterface $customer,
+        int $storeId,
+        int $status
+    ): bool {
+        $statusChanged = (int)$subscriber->getStatus() !== $status;
+        $emailChanged = $subscriber->getEmail() !== $customer->getEmail();
+        if ($subscriber->getId()
+            && !$statusChanged
+            && (int)$subscriber->getCustomerId() === (int)$customer->getId()
+            && (int)$subscriber->getStoreId() === $storeId
+            && !$emailChanged
+        ) {
+            return false;
+        }
+
+        if (!$subscriber->getId()) {
+            $subscriber->setSubscriberConfirmCode($subscriber->randomSequence());
+        }
+        $subscriber->setStatus($status)
+            ->setStatusChanged($statusChanged)
+            ->setCustomerId($customer->getId())
+            ->setStoreId($storeId)
+            ->setEmail($customer->getEmail())
+            ->save();
+
+        if ($statusChanged) {
+            return true;
+        }
+
+        /**
+         * If the subscriber is waiting to confirm from the customer
+         * and customer changed the email
+         * than need to send confirmation letter to the new email
+         */
+        return $status === Subscriber::STATUS_NOT_ACTIVE && $emailChanged;
+    }
+
+    /**
+     * Get new subscription status
+     *
+     * @param Subscriber $subscriber
+     * @param CustomerInterface $customer
+     * @param int $storeId
+     * @param bool $subscribe
+     * @return int
+     */
+    private function getNewSubscriptionStatus(
+        Subscriber $subscriber,
+        CustomerInterface $customer,
+        int $storeId,
+        bool $subscribe
+    ): int {
+        $currentStatus = (int)$subscriber->getStatus();
+        // If the current status is already as needed then return them
+        if (($subscribe && $currentStatus === Subscriber::STATUS_SUBSCRIBED)
+            || (!$subscribe && $currentStatus === Subscriber::STATUS_UNSUBSCRIBED)
+        ) {
+            return $currentStatus;
+        }
+
+        $status = $currentStatus;
+        if ($subscribe) {
+            $customerConfirmStatus = $this->customerAccountManagement->getConfirmationStatus($customer->getId());
+            if ($customerConfirmStatus === AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED) {
+                $status = Subscriber::STATUS_UNCONFIRMED;
+            } elseif ($this->isConfirmNeed($storeId)) {
+                $status = Subscriber::STATUS_NOT_ACTIVE;
+            } else {
+                $status = Subscriber::STATUS_SUBSCRIBED;
+            }
+        } elseif ($currentStatus === Subscriber::STATUS_SUBSCRIBED) {
+            $status = Subscriber::STATUS_UNSUBSCRIBED;
+        }
+
+        return $status;
+    }
+
+    /**
+     * Sends out email to customer after change subscription status
+     *
+     * @param Subscriber $subscriber
+     * @return void
+     */
+    private function sendEmailAfterChangeStatus(Subscriber $subscriber): void
+    {
+        $status = (int)$subscriber->getStatus();
+        if ($status === Subscriber::STATUS_UNCONFIRMED) {
+            return;
+        }
+
+        try {
+            switch ($status) {
+                case Subscriber::STATUS_UNSUBSCRIBED:
+                    $subscriber->sendUnsubscriptionEmail();
+                    break;
+                case Subscriber::STATUS_SUBSCRIBED:
+                    $subscriber->sendConfirmationSuccessEmail();
+                    break;
+                case Subscriber::STATUS_NOT_ACTIVE:
+                    $subscriber->sendConfirmationRequestEmail();
+                    break;
+            }
+        } catch (MailException $e) {
+            // If we are not able to send a new account email, this should be ignored
+            $this->logger->critical($e);
+        }
+    }
+
+    /**
+     * Is need to confirm subscription
+     *
+     * @param int $storeId
+     * @return bool
+     */
+    private function isConfirmNeed(int $storeId): bool
+    {
+        return (bool)$this->scopeConfig->isSetFlag(
+            Subscriber::XML_PATH_CONFIRMATION_FLAG,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+    }
+}
diff --git a/app/code/Magento/Newsletter/Model/SubscriptionManagerInterface.php b/app/code/Magento/Newsletter/Model/SubscriptionManagerInterface.php
new file mode 100644
index 0000000000000..8b92d825bdbcd
--- /dev/null
+++ b/app/code/Magento/Newsletter/Model/SubscriptionManagerInterface.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Newsletter\Model;
+
+/**
+ * Interface to update newsletter subscription status
+ */
+interface SubscriptionManagerInterface
+{
+    /**
+     * Subscribe to newsletters by email
+     *
+     * @param string $email
+     * @param int $storeId
+     * @return Subscriber
+     */
+    public function subscribe(string $email, int $storeId): Subscriber;
+
+    /**
+     * Unsubscribe from newsletters by email
+     *
+     * @param string $email
+     * @param int $storeId
+     * @param string $confirmCode
+     * @return Subscriber
+     */
+    public function unsubscribe(string $email, int $storeId, string $confirmCode): Subscriber;
+
+    /**
+     * Subscribe customer to newsletter
+     *
+     * @param int $customerId
+     * @param int $storeId
+     * @return Subscriber
+     */
+    public function subscribeCustomer(int $customerId, int $storeId): Subscriber;
+
+    /**
+     * Unsubscribe customer from newsletter
+     *
+     * @param int $customerId
+     * @param int $storeId
+     * @return Subscriber
+     */
+    public function unsubscribeCustomer(int $customerId, int $storeId): Subscriber;
+}
diff --git a/app/code/Magento/Newsletter/Model/Template.php b/app/code/Magento/Newsletter/Model/Template.php
index 4c71014826cf5..88fbfb152d14f 100644
--- a/app/code/Magento/Newsletter/Model/Template.php
+++ b/app/code/Magento/Newsletter/Model/Template.php
@@ -200,9 +200,16 @@ public function getProcessedTemplateSubject(array $variables)
     {
         $variables['this'] = $this;
 
-        return $this->getTemplateFilter()
-            ->setVariables($variables)
-            ->filter($this->getTemplateSubject());
+        $filter = $this->getTemplateFilter();
+        $filter->setVariables($variables);
+
+        $previousStrictMode = $filter->setStrictMode(
+            !$this->getData('is_legacy') && is_numeric($this->getTemplateId())
+        );
+        $result = $filter->filter($this->getTemplateSubject());
+        $filter->setStrictMode($previousStrictMode);
+
+        return $result;
     }
 
     /**
@@ -227,6 +234,8 @@ public function getTemplateText()
     }
 
     /**
+     * Return the filter factory
+     *
      * @return \Magento\Newsletter\Model\Template\FilterFactory
      */
     protected function getFilterFactory()
diff --git a/app/code/Magento/Newsletter/Setup/Patch/Data/FlagLegacyTemplates.php b/app/code/Magento/Newsletter/Setup/Patch/Data/FlagLegacyTemplates.php
new file mode 100644
index 0000000000000..13baf7f1dd5d4
--- /dev/null
+++ b/app/code/Magento/Newsletter/Setup/Patch/Data/FlagLegacyTemplates.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Newsletter\Setup\Patch\Data;
+
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+/**
+ * Flag all existing email templates overrides as legacy
+ */
+class FlagLegacyTemplates implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(ModuleDataSetupInterface $moduleDataSetup)
+    {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup
+            ->getConnection()
+            ->update($this->moduleDataSetup->getTable('newsletter_template'), ['is_legacy' => '1']);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/ObserverTest.php
new file mode 100644
index 0000000000000..7bf6d1e1c8671
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/ObserverTest.php
@@ -0,0 +1,63 @@
+<?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\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Newsletter\Model\Observer;
+use Magento\Newsletter\Model\ResourceModel\Queue\Collection;
+use Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory;
+use PHPUnit\Framework\TestCase;
+
+class ObserverTest extends TestCase
+{
+    /**
+     * @var Observer
+     */
+    private $model;
+
+    /**
+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $collectionFactoryMock;
+
+    /**
+     * Setup environment for test
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->collectionFactoryMock = $this->createPartialMock(
+            CollectionFactory::class,
+            ['create']
+        );
+
+        $this->model = $objectManager->getObject(
+            Observer::class,
+            [
+                'queueCollectionFactory' => $this->collectionFactoryMock
+            ]
+        );
+    }
+
+    /**
+     * Test scheduledSend() method
+     */
+    public function testScheduledSend()
+    {
+        $collectionMock = $this->createMock(Collection::class);
+        $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($collectionMock);
+        $collectionMock->expects($this->once())->method('setPageSize')->with(3)->willReturnSelf();
+        $collectionMock->expects($this->once())->method('setCurPage')->with(1)->willReturnSelf();
+        $collectionMock->expects($this->once())->method('addOnlyForSendingFilter')->willReturnSelf();
+        $collectionMock->expects($this->once())->method('load')->willReturnSelf();
+        $collectionMock->expects($this->once())->method('walk')->with('sendPerSubscriber', [20]);
+
+        $this->model->scheduledSend();
+    }
+}
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 e809b7e37a432..52b3df8cb8aa6 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/Plugin/CustomerPluginTest.php
@@ -5,149 +5,160 @@
  */
 namespace Magento\Newsletter\Test\Unit\Model\Plugin;
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Config\Share;
 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\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Newsletter\Model\Plugin\CustomerPlugin;
+use Magento\Newsletter\Model\ResourceModel\Subscriber\Collection;
+use Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory;
+use Magento\Newsletter\Model\Subscriber;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Newsletter\Model\SubscriptionManagerInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Website;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-class CustomerPluginTest extends \PHPUnit\Framework\TestCase
+/**
+ * Class to test Newsletter Plugin for customer
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CustomerPluginTest extends TestCase
 {
     /**
-     * @var \Magento\Newsletter\Model\Plugin\CustomerPlugin
+     * @var SubscriberFactory|MockObject
      */
-    private $plugin;
+    private $subscriberFactory;
 
     /**
-     * @var \Magento\Newsletter\Model\SubscriberFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ExtensionAttributesFactory|MockObject
      */
-    private $subscriberFactory;
+    private $extensionFactory;
 
     /**
-     * @var \Magento\Newsletter\Model\Subscriber|\PHPUnit_Framework_MockObject_MockObject
+     * @var CollectionFactory|MockObject
      */
-    private $subscriber;
+    private $collectionFactory;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var SubscriptionManagerInterface|MockObject
      */
-    private $objectManager;
+    private $subscriptionManager;
 
     /**
-     * @var ExtensionAttributesFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var Share|MockObject
      */
-    private $extensionFactoryMock;
+    private $shareConfig;
 
     /**
-     * @var CustomerExtensionInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StoreManagerInterface|MockObject
      */
-    private $customerExtensionMock;
+    private $storeManager;
 
     /**
-     * @var Subscriber|\PHPUnit_Framework_MockObject_MockObject
+     * @var ObjectManager
      */
-    private $subscriberResourceMock;
+    private $objectManager;
 
     /**
-     * @var CustomerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CustomerPlugin
      */
-    private $customerMock;
+    private $plugin;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->subscriberFactory = $this->getMockBuilder(\Magento\Newsletter\Model\SubscriberFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->subscriber = $this->getMockBuilder(\Magento\Newsletter\Model\Subscriber::class)
-            ->setMethods(
-                [
-                    'loadByEmail',
-                    'getId',
-                    'delete',
-                    'updateSubscription',
-                    'subscribeCustomerById',
-                    'unsubscribeCustomerById',
-                    'isSubscribed',
-                ]
-            )->disableOriginalConstructor()
-            ->getMock();
-        $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->subscriberFactory->expects($this->any())->method('create')->willReturn($this->subscriber);
-        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-
+        $this->subscriberFactory = $this->createMock(SubscriberFactory::class);
+        $this->extensionFactory = $this->createMock(ExtensionAttributesFactory::class);
+        $this->collectionFactory = $this->createMock(CollectionFactory::class);
+        $this->subscriptionManager = $this->createMock(SubscriptionManagerInterface::class);
+        $this->shareConfig = $this->createMock(Share::class);
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
+        $this->objectManager = new ObjectManager($this);
         $this->plugin = $this->objectManager->getObject(
-            \Magento\Newsletter\Model\Plugin\CustomerPlugin::class,
+            CustomerPlugin::class,
             [
                 'subscriberFactory' => $this->subscriberFactory,
-                'extensionFactory' => $this->extensionFactoryMock,
-                'subscriberResource' => $this->subscriberResourceMock,
+                'extensionFactory' => $this->extensionFactory,
+                'collectionFactory' => $this->collectionFactory,
+                'subscriptionManager' => $this->subscriptionManager,
+                'shareConfig' => $this->shareConfig,
+                'storeManager' => $this->storeManager,
             ]
         );
     }
 
     /**
-     * @param bool $subscriptionOriginalValue
-     * @param bool $subscriptionNewValue
+     * Test to update customer subscription after save customer
+     *
+     * @param int|null $originalStatus
+     * @param bool|null $newValue
+     * @param bool|null $expectedSubscribe
      * @dataProvider afterSaveDataProvider
-     * @return void
      */
-    public function testAfterSave($subscriptionOriginalValue, $subscriptionNewValue)
+    public function testAfterSave(?int $originalStatus, ?bool $newValue, ?bool $expectedSubscribe)
     {
-        $customerId = 1;
-        /** @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);
+        $storeId = 2;
+        $websiteId = 1;
+        $customerId = 3;
+        $customerEmail = 'email@example.com';
+
+        $store = $this->createMock(StoreInterface::class);
+        $store->method('getId')->willReturn($storeId);
+        $store->method('getWebsiteId')->willReturn($websiteId);
+        $this->storeManager->method('getStore')->willReturn($store);
 
-        /** @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)
+        $subscriber = $this->createMock(Subscriber::class);
+        $subscriber->method('getStatus')->willReturn($originalStatus);
+        $subscriber->method('getEmail')->willReturn($customerEmail);
+        $subscriber->method('isSubscribed')->willReturn($originalStatus === Subscriber::STATUS_SUBSCRIBED);
+        $subscriber->expects($this->once())
+            ->method('loadByCustomer')
+            ->with($customerId, $websiteId)
+            ->willReturnSelf();
+        $subscriber->expects($this->once())
+            ->method('loadBySubscriberEmail')
+            ->with($customerEmail, $websiteId)
             ->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);
+        $this->subscriberFactory->method('create')->willReturn($subscriber);
 
-        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);
+        $customerExtension = $this->createPartialMock(CustomerExtensionInterface::class, ['getIsSubscribed']);
+        $customerExtension->method('getIsSubscribed')->willReturn($newValue);
+        /** @var CustomerInterface|MockObject $customer */
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->method('getExtensionAttributes')->willReturn($customerExtension);
+
+        $resultIsSubscribed = $newValue ?? $originalStatus === Subscriber::STATUS_SUBSCRIBED;
+        if ($expectedSubscribe !== null) {
+            $resultSubscriber = $this->createMock(Subscriber::class);
+            $resultSubscriber->method('isSubscribed')->willReturn($resultIsSubscribed);
+            $this->subscriptionManager->expects($this->once())
+                ->method($expectedSubscribe ? 'subscribeCustomer' : 'unsubscribeCustomer')
+                ->with($customerId, $storeId)
+                ->willReturn($resultSubscriber);
+        } else {
+            $this->subscriptionManager->expects($this->never())->method('subscribeCustomer');
+            $this->subscriptionManager->expects($this->never())->method('unsubscribeCustomer');
         }
+        $resultExtension = $this->createPartialMock(CustomerExtensionInterface::class, ['setIsSubscribed']);
+        $resultExtension->expects($this->once())->method('setIsSubscribed')->with($resultIsSubscribed);
+        /** @var CustomerInterface|MockObject $result */
+        $result = $this->createMock(CustomerInterface::class);
+        $result->method('getId')->willReturn($customerId);
+        $result->method('getEmail')->willReturn($customerEmail);
+        $result->method('getExtensionAttributes')->willReturn($resultExtension);
 
-        $this->assertEquals($result, $this->plugin->afterSave($subject, $result, $this->customerMock));
+        /** @var CustomerRepository|MockObject $subject */
+        $subject = $this->createMock(CustomerRepositoryInterface::class);
+        $this->assertEquals($result, $this->plugin->afterSave($subject, $result, $customer));
     }
 
     /**
@@ -156,115 +167,135 @@ public function testAfterSave($subscriptionOriginalValue, $subscriptionNewValue)
     public function afterSaveDataProvider()
     {
         return [
-            [true, true],
-            [false, false],
-            [true, false],
-            [false, true],
+            [null, null, null],
+            [null, true, true],
+            [null, false, null],
+            [Subscriber::STATUS_SUBSCRIBED, null, null],
+            [Subscriber::STATUS_SUBSCRIBED, true, null],
+            [Subscriber::STATUS_SUBSCRIBED, false, false],
+            [Subscriber::STATUS_UNSUBSCRIBED, null, null],
+            [Subscriber::STATUS_UNSUBSCRIBED, true, true],
+            [Subscriber::STATUS_UNSUBSCRIBED, false, null],
+            [Subscriber::STATUS_UNCONFIRMED, null, true],
+            [Subscriber::STATUS_UNCONFIRMED, true, true],
+            [Subscriber::STATUS_UNCONFIRMED, false, true],
         ];
     }
 
+    /**
+     * Test to delete subscriptions after delete customer
+     */
     public function testAfterDelete()
     {
-        $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-        $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-        $customer->expects($this->once())->method('getEmail')->willReturn('test@test.com');
-        $this->subscriber->expects($this->once())->method('loadByEmail')->with('test@test.com')->willReturnSelf();
-        $this->subscriber->expects($this->once())->method('getId')->willReturn(1);
-        $this->subscriber->expects($this->once())->method('delete')->willReturnSelf();
+        $customerEmail = 'email@example.com';
+        $websiteId = 1;
+        $storeIds = [1, 2];
+
+        $subscriber = $this->createMock(Subscriber::class);
+        $subscriber->expects($this->once())->method('delete');
+        $collection = $this->createMock(Collection::class);
+        $collection->expects($this->once())
+            ->method('addFieldToFilter')
+            ->with('subscriber_email', $customerEmail)
+            ->willReturnSelf();
+        $collection->method('getIterator')->willReturn(new \ArrayIterator([$subscriber]));
+        $this->collectionFactory->expects($this->once())->method('create')->willReturn($collection);
+        $this->shareConfig->method('isWebsiteScope')->willReturn(false);
+        $website = $this->createMock(Website::class);
+        $website->method('getStoreIds')->willReturn($storeIds);
+        $this->storeManager->method('getWebsite')->with($websiteId)->willReturn($website);
 
-        $this->assertEquals(true, $this->plugin->afterDelete($subject, true, $customer));
+        /** @var CustomerRepositoryInterface|MockObject $subject */
+        $subject = $this->createMock(CustomerRepositoryInterface::class);
+        /** @var CustomerInterface|MockObject $customer */
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->method('getEmail')->willReturn($customerEmail);
+
+        $this->assertTrue($this->plugin->afterDelete($subject, true, $customer));
     }
 
+    /**
+     * Test to delete subscriptions after delete customer by id
+     */
     public function testAroundDeleteById()
     {
         $customerId = 1;
+        $customerEmail = 'test@test.com';
+        $websiteId = 1;
+        $storeIds = [1, 2];
         $deleteCustomerById = function () {
             return true;
         };
-        $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-        $customer = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-        $subject->expects($this->once())->method('getById')->willReturn($customer);
-        $customer->expects($this->once())->method('getEmail')->willReturn('test@test.com');
-        $this->subscriber->expects($this->once())->method('loadByEmail')->with('test@test.com')->willReturnSelf();
-        $this->subscriber->expects($this->once())->method('getId')->willReturn(1);
-        $this->subscriber->expects($this->once())->method('delete')->willReturnSelf();
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->expects($this->once())->method('getEmail')->willReturn($customerEmail);
+        /** @var CustomerRepositoryInterface|MockObject $subject */
+        $subject = $this->createMock(CustomerRepositoryInterface::class);
+        $subject->expects($this->once())->method('getById')->with($customerId)->willReturn($customer);
+
+        $subscriber = $this->createMock(Subscriber::class);
+        $subscriber->expects($this->once())->method('delete');
+        $collection = $this->createMock(Collection::class);
+        $collection->expects($this->once())
+            ->method('addFieldToFilter')
+            ->with('subscriber_email', $customerEmail)
+            ->willReturnSelf();
+        $collection->method('getIterator')->willReturn(new \ArrayIterator([$subscriber]));
+        $this->collectionFactory->expects($this->once())->method('create')->willReturn($collection);
+        $this->shareConfig->method('isWebsiteScope')->willReturn(false);
+        $website = $this->createMock(Website::class);
+        $website->method('getStoreIds')->willReturn($storeIds);
+        $this->storeManager->method('getWebsite')->with($websiteId)->willReturn($website);
 
-        $this->assertEquals(true, $this->plugin->aroundDeleteById($subject, $deleteCustomerById, $customerId));
+        $this->assertTrue($this->plugin->aroundDeleteById($subject, $deleteCustomerById, $customerId));
     }
 
     /**
-     * @param int|null $subscriberStatusKey
-     * @param int|null $subscriberStatusValue
-     * @param bool $isSubscribed
-     * @dataProvider afterGetByIdDataProvider
-     * @return void
+     * Test to load extension attribute after get by id
      */
-    public function testAfterGetByIdCreatesExtensionAttributesIfItIsNotSet(
-        $subscriberStatusKey,
-        $subscriberStatusValue,
-        $isSubscribed
-    ) {
-        $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-        $subscriber = [$subscriberStatusKey => $subscriberStatusValue];
+    public function testAfterGetByIdCreatesExtensionAttributes(): void
+    {
+        $storeId = 2;
+        $websiteId = 1;
+        $customerId = 3;
+        $customerEmail = 'email@example.com';
+        $subscribed = true;
 
-        $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);
+        $store = $this->createMock(StoreInterface::class);
+        $store->method('getId')->willReturn($storeId);
+        $store->method('getWebsiteId')->willReturn($websiteId);
+        $this->storeManager->method('getStore')->willReturn($store);
 
-        $this->assertEquals(
-            $this->customerMock,
-            $this->plugin->afterGetById($subject, $this->customerMock)
-        );
-    }
+        /** @var CustomerInterface|MockObject $customer */
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->method('getId')->willReturn($customerId);
+        $customer->method('getEmail')->willReturn($customerEmail);
 
-    public function testAfterGetByIdSetsIsSubscribedFlagIfItIsNotSet()
-    {
-        $subject = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-        $subscriber = ['subscriber_id' => 1, 'subscriber_status' => 1];
-
-        $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')
+        $subscriber = $this->createMock(Subscriber::class);
+        $subscriber->method('getEmail')->willReturn($customerEmail);
+        $subscriber->method('isSubscribed')->willReturn($subscribed);
+        $subscriber->expects($this->once())
+            ->method('loadByCustomer')
+            ->with($customerId, $websiteId)
+            ->willReturnSelf();
+        $subscriber->expects($this->once())
+            ->method('loadBySubscriberEmail')
+            ->with($customerEmail, $websiteId)
             ->willReturnSelf();
+        $this->subscriberFactory->method('create')->willReturn($subscriber);
 
-        $this->assertEquals(
-            $this->customerMock,
-            $this->plugin->afterGetById($subject, $this->customerMock)
+        $customerExtension = $this->createPartialMock(
+            CustomerExtensionInterface::class,
+            ['getIsSubscribed', 'setIsSubscribed']
         );
-    }
+        $customerExtension->expects($this->once())->method('setIsSubscribed')->with($subscribed);
+        $this->extensionFactory->expects($this->once())->method('create')->willReturn($customerExtension);
+        $customer->expects($this->once())->method('setExtensionAttributes')->with($customerExtension);
 
-    /**
-     * @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],
-        ];
+        /** @var CustomerRepositoryInterface|MockObject $subject */
+        $subject = $this->createMock(CustomerRepositoryInterface::class);
+        $this->assertEquals(
+            $customer,
+            $this->plugin->afterGetById($subject, $customer)
+        );
     }
 }
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
index 6ccbba9f8828b..c3814563aa46c 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php
@@ -5,118 +5,152 @@
  */
 namespace Magento\Newsletter\Test\Unit\Model;
 
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Model\Session;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Framework\Mail\TransportInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Translate\Inline\StateInterface;
+use Magento\Newsletter\Helper\Data;
+use Magento\Newsletter\Model\Queue;
 use Magento\Newsletter\Model\Subscriber;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
+ * Test Subscriber model functionality
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class SubscriberTest extends \PHPUnit\Framework\TestCase
+class SubscriberTest extends TestCase
 {
     /**
-     * @var \Magento\Newsletter\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var Data|MockObject
      */
-    protected $newsletterData;
+    private $newsletterData;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeConfigInterface|MockObject
      */
-    protected $scopeConfig;
+    private $scopeConfig;
 
     /**
-     * @var \Magento\Framework\Mail\Template\TransportBuilder|\PHPUnit_Framework_MockObject_MockObject
+     * @var TransportBuilder|MockObject
      */
-    protected $transportBuilder;
+    private $transportBuilder;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StoreManagerInterface|MockObject
      */
-    protected $storeManager;
+    private $storeManager;
 
     /**
-     * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject
+     * @var Session|MockObject
      */
-    protected $customerSession;
+    private $customerSession;
 
     /**
-     * @var \Magento\Customer\Api\CustomerRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CustomerRepositoryInterface|MockObject
      */
-    protected $customerRepository;
+    private $customerRepository;
 
     /**
-     * @var \Magento\Customer\Api\AccountManagementInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var AccountManagementInterface|MockObject
      */
-    protected $customerAccountManagement;
+    private $customerAccountManagement;
 
     /**
-     * @var \Magento\Framework\Translate\Inline\StateInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StateInterface|MockObject
      */
-    protected $inlineTranslation;
+    private $inlineTranslation;
 
     /**
-     * @var \Magento\Newsletter\Model\ResourceModel\Subscriber|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Newsletter\Model\ResourceModel\Subscriber|MockObject
      */
-    protected $resource;
+    private $resource;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
-    protected $objectManager;
+    private $objectManager;
 
     /**
-     * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
+     * @var DataObjectHelper|MockObject
      */
     private $dataObjectHelper;
 
     /**
-     * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CustomerInterfaceFactory|MockObject
      */
     private $customerFactory;
 
     /**
-     * @var \Magento\Newsletter\Model\Subscriber
+     * @var Subscriber
      */
-    protected $subscriber;
+    private $subscriber;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->newsletterData = $this->createMock(\Magento\Newsletter\Helper\Data::class);
-        $this->scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $this->transportBuilder = $this->createPartialMock(\Magento\Framework\Mail\Template\TransportBuilder::class, [
+        $this->newsletterData = $this->createMock(Data::class);
+        $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
+        $this->transportBuilder = $this->createPartialMock(
+            TransportBuilder::class,
+            [
                 'setTemplateIdentifier',
                 'setTemplateOptions',
                 'setTemplateVars',
                 'setFrom',
                 'addTo',
                 'getTransport'
-            ]);
-        $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
-        $this->customerSession = $this->createPartialMock(\Magento\Customer\Model\Session::class, [
+            ]
+        );
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
+        $this->customerSession = $this->createPartialMock(
+            Session::class,
+            [
                 'isLoggedIn',
                 'getCustomerDataObject',
                 'getCustomerId'
-            ]);
-        $this->customerRepository = $this->createMock(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-        $this->customerAccountManagement = $this->createMock(\Magento\Customer\Api\AccountManagementInterface::class);
-        $this->inlineTranslation = $this->createMock(\Magento\Framework\Translate\Inline\StateInterface::class);
-        $this->resource = $this->createPartialMock(\Magento\Newsletter\Model\ResourceModel\Subscriber::class, [
+            ]
+        );
+        $this->customerRepository = $this->createMock(CustomerRepositoryInterface::class);
+        $this->customerAccountManagement = $this->createMock(AccountManagementInterface::class);
+        $this->inlineTranslation = $this->createMock(StateInterface::class);
+        $this->resource = $this->createPartialMock(
+            \Magento\Newsletter\Model\ResourceModel\Subscriber::class,
+            [
                 'loadByEmail',
                 'getIdFieldName',
                 'save',
-                'loadByCustomerData',
-                'received'
-            ]);
-        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+                'loadByCustomer',
+                'received',
+                'loadBySubscriberEmail',
+                'loadByCustomerId',
+            ]
+        );
+        $this->objectManager = new ObjectManager($this);
 
-        $this->customerFactory = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterfaceFactory::class)
+        $this->customerFactory = $this->getMockBuilder(CustomerInterfaceFactory::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->dataObjectHelper = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
+        $this->dataObjectHelper = $this->getMockBuilder(DataObjectHelper::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->subscriber = $this->objectManager->getObject(
-            \Magento\Newsletter\Model\Subscriber::class,
+            Subscriber::class,
             [
                 'newsletterData' => $this->newsletterData,
                 'scopeConfig' => $this->scopeConfig,
@@ -128,250 +162,78 @@ protected function setUp()
                 'inlineTranslation' => $this->inlineTranslation,
                 'resource' => $this->resource,
                 'customerFactory' => $this->customerFactory,
-                'dataObjectHelper' => $this->dataObjectHelper
-            ]
-        );
-    }
-
-    public function testSubscribe()
-    {
-        $email = 'subscriber_email@magento.com';
-        $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' => Subscriber::STATUS_UNSUBSCRIBED,
-                'subscriber_email' => $email,
-                'name' => 'subscriber_name'
+                'dataObjectHelper' => $this->dataObjectHelper,
             ]
         );
-        $this->scopeConfig->expects($this->any())->method('getValue')->willReturn(true);
-        $this->customerSession->expects($this->any())->method('isLoggedIn')->willReturn(true);
-        $customerDataModel = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-        $this->customerSession->expects($this->any())->method('getCustomerDataObject')->willReturn($customerDataModel);
-        $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($storeId);
-        $customerDataModel->expects($this->any())->method('getId')->willReturn(1);
-        $this->sendEmailCheck();
-        $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
-
-        $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->subscriber->subscribe($email));
     }
 
-    public function testSubscribeNotLoggedIn()
+    /**
+     * Test to Load by subscriber email
+     *
+     * @return void
+     */
+    public function testLoadBySubscriberEmail(): void
     {
-        $email = 'subscriber_email@magento.com';
-        $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
+        $email = 'subscriber_email@example.com';
+        $websiteId = 1;
+        $subscriberData = ['some_filed' => 'value'];
+
+        $this->resource->expects($this->once())
+            ->method('loadBySubscriberEmail')
+            ->with($email, $websiteId)
+            ->willReturn($subscriberData);
+
+        $this->assertEquals(
+            $subscriberData,
+            $this->subscriber->loadBySubscriberEmail($email, $websiteId)->getData()
         );
-        $this->resource->expects($this->any())->method('loadByCustomerData')->with($customer)->willReturn(
-            [
-                'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
-                'subscriber_email' => $email,
-                'name' => 'subscriber_name'
-            ]
-        );
-        $this->scopeConfig->expects($this->any())->method('getValue')->willReturn(true);
-        $this->customerSession->expects($this->any())->method('isLoggedIn')->willReturn(false);
-        $customerDataModel = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
-        $this->customerSession->expects($this->any())->method('getCustomerDataObject')->willReturn($customerDataModel);
-        $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($storeId);
-        $customerDataModel->expects($this->any())->method('getId')->willReturn(1);
-        $this->sendEmailCheck();
-        $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
-
-        $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();
-        $this->customerRepository->expects($this->atLeastOnce())
-            ->method('getById')
-            ->with($customerId)->willReturn($customerDataMock);
-        $this->resource->expects($this->atLeastOnce())
-            ->method('loadByCustomerData')
-            ->with($customerDataMock)
-            ->willReturn(
-                [
-                    'subscriber_id' => 1,
-                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED
-                ]
-            );
-        $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
-        $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
-        $this->customerAccountManagement->expects($this->once())
-            ->method('getConfirmationStatus')
-            ->with($customerId)
-            ->willReturn('account_confirmation_required');
-        $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()
+    /**
+     * Test to Load by customer
+     *
+     * @return void
+     */
+    public function testLoadByCustomer(): void
     {
-        $storeId = 2;
         $customerId = 1;
-        $customerDataMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-            ->getMock();
-        $this->customerRepository->expects($this->atLeastOnce())
-            ->method('getById')
-            ->with($customerId)->willReturn($customerDataMock);
-        $this->resource->expects($this->atLeastOnce())
-            ->method('loadByCustomerData')
-            ->with($customerDataMock)
-            ->willReturn(
-                [
-                    'subscriber_id' => 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->exactly(2))->method('getStoreId')->willReturn($storeId);
-        $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
-        $this->sendEmailCheck();
+        $websiteId = 1;
+        $subscriberData = ['some_filed' => 'value'];
 
-        $this->subscriber->unsubscribeCustomerById($customerId);
-    }
-
-    public function testSubscribeCustomerById()
-    {
-        $storeId = 2;
-        $customerId = 1;
-        $customerDataMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-            ->getMock();
-        $this->customerRepository->expects($this->atLeastOnce())
-            ->method('getById')
-            ->with($customerId)->willReturn($customerDataMock);
-        $this->resource->expects($this->atLeastOnce())
-            ->method('loadByCustomerData')
-            ->with($customerDataMock)
-            ->willReturn(
-                [
-                    'subscriber_id' => 1,
-                    'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED
-                ]
-            );
-        $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
-        $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
-        $customerDataMock->expects($this->exactly(2))->method('getStoreId')->willReturn($storeId);
-        $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
-        $this->sendEmailCheck();
+        $this->resource->expects($this->once())
+            ->method('loadByCustomerId')
+            ->with($customerId, $websiteId)
+            ->willReturn($subscriberData);
 
-        $this->subscriber->subscribeCustomerById($customerId);
-    }
-
-    public function testSubscribeCustomerById1()
-    {
-        $storeId = 2;
-        $customerId = 1;
-        $customerDataMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-            ->getMock();
-        $this->customerRepository->expects($this->atLeastOnce())
-            ->method('getById')
-            ->with($customerId)->willReturn($customerDataMock);
-        $this->resource->expects($this->atLeastOnce())
-            ->method('loadByCustomerData')
-            ->with($customerDataMock)
-            ->willReturn(
-                [
-                    'subscriber_id' => 1,
-                    'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED
-                ]
-            );
-        $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
-        $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
-        $customerDataMock->expects($this->exactly(2))->method('getStoreId')->willReturn($storeId);
-        $customerDataMock->expects($this->once())->method('getEmail')->willReturn('email');
-        $this->sendEmailCheck();
-        $this->customerAccountManagement->expects($this->once())
-            ->method('getConfirmationStatus')
-            ->willReturn(\Magento\Customer\Api\AccountManagementInterface::ACCOUNT_CONFIRMATION_NOT_REQUIRED);
-        $this->scopeConfig->expects($this->atLeastOnce())->method('getValue')->with()->willReturn(true);
-
-        $this->subscriber->subscribeCustomerById($customerId);
-        $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();
-        $this->customerRepository->expects($this->atLeastOnce())
-            ->method('getById')
-            ->with($customerId)->willReturn($customerDataMock);
-        $this->resource->expects($this->atLeastOnce())
-            ->method('loadByCustomerData')
-            ->with($customerDataMock)
-            ->willReturn(
-                [
-                    'subscriber_id' => 1,
-                    'subscriber_status' => Subscriber::STATUS_UNCONFIRMED
-                ]
-            );
-        $customerDataMock->expects($this->atLeastOnce())->method('getId')->willReturn('id');
-        $this->resource->expects($this->atLeastOnce())->method('save')->willReturnSelf();
-        $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(Subscriber::STATUS_SUBSCRIBED, $this->subscriber->getStatus());
+        $this->assertEquals(
+            $subscriberData,
+            $this->subscriber->loadByCustomer($customerId, $websiteId)->getData()
+        );
     }
 
+    /**
+     * Test to unsubscribe customer from newsletters
+     */
     public function testUnsubscribe()
     {
         $this->resource->expects($this->once())->method('save')->willReturnSelf();
-        $this->sendEmailCheck();
+        $subscriberData = [
+            'store_id' => 2,
+            'email' => 'subscriber_email@example.com',
+            'name' => 'Subscriber Name',
+        ];
+        $this->subscriber->setData($subscriberData);
+        $this->sendEmailCheck(
+            Subscriber::XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE,
+            Subscriber::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY
+        );
 
         $this->assertEquals($this->subscriber, $this->subscriber->unsubscribe());
     }
 
     /**
+     * Test to try unsubscribe customer from newsletters with wrong confirmation code
+     *
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage This is an invalid subscription confirmation code.
      */
@@ -383,6 +245,9 @@ public function testUnsubscribeException()
         $this->subscriber->unsubscribe();
     }
 
+    /**
+     * Test to get subscriber full name
+     */
     public function testGetSubscriberFullName()
     {
         $this->subscriber->setFirstname('John');
@@ -391,6 +256,9 @@ public function testGetSubscriberFullName()
         $this->assertEquals('John Doe', $this->subscriber->getSubscriberFullName());
     }
 
+    /**
+     * Test to confirm customer subscription
+     */
     public function testConfirm()
     {
         $code = 111;
@@ -400,6 +268,9 @@ public function testConfirm()
         $this->assertTrue($this->subscriber->confirm($code));
     }
 
+    /**
+     * Test to doesn't confirm customer subscription
+     */
     public function testConfirmWrongCode()
     {
         $code = 111;
@@ -408,9 +279,12 @@ public function testConfirmWrongCode()
         $this->assertFalse($this->subscriber->confirm($code));
     }
 
+    /**
+     * Test to mark receiving subscriber of queue newsletter
+     */
     public function testReceived()
     {
-        $queue = $this->getMockBuilder(\Magento\Newsletter\Model\Queue::class)
+        $queue = $this->getMockBuilder(Queue::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->resource->expects($this->once())->method('received')->with($this->subscriber, $queue)->willReturnSelf();
@@ -419,28 +293,103 @@ public function testReceived()
     }
 
     /**
-     * @return $this
+     * Test to Sends out confirmation email
+     *
+     * @return void
      */
-    protected function sendEmailCheck()
+    public function testSendConfirmationRequestEmail(): void
     {
-        $storeModel = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getId'])
-            ->getMock();
-        $transport = $this->createMock(\Magento\Framework\Mail\TransportInterface::class);
-        $this->scopeConfig->expects($this->any())->method('getValue')->willReturn(true);
-        $this->transportBuilder->expects($this->once())->method('setTemplateIdentifier')->willReturnSelf();
-        $this->transportBuilder->expects($this->once())->method('setTemplateOptions')->willReturnSelf();
-        $this->transportBuilder->expects($this->once())->method('setTemplateVars')->willReturnSelf();
-        $this->transportBuilder->expects($this->once())->method('setFrom')->willReturnSelf();
-        $this->transportBuilder->expects($this->once())->method('addTo')->willReturnSelf();
-        $this->storeManager->expects($this->any())->method('getStore')->willReturn($storeModel);
-        $storeModel->expects($this->any())->method('getId')->willReturn(1);
-        $this->transportBuilder->expects($this->once())->method('getTransport')->willReturn($transport);
+        $confirmLink = 'confirm link';
+        $storeId = 2;
+        $subscriberData = [
+            'store_id' => $storeId,
+            'email' => 'subscriber_email@example.com',
+            'name' => 'Subscriber Name',
+        ];
+        $store = $this->createMock(StoreInterface::class);
+        $this->storeManager->method('getStore')->with($storeId)->willReturn($store);
+        $this->newsletterData->expects($this->once())
+            ->method('getConfirmationUrl')
+            ->with($this->subscriber)
+            ->willReturn($confirmLink);
+        $this->subscriber->setData($subscriberData);
+        $this->sendEmailCheck(
+            Subscriber::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
+            Subscriber::XML_PATH_CONFIRM_EMAIL_IDENTITY,
+            [
+                'store' => $store,
+                'subscriber_data' => [
+                    'confirmation_link' => $confirmLink,
+                ],
+            ]
+        );
+        $this->assertEquals($this->subscriber, $this->subscriber->sendConfirmationRequestEmail());
+    }
+
+    /**
+     * Test to Sends out success email
+     *
+     * @return void
+     */
+    public function testSendConfirmationSuccessEmail(): void
+    {
+        $subscriberData = [
+            'store_id' => 2,
+            'email' => 'subscriber_email@example.com',
+            'name' => 'Subscriber Name',
+        ];
+        $this->subscriber->setData($subscriberData);
+        $this->sendEmailCheck(
+            Subscriber::XML_PATH_SUCCESS_EMAIL_TEMPLATE,
+            Subscriber::XML_PATH_SUCCESS_EMAIL_IDENTITY
+        );
+        $this->assertEquals($this->subscriber, $this->subscriber->sendConfirmationSuccessEmail());
+    }
+
+    /**
+     * Check to send email
+     *
+     * @param string $templateConfigPath
+     * @param string $identityTemplatePath
+     * @return void
+     */
+    private function sendEmailCheck(string $templateConfigPath, string $identityTemplatePath, array $vars = []): void
+    {
+        $template = 'email_template';
+        $identity = 'email_identity';
+        $vars += ['subscriber' => $this->subscriber];
+
+        $this->scopeConfig->method('getValue')
+            ->willReturnMap(
+                [
+                    [$templateConfigPath, ScopeInterface::SCOPE_STORE, $this->subscriber->getStoreId(), $template],
+                    [$identityTemplatePath, ScopeInterface::SCOPE_STORE, $this->subscriber->getStoreId(), $identity],
+                ]
+            );
+        $this->transportBuilder->expects($this->once())
+            ->method('setTemplateIdentifier')
+            ->with($template)
+            ->willReturnSelf();
+        $this->transportBuilder->expects($this->once())
+            ->method('setTemplateOptions')
+            ->with(['area' => Area::AREA_FRONTEND, 'store' => $this->subscriber->getStoreId()])
+            ->willReturnSelf();
+        $this->transportBuilder->expects($this->once())
+            ->method('setTemplateVars')
+            ->with($vars)
+            ->willReturnSelf();
+        $this->transportBuilder->expects($this->once())
+            ->method('setFrom')
+            ->with($identity)
+            ->willReturnSelf();
+        $this->transportBuilder->expects($this->once())
+            ->method('addTo')
+            ->with($this->subscriber->getEmail(), $this->subscriber->getName())
+            ->willReturnSelf();
+        $transport = $this->createMock(TransportInterface::class);
         $transport->expects($this->once())->method('sendMessage')->willReturnSelf();
+        $this->transportBuilder->expects($this->once())->method('getTransport')->willReturn($transport);
         $this->inlineTranslation->expects($this->once())->method('suspend')->willReturnSelf();
         $this->inlineTranslation->expects($this->once())->method('resume')->willReturnSelf();
-
-        return $this;
     }
 }
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriptionManagerTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriptionManagerTest.php
new file mode 100644
index 0000000000000..ecb30f12742c8
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriptionManagerTest.php
@@ -0,0 +1,651 @@
+<?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\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Newsletter\Model\Subscriber;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Newsletter\Model\SubscriptionManager;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Test to update newsletter subscription status
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class SubscriptionManagerTest extends TestCase
+{
+    /**
+     * @var SubscriberFactory|MockObject
+     */
+    private $subscriberFactory;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @var AccountManagementInterface|MockObject
+     */
+    private $customerAccountManagement;
+
+    /**
+     * @var CustomerRepositoryInterface|MockObject
+     */
+    private $customerRepository;
+
+    /**
+     * @var SubscriptionManager
+     */
+    private $subscriptionManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->subscriberFactory = $this->createMock(SubscriberFactory::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
+        $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
+        $this->customerAccountManagement = $this->createMock(AccountManagementInterface::class);
+        $this->customerRepository = $this->createMock(CustomerRepositoryInterface::class);
+
+        $objectManager = new ObjectManager($this);
+        $this->subscriptionManager = $objectManager->getObject(
+            SubscriptionManager::class,
+            [
+                'subscriberFactory' => $this->subscriberFactory,
+                'logger' => $this->logger,
+                'storeManager' => $this->storeManager,
+                'scopeConfig' => $this->scopeConfig,
+                'customerAccountManagement' => $this->customerAccountManagement,
+                'customerRepository' => $this->customerRepository,
+            ]
+        );
+    }
+
+    /**
+     * Test to Subscribe to newsletters by email
+     *
+     * @param array $subscriberData
+     * @param string $email
+     * @param int $storeId
+     * @param bool $isConfirmNeed
+     * @param array $expectedData
+     * @dataProvider subscribeDataProvider
+     */
+    public function testSubscribe(
+        array $subscriberData,
+        string $email,
+        int $storeId,
+        bool $isConfirmNeed,
+        array $expectedData
+    ): void {
+        $websiteId = 1;
+        $store = $this->createMock(StoreInterface::class);
+        $store->method('getWebsiteId')->willReturn($websiteId);
+        $this->storeManager->method('getStore')->with($storeId)->willReturn($store);
+        /** @var Subscriber|MockObject $subscriber */
+        $subscriber = $this->createPartialMock(
+            Subscriber::class,
+            [
+                'loadBySubscriberEmail',
+                'randomSequence',
+                'save',
+                'sendConfirmationRequestEmail',
+                'sendConfirmationSuccessEmail',
+                'sendUnsubscriptionEmail'
+            ]
+        );
+        $subscriber->expects($this->once())
+            ->method('loadBySubscriberEmail')
+            ->with($email, $websiteId)
+            ->willReturnSelf();
+        $subscriber->setData($subscriberData);
+        if (empty($subscriberData['id'])) {
+            $subscriber->method('randomSequence')->willReturn($expectedData['subscriber_confirm_code']);
+        }
+        $this->subscriberFactory->method('create')->willReturn($subscriber);
+        $this->scopeConfig->method('isSetFlag')
+            ->with(Subscriber::XML_PATH_CONFIRMATION_FLAG, ScopeInterface::SCOPE_STORE, $storeId)
+            ->willReturn($isConfirmNeed);
+
+        $this->assertEquals(
+            $subscriber,
+            $this->subscriptionManager->subscribe($email, $storeId)
+        );
+        $this->assertEquals($subscriber->getData(), $expectedData);
+    }
+
+    /**
+     * Subscribe customer data provider
+     *
+     * @return array
+     */
+    public function subscribeDataProvider(): array
+    {
+        return [
+            'Subscribe new' => [
+                'subscriber_data' => [],
+                'email' => 'email@example.com',
+                'store_id' => 1,
+                'is_confirm_need' => false,
+                'expected_data' => [
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED,
+                    'subscriber_confirm_code' => '',
+                ],
+            ],
+            'Subscribe new: confirm required' => [
+                'subscriber_data' => [],
+                'email' => 'email@example.com',
+                'store_id' => 1,
+                'is_confirm_need' => true,
+                'expected_data' => [
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_NOT_ACTIVE,
+                    'subscriber_confirm_code' => '',
+                ],
+            ],
+            'Subscribe existing' => [
+                'subscriber_data' => [
+                    'subscriber_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
+                    'subscriber_confirm_code' => '',
+                    'customer_id' => 0,
+                ],
+                'email' => 'email@example.com',
+                'store_id' => 1,
+                'is_confirm_need' => false,
+                'expected_data' => [
+                    'subscriber_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED,
+                    'subscriber_confirm_code' => '',
+                    'customer_id' => 0,
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Test to Unsubscribe from newsletters by email
+     */
+    public function testUnsubscribe(): void
+    {
+        $email = 'email@example.com';
+        $storeId = 2;
+        $websiteId = 1;
+        $store = $this->createMock(StoreInterface::class);
+        $store->method('getWebsiteId')->willReturn($websiteId);
+        $this->storeManager->method('getStore')->with($storeId)->willReturn($store);
+        $confirmCode = 'confirm code';
+        /** @var Subscriber|MockObject $subscriber */
+        $subscriber = $this->createPartialMock(
+            Subscriber::class,
+            ['loadBySubscriberEmail', 'getId', 'setCheckCode', 'unsubscribe']
+        );
+        $subscriber->expects($this->once())
+            ->method('loadBySubscriberEmail')
+            ->with($email, $websiteId)
+            ->willReturnSelf();
+        $subscriber->method('getId')->willReturn(1);
+        $subscriber->expects($this->once())->method('setCheckCode')->with($confirmCode)->willReturnSelf();
+        $subscriber->expects($this->once())->method('unsubscribe')->willReturnSelf();
+        $this->subscriberFactory->method('create')->willReturn($subscriber);
+
+        $this->assertEquals(
+            $subscriber,
+            $this->subscriptionManager->unsubscribe($email, $storeId, $confirmCode)
+        );
+    }
+
+    /**
+     * Test to Subscribe customer to newsletter
+     *
+     * @param array $subscriberData
+     * @param array $customerData
+     * @param int $storeId
+     * @param bool $isConfirmNeed
+     * @param array $expectedData
+     * @param bool $needToSendEmail
+     * @dataProvider subscribeCustomerDataProvider
+     */
+    public function testSubscribeCustomer(
+        array $subscriberData,
+        array $customerData,
+        int $storeId,
+        bool $isConfirmNeed,
+        array $expectedData,
+        bool $needToSendEmail
+    ): void {
+        $websiteId = 1;
+        $customerId = $customerData['id'];
+        $store = $this->createMock(StoreInterface::class);
+        $store->method('getWebsiteId')->willReturn($websiteId);
+        $this->storeManager->method('getStore')->with($storeId)->willReturn($store);
+        /** @var CustomerInterface|MockObject $customer */
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->method('getId')->willReturn($customerId);
+        $customer->method('getEmail')->willReturn($customerData['email']);
+        $this->customerRepository->method('getById')->with($customerId)->willReturn($customer);
+        /** @var Subscriber|MockObject $subscriber */
+        $subscriber = $this->createPartialMock(
+            Subscriber::class,
+            [
+                'loadByCustomer',
+                'loadBySubscriberEmail',
+                'randomSequence',
+                'save',
+                'sendConfirmationRequestEmail',
+                'sendConfirmationSuccessEmail',
+                'sendUnsubscriptionEmail'
+            ]
+        );
+        $subscriber->expects($this->once())
+            ->method('loadByCustomer')
+            ->with($customerId, $websiteId)
+            ->willReturnSelf();
+        if (empty($subscriberData['subscriber_id'])) {
+            $subscriber->expects($this->once())
+                ->method('loadBySubscriberEmail')
+                ->with($customerData['email'], $websiteId)
+                ->willReturnSelf();
+        }
+        $subscriber->setData($subscriberData);
+        if (empty($subscriberData['subscriber_id'])) {
+            $subscriber->method('randomSequence')->willReturn($expectedData['subscriber_confirm_code']);
+        }
+        $sendEmailMethod = $this->getSendEmailMethod($expectedData['subscriber_status'] ?? 0);
+        if ($needToSendEmail) {
+            $subscriber->expects($this->once())->method($sendEmailMethod);
+        } else {
+            $subscriber->expects($this->never())->method('sendConfirmationRequestEmail');
+            $subscriber->expects($this->never())->method('sendConfirmationSuccessEmail');
+            $subscriber->expects($this->never())->method('sendUnsubscriptionEmail');
+        }
+        $this->subscriberFactory->method('create')->willReturn($subscriber);
+        $this->scopeConfig->method('isSetFlag')
+            ->with(Subscriber::XML_PATH_CONFIRMATION_FLAG, ScopeInterface::SCOPE_STORE, $storeId)
+            ->willReturn($isConfirmNeed);
+        $this->customerAccountManagement
+            ->method('getConfirmationStatus')
+            ->willReturn($customerData['confirmation_status']);
+
+        $this->assertEquals(
+            $subscriber,
+            $this->subscriptionManager->subscribeCustomer($customerId, $storeId)
+        );
+        $this->assertEquals($subscriber->getData(), $expectedData);
+    }
+
+    /**
+     * Get expected send email method
+     *
+     * @param int $status
+     * @return string
+     */
+    private function getSendEmailMethod(int $status): string
+    {
+        switch ($status) {
+            case Subscriber::STATUS_SUBSCRIBED:
+                $sendEmailMethod = 'sendConfirmationSuccessEmail';
+                break;
+            case Subscriber::STATUS_NOT_ACTIVE:
+                $sendEmailMethod = 'sendConfirmationRequestEmail';
+                break;
+            case Subscriber::STATUS_UNSUBSCRIBED:
+                $sendEmailMethod = 'sendUnsubscriptionEmail';
+                break;
+            default:
+                $sendEmailMethod = '';
+        }
+
+        return $sendEmailMethod;
+    }
+
+    /**
+     * Subscribe customer data provider
+     *
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function subscribeCustomerDataProvider(): array
+    {
+        return [
+            'Subscribe new' => [
+                'subscriber_data' => [],
+                'customer_data' => [
+                    'id' => 1,
+                    'email' => 'email@example.com',
+                    'confirmation_status' => AccountManagementInterface::ACCOUNT_CONFIRMED,
+                ],
+                'store_id' => 1,
+                'is_confirm_need' => false,
+                'expected_data' => [
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED,
+                    'subscriber_confirm_code' => '',
+                ],
+                'needToSendEmail' => true,
+            ],
+            'Subscribe new: customer confirm required' => [
+                'subscriber_data' => [],
+                'customer_data' => [
+                    'id' => 1,
+                    'email' => 'email@example.com',
+                    'confirmation_status' => AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED,
+                ],
+                'store_id' => 1,
+                'is_confirm_need' => false,
+                'expected_data' => [
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_UNCONFIRMED,
+                    'subscriber_confirm_code' => '',
+                ],
+                'needToSendEmail' => false,
+            ],
+            'Subscribe existing' => [
+                'subscriber_data' => [
+                    'subscriber_id' => 1,
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
+                    'subscriber_confirm_code' => '',
+                ],
+                'customer_data' => [
+                    'id' => 1,
+                    'email' => 'email@example.com',
+                    'confirmation_status' => AccountManagementInterface::ACCOUNT_CONFIRMED,
+                ],
+                'store_id' => 1,
+                'is_confirm_need' => false,
+                'expected_data' => [
+                    'subscriber_id' => 1,
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED,
+                    'subscriber_confirm_code' => '',
+                ],
+                'needToSendEmail' => true,
+            ],
+            'Subscribe existing: subscription confirm required' => [
+                'subscriber_data' => [
+                    'subscriber_id' => 1,
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
+                    'subscriber_confirm_code' => '',
+                ],
+                'customer_data' => [
+                    'id' => 1,
+                    'email' => 'email@example.com',
+                    'confirmation_status' => AccountManagementInterface::ACCOUNT_CONFIRMED,
+                ],
+                'store_id' => 1,
+                'is_confirm_need' => true,
+                'expected_data' => [
+                    'subscriber_id' => 1,
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_NOT_ACTIVE,
+                    'subscriber_confirm_code' => '',
+                ],
+                'needToSendEmail' => true,
+            ],
+            'Update subscription data' => [
+                'subscriber_data' => [
+                    'subscriber_id' => 1,
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED,
+                    'subscriber_confirm_code' => '',
+                ],
+                'customer_data' => [
+                    'id' => 1,
+                    'email' => 'email2@example.com',
+                    'confirmation_status' => AccountManagementInterface::ACCOUNT_CONFIRMED,
+                ],
+                'store_id' => 2,
+                'is_confirm_need' => false,
+                'expected_data' => [
+                    'subscriber_id' => 1,
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email2@example.com',
+                    'store_id' => 2,
+                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED,
+                    'subscriber_confirm_code' => '',
+                ],
+                'needToSendEmail' => false,
+            ],
+            'Update subscription data: subscription confirm required ' => [
+                'subscriber_data' => [
+                    'subscriber_id' => 1,
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_NOT_ACTIVE,
+                    'subscriber_confirm_code' => '',
+                ],
+                'customer_data' => [
+                    'id' => 1,
+                    'email' => 'email2@example.com',
+                    'confirmation_status' => AccountManagementInterface::ACCOUNT_CONFIRMED,
+                ],
+                'store_id' => 2,
+                'is_confirm_need' => true,
+                'expected_data' => [
+                    'subscriber_id' => 1,
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email2@example.com',
+                    'store_id' => 2,
+                    'subscriber_status' => Subscriber::STATUS_NOT_ACTIVE,
+                    'subscriber_confirm_code' => '',
+                ],
+                'needToSendEmail' => true,
+            ],
+        ];
+    }
+
+    /**
+     * Test to Unsubscribe customer from newsletter
+     *
+     * @param array $subscriberData
+     * @param array $customerData
+     * @param int $storeId
+     * @param array $expectedData
+     * @param bool $needToSendEmail
+     * @dataProvider unsubscribeCustomerDataProvider
+     */
+    public function testUnsubscribeCustomer(
+        array $subscriberData,
+        array $customerData,
+        int $storeId,
+        array $expectedData,
+        bool $needToSendEmail
+    ): void {
+        $websiteId = 1;
+        $customerId = $customerData['id'];
+        $store = $this->createMock(StoreInterface::class);
+        $store->method('getWebsiteId')->willReturn($websiteId);
+        $this->storeManager->method('getStore')->with($storeId)->willReturn($store);
+        /** @var CustomerInterface|MockObject $customer */
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->method('getId')->willReturn($customerId);
+        $customer->method('getEmail')->willReturn($customerData['email']);
+        $this->customerRepository->method('getById')->with($customerId)->willReturn($customer);
+        /** @var Subscriber|MockObject $subscriber */
+        $subscriber = $this->createPartialMock(
+            Subscriber::class,
+            [
+                'loadByCustomer',
+                'loadBySubscriberEmail',
+                'randomSequence',
+                'save',
+                'sendConfirmationRequestEmail',
+                'sendConfirmationSuccessEmail',
+                'sendUnsubscriptionEmail'
+            ]
+        );
+        $subscriber->expects($this->once())
+            ->method('loadByCustomer')
+            ->with($customerId, $websiteId)
+            ->willReturnSelf();
+        if (empty($subscriberData['subscriber_id'])) {
+            $subscriber->expects($this->once())
+                ->method('loadBySubscriberEmail')
+                ->with($customerData['email'], $websiteId)
+                ->willReturnSelf();
+        }
+        $subscriber->setData($subscriberData);
+        $sendEmailMethod = $this->getSendEmailMethod($expectedData['subscriber_status'] ?? 0);
+        if ($needToSendEmail) {
+            $subscriber->expects($this->once())->method($sendEmailMethod);
+        } else {
+            $subscriber->expects($this->never())->method('sendConfirmationRequestEmail');
+            $subscriber->expects($this->never())->method('sendConfirmationSuccessEmail');
+            $subscriber->expects($this->never())->method('sendUnsubscriptionEmail');
+        }
+        $this->subscriberFactory->method('create')->willReturn($subscriber);
+
+        $this->assertEquals(
+            $subscriber,
+            $this->subscriptionManager->unsubscribeCustomer($customerId, $storeId)
+        );
+        $this->assertEquals($subscriber->getData(), $expectedData);
+    }
+
+    /**
+     * Unsubscribe customer data provider
+     *
+     * @return array
+     */
+    public function unsubscribeCustomerDataProvider(): array
+    {
+        return [
+            'Unsubscribe new' => [
+                'subscriber_data' => [],
+                'customer_data' => [
+                    'id' => 1,
+                    'email' => 'email@example.com',
+                ],
+                'store_id' => 1,
+                'expected_data' => [
+                ],
+                'needToSendEmail' => false,
+            ],
+            'Unsubscribe existing' => [
+                'subscriber_data' => [
+                    'subscriber_id' => 1,
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_SUBSCRIBED,
+                    'subscriber_confirm_code' => '',
+                ],
+                'customer_data' => [
+                    'id' => 1,
+                    'email' => 'email@example.com',
+                ],
+                'store_id' => 1,
+                'expected_data' => [
+                    'subscriber_id' => 1,
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
+                    'subscriber_confirm_code' => '',
+                ],
+                'needToSendEmail' => true,
+            ],
+            'Unsubscribe existing: subscription confirm required' => [
+                'subscriber_data' => [
+                    'subscriber_id' => 1,
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_NOT_ACTIVE,
+                    'subscriber_confirm_code' => '',
+                ],
+                'customer_data' => [
+                    'id' => 1,
+                    'email' => 'email@example.com',
+                ],
+                'store_id' => 1,
+                'expected_data' => [
+                    'subscriber_id' => 1,
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_NOT_ACTIVE,
+                    'subscriber_confirm_code' => '',
+                ],
+                'needToSendEmail' => false,
+            ],
+            'Update subscription data' => [
+                'subscriber_data' => [
+                    'subscriber_id' => 1,
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email@example.com',
+                    'store_id' => 1,
+                    'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
+                    'subscriber_confirm_code' => '',
+                ],
+                'customer_data' => [
+                    'id' => 1,
+                    'email' => 'email2@example.com',
+                ],
+                'store_id' => 2,
+                'expected_data' => [
+                    'subscriber_id' => 1,
+                    'customer_id' => 1,
+                    'subscriber_email' => 'email2@example.com',
+                    'store_id' => 2,
+                    'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
+                    'subscriber_confirm_code' => '',
+                ],
+                'needToSendEmail' => false,
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
index 52bb803dd377f..b53ac39f0e4e2 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
@@ -197,20 +197,20 @@ protected function getModelMock(array $mockedMethods = [])
 
     public function testGetProcessedTemplateSubject()
     {
-        $model = $this->getModelMock([
-            'getTemplateFilter',
-            'getDesignConfig',
-            'applyDesignConfig',
-            'setVariables',
-        ]);
+        $model = $this->getModelMock(
+            [
+                'getTemplateFilter',
+                'getDesignConfig',
+                'applyDesignConfig',
+                'setVariables',
+            ]
+        );
 
         $templateSubject = 'templateSubject';
         $model->setTemplateSubject($templateSubject);
+        $model->setTemplateId('foobar');
 
-        $filterTemplate = $this->getMockBuilder(\Magento\Framework\Filter\Template::class)
-            ->setMethods(['setVariables', 'setStoreId', 'filter'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $filterTemplate = $this->createMock(\Magento\Framework\Filter\Template::class);
         $model->expects($this->once())
             ->method('getTemplateFilter')
             ->will($this->returnValue($filterTemplate));
@@ -221,6 +221,11 @@ public function testGetProcessedTemplateSubject()
             ->with($templateSubject)
             ->will($this->returnValue($expectedResult));
 
+        $filterTemplate->expects($this->exactly(2))
+            ->method('setStrictMode')
+            ->withConsecutive([$this->equalTo(false)], [$this->equalTo(true)])
+            ->willReturnOnConsecutiveCalls(true, false);
+
         $variables = ['key' => 'value'];
         $filterTemplate->expects($this->once())
             ->method('setVariables')
@@ -245,21 +250,24 @@ public function testGetProcessedTemplateSubject()
      */
     public function testGetProcessedTemplate($variables, $templateType, $storeId, $expectedVariables, $expectedResult)
     {
+        class_exists(\Magento\Newsletter\Model\Template\Filter::class, true);
         $filterTemplate = $this->getMockBuilder(\Magento\Newsletter\Model\Template\Filter::class)
-            ->setMethods([
-                'setUseSessionInUrl',
-                'setPlainTemplateMode',
-                'setIsChildTemplate',
-                'setDesignParams',
-                'setVariables',
-                'setStoreId',
-                'filter',
-                'getStoreId',
-                'getInlineCssFiles',
-            ])
+            ->setMethods(
+                [
+                    'setUseSessionInUrl',
+                    'setPlainTemplateMode',
+                    'setIsChildTemplate',
+                    'setDesignParams',
+                    'setVariables',
+                    'setStoreId',
+                    'filter',
+                    'getStoreId',
+                    'getInlineCssFiles',
+                    'setStrictMode',
+                ]
+            )
             ->disableOriginalConstructor()
             ->getMock();
-
         $filterTemplate->expects($this->once())
             ->method('setUseSessionInUrl')
             ->with(false)
@@ -281,12 +289,15 @@ public function testGetProcessedTemplate($variables, $templateType, $storeId, $e
             ->method('getStoreId')
             ->will($this->returnValue($storeId));
 
+        $filterTemplate->expects($this->exactly(2))
+            ->method('setStrictMode')
+            ->withConsecutive([$this->equalTo(true)], [$this->equalTo(false)])
+            ->willReturnOnConsecutiveCalls(false, true);
+
         // The following block of code tests to ensure that the store id of the subscriber will be used, if the
         // 'subscriber' variable is set.
         $subscriber = $this->getMockBuilder(\Magento\Newsletter\Model\Subscriber::class)
-            ->setMethods([
-                'getStoreId',
-            ])
+            ->setMethods(['getStoreId'])
             ->disableOriginalConstructor()
             ->getMock();
         $subscriber->expects($this->once())
@@ -296,18 +307,20 @@ public function testGetProcessedTemplate($variables, $templateType, $storeId, $e
         $variables['subscriber'] = $subscriber;
 
         $expectedVariables['store'] = $this->store;
-
-        $model = $this->getModelMock([
-            'getDesignParams',
-            'applyDesignConfig',
-            'getTemplateText',
-            'isPlain',
-        ]);
+        $model = $this->getModelMock(
+            [
+                'getDesignParams',
+                'applyDesignConfig',
+                'getTemplateText',
+                'isPlain',
+            ]
+        );
         $filterTemplate->expects($this->any())
             ->method('setVariables')
             ->with(array_merge(['this' => $model], $expectedVariables));
         $model->setTemplateFilter($filterTemplate);
         $model->setTemplateType($templateType);
+        $model->setTemplateId('123');
 
         $designParams = [
             'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
diff --git a/app/code/Magento/Newsletter/etc/db_schema.xml b/app/code/Magento/Newsletter/etc/db_schema.xml
index 257416d0bc465..c038b02404875 100644
--- a/app/code/Magento/Newsletter/etc/db_schema.xml
+++ b/app/code/Magento/Newsletter/etc/db_schema.xml
@@ -54,6 +54,8 @@
                 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"/>
+        <column xsi:type="boolean" name="is_legacy" nullable="false"
+                default="false" comment="Should the template render in legacy mode"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="template_id"/>
         </constraint>
diff --git a/app/code/Magento/Newsletter/etc/di.xml b/app/code/Magento/Newsletter/etc/di.xml
index 179ec19cccfc5..3c35936a2e8aa 100644
--- a/app/code/Magento/Newsletter/etc/di.xml
+++ b/app/code/Magento/Newsletter/etc/di.xml
@@ -25,4 +25,11 @@
         <plugin name="update_newsletter_subscription_on_customer_update"
                 type="Magento\Newsletter\Model\Plugin\CustomerPlugin"/>
     </type>
+    <type name="Magento\Newsletter\Model\Subscriber">
+        <arguments>
+            <argument name="customerSession" xsi:type="object">Magento\Customer\Model\Session\Proxy</argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Newsletter\Model\SubscriptionManagerInterface"
+                type="Magento\Newsletter\Model\SubscriptionManager"/>
 </config>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
index aef84c068100a..5d54dab99e753 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
@@ -91,7 +91,6 @@
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Customer First Name</argument>
                             <argument name="index" xsi:type="string">firstname</argument>
-                            <argument name="default" xsi:type="string">----</argument>
                             <argument name="header_css_class" xsi:type="string">col-first-name</argument>
                             <argument name="column_css_class" xsi:type="string">col-first-name</argument>
                         </arguments>
@@ -100,7 +99,6 @@
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Customer Last Name</argument>
                             <argument name="index" xsi:type="string">lastname</argument>
-                            <argument name="default" xsi:type="string">----</argument>
                             <argument name="header_css_class" xsi:type="string">col-last-name</argument>
                             <argument name="column_css_class" xsi:type="string">col-last-name</argument>
                         </arguments>
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 c49a5c61a7172..abc56070b6892 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
@@ -17,12 +17,13 @@ use Magento\Framework\App\TemplateTypesInterface;
     </div>
     <?= /* @noEscape */ $block->getForm() ?>
 </form>
-<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="get" id="newsletter_template_preview_form" target="_blank">
+<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" 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="" />
         <input type="hidden" id="preview_styles" name="styles" value="" />
         <input type="hidden" id="preview_id" name="id" value="" />
+        <input type="hidden" name="form_key" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" >
     </div>
 </form>
 <script>
diff --git a/app/code/Magento/Newsletter/view/frontend/email/subscr_confirm.html b/app/code/Magento/Newsletter/view/frontend/email/subscr_confirm.html
index eaf760c080370..beeda47d9d738 100644
--- a/app/code/Magento/Newsletter/view/frontend/email/subscr_confirm.html
+++ b/app/code/Magento/Newsletter/view/frontend/email/subscr_confirm.html
@@ -6,14 +6,13 @@
 -->
 <!--@subject {{trans "Newsletter subscription confirmation"}} @-->
 <!--@vars {
-"var customer.name":"Customer Name",
-"var subscriber.getConfirmationLink()":"Subscriber Confirmation URL"
+"var subscriber_data.confirmation_link":"Subscriber Confirmation URL"
 } @-->
 
 {{template config_path="design/email/header_template"}}
 
 <p class="greeting">{{trans "Thank you for subscribing to our newsletter."}}</p>
 <p>{{trans "To begin receiving the newsletter, you must first confirm your subscription by clicking on the following link:"}}</p>
-<p><a href="{{var subscriber.getConfirmationLink()}}">{{var subscriber.getConfirmationLink()}}</a></p>
+<p><a href="{{var subscriber_data.confirmation_link}}">{{var subscriber_data.confirmation_link}}</a></p>
 
 {{template config_path="design/email/footer_template"}}
diff --git a/app/code/Magento/OfflinePayments/Observer/BeforeOrderPaymentSaveObserver.php b/app/code/Magento/OfflinePayments/Observer/BeforeOrderPaymentSaveObserver.php
index 16ef7ecdf5011..daf1cef3fff60 100644
--- a/app/code/Magento/OfflinePayments/Observer/BeforeOrderPaymentSaveObserver.php
+++ b/app/code/Magento/OfflinePayments/Observer/BeforeOrderPaymentSaveObserver.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
 
 namespace Magento\OfflinePayments\Observer;
 
@@ -11,7 +10,6 @@
 use Magento\OfflinePayments\Model\Banktransfer;
 use Magento\OfflinePayments\Model\Cashondelivery;
 use Magento\OfflinePayments\Model\Checkmo;
-use Magento\Sales\Model\Order\Payment;
 
 /**
  * Sets payment additional information.
@@ -19,22 +17,24 @@
 class BeforeOrderPaymentSaveObserver implements ObserverInterface
 {
     /**
-     * Sets current instructions for bank transfer account.
+     * Sets current instructions for bank transfer account
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function execute(\Magento\Framework\Event\Observer $observer): void
+    public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        /** @var Payment $payment */
+        /** @var \Magento\Sales\Model\Order\Payment $payment */
         $payment = $observer->getEvent()->getPayment();
         $instructionMethods = [
             Banktransfer::PAYMENT_METHOD_BANKTRANSFER_CODE,
             Cashondelivery::PAYMENT_METHOD_CASHONDELIVERY_CODE
         ];
         if (in_array($payment->getMethod(), $instructionMethods)) {
-            $payment->setAdditionalInformation('instructions', $this->getInstructions($payment));
+            $payment->setAdditionalInformation(
+                'instructions',
+                $payment->getMethodInstance()->getInstructions()
+            );
         } elseif ($payment->getMethod() === Checkmo::PAYMENT_METHOD_CHECKMO_CODE) {
             $methodInstance = $payment->getMethodInstance();
             if (!empty($methodInstance->getPayableTo())) {
@@ -45,17 +45,4 @@ public function execute(\Magento\Framework\Event\Observer $observer): void
             }
         }
     }
-
-    /**
-     * Retrieve store-specific payment method instructions, or already saved if exists.
-     *
-     * @param Payment $payment
-     * @return string|null
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    private function getInstructions(Payment $payment): ?string
-    {
-        return $payment->getAdditionalInformation('instructions')
-            ?: $payment->getMethodInstance()->getConfigData('instructions', $payment->getOrder()->getStoreId());
-    }
 }
diff --git a/app/code/Magento/OfflinePayments/Test/Unit/Observer/BeforeOrderPaymentSaveObserverTest.php b/app/code/Magento/OfflinePayments/Test/Unit/Observer/BeforeOrderPaymentSaveObserverTest.php
index 57c5ec533dc64..51edaea0e659c 100644
--- a/app/code/Magento/OfflinePayments/Test/Unit/Observer/BeforeOrderPaymentSaveObserverTest.php
+++ b/app/code/Magento/OfflinePayments/Test/Unit/Observer/BeforeOrderPaymentSaveObserverTest.php
@@ -11,7 +11,6 @@
 use Magento\OfflinePayments\Model\Banktransfer;
 use Magento\OfflinePayments\Model\Cashondelivery;
 use Magento\OfflinePayments\Observer\BeforeOrderPaymentSaveObserver;
-use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Magento\OfflinePayments\Model\Checkmo;
@@ -77,12 +76,19 @@ public function testBeforeOrderPaymentSaveWithInstructions($methodCode)
         $this->payment->expects(self::once())
             ->method('getMethod')
             ->willReturn($methodCode);
-        $this->payment->method('getAdditionalInformation')
-            ->with('instructions')
-            ->willReturn('payment configuration');
         $this->payment->expects(self::once())
             ->method('setAdditionalInformation')
             ->with('instructions', 'payment configuration');
+        $method = $this->getMockBuilder(Banktransfer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $method->expects(self::once())
+            ->method('getInstructions')
+            ->willReturn('payment configuration');
+        $this->payment->expects(self::once())
+            ->method('getMethodInstance')
+            ->willReturn($method);
 
         $this->_model->execute($this->observer);
     }
diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json
index 7bf4b78628a70..4de112ac72152 100644
--- a/app/code/Magento/OfflinePayments/composer.json
+++ b/app/code/Magento/OfflinePayments/composer.json
@@ -8,8 +8,7 @@
         "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/module-checkout": "*",
-        "magento/module-payment": "*",
-        "magento/module-sales": "*"
+        "magento/module-payment": "*"
     },
     "suggest": {
         "magento/module-config": "*"
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
index 36f9d35327fce..28395f8eeb849 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
@@ -7,8 +7,9 @@
 /**
  * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
  */
+$paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
+<?= $block->escapeHtml($paymentTitle) ?>
 <?php if ($block->getInfo()->getAdditionalInformation()) : ?>
     <?php if ($block->getPayableTo()) : ?>
         <br /><?= $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
index d8d952526e67b..f85a8f8357dd9 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
@@ -7,8 +7,9 @@
 /**
  * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
  */
+$paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
+<?= $block->escapeHtml($paymentTitle) ?>
     {{pdf_row_separator}}
 <?php if ($block->getInfo()->getAdditionalInformation()) : ?>
     {{pdf_row_separator}}
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml
index 2a6de7f0cc356..ae7f654a1350b 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml
@@ -6,8 +6,9 @@
 /**
  * @var $block \Magento\OfflinePayments\Block\Info\Purchaseorder
  */
+$paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<div class="order-payment-method-name"><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></div>
+<div class="order-payment-method-name"><?= $block->escapeHtml($paymentTitle) ?></div>
 <table class="data-table admin__table-secondary">
     <tr>
         <th><?= $block->escapeHtml(__('Purchase Order Number')) ?>:</th>
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
index 674e6b8089787..a1fca2b155f11 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php
@@ -63,6 +63,24 @@ public function __construct(
         parent::__construct($scopeConfig, $rateErrorFactory, $logger, $data);
     }
 
+    /**
+     * Check subtotal for allowed free shipping
+     *
+     * @param RateRequest $request
+     *
+     * @return bool
+     */
+    private function isFreeShippingRequired(RateRequest $request): bool
+    {
+        $minSubtotal = $request->getPackageValueWithDiscount();
+        if ($request->getBaseSubtotalWithDiscountInclTax()
+            && $this->getConfigFlag('tax_including')) {
+            $minSubtotal = $request->getBaseSubtotalWithDiscountInclTax();
+        }
+
+        return $minSubtotal >= $this->getConfigData('free_shipping_subtotal');
+    }
+
     /**
      * FreeShipping Rates Collector
      *
@@ -80,10 +98,7 @@ public function collectRates(RateRequest $request)
 
         $this->_updateFreeMethodQuote($request);
 
-        if ($request->getFreeShipping() || $request->getPackageValueWithDiscount() >= $this->getConfigData(
-            'free_shipping_subtotal'
-        )
-        ) {
+        if ($request->getFreeShipping() || $this->isFreeShippingRequired($request)) {
             /** @var \Magento\Quote\Model\Quote\Address\RateResult\Method $method */
             $method = $this->_rateMethodFactory->create();
 
diff --git a/app/code/Magento/OfflineShipping/Test/Mftf/Data/MultishippingConfigData.xml b/app/code/Magento/OfflineShipping/Test/Mftf/Data/MultishippingConfigData.xml
new file mode 100644
index 0000000000000..569eddf336782
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/Test/Mftf/Data/MultishippingConfigData.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="EnableFreeShippingMethod">
+        <data key="path">carriers/freeshipping/active</data>
+        <data key="label">Yes</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="DisableFreeShippingMethod">
+        <data key="path">carriers/freeshipping/active</data>
+        <data key="label">No</data>
+        <data key="value">0</data>
+    </entity>
+    <entity name="EnableFlatRateShippingMethod">
+        <data key="path">carriers/flatrate/active</data>
+        <data key="label">Yes</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="DisableFlatRateShippingMethod">
+        <data key="path">carriers/flatrate/active</data>
+        <data key="label">No</data>
+        <data key="value">0</data>
+    </entity>
+    <entity name="EnableMultiShippingCheckoutMultiple">
+        <data key="path">multishipping/options/checkout_multiple</data>
+        <data key="label">Yes</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="DisableMultiShippingCheckoutMultiple">
+        <data key="path">multishipping/options/checkout_multiple</data>
+        <data key="label">No</data>
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/OfflineShipping/Test/Mftf/Test/StorefrontFreeShippingDisplayWithInclTaxOptionTest.xml b/app/code/Magento/OfflineShipping/Test/Mftf/Test/StorefrontFreeShippingDisplayWithInclTaxOptionTest.xml
new file mode 100644
index 0000000000000..db44a06b54a88
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/Test/Mftf/Test/StorefrontFreeShippingDisplayWithInclTaxOptionTest.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="StorefrontFreeShippingDisplayWithInclTaxOptionTest">
+        <annotations>
+            <features value="Shipping"/>
+            <stories value="Offline Shipping Methods"/>
+            <title value="Free Shipping Minimum Order Amount Excluding/Including Tax options"/>
+            <description value="Free Shipping Minimum Order Amount Excluding/Including Tax options"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-20613"/>
+            <useCaseId value="MC-18457"/>
+            <group value="shipping"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
+                <field key="price">100.00</field>
+            </createData>
+            <!-- Enable free shipping method -->
+            <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShippingMethod"/>
+            <createData entity="setFreeShippingSubtotal" stepKey="setFreeShippingSubtotal"/>
+            <createData entity="SetTaxIncluding" stepKey="setTaxIncluding"/>
+            <!--  Tax configuration (Store>Configuration; Sales>Tax) -->
+            <createData entity="Tax_Config_CA" stepKey="configureTaxForCA"/>
+            <createData entity="defaultTaxRule" stepKey="createTaxRule"/>
+        </before>
+        <after>
+            <!-- Disable free shipping method -->
+            <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShippingMethod"/>
+            <createData entity="setFreeShippingSubtotalToDefault" stepKey="setFreeShippingSubtotalToDefault"/>
+            <createData entity="SetTaxIncludingToDefault" stepKey="setTaxIncludingToDefault"/>
+            <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
+            <createData entity="DefaultTaxConfig" stepKey="resetTaxConfiguration"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+        </after>
+        <!-- Add simple product to cart -->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <!-- Assert that taxes are applied correctly for CA -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForCart"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.tax}}" stepKey="waitForOverviewVisible"/>
+        <waitForElement time="30" selector="{{CheckoutCartSummarySection.estimateShippingAndTaxForm}}" stepKey="waitForEstimateShippingAndTaxForm"/>
+        <waitForElement time="30" selector="{{CheckoutCartSummarySection.shippingMethodForm}}" stepKey="waitForShippingMethodForm"/>
+        <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUSCountry"/>
+        <waitForPageLoad stepKey="waitForSelectCountry"/>
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="California" stepKey="selectCaliforniaRegion"/>
+        <waitForPageLoad stepKey="waitForSelectRegion"/>
+        <see selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"  stepKey="seeTaxForCA"/>
+        <!-- See available Free Shipping option -->
+        <actionGroup ref="StorefrontAssertShippingMethodPresentInCartActionGroup" stepKey="assertShippingMethodLabel">
+            <argument name="shippingMethod" value="{{freeTitleDefault.value}}"/>
+        </actionGroup>
+        <!-- Change State to New York -->
+        <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_NY.state}}" stepKey="selectAnotherState"/>
+        <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
+        <dontSee selector="{{CheckoutCartSummarySection.shippingMethodLabel}}" userInput="{{freeTitleDefault.value}}" stepKey="assertShippingMethodIsNotPresentInCart"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Model/Carrier/FreeshippingTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Model/Carrier/FreeshippingTest.php
new file mode 100644
index 0000000000000..7f8959e610d42
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Model/Carrier/FreeshippingTest.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\OfflineShipping\Test\Unit\Model\Carrier;
+
+use Magento\Quote\Model\Quote\Address\RateResult\Method;
+use Magento\Shipping\Model\Rate\Result;
+use Magento\OfflineShipping\Model\Carrier\Freeshipping;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Quote\Model\Quote\Address\RateResult\MethodFactory;
+use Magento\Shipping\Model\Rate\ResultFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Quote\Model\Quote\Address\RateRequest;
+use Magento\Store\Model\ScopeInterface;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use PHPUnit\Framework\MockObject\Matcher\InvokedCount;
+
+/**
+ * Class for test free shipping
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class FreeshippingTest extends TestCase
+{
+    /**
+     * @var Freeshipping
+     */
+    private $model;
+
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var ResultFactory|MockObject
+     */
+    private $resultFactoryMock;
+
+    /**
+     * @var MethodFactory|MockObject
+     */
+    private $methodFactoryMock;
+
+    /**
+     * @var ObjectManager
+     */
+    private $helper;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->methodFactoryMock = $this
+            ->getMockBuilder(MethodFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->helper = new ObjectManager($this);
+        $this->model = $this->helper->getObject(
+            Freeshipping::class,
+            [
+                'scopeConfig' => $this->scopeConfigMock,
+                '_rateResultFactory' => $this->resultFactoryMock,
+                '_rateMethodFactory' => $this->methodFactoryMock,
+            ]
+        );
+    }
+
+    /**
+     * Test for collect rate free shipping with tax options
+     *
+     * @param int $subtotalInclTax
+     * @param int $minOrderAmount
+     * @param int $packageValueWithDiscount
+     * @param int $baseSubtotalWithDiscountInclTax
+     * @param InvokedCount $expectedCallAppend
+     *
+     * @return void
+     * @dataProvider freeShippingWithSubtotalTaxDataProvider
+     */
+    public function testCollectRatesFreeShippingWithTaxOptions(
+        int $subtotalInclTax,
+        int $minOrderAmount,
+        int $packageValueWithDiscount,
+        int $baseSubtotalWithDiscountInclTax,
+        InvokedCount $expectedCallAppend
+    ): void {
+        /** @var RateRequest|MockObject $request */
+        $request = $this->getMockBuilder(RateRequest::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'getAllItems',
+                    'getPackageQty',
+                    'getFreeShipping',
+                    'getBaseSubtotalWithDiscountInclTax',
+                    'getPackageValueWithDiscount',
+                ]
+            )
+            ->getMock();
+        $item = $this->getMockBuilder(QuoteItem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->scopeConfigMock->expects($this->at(0))
+            ->method('isSetFlag')
+            ->willReturn(true);
+        $this->scopeConfigMock->expects($this->at(1))
+            ->method('isSetFlag')
+            ->with(
+                'carriers/freeshipping/tax_including',
+                ScopeInterface::SCOPE_STORE,
+                null
+            )
+            ->willReturn($subtotalInclTax);
+        $this->scopeConfigMock->expects($this->at(2))
+            ->method('getValue')
+            ->with(
+                'carriers/freeshipping/free_shipping_subtotal',
+                ScopeInterface::SCOPE_STORE,
+                null
+            )
+            ->willReturn($minOrderAmount);
+        $method = $this->getMockBuilder(Method::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setCarrier', 'setCarrierTitle', 'setMethod', 'setMethodTitle', 'setPrice', 'setCost'])
+            ->getMock();
+        $resultModel = $this->getMockBuilder(Result::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['append'])
+            ->getMock();
+        $this->resultFactoryMock->method('create')
+            ->willReturn($resultModel);
+        $request->method('getPackageValueWithDiscount')
+            ->willReturn($packageValueWithDiscount);
+        $request->method('getAllItems')
+            ->willReturn([$item]);
+        $request->method('getFreeShipping')
+            ->willReturn(false);
+        $request->method('getBaseSubtotalWithDiscountInclTax')
+            ->willReturn($baseSubtotalWithDiscountInclTax);
+        $this->methodFactoryMock->method('create')->willReturn($method);
+
+        $resultModel->expects($expectedCallAppend)
+            ->method('append')
+            ->with($method);
+
+        $this->model->collectRates($request);
+    }
+
+    /**
+     * @return array
+     */
+    public function freeShippingWithSubtotalTaxDataProvider(): array
+    {
+        return [
+            [
+                'subtotalInclTax' => 1,
+                'minOrderAmount' => 10,
+                'packageValueWithDiscount' => 8,
+                'baseSubtotalWithDiscountInclTax' => 15,
+                'expectedCallAppend' => $this->once(),
+
+            ],
+            [
+                'subtotalInclTax' => 1,
+                'minOrderAmount' => 20,
+                'packageValueWithDiscount' => 8,
+                'baseSubtotalWithDiscountInclTax' => 15,
+                'expectedCallAppend' => $this->never(),
+
+            ],
+            [
+                'subtotalInclTax' => 0,
+                'minOrderAmount' => 10,
+                'packageValueWithDiscount' => 8,
+                'baseSubtotalWithDiscountInclTax' => 15,
+                'expectedCallAppend' => $this->never(),
+
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml b/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml
index 2b29d2211b9d1..cb75bddf4d7bd 100644
--- a/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml
+++ b/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml
@@ -127,6 +127,10 @@
                     <label>Minimum Order Amount</label>
                     <validate>validate-number validate-zero-or-greater</validate>
                 </field>
+                <field id="tax_including" translate="label" sortOrder="5" type="select" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                    <label>Include Tax to Amount</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
                 <field id="name" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Method Name</label>
                 </field>
diff --git a/app/code/Magento/PageCache/Model/DepersonalizeChecker.php b/app/code/Magento/PageCache/Model/DepersonalizeChecker.php
index 4012499d5da5a..3023efb7a71a6 100644
--- a/app/code/Magento/PageCache/Model/DepersonalizeChecker.php
+++ b/app/code/Magento/PageCache/Model/DepersonalizeChecker.php
@@ -20,7 +20,7 @@ class DepersonalizeChecker
     /**
      * Module manager
      *
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     private $moduleManager;
 
@@ -33,12 +33,12 @@ class DepersonalizeChecker
 
     /**
      * @param \Magento\Framework\App\RequestInterface $request
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param Config $cacheConfig
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         Config $cacheConfig
     ) {
         $this->request = $request;
diff --git a/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php b/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
index ef85d6faf2371..88619673ad425 100644
--- a/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
+++ b/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
@@ -7,6 +7,8 @@
 
 /**
  * Class LayoutPlugin
+ *
+ * Plugin for Magento\Framework\View\Layout
  */
 class LayoutPlugin
 {
@@ -20,22 +22,31 @@ class LayoutPlugin
      */
     protected $response;
 
+    /**
+     * @var \Magento\Framework\App\MaintenanceMode
+     */
+    private $maintenanceMode;
+
     /**
      * Constructor
      *
      * @param \Magento\Framework\App\ResponseInterface $response
-     * @param \Magento\PageCache\Model\Config $config
+     * @param \Magento\PageCache\Model\Config          $config
+     * @param \Magento\Framework\App\MaintenanceMode   $maintenanceMode
      */
     public function __construct(
         \Magento\Framework\App\ResponseInterface $response,
-        \Magento\PageCache\Model\Config $config
+        \Magento\PageCache\Model\Config $config,
+        \Magento\Framework\App\MaintenanceMode $maintenanceMode
     ) {
         $this->response = $response;
         $this->config = $config;
+        $this->maintenanceMode = $maintenanceMode;
     }
 
     /**
      * Set appropriate Cache-Control headers
+     *
      * We have to set public headers in order to tell Varnish and Builtin app that page should be cached
      *
      * @param \Magento\Framework\View\Layout $subject
@@ -44,7 +55,7 @@ public function __construct(
      */
     public function afterGenerateXml(\Magento\Framework\View\Layout $subject, $result)
     {
-        if ($subject->isCacheable() && $this->config->isEnabled()) {
+        if ($subject->isCacheable() && !$this->maintenanceMode->isOn() && $this->config->isEnabled()) {
             $this->response->setPublicHeaders($this->config->getTtl());
         }
         return $result;
@@ -68,6 +79,7 @@ public function afterGetOutput(\Magento\Framework\View\Layout $subject, $result)
                     if ($isVarnish && $isEsiBlock) {
                         continue;
                     }
+                    // phpcs:ignore
                     $tags = array_merge($tags, $block->getIdentities());
                 }
             }
diff --git a/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance.php b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance.php
deleted file mode 100644
index 7017da27eee93..0000000000000
--- a/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\PageCache\Observer;
-
-use Magento\Framework\Event\ObserverInterface;
-use Magento\Framework\Event\Observer;
-use Magento\Framework\App\Cache\Manager;
-use Magento\PageCache\Model\Cache\Type as PageCacheType;
-use Magento\PageCache\Observer\SwitchPageCacheOnMaintenance\PageCacheState;
-
-/**
- * Switch Page Cache on maintenance.
- */
-class SwitchPageCacheOnMaintenance implements ObserverInterface
-{
-    /**
-     * @var Manager
-     */
-    private $cacheManager;
-
-    /**
-     * @var PageCacheState
-     */
-    private $pageCacheStateStorage;
-
-    /**
-     * @param Manager $cacheManager
-     * @param PageCacheState $pageCacheStateStorage
-     */
-    public function __construct(Manager $cacheManager, PageCacheState $pageCacheStateStorage)
-    {
-        $this->cacheManager = $cacheManager;
-        $this->pageCacheStateStorage = $pageCacheStateStorage;
-    }
-
-    /**
-     * Switches Full Page Cache.
-     *
-     * Depending on enabling or disabling Maintenance Mode it turns off or restores Full Page Cache state.
-     *
-     * @param Observer $observer
-     * @return void
-     */
-    public function execute(Observer $observer): void
-    {
-        if ($observer->getData('isOn')) {
-            $this->pageCacheStateStorage->save($this->isFullPageCacheEnabled());
-            $this->turnOffFullPageCache();
-        } else {
-            $this->restoreFullPageCacheState();
-        }
-    }
-
-    /**
-     * Turns off Full Page Cache.
-     *
-     * @return void
-     */
-    private function turnOffFullPageCache(): void
-    {
-        if (!$this->isFullPageCacheEnabled()) {
-            return;
-        }
-
-        $this->cacheManager->clean([PageCacheType::TYPE_IDENTIFIER]);
-        $this->cacheManager->setEnabled([PageCacheType::TYPE_IDENTIFIER], false);
-    }
-
-    /**
-     * Full Page Cache state.
-     *
-     * @return bool
-     */
-    private function isFullPageCacheEnabled(): bool
-    {
-        $cacheStatus = $this->cacheManager->getStatus();
-
-        if (!array_key_exists(PageCacheType::TYPE_IDENTIFIER, $cacheStatus)) {
-            return false;
-        }
-
-        return (bool)$cacheStatus[PageCacheType::TYPE_IDENTIFIER];
-    }
-
-    /**
-     * Restores Full Page Cache state.
-     *
-     * Returns FPC to previous state that was before maintenance mode turning on.
-     *
-     * @return void
-     */
-    private function restoreFullPageCacheState(): void
-    {
-        $storedPageCacheState = $this->pageCacheStateStorage->isEnabled();
-        $this->pageCacheStateStorage->flush();
-
-        if ($storedPageCacheState) {
-            $this->cacheManager->setEnabled([PageCacheType::TYPE_IDENTIFIER], true);
-        }
-    }
-}
diff --git a/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php
index e4cadf728f2ea..da6a71a0c2655 100644
--- a/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php
+++ b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php
@@ -13,7 +13,11 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
- * Page Cache state.
+ * Class PageCacheState
+ *
+ * Page Cache State Observer
+ *
+ * @deprecated Originally used by now removed observer SwitchPageCacheOnMaintenance
  */
 class PageCacheState
 {
diff --git a/app/code/Magento/PageCache/Plugin/RegisterFormKeyFromCookie.php b/app/code/Magento/PageCache/Plugin/RegisterFormKeyFromCookie.php
index 6cdc500aaf33c..36a20ec658b6f 100644
--- a/app/code/Magento/PageCache/Plugin/RegisterFormKeyFromCookie.php
+++ b/app/code/Magento/PageCache/Plugin/RegisterFormKeyFromCookie.php
@@ -10,10 +10,10 @@
 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\Escaper;
 use Magento\Framework\Session\Config\ConfigInterface;
+use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 
 /**
  * Allow for registration of a form key through cookies.
@@ -46,7 +46,7 @@ class RegisterFormKeyFromCookie
     private $sessionConfig;
 
     /**
-     * @param CacheFormKey $formKey
+     * @param CacheFormKey $cacheFormKey
      * @param Escaper $escaper
      * @param FormKey $formKey
      * @param CookieMetadataFactory $cookieMetadataFactory
@@ -70,7 +70,6 @@ public function __construct(
      * Set form key from the cookie.
      *
      * @return void
-     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeDispatch(): void
@@ -85,6 +84,8 @@ public function beforeDispatch(): void
     }
 
     /**
+     * Set form key cookie
+     *
      * @param string $formKey
      * @return void
      */
@@ -94,6 +95,7 @@ private function updateCookieFormKey(string $formKey): void
             ->createPublicCookieMetadata();
         $cookieMetadata->setDomain($this->sessionConfig->getCookieDomain());
         $cookieMetadata->setPath($this->sessionConfig->getCookiePath());
+        $cookieMetadata->setSecure($this->sessionConfig->getCookieSecure());
         $lifetime = $this->sessionConfig->getCookieLifetime();
         if ($lifetime !== 0) {
             $cookieMetadata->setDuration($lifetime);
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/DepersonalizeCheckerTest.php b/app/code/Magento/PageCache/Test/Unit/Model/DepersonalizeCheckerTest.php
index 6857c637bab84..8cc933853a492 100644
--- a/app/code/Magento/PageCache/Test/Unit/Model/DepersonalizeCheckerTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Model/DepersonalizeCheckerTest.php
@@ -18,7 +18,7 @@ class DepersonalizeCheckerTest extends \PHPUnit\Framework\TestCase
     private $requestMock;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
      */
     private $moduleManagerMock;
 
@@ -30,7 +30,7 @@ class DepersonalizeCheckerTest extends \PHPUnit\Framework\TestCase
     public function setup()
     {
         $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
-        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\ModuleManagerInterface::class);
+        $this->moduleManagerMock = $this->createMock(\Magento\Framework\Module\Manager::class);
         $this->cacheConfigMock = $this->createMock(\Magento\PageCache\Model\Config::class);
     }
 
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 6c39fe1e7979c..e2bc7f237ab0a 100644
--- a/app/code/Magento/PageCache/Test/Unit/Model/Layout/LayoutPluginTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Model/Layout/LayoutPluginTest.php
@@ -27,6 +27,11 @@ class LayoutPluginTest extends \PHPUnit\Framework\TestCase
      */
     protected $configMock;
 
+    /**
+     * @var \Magento\Framework\App\MaintenanceMode|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $maintenanceModeMock;
+
     protected function setUp()
     {
         $this->layoutMock = $this->getMockForAbstractClass(
@@ -40,27 +45,33 @@ protected function setUp()
         );
         $this->responseMock = $this->createMock(\Magento\Framework\App\Response\Http::class);
         $this->configMock = $this->createMock(\Magento\PageCache\Model\Config::class);
+        $this->maintenanceModeMock = $this->createMock(\Magento\Framework\App\MaintenanceMode::class);
 
         $this->model = new \Magento\PageCache\Model\Layout\LayoutPlugin(
             $this->responseMock,
-            $this->configMock
+            $this->configMock,
+            $this->maintenanceModeMock
         );
     }
 
     /**
      * @param $cacheState
      * @param $layoutIsCacheable
+     * @param $maintenanceModeIsEnabled
+     *
      * @dataProvider afterGenerateXmlDataProvider
      */
-    public function testAfterGenerateXml($cacheState, $layoutIsCacheable)
+    public function testAfterGenerateXml($cacheState, $layoutIsCacheable, $maintenanceModeIsEnabled)
     {
         $maxAge = 180;
         $result = 'test';
 
         $this->layoutMock->expects($this->once())->method('isCacheable')->will($this->returnValue($layoutIsCacheable));
         $this->configMock->expects($this->any())->method('isEnabled')->will($this->returnValue($cacheState));
+        $this->maintenanceModeMock->expects($this->any())->method('isOn')
+            ->will($this->returnValue($maintenanceModeIsEnabled));
 
-        if ($layoutIsCacheable && $cacheState) {
+        if ($layoutIsCacheable && $cacheState && !$maintenanceModeIsEnabled) {
             $this->configMock->expects($this->once())->method('getTtl')->will($this->returnValue($maxAge));
             $this->responseMock->expects($this->once())->method('setPublicHeaders')->with($maxAge);
         } else {
@@ -76,10 +87,11 @@ public function testAfterGenerateXml($cacheState, $layoutIsCacheable)
     public function afterGenerateXmlDataProvider()
     {
         return [
-            'Full_cache state is true, Layout is cache-able' => [true, true],
-            'Full_cache state is true, Layout is not cache-able' => [true, false],
-            'Full_cache state is false, Layout is not cache-able' => [false, false],
-            'Full_cache state is false, Layout is cache-able' => [false, true]
+            'Full_cache state is true, Layout is cache-able' => [true, true, false],
+            'Full_cache state is true, Layout is not cache-able' => [true, false, false],
+            'Full_cache state is false, Layout is not cache-able' => [false, false, false],
+            'Full_cache state is false, Layout is cache-able' => [false, true, false],
+            'Full_cache state is true, Layout is cache-able, Maintenance mode is enabled' => [true, true, true],
         ];
     }
 
diff --git a/app/code/Magento/PageCache/Test/Unit/Observer/SwitchPageCacheOnMaintenanceTest.php b/app/code/Magento/PageCache/Test/Unit/Observer/SwitchPageCacheOnMaintenanceTest.php
deleted file mode 100644
index 2dbb815c70925..0000000000000
--- a/app/code/Magento/PageCache/Test/Unit/Observer/SwitchPageCacheOnMaintenanceTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\PageCache\Test\Unit\Observer;
-
-use PHPUnit\Framework\TestCase;
-use Magento\PageCache\Observer\SwitchPageCacheOnMaintenance;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\App\Cache\Manager;
-use Magento\Framework\Event\Observer;
-use Magento\PageCache\Model\Cache\Type as PageCacheType;
-use Magento\PageCache\Observer\SwitchPageCacheOnMaintenance\PageCacheState;
-
-/**
- * SwitchPageCacheOnMaintenance observer test.
- */
-class SwitchPageCacheOnMaintenanceTest extends TestCase
-{
-    /**
-     * @var SwitchPageCacheOnMaintenance
-     */
-    private $model;
-
-    /**
-     * @var Manager|\PHPUnit\Framework\MockObject\MockObject
-     */
-    private $cacheManager;
-
-    /**
-     * @var PageCacheState|\PHPUnit\Framework\MockObject\MockObject
-     */
-    private $pageCacheStateStorage;
-
-    /**
-     * @var Observer|\PHPUnit\Framework\MockObject\MockObject
-     */
-    private $observer;
-
-    /**
-     * @inheritdoc
-     */
-    protected function setUp(): void
-    {
-        $objectManager = new ObjectManager($this);
-        $this->cacheManager = $this->createMock(Manager::class);
-        $this->pageCacheStateStorage = $this->createMock(PageCacheState::class);
-        $this->observer = $this->createMock(Observer::class);
-
-        $this->model = $objectManager->getObject(SwitchPageCacheOnMaintenance::class, [
-            'cacheManager' => $this->cacheManager,
-            'pageCacheStateStorage' => $this->pageCacheStateStorage,
-        ]);
-    }
-
-    /**
-     * Tests execute when setting maintenance mode to on.
-     *
-     * @param array $cacheStatus
-     * @param bool $cacheState
-     * @param int $flushCacheCalls
-     * @return void
-     * @dataProvider enablingPageCacheStateProvider
-     */
-    public function testExecuteWhileMaintenanceEnabling(
-        array $cacheStatus,
-        bool $cacheState,
-        int $flushCacheCalls
-    ): void {
-        $this->observer->method('getData')
-            ->with('isOn')
-            ->willReturn(true);
-        $this->cacheManager->method('getStatus')
-            ->willReturn($cacheStatus);
-
-        // Page Cache state will be stored.
-        $this->pageCacheStateStorage->expects($this->once())
-            ->method('save')
-            ->with($cacheState);
-
-        // Page Cache will be cleaned and disabled
-        $this->cacheManager->expects($this->exactly($flushCacheCalls))
-            ->method('clean')
-            ->with([PageCacheType::TYPE_IDENTIFIER]);
-        $this->cacheManager->expects($this->exactly($flushCacheCalls))
-            ->method('setEnabled')
-            ->with([PageCacheType::TYPE_IDENTIFIER], false);
-
-        $this->model->execute($this->observer);
-    }
-
-    /**
-     * Tests execute when setting Maintenance Mode to off.
-     *
-     * @param bool $storedCacheState
-     * @param int $enableCacheCalls
-     * @return void
-     * @dataProvider disablingPageCacheStateProvider
-     */
-    public function testExecuteWhileMaintenanceDisabling(bool $storedCacheState, int $enableCacheCalls): void
-    {
-        $this->observer->method('getData')
-            ->with('isOn')
-            ->willReturn(false);
-
-        $this->pageCacheStateStorage->method('isEnabled')
-            ->willReturn($storedCacheState);
-
-        // Nullify Page Cache state.
-        $this->pageCacheStateStorage->expects($this->once())
-            ->method('flush');
-
-        // Page Cache will be enabled.
-        $this->cacheManager->expects($this->exactly($enableCacheCalls))
-            ->method('setEnabled')
-            ->with([PageCacheType::TYPE_IDENTIFIER]);
-
-        $this->model->execute($this->observer);
-    }
-
-    /**
-     * Page Cache state data provider.
-     *
-     * @return array
-     */
-    public function enablingPageCacheStateProvider(): array
-    {
-        return [
-            'page_cache_is_enable' => [
-                'cache_status' => [PageCacheType::TYPE_IDENTIFIER => 1],
-                'cache_state' => true,
-                'flush_cache_calls' => 1,
-            ],
-            'page_cache_is_missing_in_system' => [
-                'cache_status' => [],
-                'cache_state' => false,
-                'flush_cache_calls' => 0,
-            ],
-            'page_cache_is_disable' => [
-                'cache_status' => [PageCacheType::TYPE_IDENTIFIER => 0],
-                'cache_state' => false,
-                'flush_cache_calls' => 0,
-            ],
-        ];
-    }
-
-    /**
-     * Page Cache state data provider.
-     *
-     * @return array
-     */
-    public function disablingPageCacheStateProvider(): array
-    {
-        return [
-            ['stored_cache_state' => true, 'enable_cache_calls' => 1],
-            ['stored_cache_state' => false, 'enable_cache_calls' => 0],
-        ];
-    }
-}
diff --git a/app/code/Magento/PageCache/etc/events.xml b/app/code/Magento/PageCache/etc/events.xml
index 3f0a2532ae60a..7584f5f36d69c 100644
--- a/app/code/Magento/PageCache/etc/events.xml
+++ b/app/code/Magento/PageCache/etc/events.xml
@@ -57,7 +57,4 @@
     <event name="customer_logout">
         <observer name="FlushFormKey" instance="Magento\PageCache\Observer\FlushFormKey"/>
     </event>
-    <event name="maintenance_mode_changed">
-        <observer name="page_cache_switcher_for_maintenance" instance="Magento\PageCache\Observer\SwitchPageCacheOnMaintenance"/>
-    </event>
 </config>
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 735fe9a6cb236..41a32ab8a49c8 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
@@ -112,11 +112,14 @@ define([
          * @private
          */
         _create: function () {
-            var formKey = $.mage.cookies.get('form_key');
+            var formKey = $.mage.cookies.get('form_key'),
+                options = {
+                    secure: window.cookiesConfig ? window.cookiesConfig.secure : false
+                };
 
             if (!formKey) {
                 formKey = generateRandomString(this.options.allowedCharacters, this.options.length);
-                $.mage.cookies.set('form_key', formKey);
+                $.mage.cookies.set('form_key', formKey, options);
             }
             $(this.options.inputSelector).val(formKey);
         }
diff --git a/app/code/Magento/Payment/Block/Info/Instructions.php b/app/code/Magento/Payment/Block/Info/Instructions.php
index f670fa6925bfb..687c6b54a2f4f 100644
--- a/app/code/Magento/Payment/Block/Info/Instructions.php
+++ b/app/code/Magento/Payment/Block/Info/Instructions.php
@@ -25,18 +25,6 @@ class Instructions extends \Magento\Payment\Block\Info
      */
     protected $_template = 'Magento_Payment::info/instructions.phtml';
 
-    /**
-     * Gets payment method title for appropriate store.
-     *
-     * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    public function getTitle()
-    {
-        return $this->getInfo()->getAdditionalInformation('method_title')
-            ?: $this->getMethod()->getConfigData('title', $this->getInfo()->getOrder()->getStoreId());
-    }
-
     /**
      * Get instructions text from order payment
      * (or from config, if instructions are missed in payment)
diff --git a/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml b/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml
index 14c8bd0fecde7..eeae53d082443 100644
--- a/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml
+++ b/app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml
@@ -11,4 +11,8 @@
     <entity name="PaymentMethodCheckMoneyOrder" type="payment_method">
         <data key="method">checkmo</data>
     </entity>
+
+    <entity name="CashOnDeliveryPaymentMethodDefault" type="cashondelivery_payment_method">
+        <requiredEntity type="active">CashOnDeliveryEnableConfigData</requiredEntity>
+    </entity>
 </entities>
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
index 39506a682038f..3ad3a0e1c60de 100644
--- a/app/code/Magento/Payment/Test/Mftf/Metadata/payment_method-meta.xml
+++ b/app/code/Magento/Payment/Test/Mftf/Metadata/payment_method-meta.xml
@@ -11,4 +11,18 @@
     <operation name="CreatePaymentMethod" dataType="payment_method" type="create">
         <field key="method">string</field>
     </operation>
+    <operation name="cashondeliveryPaymentMethodSetup" dataType="cashondelivery_payment_method" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
+        <object key="groups" dataType="cashondelivery_payment_method">
+            <object key="cashondelivery" dataType="cashondelivery_payment_method">
+                <object key="fields" dataType="cashondelivery_payment_method">
+                    <object key="active" dataType="active">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="title" dataType="title">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
 </operations>
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Info/InstructionsTest.php b/app/code/Magento/Payment/Test/Unit/Block/Info/InstructionsTest.php
index 88144b6e05c62..68c76d94e02ae 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/Info/InstructionsTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/Info/InstructionsTest.php
@@ -4,12 +4,11 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * Test class for \Magento\Payment\Block\Info\Instructions
+ */
 namespace Magento\Payment\Test\Unit\Block\Info;
 
-use Magento\Payment\Model\MethodInterface;
-use Magento\Sales\Model\Order;
-use PHPUnit\Framework\MockObject\MockObject;
-
 class InstructionsTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -26,59 +25,10 @@ protected function setUp()
     {
         $context = $this->createMock(\Magento\Framework\View\Element\Template\Context::class);
         $this->_instructions = new \Magento\Payment\Block\Info\Instructions($context);
-        $this->_info = $this->getMockBuilder(\Magento\Payment\Model\Info::class)
-            ->setMethods(
-                [
-                    'getOrder',
-                    'getAdditionalInformation',
-                    'getMethodInstance'
-                ]
-            )
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->_info = $this->createMock(\Magento\Payment\Model\Info::class);
         $this->_instructions->setData('info', $this->_info);
     }
 
-    /**
-     * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    public function testGetTitleFromPaymentAdditionalData()
-    {
-        $this->_info->method('getAdditionalInformation')
-            ->with('method_title')
-            ->willReturn('payment_method_title');
-
-        $this->getMethod()->expects($this->never())
-            ->method('getConfigData');
-
-        $this->assertEquals($this->_instructions->getTitle(), 'payment_method_title');
-    }
-
-    /**
-     * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    public function testGetTitleFromPaymentMethodConfig()
-    {
-        $this->_info->method('getAdditionalInformation')
-            ->with('method_title')
-            ->willReturn(null);
-
-        $this->getMethod()->expects($this->once())
-            ->method('getConfigData')
-            ->with('title', null)
-            ->willReturn('payment_method_title');
-
-        $order = $this->getOrder();
-        $this->_info->method('getOrder')->willReturn($order);
-
-        $this->assertEquals($this->_instructions->getTitle(), 'payment_method_title');
-    }
-
-    /**
-     * @return void
-     */
     public function testGetInstructionAdditionalInformation()
     {
         $this->_info->expects($this->once())
@@ -91,13 +41,10 @@ public function testGetInstructionAdditionalInformation()
         $this->assertEquals('get the instruction here', $this->_instructions->getInstructions());
     }
 
-    /**
-     * @return void
-     */
     public function testGetInstruction()
     {
         $methodInstance = $this->getMockBuilder(
-            MethodInterface::class
+            \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
         $methodInstance->expects($this->once())
             ->method('getConfigData')
@@ -112,27 +59,4 @@ public function testGetInstruction()
             ->willReturn($methodInstance);
         $this->assertEquals('get the instruction here', $this->_instructions->getInstructions());
     }
-
-    /**
-     * @return MethodInterface|MockObject
-     */
-    private function getMethod()
-    {
-        $method = $this->getMockBuilder(MethodInterface::class)
-            ->getMockForAbstractClass();
-        $this->_info->method('getMethodInstance')
-            ->willReturn($method);
-
-        return $method;
-    }
-
-    /**
-     * @return Order|MockObject
-     */
-    private function getOrder()
-    {
-        return $this->getMockBuilder(Order::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-    }
 }
diff --git a/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php b/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
index fbf80de519f9f..71e0384c72f79 100644
--- a/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
+++ b/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 namespace Magento\Payment\Ui\Component\Listing\Column\Method;
 
 /**
@@ -41,6 +42,14 @@ public function toOptionArray()
         if ($this->options === null) {
             $this->options = $this->paymentHelper->getPaymentMethodList(true, true);
         }
+
+        array_walk(
+            $this->options,
+            function (&$item) {
+                $item['__disableTmpl'] = true;
+            }
+        );
+
         return $this->options;
     }
 }
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
index 8b9c37f112560..3cd88bddbfb1f 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
@@ -9,8 +9,9 @@
  * @see \Magento\Payment\Block\Info
  */
 $specificInfo = $block->getSpecificInformation();
+$paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
+<?= $block->escapeHtml($paymentTitle) ?>
 
 <?php if ($specificInfo) : ?>
     <table class="data-table admin__table-secondary">
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
index 904f0bd2e2cdc..f60c1d063addf 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
@@ -9,7 +9,7 @@
  * @see \Magento\Payment\Block\Info
  */
 ?>
-<p><?= $block->escapeHtml($block->getTitle()) ?></p>
+<p><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></p>
 <?php if ($block->getInstructions()) : ?>
     <table>
         <tbody>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
index a8583ea5549fe..54b9e48d07a94 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
@@ -8,8 +8,9 @@
  * @see \Magento\Payment\Block\Info
  * @var \Magento\Payment\Block\Info $block
  */
+$paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>{{pdf_row_separator}}
+<?= $block->escapeHtml($paymentTitle) ?>{{pdf_row_separator}}
 
 <?php if ($specificInfo = $block->getSpecificInformation()) : ?>
     <?php foreach ($specificInfo as $label => $value) : ?>
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 c41be40cba144..746a4bd2cf33b 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
@@ -4,23 +4,15 @@
  */
 
 /* @api */
-(function (factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'Magento_Payment/js/model/credit-card-validation/cvv-validator',
-            'Magento_Payment/js/model/credit-card-validation/credit-card-number-validator',
-            'Magento_Payment/js/model/credit-card-validation/expiration-date-validator/expiration-year-validator',
-            'Magento_Payment/js/model/credit-card-validation/expiration-date-validator/expiration-month-validator',
-            'Magento_Payment/js/model/credit-card-validation/credit-card-data',
-            'mage/translate'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($, cvvValidator, creditCardNumberValidator, yearValidator, monthValidator, creditCardData) {
+define([
+    'jquery',
+    'Magento_Payment/js/model/credit-card-validation/cvv-validator',
+    'Magento_Payment/js/model/credit-card-validation/credit-card-number-validator',
+    'Magento_Payment/js/model/credit-card-validation/expiration-date-validator/expiration-year-validator',
+    'Magento_Payment/js/model/credit-card-validation/expiration-date-validator/expiration-month-validator',
+    'Magento_Payment/js/model/credit-card-validation/credit-card-data',
+    'mage/translate'
+], function ($, cvvValidator, creditCardNumberValidator, yearValidator, monthValidator, creditCardData) {
     'use strict';
 
     $('.payment-method-content input[type="number"]').on('keyup', function () {
@@ -111,4 +103,4 @@
         rule.unshift(i);
         $.validator.addMethod.apply($.validator, rule);
     });
-}));
+});
diff --git a/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml b/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
index a8d2b15c3ea31..60efae16b1711 100644
--- a/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
@@ -10,7 +10,7 @@
  */
 ?>
 <dl class="payment-method">
-    <dt class="title"><?= $block->escapeHtml($block->getTitle()) ?></dt>
+    <dt class="title"><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
 <?php if ($block->getInstructions()) : ?>
     <dd class="content"><?= /* @noEscape */ nl2br($block->escapeHtml($block->getInstructions())) ?></dd>
 <?php endif; ?>
diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index ede9cacf25d40..59e4db6d84201 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -83,7 +83,7 @@ public function getConfig(string $page): array
             'allowedFunding' => $this->getAllowedFunding($page),
             'disallowedFunding' => $this->getDisallowedFunding(),
             'styles' => $this->getButtonStyles($page),
-            'isVisibleOnProductPage'  => $this->config->getValue('visible_on_product'),
+            'isVisibleOnProductPage'  => (bool)$this->config->getValue('visible_on_product'),
             'isGuestCheckoutAllowed'  => $isGuestCheckoutAllowed
         ];
     }
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
new file mode 100644
index 0000000000000..1bea6b11b966b
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Fieldset;
+
+class GroupTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Group
+     */
+    private $_model;
+
+    /**
+     * @var \Magento\Framework\Data\Form\Element\AbstractElement
+     */
+    private $_element;
+
+    /**
+     * @var \Magento\Backend\Model\Auth\Session|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $_authSession;
+
+    /**
+     * @var \Magento\User\Model\User|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $_user;
+
+    /**
+     * @var \Magento\Config\Model\Config\Structure\Element\Group|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $_group;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->_group = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Group::class);
+        $this->_element = $this->getMockForAbstractClass(
+            \Magento\Framework\Data\Form\Element\AbstractElement::class,
+            [],
+            '',
+            false,
+            true,
+            true,
+            ['getHtmlId', 'getElementHtml', 'getName', 'getElements', 'getId']
+        );
+        $this->_element->expects($this->any())
+            ->method('getHtmlId')
+            ->will($this->returnValue('html id'));
+        $this->_element->expects($this->any())
+            ->method('getElementHtml')
+            ->will($this->returnValue('element html'));
+        $this->_element->expects($this->any())
+            ->method('getName')
+            ->will($this->returnValue('name'));
+        $this->_element->expects($this->any())
+            ->method('getElements')
+            ->will($this->returnValue([]));
+        $this->_element->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue('id'));
+        $this->_user = $this->createMock(\Magento\User\Model\User::class);
+        $this->_authSession = $this->createMock(\Magento\Backend\Model\Auth\Session::class);
+        $this->_authSession->expects($this->any())
+            ->method('__call')
+            ->with('getUser')
+            ->will($this->returnValue($this->_user));
+        $this->_model = $helper->getObject(
+            \Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group::class,
+            ['authSession' => $this->_authSession]
+        );
+        $this->_model->setGroup($this->_group);
+    }
+
+    /**
+     * @param mixed $expanded
+     * @param int $expected
+     * @dataProvider isCollapseStateDataProvider
+     */
+    public function testIsCollapseState($expanded, $expected)
+    {
+        $this->_user->setExtra(['configState' => []]);
+        $this->_element->setGroup(isset($expanded) ? ['expanded' => $expanded] : []);
+        $html = $this->_model->render($this->_element);
+        $this->assertContains(
+            '<input id="' . $this->_element->getHtmlId() . '-state" name="config_state['
+            . $this->_element->getId() . ']" type="hidden" value="' . $expected . '" />',
+            $html
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function isCollapseStateDataProvider()
+    {
+        return [
+            [null, 0],
+            [false, 0],
+            ['', 0],
+            [1, 1],
+            ['1', 1],
+        ];
+    }
+}
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php
index 478607f9956e6..7256984ab5226 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php
@@ -32,7 +32,7 @@
                 'label' => 'installment',
                 'installmentperiod' => 0
             ],
-            'isVisibleOnProductPage' => 0,
+            'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true
         ]
     ],
@@ -62,7 +62,7 @@
                 'label' => 'installment',
                 'installmentperiod' => 0
             ],
-            'isVisibleOnProductPage' => 0,
+            'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true
         ]
     ],
@@ -91,7 +91,7 @@
                 'shape' => 'rect',
                 'label' => 'paypal'
             ],
-            'isVisibleOnProductPage' => 0,
+            'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true
         ]
     ],
@@ -120,7 +120,7 @@
                 'shape' => 'rect',
                 'label' => 'paypal'
             ],
-            'isVisibleOnProductPage' => 0,
+            'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true
         ]
     ],
@@ -149,7 +149,7 @@
                 'shape' => 'rect',
                 'label' => 'paypal',
             ],
-            'isVisibleOnProductPage' => 0,
+            'isVisibleOnProductPage' => false,
             'isGuestCheckoutAllowed' => true
         ]
     ]
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml
index ca886c7827ffd..88bb61f2cdc99 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml
@@ -13,7 +13,7 @@
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                 <field id="merchant_country" type="select" translate="label comment" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Merchant Country</label>
-                    <comment>If not specified, Default Country from General Config will be used</comment>
+                    <comment>If not specified, Default Country from General Config will be used.</comment>
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Country</frontend_model>
                     <source_model>Magento\Paypal\Model\System\Config\Source\MerchantCountry</source_model>
                     <backend_model>Magento\Paypal\Model\System\Config\Backend\MerchantCountry</backend_model>
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/styles.css b/app/code/Magento/Paypal/view/adminhtml/web/styles.css
index 9d63dbff5f3f9..ee0bb1d0c420b 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/styles.css
+++ b/app/code/Magento/Paypal/view/adminhtml/web/styles.css
@@ -28,9 +28,9 @@
 .paypal-recommended-header > .admin__collapsible-block > a::before {content: "" !important;}
 .paypal-other-header > .admin__collapsible-block > a::before {content: '' !important; width: 0; height: 0; border-color: transparent; border-top-color: #000; border-style: solid; border-width: .8rem .5rem 0 .5rem; margin-top:1px; transition: all .2s linear;}
 .paypal-other-header > .admin__collapsible-block > a.open::before {border-color: transparent; border-bottom-color: #000; border-width: 0 .5rem .8rem .5rem;}
-.paypal-other-header > .admin__collapsible-block > a {color: #007bdb !important; text-align: right;}
 .payments-other-header > .admin__collapsible-block > a,
-.paypal-recommended-header > .admin__collapsible-block > a {display: inline-block;}
+.paypal-recommended-header > .admin__collapsible-block > a,
+.paypal-other-header > .admin__collapsible-block > a {display: inline-block;}
 .payments-other-header > .admin__collapsible-block > a::before,
 .paypal-recommended-header > .admin__collapsible-block > a::before {content: '' !important; width: 0; height: 0; border-color: transparent; border-top-color: #000; border-style: solid; border-width: .8rem .5rem 0 .5rem; margin-top:1px; transition: all .2s linear;}
 .payments-other-header > .admin__collapsible-block > a.open::before,
diff --git a/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
index 60172f696e9ed..8abd57cc69132 100644
--- a/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
+++ b/app/code/Magento/PaypalCaptcha/view/frontend/web/js/view/payment/list-mixin.js
@@ -34,14 +34,16 @@ define([
 
         /**
          * Overrides default window.clearTimeout() to catch errors from iframe and reload Captcha.
+         *
+         * @param {Number} timeoutID
          */
-        clearTimeout: function () {
+        clearTimeout: function (timeoutID) {
             var captcha = captchaList.getCaptchaByFormId(this.formId);
 
             if (captcha !== null) {
                 captcha.refresh();
             }
-            clearTimeout();
+            clearTimeout(timeoutID);
         }
     };
 
diff --git a/app/code/Magento/Persistent/Model/QuoteManager.php b/app/code/Magento/Persistent/Model/QuoteManager.php
index 8ae22e4c26c6f..ebddfe5a43600 100644
--- a/app/code/Magento/Persistent/Model/QuoteManager.php
+++ b/app/code/Magento/Persistent/Model/QuoteManager.php
@@ -89,7 +89,6 @@ public function setGuest($checkQuote = false)
                 ->setCustomerLastname(null)
                 ->setCustomerGroupId(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID)
                 ->setIsPersistent(false)
-                ->setCustomerIsGuest(true)
                 ->removeAllAddresses();
             //Create guest addresses
             $quote->getShippingAddress();
@@ -121,7 +120,6 @@ public function convertCustomerCartToGuest()
                 ->setCustomerEmail(null)
                 ->setCustomerFirstname(null)
                 ->setCustomerLastname(null)
-                ->setCustomerGroupId(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID)
                 ->setIsPersistent(false);
             $quote->getAddressesCollection()->walk('setCustomerAddressId', ['customerAddressId' => null]);
             $quote->getAddressesCollection()->walk('setCustomerId', ['customerId' => null]);
diff --git a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
index 6a8772358f010..036f17fb3c1b2 100644
--- a/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
+++ b/app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php
@@ -6,6 +6,9 @@
 namespace Magento\Persistent\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\Quote;
 
 /**
@@ -74,6 +77,11 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
      */
     private $quote;
 
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
     /**
      * @param \Magento\Persistent\Helper\Session $persistentSession
      * @param \Magento\Persistent\Helper\Data $persistentData
@@ -82,6 +90,7 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Framework\App\RequestInterface $request
+     * @param CartRepositoryInterface $quoteRepository
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -90,7 +99,8 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Framework\App\RequestInterface $request
+        \Magento\Framework\App\RequestInterface $request,
+        CartRepositoryInterface $quoteRepository
     ) {
         $this->_persistentSession = $persistentSession;
         $this->quoteManager = $quoteManager;
@@ -99,6 +109,7 @@ public function __construct(
         $this->_eventManager = $eventManager;
         $this->_persistentData = $persistentData;
         $this->request = $request;
+        $this->quoteRepository = $quoteRepository;
     }
 
     /**
@@ -147,9 +158,11 @@ public function execute(\Magento\Framework\Event\Observer $observer)
      */
     private function isPersistentQuoteOutdated(): bool
     {
-        if ((!$this->_persistentData->isEnabled() || !$this->_persistentData->isShoppingCartPersist())
+        if (!($this->_persistentData->isEnabled() && $this->_persistentData->isShoppingCartPersist())
             && !$this->_customerSession->isLoggedIn()
-            && $this->_checkoutSession->getQuoteId()) {
+            && $this->_checkoutSession->getQuoteId()
+            && $this->isActiveQuote()
+        ) {
             return (bool)$this->getQuote()->getIsPersistent();
         }
         return false;
@@ -182,6 +195,21 @@ private function getQuote(): Quote
         return $this->quote;
     }
 
+    /**
+     * Check if quote is active.
+     *
+     * @return bool
+     */
+    private function isActiveQuote(): bool
+    {
+        try {
+            $this->quoteRepository->getActive($this->_checkoutSession->getQuoteId());
+            return true;
+        } catch (NoSuchEntityException $e) {
+            return false;
+        }
+    }
+
     /**
      * Check current request is coming from onepage checkout page.
      *
diff --git a/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php b/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php
index 94726bc9b1d05..f2f9b96fa82e4 100644
--- a/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php
+++ b/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php
@@ -4,10 +4,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Persistent\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ *  Make persistent quote to be guest
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
 class MakePersistentQuoteGuestObserver implements ObserverInterface
 {
     /**
@@ -65,8 +71,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         /** @var $action \Magento\Persistent\Controller\Index */
         $action = $observer->getEvent()->getControllerAction();
         if ($action instanceof \Magento\Persistent\Controller\Index) {
-            if ((($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
-                || $this->_persistentData->isShoppingCartPersist())
+            if (($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
+                || $this->_persistentData->isShoppingCartPersist()
             ) {
                 $this->quoteManager->setGuest(true);
             }
diff --git a/app/code/Magento/Persistent/Test/Unit/CustomerData/PersistentTest.php b/app/code/Magento/Persistent/Test/Unit/CustomerData/PersistentTest.php
new file mode 100644
index 0000000000000..a95f5530bb800
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Unit/CustomerData/PersistentTest.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Persistent\Test\Unit\CustomerData;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Helper\View;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Persistent\CustomerData\Persistent;
+use Magento\Persistent\Helper\Session;
+use Magento\Persistent\Model\Session as PersistentSession;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class PersistentTest extends TestCase
+{
+    /**
+     * Stub customer id
+     */
+    private const STUB_CUSTOMER_ID = 1;
+
+    /**
+     * Stub customer name
+     */
+    private const STUB_CUSTOMER_NAME = 'Adam John';
+
+    /**
+     * @var Persistent
+     */
+    private $customerData;
+
+    /**
+     * @var Session|MockObject
+     */
+    private $persistentSessionHelperMock;
+
+    /**
+     * @var View|MockObject
+     */
+    private $customerViewHelperMock;
+
+    /**
+     * @var CustomerRepositoryInterface|MockObject
+     */
+    private $customerRepositoryMock;
+
+    /**
+     * Setup environment for test
+     */
+    protected function setUp()
+    {
+        $this->persistentSessionHelperMock = $this->createMock(Session::class);
+        $this->customerViewHelperMock = $this->createMock(View::class);
+        $this->customerRepositoryMock = $this->createMock(CustomerRepositoryInterface::class);
+
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->customerData = $objectManager->getObject(
+            Persistent::class,
+            [
+                'persistentSession' => $this->persistentSessionHelperMock,
+                'customerViewHelper' => $this->customerViewHelperMock,
+                'customerRepository' => $this->customerRepositoryMock
+            ]
+        );
+    }
+
+    /**
+     * Test getSectionData() when disable persistent
+     */
+    public function testGetSectionDataWhenDisablePersistent()
+    {
+        $this->persistentSessionHelperMock->method('isPersistent')->willReturn(false);
+
+        $this->assertEquals([], $this->customerData->getSectionData());
+    }
+
+    /**
+     * Test getSectionData() when customer doesn't login
+     */
+    public function testGetSectionDataWhenCustomerNotLoggedInReturnsEmptyArray()
+    {
+        $this->persistentSessionHelperMock->method('isPersistent')->willReturn(true);
+
+        $persistentSessionMock = $this->createPartialMock(PersistentSession::class, ['getCustomerId']);
+        $persistentSessionMock->method('getCustomerId')->willReturn(null);
+        $this->persistentSessionHelperMock->method('getSession')->willReturn($persistentSessionMock);
+
+        $this->assertEquals([], $this->customerData->getSectionData());
+    }
+
+    /**
+     * Test getSectionData() when customer login and enable persistent
+     */
+    public function testGetSectionDataCustomerLoginAndEnablePersistent()
+    {
+        $this->persistentSessionHelperMock->method('isPersistent')->willReturn(true);
+
+        $persistentSessionMock = $this->createPartialMock(PersistentSession::class, ['getCustomerId']);
+        $persistentSessionMock->method('getCustomerId')->willReturn(self::STUB_CUSTOMER_ID);
+        $this->persistentSessionHelperMock->method('getSession')->willReturn($persistentSessionMock);
+
+        $customerMock = $this->createMock(CustomerInterface::class);
+        $this->customerRepositoryMock->method('getById')->with(self::STUB_CUSTOMER_ID)->willReturn($customerMock);
+        $this->customerViewHelperMock->method('getCustomerName')->with($customerMock)
+            ->willReturn(self::STUB_CUSTOMER_NAME);
+
+        $this->assertEquals(
+            [
+                'fullname' => self::STUB_CUSTOMER_NAME
+            ],
+            $this->customerData->getSectionData()
+        );
+    }
+}
diff --git a/app/code/Magento/Persistent/Test/Unit/Helper/SessionTest.php b/app/code/Magento/Persistent/Test/Unit/Helper/SessionTest.php
new file mode 100644
index 0000000000000..7009ff4d33c0b
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Unit/Helper/SessionTest.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Persistent\Test\Unit\Helper;
+
+use Magento\Persistent\Helper\Session as SessionHelper;
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Persistent\Helper\Data as DataHelper;
+use Magento\Persistent\Model\SessionFactory;
+use Magento\Persistent\Model\Session;
+
+/**
+ * Class \Magento\Persistent\Test\Unit\Helper\SessionTest
+ */
+class SessionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Context
+     */
+    private $context;
+
+    /**
+     * @var  \PHPUnit_Framework_MockObject_MockObject|SessionHelper
+     */
+    private $helper;
+
+    /**
+     * @var  \PHPUnit_Framework_MockObject_MockObject|DataHelper
+     */
+    private $dataHelper;
+
+    /**
+     * @var  \PHPUnit_Framework_MockObject_MockObject|CheckoutSession
+     */
+    private $checkoutSession;
+
+    /**
+     * @var  \PHPUnit_Framework_MockObject_MockObject|SessionFactory
+     */
+    private $sessionFactory;
+
+    /**
+     * @var  \PHPUnit_Framework_MockObject_MockObject|Session
+     */
+    private $session;
+
+    /**
+     * Setup environment
+     */
+    protected function setUp()
+    {
+        $this->context = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dataHelper = $this->getMockBuilder(DataHelper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->checkoutSession = $this->getMockBuilder(CheckoutSession::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->sessionFactory = $this->getMockBuilder(SessionFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->session = $this->getMockBuilder(Session::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->sessionFactory->expects($this->any())->method('create')->willReturn($this->session);
+
+        $this->helper = $this->getMockBuilder(SessionHelper::class)
+            ->setMethods(['getSession'])
+            ->setConstructorArgs(
+                [
+                    'context' => $this->context,
+                    'persistentData' => $this->dataHelper,
+                    'checkoutSession' => $this->checkoutSession,
+                    'sessionFactory' => $this->sessionFactory
+                ]
+            )
+            ->getMock();
+    }
+
+    /**
+     * Test isPersistent() function
+     *
+     * @param int|null $id
+     * @param boolean $isEnabled
+     * @param boolean $expected
+     * @dataProvider isPersistentDataProvider
+     */
+    public function testIsPersistent($id, $isEnabled, $expected)
+    {
+        $this->session->expects($this->any())->method('getId')
+            ->willReturn($id);
+        $this->helper->expects($this->any())->method('getSession')
+            ->willReturn($this->session);
+        $this->dataHelper->expects($this->any())->method('isEnabled')
+            ->willReturn($isEnabled);
+
+        $this->assertEquals($expected, $this->helper->isPersistent());
+    }
+
+    /**
+     * Data Provider for test isPersistent()
+     *
+     * @return array
+     */
+    public function isPersistentDataProvider()
+    {
+        return [
+            'session_id_and_enable_persistent' => [
+                1,
+                true,
+                true
+            ],
+            'no_session_id_and_enable_persistent' => [
+                null,
+                true,
+                false
+            ]
+        ];
+    }
+
+    /**
+     * Test isRememberMeChecked() function
+     *
+     * @param boolean|null $checked
+     * @param boolean $isEnabled
+     * @param boolean $isRememberMeEnabled
+     * @param boolean $isRememberMeCheckedDefault
+     * @param boolean $expected
+     * @dataProvider isRememberMeCheckedProvider
+     */
+    public function testIsRememberMeChecked(
+        $checked,
+        $isEnabled,
+        $isRememberMeEnabled,
+        $isRememberMeCheckedDefault,
+        $expected
+    ) {
+        $this->helper->setRememberMeChecked($checked);
+        $this->dataHelper->expects($this->any())->method('isEnabled')
+            ->willReturn($isEnabled);
+        $this->dataHelper->expects($this->any())->method('isRememberMeEnabled')
+            ->willReturn($isRememberMeEnabled);
+        $this->dataHelper->expects($this->any())->method('isRememberMeCheckedDefault')
+            ->willReturn($isRememberMeCheckedDefault);
+
+        $this->assertEquals($expected, $this->helper->isRememberMeChecked());
+    }
+
+    /**
+     * Data Provider for test isRememberMeChecked()
+     *
+     * @return array
+     */
+    public function isRememberMeCheckedProvider()
+    {
+        return [
+            'enable_all_config' => [
+                null,
+                true,
+                true,
+                true,
+                true
+            ],
+            'at_least_once_disabled' => [
+                null,
+                false,
+                true,
+                true,
+                false
+            ],
+            'set_remember_me_checked_false' => [
+                false,
+                true,
+                true,
+                true,
+                false
+            ],
+            'set_remember_me_checked_true' => [
+                true,
+                false,
+                true,
+                true,
+                true
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/Layout/DepersonalizePluginTest.php b/app/code/Magento/Persistent/Test/Unit/Model/Layout/DepersonalizePluginTest.php
index 5ba0182ecc57a..9731811ea8a97 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/Layout/DepersonalizePluginTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/Layout/DepersonalizePluginTest.php
@@ -46,17 +46,9 @@ protected function setUp()
 
         $this->requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
 
-        $this->moduleManagerMock = $this->createPartialMock(
-            \Magento\Framework\Module\ModuleManagerInterface::class,
-            ['isEnabled']
-        );
-        $this->cacheConfigMock = $this->createPartialMock(
-            \Magento\PageCache\Model\Config::class,
-            ['isEnabled']
-        );
-        $this->depersonalizeCheckerMock = $this->createMock(
-            \Magento\PageCache\Model\DepersonalizeChecker::class
-        );
+        $this->moduleManagerMock = $this->createPartialMock(\Magento\Framework\Module\Manager::class, ['isEnabled']);
+        $this->cacheConfigMock = $this->createPartialMock(\Magento\PageCache\Model\Config::class, ['isEnabled']);
+        $this->depersonalizeCheckerMock = $this->createMock(\Magento\PageCache\Model\DepersonalizeChecker::class);
 
         $this->plugin = $this->objectManager->getObject(
             \Magento\Persistent\Model\Layout\DepersonalizePlugin::class,
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
index e5de8e7d4aade..afabf18079fbc 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
@@ -55,7 +55,9 @@ protected function setUp()
     {
         $this->persistentSessionMock = $this->createMock(\Magento\Persistent\Helper\Session::class);
         $this->sessionMock =
-            $this->createPartialMock(\Magento\Persistent\Model\Session::class, [
+            $this->createPartialMock(
+                \Magento\Persistent\Model\Session::class,
+                [
                     'setLoadInactive',
                     'setCustomerData',
                     'clearQuote',
@@ -63,7 +65,8 @@ protected function setUp()
                     'getQuote',
                     'removePersistentCookie',
                     '__wakeup',
-                ]);
+                ]
+            );
         $this->persistentDataMock = $this->createMock(\Magento\Persistent\Helper\Data::class);
         $this->checkoutSessionMock = $this->createMock(\Magento\Checkout\Model\Session::class);
 
@@ -71,7 +74,9 @@ protected function setUp()
             $this->createMock(\Magento\Eav\Model\Entity\Collection\AbstractCollection::class);
 
         $this->quoteRepositoryMock = $this->createMock(\Magento\Quote\Api\CartRepositoryInterface::class);
-        $this->quoteMock = $this->createPartialMock(\Magento\Quote\Model\Quote::class, [
+        $this->quoteMock = $this->createPartialMock(
+            \Magento\Quote\Model\Quote::class,
+            [
                 'getId',
                 'getIsPersistent',
                 'getPaymentsCollection',
@@ -90,7 +95,8 @@ protected function setUp()
                 'getIsActive',
                 'getCustomerId',
                 '__wakeup'
-            ]);
+            ]
+        );
 
         $this->model = new QuoteManager(
             $this->persistentSessionMock,
@@ -258,21 +264,22 @@ public function testConvertCustomerCartToGuest()
             ->method('setCustomerFirstname')->with(null)->willReturn($this->quoteMock);
         $this->quoteMock->expects($this->once())
             ->method('setCustomerLastname')->with(null)->willReturn($this->quoteMock);
-        $this->quoteMock->expects($this->once())->method('setCustomerGroupId')
-            ->with(\Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID)
+        $this->quoteMock->expects($this->never())->method('setCustomerGroupId')
             ->willReturn($this->quoteMock);
         $this->quoteMock->expects($this->once())
             ->method('setIsPersistent')->with(false)->willReturn($this->quoteMock);
         $this->quoteMock->expects($this->exactly(3))
             ->method('getAddressesCollection')->willReturn($this->abstractCollectionMock);
-        $this->abstractCollectionMock->expects($this->exactly(3))->method('walk')->with($this->logicalOr(
-            $this->equalTo('setCustomerAddressId'),
-            $this->equalTo($addressArgs),
-            $this->equalTo('setCustomerId'),
-            $this->equalTo($customerIdArgs),
-            $this->equalTo('setEmail'),
-            $this->equalTo($emailArgs)
-        ));
+        $this->abstractCollectionMock->expects($this->exactly(3))->method('walk')->with(
+            $this->logicalOr(
+                $this->equalTo('setCustomerAddressId'),
+                $this->equalTo($addressArgs),
+                $this->equalTo('setCustomerId'),
+                $this->equalTo($customerIdArgs),
+                $this->equalTo('setEmail'),
+                $this->equalTo($emailArgs)
+            )
+        );
         $this->quoteMock->expects($this->once())->method('collectTotals')->willReturn($this->quoteMock);
         $this->persistentSessionMock->expects($this->once())
             ->method('getSession')->willReturn($this->sessionMock);
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
index 2c5b9dad48eb3..31a6ba9f10e7e 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Persistent\Test\Unit\Observer;
 
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
 
 /**
@@ -63,6 +65,11 @@ class CheckExpirePersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
      */
     private $quoteMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|CartRepositoryInterface
+     */
+    private $quoteRepositoryMock;
+
     /**
      * @inheritdoc
      */
@@ -82,6 +89,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getRequestUri', 'getServer'])
             ->getMockForAbstractClass();
+        $this->quoteRepositoryMock = $this->createMock(CartRepositoryInterface::class);
 
         $this->model = new \Magento\Persistent\Observer\CheckExpirePersistentQuoteObserver(
             $this->sessionMock,
@@ -90,7 +98,8 @@ protected function setUp()
             $this->eventManagerMock,
             $this->customerSessionMock,
             $this->checkoutSessionMock,
-            $this->requestMock
+            $this->requestMock,
+            $this->quoteRepositoryMock
         );
         $this->quoteMock = $this->getMockBuilder(Quote::class)
         ->setMethods(['getCustomerIsGuest', 'getIsPersistent'])
@@ -111,12 +120,19 @@ public function testExecuteWhenCanNotApplyPersistentData()
 
     public function testExecuteWhenPersistentIsNotEnabled()
     {
+        $quoteId = 'quote_id_1';
+
         $this->persistentHelperMock
             ->expects($this->once())
             ->method('canProcess')
             ->with($this->observerMock)
             ->willReturn(true);
         $this->persistentHelperMock->expects($this->exactly(2))->method('isEnabled')->willReturn(false);
+        $this->checkoutSessionMock->expects($this->exactly(2))->method('getQuoteId')->willReturn($quoteId);
+        $this->quoteRepositoryMock->expects($this->once())
+            ->method('getActive')
+            ->with($quoteId)
+            ->willThrowException(new NoSuchEntityException());
         $this->eventManagerMock->expects($this->never())->method('dispatch');
         $this->model->execute($this->observerMock);
     }
diff --git a/app/code/Magento/ProductAlert/Test/Unit/Helper/DataTest.php b/app/code/Magento/ProductAlert/Test/Unit/Helper/DataTest.php
new file mode 100644
index 0000000000000..122d785e79599
--- /dev/null
+++ b/app/code/Magento/ProductAlert/Test/Unit/Helper/DataTest.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ProductAlert\Test\Unit\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Magento\ProductAlert\Helper\Data as HelperData;
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\Url\EncoderInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\ProductAlert\Model\Observer;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\ProductAlert\Block\Email\Price;
+use Magento\Framework\Exception\LocalizedException;
+
+class DataTest extends TestCase
+{
+    /**
+     * @var HelperData
+     */
+    private $helper;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var UrlInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlBuilderMock;
+
+    /**
+     * @var EncoderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $encoderMock;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var LayoutInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $layoutMock;
+
+    /**
+     * Setup environment for testing
+     */
+    protected function setUp()
+    {
+        $this->contextMock = $this->createMock(Context::class);
+        $this->urlBuilderMock = $this->createMock(UrlInterface::class);
+        $this->encoderMock = $this->createMock(EncoderInterface::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->layoutMock = $this->createMock(LayoutInterface::class);
+        $this->contextMock->expects($this->once())->method('getUrlBuilder')->willReturn($this->urlBuilderMock);
+        $this->contextMock->expects($this->once())->method('getUrlEncoder')->willReturn($this->encoderMock);
+        $this->contextMock->expects($this->once())->method('getScopeConfig')->willReturn($this->scopeConfigMock);
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $productMock = $this->createMock(Product::class);
+        $productMock->expects($this->any())->method('getId')->willReturn(1);
+
+        $this->helper = $this->objectManagerHelper->getObject(
+            HelperData::class,
+            [
+                'context' => $this->contextMock,
+                'layout' => $this->layoutMock
+            ]
+        );
+        $this->helper->setProduct($productMock);
+    }
+
+    /**
+     * Test getSaveUrl() function
+     */
+    public function testGetSaveUrl()
+    {
+        $currentUrl = 'http://www.example.com/';
+        $type = 'stock';
+        $uenc = strtr(base64_encode($currentUrl), '+/=', '-_,');
+        $expected = 'http://www.example.com/roductalert/add/stock/product_id/1/uenc/' . $uenc;
+
+        $this->urlBuilderMock->expects($this->any())->method('getCurrentUrl')->willReturn($currentUrl);
+        $this->encoderMock->expects($this->any())->method('encode')
+            ->with($currentUrl)
+            ->willReturn($uenc);
+        $this->urlBuilderMock->expects($this->any())->method('getUrl')
+            ->with(
+                'productalert/add/' . $type,
+                [
+                    'product_id' => 1,
+                    'uenc' => $uenc
+                ]
+            )
+            ->willReturn($expected);
+
+        $this->assertEquals($expected, $this->helper->getSaveUrl($type));
+    }
+
+    /**
+     * Test createBlock() with no exception
+     */
+    public function testCreateBlockWithNoException()
+    {
+        $priceBlockMock = $this->createMock(Price::class);
+        $this->layoutMock->expects($this->once())->method('createBlock')->willReturn($priceBlockMock);
+
+        $this->assertEquals($priceBlockMock, $this->helper->createBlock(Price::class));
+    }
+
+    /**
+     * Test createBlock() with exception
+     */
+    public function testCreateBlockWithException()
+    {
+        $invalidBlock = $this->createMock(Product::class);
+        $this->expectException(LocalizedException::class);
+
+        $this->helper->createBlock($invalidBlock);
+    }
+
+    /**
+     * Test isStockAlertAllowed() function with Yes settings
+     */
+    public function testIsStockAlertAllowedWithYesSettings()
+    {
+        $this->scopeConfigMock->expects($this->any())->method('isSetFlag')
+            ->with(Observer::XML_PATH_STOCK_ALLOW, ScopeInterface::SCOPE_STORE)
+            ->willReturn('1');
+
+        $this->assertEquals('1', $this->helper->isStockAlertAllowed());
+    }
+
+    /**
+     * Test isPriceAlertAllowed() function with Yes settings
+     */
+    public function testIsPriceAlertAllowedWithYesSetting()
+    {
+        $this->scopeConfigMock->expects($this->any())->method('isSetFlag')
+            ->with(Observer::XML_PATH_PRICE_ALLOW, ScopeInterface::SCOPE_STORE)
+            ->willReturn('1');
+
+        $this->assertEquals('1', $this->helper->isPriceAlertAllowed());
+    }
+}
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminAssertVideoNoValidationErrorActionGroup.xml b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminAssertVideoNoValidationErrorActionGroup.xml
new file mode 100644
index 0000000000000..676974a577cbf
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminAssertVideoNoValidationErrorActionGroup.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="AdminAssertVideoNoValidationErrorActionGroup">
+        <arguments>
+            <argument name="inputName" type="string"/>
+        </arguments>
+
+        <dontSeeElement selector="{{AdminProductNewVideoSection.errorElement(inputName)}}"
+                        stepKey="seeElementValidationError"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminFillProductVideoFieldActionGroup.xml b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminFillProductVideoFieldActionGroup.xml
new file mode 100644
index 0000000000000..c4448dee84cd5
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminFillProductVideoFieldActionGroup.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="AdminFillProductVideoFieldActionGroup">
+        <arguments>
+            <argument name="input" type="string"/>
+            <argument name="value" type="string"/>
+        </arguments>
+
+        <fillField selector="{{input}}" userInput="{{value}}" stepKey="fillVideoField"/>
+    </actionGroup>
+</actionGroups>
+
+
+
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminGetVideoInformationActionGroup.xml b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminGetVideoInformationActionGroup.xml
new file mode 100644
index 0000000000000..c786a77de97f2
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminGetVideoInformationActionGroup.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="AdminGetVideoInformationActionGroup">
+        <click selector="{{AdminProductNewVideoSection.getVideoInformationButton}}" stepKey="getVideoInformation"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminOpenProductVideoModalActionGroup.xml b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminOpenProductVideoModalActionGroup.xml
new file mode 100644
index 0000000000000..569200efa7379
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminOpenProductVideoModalActionGroup.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="AdminOpenProductVideoModalActionGroup">
+        <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"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AssertAdminVideoValidationErrorActionGroup.xml b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AssertAdminVideoValidationErrorActionGroup.xml
new file mode 100644
index 0000000000000..60e2391712f1b
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AssertAdminVideoValidationErrorActionGroup.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="AssertAdminVideoValidationErrorActionGroup">
+        <arguments>
+            <argument name="inputName" type="string"/>
+            <argument name="errorMessage" type="string" defaultValue="This is a required field."/>
+        </arguments>
+
+        <see selector="{{AdminProductNewVideoSection.errorElement(inputName)}}" userInput="{{errorMessage}}"
+             stepKey="seeElementValidationError"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml
index 71dad6a24f148..58a1c40a4e470 100644
--- a/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Section/AdminProductNewVideoSection.xml
@@ -12,6 +12,7 @@
         <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="getVideoInformationButton" type="button" selector="#new_video_get"/>
         <element name="videoUrlTextField" type="input" selector="#video_url"/>
         <element name="videoTitleTextField" type="input" selector="#video_title"/>
         <element name="videoDescriptionTextField" type="input" selector="#video_description"/>
@@ -20,5 +21,6 @@
         <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"/>
+        <element name="errorElement" type="text" selector="#{{inputName}}-error" parameterized="true" />
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminValidateUrlOnGetVideoInformationTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminValidateUrlOnGetVideoInformationTest.xml
new file mode 100644
index 0000000000000..0db15276e8c67
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminValidateUrlOnGetVideoInformationTest.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="AdminValidateUrlOnGetVideoInformationTest">
+        <annotations>
+            <stories value="Admin validates the url when getting video information"/>
+            <title value="Admin validates the url when getting video information"/>
+            <description value="Testing for a required video url when getting video information"/>
+            <severity value="CRITICAL"/>
+            <group value="ProductVideo"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="ProductVideoYoutubeApiKeyConfig" stepKey="setStoreConfig"/>
+        </before>
+        <after>
+            <createData entity="DefaultProductVideoConfig" stepKey="setStoreDefaultConfig"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndexPage"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenProductVideoModalActionGroup" stepKey="openAddProductVideoModal"/>
+        <actionGroup ref="AdminGetVideoInformationActionGroup" stepKey="clickOnGetVideoInformation"/>
+        <actionGroup ref="AssertAdminVideoValidationErrorActionGroup" stepKey="seeUrlValidationMessage">
+            <argument name="inputName" value="video_url"/>
+        </actionGroup>
+        <actionGroup ref="AdminFillProductVideoFieldActionGroup" stepKey="fillVideoUrlField">
+            <argument name="input" value="{{AdminProductNewVideoSection.videoUrlTextField}}"/>
+            <argument name="value" value="{{mftfTestProductVideo.videoUrl}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminGetVideoInformationActionGroup" stepKey="clickOnGetVideoInformation2"/>
+        <actionGroup ref="AdminAssertVideoNoValidationErrorActionGroup" stepKey="dontSeeUrlValidationMessage">
+            <argument name="inputName" value="video_url"/>
+        </actionGroup>
+    </test>
+</tests>
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 e9b234c5f1160..9cc731dde4b0c 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
@@ -282,9 +282,15 @@ define([
          * @private
          */
         _onGetVideoInformationClick: function () {
-            this._onlyVideoPlayer = false;
-            this._isEditPage = false;
-            this._videoUrlWidget.trigger('update_video_information');
+            var videoForm = this.element.find(this._videoFormSelector);
+
+            videoForm.validation();
+
+            if (this.element.find(this._videoUrlSelector).valid()) {
+                this._onlyVideoPlayer = false;
+                this._isEditPage = false;
+                this._videoUrlWidget.trigger('update_video_information');
+            }
         },
 
         /**
@@ -299,6 +305,14 @@ define([
          * @private
          */
         _onGetVideoInformationStartRequest: function () {
+            var videoForm = this.element.find(this._videoFormSelector);
+
+            try {
+                videoForm.validation('clearError');
+            } catch (e) {
+                // Do nothing
+            }
+
             this._videoRequestComplete = false;
         },
 
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 ede0d2019309d..aead951043448 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
@@ -344,6 +344,7 @@ define([
                     .attr('mozallowfullscreen', '')
                     .attr('allowfullscreen', '')
                     .attr('referrerPolicy', 'origin')
+                    .attr('allow', 'autoplay')
             );
             this._player = window.$f(this.element.children(':first')[0]);
 
diff --git a/app/code/Magento/Quote/Api/CartManagementInterface.php b/app/code/Magento/Quote/Api/CartManagementInterface.php
index 7aa4bc4c7603a..dc8ab7fedc870 100644
--- a/app/code/Magento/Quote/Api/CartManagementInterface.php
+++ b/app/code/Magento/Quote/Api/CartManagementInterface.php
@@ -52,6 +52,9 @@ public function getCartForCustomer($customerId);
      * @param int $customerId The customer ID.
      * @param int $storeId
      * @return boolean
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\StateException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function assignCustomer($cartId, $customerId, $storeId);
 
diff --git a/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php b/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php
index 266a6e67528e4..678c92250f531 100644
--- a/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php
+++ b/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php
@@ -71,7 +71,7 @@ public function __construct(
      * Converts a specified rate model to a shipping method data object.
      *
      * @param \Magento\Quote\Model\Quote\Item $item
-     * @return array
+     * @return \Magento\Quote\Api\Data\TotalsItemInterface
      * @throws \Exception
      */
     public function modelToDataObject($item)
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 3ecbc69b80785..db8ac0d1fe179 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -425,9 +425,11 @@ protected function _populateBeforeSaveData()
      */
     protected function _isSameAsBilling()
     {
+        $quoteSameAsBilling = $this->getSameAsBilling();
+
         return $this->getAddressType() == \Magento\Quote\Model\Quote\Address::TYPE_SHIPPING &&
-            ($this->_isNotRegisteredCustomer() ||
-            $this->_isDefaultShippingNullOrSameAsBillingAddress());
+            ($this->_isNotRegisteredCustomer() || $this->_isDefaultShippingNullOrSameAsBillingAddress()) &&
+            ($quoteSameAsBilling || $quoteSameAsBilling === 0 || $quoteSameAsBilling === null);
     }
 
     /**
@@ -471,7 +473,7 @@ protected function _isDefaultShippingNullOrSameAsBillingAddress()
     /**
      * Declare address quote model object
      *
-     * @param   \Magento\Quote\Model\Quote $quote
+     * @param \Magento\Quote\Model\Quote $quote
      * @return $this
      */
     public function setQuote(\Magento\Quote\Model\Quote $quote)
@@ -691,7 +693,7 @@ public function getItemQty($itemId = 0)
      */
     public function hasItems()
     {
-        return sizeof($this->getAllItems()) > 0;
+        return count($this->getAllItems()) > 0;
     }
 
     /**
@@ -1020,6 +1022,7 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte
         $request->setLimitCarrier($this->getLimitCarrier());
         $baseSubtotalInclTax = $this->getBaseSubtotalTotalInclTax();
         $request->setBaseSubtotalInclTax($baseSubtotalInclTax);
+        $request->setBaseSubtotalWithDiscountInclTax($this->getBaseSubtotalWithDiscount() + $this->getBaseTaxAmount());
 
         $result = $this->_rateCollector->create()->collectRates($request)->getResult();
 
@@ -1225,8 +1228,8 @@ public function setBaseShippingAmount($value, $alreadyExclTax = false)
     /**
      * Set total amount value
      *
-     * @param   string $code
-     * @param   float $amount
+     * @param string $code
+     * @param float $amount
      * @return $this
      */
     public function setTotalAmount($code, $amount)
@@ -1243,8 +1246,8 @@ public function setTotalAmount($code, $amount)
     /**
      * Set total amount value in base store currency
      *
-     * @param   string $code
-     * @param   float $amount
+     * @param string $code
+     * @param float $amount
      * @return $this
      */
     public function setBaseTotalAmount($code, $amount)
@@ -1261,8 +1264,8 @@ public function setBaseTotalAmount($code, $amount)
     /**
      * Add amount total amount value
      *
-     * @param   string $code
-     * @param   float $amount
+     * @param string $code
+     * @param float $amount
      * @return $this
      */
     public function addTotalAmount($code, $amount)
@@ -1276,8 +1279,8 @@ public function addTotalAmount($code, $amount)
     /**
      * Add amount total amount value in base store currency
      *
-     * @param   string $code
-     * @param   float $amount
+     * @param string $code
+     * @param float $amount
      * @return $this
      */
     public function addBaseTotalAmount($code, $amount)
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Grand.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Grand.php
index 13f41f909d43f..2cefec2c9035a 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Grand.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Grand.php
@@ -3,43 +3,64 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Quote\Model\Quote\Address\Total;
 
-class Grand extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Pricing\PriceCurrencyInterface as PriceRounder;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface as ShippingAssignment;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address\Total;
+
+/**
+ * Collect grand totals.
+ */
+class Grand extends AbstractTotal
 {
+    /**
+     * @var PriceRounder
+     */
+    private $priceRounder;
+
+    /**
+     * @param PriceRounder|null $priceRounder
+     */
+    public function __construct(?PriceRounder $priceRounder)
+    {
+        $this->priceRounder = $priceRounder?: ObjectManager::getInstance()->get(PriceRounder::class);
+    }
+
     /**
      * Collect grand total address amount
      *
-     * @param \Magento\Quote\Model\Quote $quote
-     * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment
-     * @param \Magento\Quote\Model\Quote\Address\Total $total
-     * @return $this
+     * @param Quote $quote
+     * @param ShippingAssignment $shippingAssignment
+     * @param Total $total
+     * @return Grand
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function collect(
-        \Magento\Quote\Model\Quote $quote,
-        \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment,
-        \Magento\Quote\Model\Quote\Address\Total $total
-    ) {
-        $grandTotal = $total->getGrandTotal();
-        $baseGrandTotal = $total->getBaseGrandTotal();
+    public function collect(Quote $quote, ShippingAssignment $shippingAssignment, Total $total): Grand
+    {
         $totals = array_sum($total->getAllTotalAmounts());
         $baseTotals = array_sum($total->getAllBaseTotalAmounts());
+        $grandTotal = $this->priceRounder->roundPrice($total->getGrandTotal() + $totals, 4);
+        $baseGrandTotal = $this->priceRounder->roundPrice($total->getBaseGrandTotal() + $baseTotals, 4);
 
-        $total->setGrandTotal($grandTotal + $totals);
-        $total->setBaseGrandTotal($baseGrandTotal + $baseTotals);
+        $total->setGrandTotal($grandTotal);
+        $total->setBaseGrandTotal($baseGrandTotal);
         return $this;
     }
 
     /**
      * Add grand total information to address
      *
-     * @param \Magento\Quote\Model\Quote $quote
-     * @param \Magento\Quote\Model\Quote\Address\Total $total
-     * @return $this
+     * @param Quote $quote
+     * @param Total $total
+     * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
+    public function fetch(Quote $quote, Total $total): array
     {
         return [
             'code' => $this->getCode(),
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
index 84ef699b6209e..3a81341e2b02a 100644
--- a/app/code/Magento/Quote/Model/QuoteManagement.php
+++ b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -298,22 +298,28 @@ public function assignCustomer($cartId, $customerId, $storeId)
             );
         }
         try {
-            $this->quoteRepository->getForCustomer($customerId);
-            throw new StateException(
-                __("The customer can't be assigned to the cart because the customer already has an active cart.")
-            );
+            $customerActiveQuote = $this->quoteRepository->getForCustomer($customerId);
+
+            $quote->merge($customerActiveQuote);
+            $customerActiveQuote->setIsActive(0);
+            $this->quoteRepository->save($customerActiveQuote);
+
         // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
         }
 
         $quote->setCustomer($customer);
         $quote->setCustomerIsGuest(0);
+        $quote->setIsActive(1);
+
         /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'quote_id');
         if ($quoteIdMask->getId()) {
             $quoteIdMask->delete();
         }
+
         $this->quoteRepository->save($quote);
+
         return true;
     }
 
diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php
index 30931821ddc7d..ccfd3df5fafa3 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository.php
@@ -224,7 +224,7 @@ protected function loadQuote($loadMethod, $loadField, $identifier, array $shared
     {
         /** @var CartInterface $quote */
         $quote = $this->cartFactory->create();
-        if ($sharedStoreIds && method_exists($quote, 'setSharedStoreIds')) {
+        if ($sharedStoreIds && is_callable([$quote, 'setSharedStoreIds'])) {
             $quote->setSharedStoreIds($sharedStoreIds);
         }
         $quote->setStoreId($this->storeManager->getStore()->getId())->$loadMethod($identifier);
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 392a815ed963c..443e4fda1bd8c 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -10,6 +10,7 @@
 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\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Item as QuoteItem;
 use Magento\Quote\Model\ResourceModel\Quote\Item as ResourceQuoteItem;
@@ -256,8 +257,17 @@ protected function _assignProducts(): self
         foreach ($this as $item) {
             /** @var ProductInterface $product */
             $product = $productCollection->getItemById($item->getProductId());
+            try {
+                /** @var QuoteItem $item */
+                $parentItem = $item->getParentItem();
+                $parentProduct = $parentItem ? $parentItem->getProduct() : null;
+            } catch (NoSuchEntityException $exception) {
+                $parentItem = null;
+                $parentProduct = null;
+                $this->_logger->error($exception);
+            }
             $qtyOptions = [];
-            if ($product && $this->isValidProduct($product)) {
+            if ($this->isValidProduct($product) && (!$parentItem || $this->isValidProduct($parentProduct))) {
                 $product->setCustomOptions([]);
                 $optionProductIds = $this->getOptionProductIds($item, $product, $productCollection);
                 foreach ($optionProductIds as $optionProductId) {
@@ -276,7 +286,7 @@ protected function _assignProducts(): self
             }
         }
         if ($this->recollectQuote && $this->_quote) {
-            $this->_quote->collectTotals();
+            $this->_quote->setTotalsCollectedFlag(false);
         }
         \Magento\Framework\Profiler::stop('QUOTE:' . __METHOD__);
 
@@ -327,7 +337,7 @@ private function getOptionProductIds(
      * @param ProductInterface $product
      * @return bool
      */
-    private function isValidProduct(ProductInterface $product): bool
+    private function isValidProduct(?ProductInterface $product): bool
     {
         $result = ($product && (int)$product->getStatus() !== ProductStatus::STATUS_DISABLED);
 
diff --git a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
index 77dfec9603a5c..a1228903e2323 100644
--- a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
+++ b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
@@ -113,6 +113,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
 
             $customerCountryCode = $customerAddress->getCountryId();
             $customerVatNumber = $customerAddress->getVatId();
+            $address->setCountryId($customerCountryCode);
+            $address->setVatId($customerVatNumber);
         }
 
         $groupId = null;
diff --git a/app/code/Magento/Quote/Observer/SubmitObserver.php b/app/code/Magento/Quote/Observer/SubmitObserver.php
index 0d6613a691390..db0ba7fb77937 100644
--- a/app/code/Magento/Quote/Observer/SubmitObserver.php
+++ b/app/code/Magento/Quote/Observer/SubmitObserver.php
@@ -14,7 +14,7 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * Class SubmitObserver
+ * Class responsive for sending order and invoice emails when it's created through storefront.
  */
 class SubmitObserver implements ObserverInterface
 {
@@ -49,7 +49,7 @@ public function __construct(
     }
 
     /**
-     * Sends emails to customer.
+     * Send order and invoice email.
      *
      * @param Observer $observer
      *
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ChangeQuoteControlTest.php b/app/code/Magento/Quote/Test/Unit/Model/ChangeQuoteControlTest.php
new file mode 100644
index 0000000000000..dc62c57c84941
--- /dev/null
+++ b/app/code/Magento/Quote/Test/Unit/Model/ChangeQuoteControlTest.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Test\Unit\Model;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Quote\Model\ChangeQuoteControl;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Unit test for \Magento\Quote\Model\ChangeQuoteControl
+ *
+ * Class \Magento\Quote\Test\Unit\Model\ChangeQuoteControlTest
+ */
+class ChangeQuoteControlTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * @var \Magento\Quote\Model\ChangeQuoteControl
+     */
+    protected $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $userContextMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $quoteMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->userContextMock = $this->createMock(UserContextInterface::class);
+
+        $this->model = $this->objectManager->getObject(
+            ChangeQuoteControl::class,
+            [
+                'userContext' => $this->userContextMock
+            ]
+        );
+
+        $this->quoteMock = $this->getMockForAbstractClass(
+            CartInterface::class,
+            [],
+            '',
+            false,
+            true,
+            true,
+            ['getCustomerId']
+        );
+    }
+
+    /**
+     * Test if the quote is belonged to customer
+     */
+    public function testIsAllowedIfTheQuoteIsBelongedToCustomer()
+    {
+        $quoteCustomerId = 1;
+        $this->quoteMock->expects($this->any())->method('getCustomerId')
+            ->will($this->returnValue($quoteCustomerId));
+        $this->userContextMock->expects($this->any())->method('getUserType')
+            ->will($this->returnValue(UserContextInterface::USER_TYPE_CUSTOMER));
+        $this->userContextMock->expects($this->any())->method('getUserId')
+            ->will($this->returnValue($quoteCustomerId));
+
+        $this->assertEquals(true, $this->model->isAllowed($this->quoteMock));
+    }
+
+    /**
+     * Test if the quote is not belonged to customer
+     */
+    public function testIsAllowedIfTheQuoteIsNotBelongedToCustomer()
+    {
+        $currentCustomerId = 1;
+        $quoteCustomerId = 2;
+
+        $this->quoteMock->expects($this->any())->method('getCustomerId')
+            ->will($this->returnValue($quoteCustomerId));
+        $this->userContextMock->expects($this->any())->method('getUserType')
+            ->will($this->returnValue(UserContextInterface::USER_TYPE_CUSTOMER));
+        $this->userContextMock->expects($this->any())->method('getUserId')
+            ->will($this->returnValue($currentCustomerId));
+
+        $this->assertEquals(false, $this->model->isAllowed($this->quoteMock));
+    }
+
+    /**
+     * Test if the quote is belonged to guest and the context is guest
+     */
+    public function testIsAllowedIfQuoteIsBelongedToGuestAndContextIsGuest()
+    {
+        $quoteCustomerId = null;
+        $this->quoteMock->expects($this->any())->method('getCustomerId')
+            ->will($this->returnValue($quoteCustomerId));
+        $this->userContextMock->expects($this->any())->method('getUserType')
+            ->will($this->returnValue(UserContextInterface::USER_TYPE_GUEST));
+        $this->assertEquals(true, $this->model->isAllowed($this->quoteMock));
+    }
+
+    /**
+     * Test if the quote is belonged to customer and the context is guest
+     */
+    public function testIsAllowedIfQuoteIsBelongedToCustomerAndContextIsGuest()
+    {
+        $quoteCustomerId = 1;
+        $this->quoteMock->expects($this->any())->method('getCustomerId')
+            ->will($this->returnValue($quoteCustomerId));
+        $this->userContextMock->expects($this->any())->method('getUserType')
+            ->will($this->returnValue(UserContextInterface::USER_TYPE_GUEST));
+        $this->assertEquals(false, $this->model->isAllowed($this->quoteMock));
+    }
+
+    /**
+     * Test if the context is admin
+     */
+    public function testIsAllowedIfContextIsAdmin()
+    {
+        $this->userContextMock->expects($this->any())->method('getUserType')
+            ->will($this->returnValue(UserContextInterface::USER_TYPE_ADMIN));
+        $this->assertEquals(true, $this->model->isAllowed($this->quoteMock));
+    }
+
+    /**
+     * Test if the context is integration
+     */
+    public function testIsAllowedIfContextIsIntegration()
+    {
+        $this->userContextMock->expects($this->any())->method('getUserType')
+            ->will($this->returnValue(UserContextInterface::USER_TYPE_INTEGRATION));
+        $this->assertEquals(true, $this->model->isAllowed($this->quoteMock));
+    }
+}
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/GrandTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/GrandTest.php
index 34c51f294c05f..6771583b5bbb0 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/GrandTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/GrandTest.php
@@ -6,18 +6,43 @@
 namespace Magento\Quote\Test\Unit\Model\Quote\Address\Total;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Quote\Model\Quote\Address\Total\Grand;
+use Magento\Framework\Pricing\PriceCurrencyInterface as PriceRounder;
+use PHPUnit_Framework_MockObject_MockObject as ObjectMock;
+use PHPUnit\Framework\TestCase;
 
-class GrandTest extends \PHPUnit\Framework\TestCase
+/**
+ * Grand totals collector test.
+ */
+class GrandTest extends TestCase
 {
     /**
-     * @var \Magento\Quote\Model\Quote\Address\Total\Grand
+     * @var PriceRounder|ObjectMock
+     */
+    private $priceRounder;
+
+    /**
+     * @var Grand
      */
-    protected $model;
+    private $model;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
-        $objectManager = new ObjectManager($this);
-        $this->model = $objectManager->getObject(\Magento\Quote\Model\Quote\Address\Total\Grand::class);
+        $this->priceRounder = $this->getMockBuilder(PriceRounder::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['roundPrice'])
+            ->getMockForAbstractClass();
+
+        $helper = new ObjectManager($this);
+        $this->model = $helper->getObject(
+            Grand::class,
+            [
+                'priceRounder' => $this->priceRounder,
+            ]
+        );
     }
 
     public function testCollect()
@@ -27,14 +52,20 @@ public function testCollect()
         $grandTotal = 6.4; // 1 + 2 + 3.4
         $grandTotalBase = 15.7; // 4 + 5 + 6.7
 
-        $totalMock = $this->createPartialMock(\Magento\Quote\Model\Quote\Address\Total::class, [
+        $this->priceRounder->expects($this->at(0))->method('roundPrice')->willReturn($grandTotal + 2);
+        $this->priceRounder->expects($this->at(1))->method('roundPrice')->willReturn($grandTotalBase + 2);
+
+        $totalMock = $this->createPartialMock(
+            \Magento\Quote\Model\Quote\Address\Total::class,
+            [
                 'getAllTotalAmounts',
                 'getAllBaseTotalAmounts',
                 'setGrandTotal',
                 'setBaseGrandTotal',
                 'getGrandTotal',
                 'getBaseGrandTotal'
-            ]);
+            ]
+        );
         $totalMock->expects($this->once())->method('getGrandTotal')->willReturn(2);
         $totalMock->expects($this->once())->method('getBaseGrandTotal')->willReturn(2);
         $totalMock->expects($this->once())->method('getAllTotalAmounts')->willReturn($totals);
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
index cd2afc39733f2..2c61c192ead62 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
@@ -7,11 +7,13 @@
 
 namespace Magento\Quote\Test\Unit\Model;
 
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Customer;
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
 
 use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
 use Magento\Quote\Model\CustomerManagement;
+use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\Sales\Api\Data\OrderAddressInterface;
 
@@ -199,7 +201,7 @@ protected function setUp()
         );
 
         $this->quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
+            Quote::class,
             [
                 'assignCustomer',
                 'collectTotals',
@@ -275,7 +277,7 @@ public function testCreateEmptyCartAnonymous()
         $storeId = 345;
         $quoteId = 2311;
 
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $quoteMock = $this->createMock(Quote::class);
         $quoteAddress = $this->createPartialMock(
             \Magento\Quote\Model\Quote\Address::class,
             ['setCollectShippingRates']
@@ -306,14 +308,14 @@ public function testCreateEmptyCartForCustomer()
         $quoteId = 2311;
         $userId = 567;
 
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $quoteMock = $this->createMock(Quote::class);
 
         $this->quoteRepositoryMock
             ->expects($this->once())
             ->method('getActiveForCustomer')
             ->with($userId)
-            ->willThrowException(new NoSuchEntityException());
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException());
+        $customer = $this->getMockBuilder(CustomerInterface::class)
             ->setMethods(['getDefaultBilling'])->disableOriginalConstructor()->getMockForAbstractClass();
         $quoteAddress = $this->createPartialMock(
             \Magento\Quote\Model\Quote\Address::class,
@@ -342,14 +344,14 @@ public function testCreateEmptyCartForCustomerReturnExistsQuote()
         $storeId = 345;
         $userId = 567;
 
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $quoteMock = $this->createMock(Quote::class);
 
         $this->quoteRepositoryMock
             ->expects($this->once())
             ->method('getActiveForCustomer')
             ->with($userId)->willReturn($quoteMock);
 
-        $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+        $customer = $this->getMockBuilder(CustomerInterface::class)
             ->setMethods(['getDefaultBilling'])->disableOriginalConstructor()->getMockForAbstractClass();
         $quoteAddress = $this->createPartialMock(
             \Magento\Quote\Model\Quote\Address::class,
@@ -379,8 +381,8 @@ public function testAssignCustomerFromAnotherStore()
         $customerId = 455;
         $storeId = 5;
 
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
-        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $quoteMock = $this->createMock(Quote::class);
+        $customerMock = $this->createMock(CustomerInterface::class);
 
         $this->quoteRepositoryMock
             ->expects($this->once())
@@ -395,7 +397,7 @@ public function testAssignCustomerFromAnotherStore()
             ->willReturn($customerMock);
 
         $customerModelMock = $this->createPartialMock(
-            \Magento\Customer\Model\Customer::class,
+            Customer::class,
             ['load', 'getSharedStoreIds']
         );
         $this->customerFactoryMock->expects($this->once())->method('create')->willReturn($customerModelMock);
@@ -424,10 +426,10 @@ public function testAssignCustomerToNonanonymousCart()
         $storeId = 5;
 
         $quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
+            Quote::class,
             ['getCustomerId', 'setCustomer', 'setCustomerIsGuest']
         );
-        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $customerMock = $this->createMock(CustomerInterface::class);
 
         $this->quoteRepositoryMock
             ->expects($this->once())
@@ -442,7 +444,7 @@ public function testAssignCustomerToNonanonymousCart()
             ->willReturn($customerMock);
 
         $customerModelMock = $this->createPartialMock(
-            \Magento\Customer\Model\Customer::class,
+            Customer::class,
             ['load', 'getSharedStoreIds']
         );
         $this->customerFactoryMock->expects($this->once())->method('create')->willReturn($customerModelMock);
@@ -463,7 +465,7 @@ public function testAssignCustomerToNonanonymousCart()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\StateException
+     * @expectedException \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testAssignCustomerNoSuchCustomer()
     {
@@ -472,10 +474,51 @@ public function testAssignCustomerNoSuchCustomer()
         $storeId = 5;
 
         $quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
+            Quote::class,
             ['getCustomerId', 'setCustomer', 'setCustomerIsGuest']
         );
-        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+
+        $this->quoteRepositoryMock
+            ->expects($this->once())
+            ->method('getActive')
+            ->with($cartId)
+            ->willReturn($quoteMock);
+
+        $this->customerRepositoryMock
+            ->expects($this->once())
+            ->method('getById')
+            ->with($customerId)
+            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException());
+
+        $this->expectExceptionMessage(
+            "No such entity."
+        );
+
+        $this->model->assignCustomer($cartId, $customerId, $storeId);
+    }
+
+    public function testAssignCustomerWithActiveCart()
+    {
+        $cartId = 220;
+        $customerId = 455;
+        $storeId = 5;
+
+        $this->getPropertyValue($this->model, 'quoteIdMaskFactory')
+            ->expects($this->once())
+            ->method('create')
+            ->willReturn($this->quoteIdMock);
+
+        $quoteMock = $this->createPartialMock(
+            Quote::class,
+            ['getCustomerId', 'setCustomer', 'setCustomerIsGuest', 'setIsActive', 'getIsActive', 'merge']
+        );
+
+        $activeQuoteMock = $this->createPartialMock(
+            Quote::class,
+            ['getCustomerId', 'setCustomer', 'setCustomerIsGuest', 'setIsActive', 'getIsActive', 'merge']
+        );
+
+        $customerMock = $this->createMock(CustomerInterface::class);
 
         $this->quoteRepositoryMock
             ->expects($this->once())
@@ -490,7 +533,7 @@ public function testAssignCustomerNoSuchCustomer()
             ->willReturn($customerMock);
 
         $customerModelMock = $this->createPartialMock(
-            \Magento\Customer\Model\Customer::class,
+            Customer::class,
             ['load', 'getSharedStoreIds']
         );
         $this->customerFactoryMock->expects($this->once())->method('create')->willReturn($customerModelMock);
@@ -506,17 +549,26 @@ public function testAssignCustomerNoSuchCustomer()
             ->willReturn([$storeId, 'some store value']);
 
         $quoteMock->expects($this->once())->method('getCustomerId')->willReturn(null);
-
         $this->quoteRepositoryMock
             ->expects($this->once())
             ->method('getForCustomer')
-            ->with($customerId);
+            ->with($customerId)
+            ->willReturn($activeQuoteMock);
 
-        $this->model->assignCustomer($cartId, $customerId, $storeId);
+        $quoteMock->expects($this->once())->method('merge')->with($activeQuoteMock)->willReturnSelf();
+        $activeQuoteMock->expects($this->once())->method('setIsActive')->with(0);
+        $this->quoteRepositoryMock->expects($this->atLeastOnce())->method('save')->with($activeQuoteMock);
 
-        $this->expectExceptionMessage(
-            "The customer can't be assigned to the cart because the customer already has an active cart."
-        );
+        $quoteMock->expects($this->once())->method('setCustomer')->with($customerMock);
+        $quoteMock->expects($this->once())->method('setCustomerIsGuest')->with(0);
+        $quoteMock->expects($this->once())->method('setIsActive')->with(1);
+
+        $this->quoteIdMock->expects($this->once())->method('load')->with($cartId, 'quote_id')->willReturnSelf();
+        $this->quoteIdMock->expects($this->once())->method('getId')->willReturn(10);
+        $this->quoteIdMock->expects($this->once())->method('delete');
+        $this->quoteRepositoryMock->expects($this->atLeastOnce())->method('save')->with($quoteMock);
+
+        $this->model->assignCustomer($cartId, $customerId, $storeId);
     }
 
     public function testAssignCustomer()
@@ -529,15 +581,13 @@ public function testAssignCustomer()
             ->expects($this->once())
             ->method('create')
             ->willReturn($this->quoteIdMock);
-        $this->quoteIdMock->expects($this->once())->method('load')->with($cartId, 'quote_id')->willReturnSelf();
-        $this->quoteIdMock->expects($this->once())->method('getId')->willReturn(10);
-        $this->quoteIdMock->expects($this->once())->method('delete');
+
         $quoteMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
-            ['getCustomerId', 'setCustomer', 'setCustomerIsGuest']
+            Quote::class,
+            ['getCustomerId', 'setCustomer', 'setCustomerIsGuest', 'setIsActive', 'getIsActive', 'merge']
         );
-        $customerMock = $this->createMock(\Magento\Customer\Api\Data\CustomerInterface::class);
 
+        $customerMock = $this->createMock(CustomerInterface::class);
         $this->quoteRepositoryMock
             ->expects($this->once())
             ->method('getActive')
@@ -551,10 +601,12 @@ public function testAssignCustomer()
             ->willReturn($customerMock);
 
         $customerModelMock = $this->createPartialMock(
-            \Magento\Customer\Model\Customer::class,
+            Customer::class,
             ['load', 'getSharedStoreIds']
         );
+
         $this->customerFactoryMock->expects($this->once())->method('create')->willReturn($customerModelMock);
+
         $customerModelMock
             ->expects($this->once())
             ->method('load')
@@ -572,11 +624,17 @@ public function testAssignCustomer()
             ->expects($this->once())
             ->method('getForCustomer')
             ->with($customerId)
-            ->willThrowException(new NoSuchEntityException());
+            ->willThrowException(new \Magento\Framework\Exception\NoSuchEntityException());
+
+        $quoteMock->expects($this->never())->method('merge');
 
         $quoteMock->expects($this->once())->method('setCustomer')->with($customerMock);
         $quoteMock->expects($this->once())->method('setCustomerIsGuest')->with(0);
+        $quoteMock->expects($this->once())->method('setIsActive')->with(1);
 
+        $this->quoteIdMock->expects($this->once())->method('load')->with($cartId, 'quote_id')->willReturnSelf();
+        $this->quoteIdMock->expects($this->once())->method('getId')->willReturn(10);
+        $this->quoteIdMock->expects($this->once())->method('delete');
         $this->quoteRepositoryMock->expects($this->once())->method('save')->with($quoteMock);
 
         $this->model->assignCustomer($cartId, $customerId, $storeId);
@@ -881,7 +939,7 @@ protected function getQuote(
         \Magento\Quote\Model\Quote\Address $shippingAddress = null
     ) {
         $quote = $this->createPartialMock(
-            \Magento\Quote\Model\Quote::class,
+            Quote::class,
             [
                 'setIsActive',
                 'getCustomerEmail',
@@ -928,7 +986,7 @@ protected function getQuote(
             ->willReturn($payment);
 
         $customer = $this->createPartialMock(
-            \Magento\Customer\Model\Customer::class,
+            Customer::class,
             ['getDefaultBilling', 'getId']
         );
         $quote->expects($this->any())->method('getCustomerId')->willReturn($customerId);
@@ -1016,12 +1074,12 @@ protected function prepareOrderFactory(
     }
 
     /**
-     * @throws NoSuchEntityException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testGetCartForCustomer()
     {
         $customerId = 100;
-        $cartMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $cartMock = $this->createMock(Quote::class);
         $this->quoteRepositoryMock->expects($this->once())
             ->method('getActiveForCustomer')
             ->with($customerId)
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
index 095e1760df86f..9c28a06fe83eb 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SortOrder;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use PHPUnit\Framework\MockObject\Matcher\InvokedCount as InvokedCountMatch;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Quote\Api\Data\CartInterface;
@@ -284,7 +285,14 @@ public function testGetWithSharedStoreIds()
         $this->assertEquals($this->quoteMock, $this->model->get($cartId, $sharedStoreIds));
     }
 
-    public function testGetForCustomer()
+    /**
+     * Test getForCustomer method
+     *
+     * @param InvokedCountMatch $invokeTimes
+     * @param array $sharedStoreIds
+     * @dataProvider getForCustomerDataProvider
+     */
+    public function testGetForCustomer(InvokedCountMatch $invokeTimes, array $sharedStoreIds)
     {
         $cartId = 17;
         $customerId = 23;
@@ -298,7 +306,7 @@ public function testGetForCustomer()
         $this->storeMock->expects(static::once())
             ->method('getId')
             ->willReturn(1);
-        $this->quoteMock->expects(static::never())
+        $this->quoteMock->expects($invokeTimes)
             ->method('setSharedStoreIds');
         $this->quoteMock->expects(static::once())
             ->method('loadByCustomer')
@@ -312,8 +320,27 @@ public function testGetForCustomer()
             ->method('load')
             ->with($this->quoteMock);
 
+        static::assertEquals($this->quoteMock, $this->model->getForCustomer($customerId, $sharedStoreIds));
         static::assertEquals($this->quoteMock, $this->model->getForCustomer($customerId));
-        static::assertEquals($this->quoteMock, $this->model->getForCustomer($customerId));
+    }
+
+    /**
+     * Checking how many times we invoke setSharedStoreIds() in protected method loadQuote()
+     *
+     * @return array
+     */
+    public function getForCustomerDataProvider()
+    {
+        return [
+            [
+                'invoke_number_times' => static::never(),
+                'shared_store_ids' => []
+            ],
+            [
+                'invoke_number_times' => static::once(),
+                'shared_store_ids' => [1]
+            ]
+        ];
     }
 
     /**
diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
index 4ea067c9be8f6..a590c8aa891a5 100644
--- a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
@@ -314,6 +314,43 @@ public function testDispatchWithCustomerCountryInEU()
         $this->model->execute($this->observerMock);
     }
 
+    public function testDispatchWithAddressCustomerVatIdAndCountryId()
+    {
+        $customerCountryCode = "BE";
+        $customerVat = "123123123";
+        $defaultShipping = 1;
+
+        $customerAddress = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
+        $customerAddress->expects($this->any())
+            ->method("getVatId")
+            ->willReturn($customerVat);
+
+        $customerAddress->expects($this->any())
+            ->method("getCountryId")
+            ->willReturn($customerCountryCode);
+
+        $this->addressRepository->expects($this->once())
+            ->method("getById")
+            ->with($defaultShipping)
+            ->willReturn($customerAddress);
+
+        $this->customerMock->expects($this->atLeastOnce())
+            ->method("getDefaultShipping")
+            ->willReturn($defaultShipping);
+
+        $this->vatValidatorMock->expects($this->once())
+            ->method('isEnabled')
+            ->with($this->quoteAddressMock, $this->storeId)
+            ->will($this->returnValue(true));
+
+        $this->customerVatMock->expects($this->once())
+            ->method('isCountryInEU')
+            ->with($customerCountryCode)
+            ->willReturn(true);
+
+        $this->model->execute($this->observerMock);
+    }
+
     public function testDispatchWithEmptyShippingAddress()
     {
         $customerCountryCode = "DE";
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
index 005cf3a10ca80..91c77a1a3ecc5 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
@@ -8,7 +8,7 @@
 namespace Magento\QuoteGraphQl\Model\Cart;
 
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\Message\AbstractMessage;
+use Magento\Framework\Message\MessageInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
 
@@ -55,29 +55,15 @@ public function execute(Quote $cart, array $cartItems): void
         }
 
         if ($cart->getData('has_error')) {
-            throw new GraphQlInputException(
-                __('Shopping cart error: %message', ['message' => $this->getCartErrors($cart)])
-            );
+            $e = new GraphQlInputException(__('Shopping cart errors'));
+            $errors = $cart->getErrors();
+            foreach ($errors as $error) {
+                /** @var MessageInterface $error */
+                $e->addError(new GraphQlInputException(__($error->getText())));
+            }
+            throw $e;
         }
 
         $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
index 11719db2d1b8f..83c1d03f132db 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
@@ -72,7 +72,12 @@ public function execute(Quote $cart, array $cartItemData): void
         }
 
         if (is_string($result)) {
-            throw new GraphQlInputException(__($result));
+            $e = new GraphQlInputException(__('Cannot add product to cart'));
+            $errors = array_unique(explode("\n", $result));
+            foreach ($errors as $error) {
+                $e->addError(new GraphQlInputException(__($error)));
+            }
+            throw $e;
         }
     }
 
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/Address/SaveQuoteAddressToCustomerAddressBook.php b/app/code/Magento/QuoteGraphQl/Model/Cart/Address/SaveQuoteAddressToCustomerAddressBook.php
new file mode 100644
index 0000000000000..c87101156327e
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/Address/SaveQuoteAddressToCustomerAddressBook.php
@@ -0,0 +1,104 @@
+<?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\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Customer\Api\Data\RegionInterface;
+use Magento\Customer\Api\Data\RegionInterfaceFactory;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
+
+/**
+ * Save Address to Customer Address Book.
+ */
+class SaveQuoteAddressToCustomerAddressBook
+{
+    /**
+     * @var AddressInterfaceFactory
+     */
+    private $addressFactory;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var RegionInterfaceFactory
+     */
+    private $regionFactory;
+
+    /**
+     * @param AddressInterfaceFactory $addressFactory
+     * @param AddressRepositoryInterface $addressRepository
+     * @param RegionInterfaceFactory $regionFactory
+     */
+    public function __construct(
+        AddressInterfaceFactory $addressFactory,
+        AddressRepositoryInterface $addressRepository,
+        RegionInterfaceFactory $regionFactory
+    ) {
+        $this->addressFactory = $addressFactory;
+        $this->addressRepository = $addressRepository;
+        $this->regionFactory = $regionFactory;
+    }
+
+    /**
+     * Save Address to Customer Address Book.
+     *
+     * @param QuoteAddress $quoteAddress
+     * @param int $customerId
+     *
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function execute(QuoteAddress $quoteAddress, int $customerId): void
+    {
+        try {
+            /** @var AddressInterface $customerAddress */
+            $customerAddress = $this->addressFactory->create();
+            $customerAddress->setFirstname($quoteAddress->getFirstname())
+                ->setLastname($quoteAddress->getLastname())
+                ->setMiddlename($quoteAddress->getMiddlename())
+                ->setPrefix($quoteAddress->getPrefix())
+                ->setSuffix($quoteAddress->getSuffix())
+                ->setVatId($quoteAddress->getVatId())
+                ->setCountryId($quoteAddress->getCountryId())
+                ->setCompany($quoteAddress->getCompany())
+                ->setRegionId($quoteAddress->getRegionId())
+                ->setFax($quoteAddress->getFax())
+                ->setCity($quoteAddress->getCity())
+                ->setPostcode($quoteAddress->getPostcode())
+                ->setStreet($quoteAddress->getStreet())
+                ->setTelephone($quoteAddress->getTelephone())
+                ->setCustomerId($customerId);
+
+            /** @var RegionInterface $region */
+            $region = $this->regionFactory->create();
+            $region->setRegionCode($quoteAddress->getRegionCode())
+                ->setRegion($quoteAddress->getRegion())
+                ->setRegionId($quoteAddress->getRegionId());
+            $customerAddress->setRegion($region);
+
+            $this->addressRepository->save($customerAddress);
+        } catch (InputException $inputException) {
+            $graphQlInputException = new GraphQlInputException(__($inputException->getMessage()));
+            $errors = $inputException->getErrors();
+            foreach ($errors as $error) {
+                $graphQlInputException->addError(new GraphQlInputException(__($error->getMessage())));
+            }
+            throw $graphQlInputException;
+        } catch (LocalizedException $exception) {
+            throw new GraphQlInputException(__($exception->getMessage()), $exception);
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php
index dd6478b4873c6..22bd0abb1a159 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignBillingAddressToCart.php
@@ -7,7 +7,7 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
@@ -39,20 +39,20 @@ public function __construct(
      *
      * @param CartInterface $cart
      * @param AddressInterface $billingAddress
-     * @param bool $useForShipping
+     * @param bool $sameAsShipping
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
      */
     public function execute(
         CartInterface $cart,
         AddressInterface $billingAddress,
-        bool $useForShipping
+        bool $sameAsShipping
     ): void {
         try {
-            $this->billingAddressManagement->assign($cart->getId(), $billingAddress, $useForShipping);
+            $this->billingAddressManagement->assign($cart->getId(), $billingAddress, $sameAsShipping);
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-        } catch (LocalizedException $e) {
+        } catch (InputException $e) {
             throw new GraphQlInputException(__($e->getMessage()), $e);
         }
     }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
index 527999b245a4c..4dbcfad31e84c 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
@@ -7,7 +7,7 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
@@ -50,7 +50,7 @@ public function execute(
             $this->shippingAddressManagement->assign($cart->getId(), $shippingAddress);
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
-        } catch (LocalizedException $e) {
+        } catch (InputException $e) {
             throw new GraphQlInputException(__($e->getMessage()), $e);
         }
     }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/BuyRequestDataProviderInterface.php b/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/BuyRequestDataProviderInterface.php
index cd61b52db1beb..77925d0940cf4 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/BuyRequestDataProviderInterface.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/BuyRequestDataProviderInterface.php
@@ -13,10 +13,10 @@
 interface BuyRequestDataProviderInterface
 {
     /**
-     * Build buy request for adding product to cart
+     * Provide buy request data from add to cart item request
      *
      * @param array $cartItemData
-     * @return DataObject
+     * @return array
      */
     public function execute(array $cartItemData): array;
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/DiscountAggregator.php b/app/code/Magento/QuoteGraphQl/Model/Cart/DiscountAggregator.php
deleted file mode 100644
index a620b4b2610cf..0000000000000
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/DiscountAggregator.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\QuoteGraphQl\Model\Cart;
-
-use Magento\Quote\Model\Quote;
-
-/**
- * Aggregate cart level discounts
- *
- * @package Magento\QuoteGraphQl\Model\Cart
- */
-class DiscountAggregator
-{
-    /**
-     * Aggregate Discount per rule
-     *
-     * @param Quote $quote
-     * @return array
-     */
-    public function aggregateDiscountPerRule(
-        Quote $quote
-    ) {
-        $items = $quote->getItems();
-        $discountPerRule = [];
-        foreach ($items as $item) {
-            $discountBreakdown = $item->getExtensionAttributes()->getDiscounts();
-            if ($discountBreakdown) {
-                foreach ($discountBreakdown as $key => $value) {
-                    /* @var \Magento\SalesRule\Model\Rule\Action\Discount\Data $discount */
-                    $discount = $value['discount'];
-                    $rule = $value['rule'];
-                    if (isset($discountPerRule[$key])) {
-                        $discountPerRule[$key]['discount'] += $discount->getAmount();
-                    } else {
-                        $discountPerRule[$key]['discount'] = $discount->getAmount();
-                    }
-                    $discountPerRule[$key]['rule'] = $rule;
-                }
-            }
-        }
-        return $discountPerRule;
-    }
-}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
index c4d795293220f..468ef4b8f879c 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php
@@ -7,7 +7,6 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\Customer\Model\Address\AbstractAddress;
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
@@ -41,33 +40,46 @@ public function execute(QuoteAddress $address): array
         $addressData = $this->dataObjectConverter->toFlatArray($address, [], AddressInterface::class);
         $addressData['model'] = $address;
 
-        $addressData = array_merge($addressData, [
-            'country' => [
-                'code' => $address->getCountryId(),
-                'label' => $address->getCountry()
-            ],
-            'region' => [
-                'code' => $address->getRegionCode(),
-                'label' => $address->getRegion()
-            ],
-            'street' => $address->getStreet(),
-            'items_weight' => $address->getWeight(),
-            'customer_notes' => $address->getCustomerNotes()
-        ]);
+        $addressData = array_merge(
+            $addressData,
+            [
+                'country' => [
+                    'code' => $address->getCountryId(),
+                    'label' => $address->getCountry()
+                ],
+                'region' => [
+                    'code' => $address->getRegionCode(),
+                    'label' => $address->getRegion()
+                ],
+                'street' => $address->getStreet(),
+                'items_weight' => $address->getWeight(),
+                'customer_notes' => $address->getCustomerNotes()
+            ]
+        );
 
         if (!$address->hasItems()) {
             return $addressData;
         }
 
-        $addressItemsData = [];
         foreach ($address->getAllItems() as $addressItem) {
-            $addressItemsData[] = [
-                'cart_item_id' => $addressItem->getQuoteItemId(),
+            if ($addressItem instanceof \Magento\Quote\Model\Quote\Item) {
+                $itemId = $addressItem->getItemId();
+            } else {
+                $itemId = $addressItem->getQuoteItemId();
+            }
+            $productData = $addressItem->getProduct()->getData();
+            $productData['model'] = $addressItem->getProduct();
+            $addressData['cart_items'][] = [
+                'cart_item_id' => $itemId,
                 'quantity' => $addressItem->getQty()
             ];
+            $addressData['cart_items_v2'][] = [
+                'id' => $itemId,
+                'quantity' => $addressItem->getQty(),
+                'product' => $productData,
+                'model' => $addressItem,
+            ];
         }
-        $addressData['cart_items'] = $addressItemsData;
-
         return $addressData;
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetShippingAddress.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetShippingAddress.php
index 6e35091aecd7b..2a57c281de183 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetShippingAddress.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetShippingAddress.php
@@ -12,6 +12,7 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Quote\Model\Quote\Address;
+use Magento\QuoteGraphQl\Model\Cart\Address\SaveQuoteAddressToCustomerAddressBook;
 
 /**
  * Get shipping address
@@ -23,12 +24,21 @@ class GetShippingAddress
      */
     private $quoteAddressFactory;
 
+    /**
+     * @var SaveQuoteAddressToCustomerAddressBook
+     */
+    private $saveQuoteAddressToCustomerAddressBook;
+
     /**
      * @param QuoteAddressFactory $quoteAddressFactory
+     * @param SaveQuoteAddressToCustomerAddressBook $saveQuoteAddressToCustomerAddressBook
      */
-    public function __construct(QuoteAddressFactory $quoteAddressFactory)
-    {
+    public function __construct(
+        QuoteAddressFactory $quoteAddressFactory,
+        SaveQuoteAddressToCustomerAddressBook $saveQuoteAddressToCustomerAddressBook
+    ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
+        $this->saveQuoteAddressToCustomerAddressBook = $saveQuoteAddressToCustomerAddressBook;
     }
 
     /**
@@ -62,8 +72,38 @@ public function execute(ContextInterface $context, array $shippingAddressInput):
             );
         }
 
+        $shippingAddress = $this->createShippingAddress($context, $customerAddressId, $addressInput);
+
+        return $shippingAddress;
+    }
+
+    /**
+     * Create shipping address.
+     *
+     * @param ContextInterface $context
+     * @param int|null $customerAddressId
+     * @param array|null $addressInput
+     *
+     * @return \Magento\Quote\Model\Quote\Address
+     * @throws GraphQlAuthorizationException
+     */
+    private function createShippingAddress(
+        ContextInterface $context,
+        ?int $customerAddressId,
+        ?array $addressInput
+    ) {
+        $customerId = $context->getUserId();
+
         if (null === $customerAddressId) {
             $shippingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
+
+            // need to save address only for registered user and if save_in_address_book = true
+            if (0 !== $customerId
+                && isset($addressInput['save_in_address_book'])
+                && (bool)$addressInput['save_in_address_book'] === true
+            ) {
+                $this->saveQuoteAddressToCustomerAddressBook->execute($shippingAddress, $customerId);
+            }
         } else {
             if (false === $context->getExtensionAttributes()->getIsCustomer()) {
                 throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
@@ -71,7 +111,7 @@ public function execute(ContextInterface $context, array $shippingAddressInput):
 
             $shippingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress(
                 (int)$customerAddressId,
-                $context->getUserId()
+                $customerId
             );
         }
 
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
index afc88f026ed62..9cb3d9173ac59 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/QuoteAddressFactory.php
@@ -15,6 +15,9 @@
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
 use Magento\Quote\Model\Quote\AddressFactory as BaseQuoteAddressFactory;
+use Magento\Directory\Model\ResourceModel\Region\CollectionFactory as RegionCollectionFactory;
+use Magento\Directory\Helper\Data as CountryHelper;
+use Magento\Directory\Model\AllowedCountries;
 
 /**
  * Create QuoteAddress
@@ -36,36 +39,77 @@ class QuoteAddressFactory
      */
     private $addressHelper;
 
+    /**
+     * @var RegionCollectionFactory
+     */
+    private $regionCollectionFactory;
+
+    /**
+     * @var CountryHelper
+     */
+    private $countryHelper;
+
+    /**
+     * @var AllowedCountries
+     */
+    private $allowedCountries;
+
     /**
      * @param BaseQuoteAddressFactory $quoteAddressFactory
      * @param GetCustomerAddress $getCustomerAddress
      * @param AddressHelper $addressHelper
+     * @param RegionCollectionFactory $regionCollectionFactory
+     * @param CountryHelper $countryHelper
+     * @param AllowedCountries $allowedCountries
      */
     public function __construct(
         BaseQuoteAddressFactory $quoteAddressFactory,
         GetCustomerAddress $getCustomerAddress,
-        AddressHelper $addressHelper
+        AddressHelper $addressHelper,
+        RegionCollectionFactory $regionCollectionFactory,
+        CountryHelper $countryHelper,
+        AllowedCountries $allowedCountries
     ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
         $this->getCustomerAddress = $getCustomerAddress;
         $this->addressHelper = $addressHelper;
+        $this->regionCollectionFactory = $regionCollectionFactory;
+        $this->countryHelper = $countryHelper;
+        $this->allowedCountries = $allowedCountries;
     }
 
     /**
      * Create QuoteAddress based on input data
      *
      * @param array $addressInput
+     *
      * @return QuoteAddress
      * @throws GraphQlInputException
      */
     public function createBasedOnInputData(array $addressInput): QuoteAddress
     {
         $addressInput['country_id'] = '';
-        if ($addressInput['country_code']) {
+        if (isset($addressInput['country_code']) && $addressInput['country_code']) {
             $addressInput['country_code'] = strtoupper($addressInput['country_code']);
             $addressInput['country_id'] = $addressInput['country_code'];
         }
 
+        $allowedCountries = $this->allowedCountries->getAllowedCountries();
+        if (!in_array($addressInput['country_code'], $allowedCountries, true)) {
+            throw new GraphQlInputException(__('Country is not available'));
+        }
+        $isRegionRequired = $this->countryHelper->isRegionRequired($addressInput['country_code']);
+        if ($isRegionRequired && !empty($addressInput['region'])) {
+            $regionCollection = $this->regionCollectionFactory
+                ->create()
+                ->addRegionCodeFilter($addressInput['region'])
+                ->addCountryFilter($addressInput['country_code']);
+            if ($regionCollection->getSize() === 0) {
+                throw new GraphQlInputException(
+                    __('Region is not available for the selected country')
+                );
+            }
+        }
         $maxAllowedLineCount = $this->addressHelper->getStreetLines();
         if (is_array($addressInput['street']) && count($addressInput['street']) > $maxAllowedLineCount) {
             throw new GraphQlInputException(
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
index 673debefd0874..20a3677ef1feb 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
@@ -13,6 +13,7 @@
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\Quote\Address;
+use Magento\QuoteGraphQl\Model\Cart\Address\SaveQuoteAddressToCustomerAddressBook;
 
 /**
  * Set billing address for a specified shopping cart
@@ -29,16 +30,24 @@ class SetBillingAddressOnCart
      */
     private $assignBillingAddressToCart;
 
+    /**
+     * @var SaveQuoteAddressToCustomerAddressBook
+     */
+    private $saveQuoteAddressToCustomerAddressBook;
+
     /**
      * @param QuoteAddressFactory $quoteAddressFactory
      * @param AssignBillingAddressToCart $assignBillingAddressToCart
+     * @param SaveQuoteAddressToCustomerAddressBook $saveQuoteAddressToCustomerAddressBook
      */
     public function __construct(
         QuoteAddressFactory $quoteAddressFactory,
-        AssignBillingAddressToCart $assignBillingAddressToCart
+        AssignBillingAddressToCart $assignBillingAddressToCart,
+        SaveQuoteAddressToCustomerAddressBook $saveQuoteAddressToCustomerAddressBook
     ) {
         $this->quoteAddressFactory = $quoteAddressFactory;
         $this->assignBillingAddressToCart = $assignBillingAddressToCart;
+        $this->saveQuoteAddressToCustomerAddressBook = $saveQuoteAddressToCustomerAddressBook;
     }
 
     /**
@@ -56,8 +65,11 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
     {
         $customerAddressId = $billingAddressInput['customer_address_id'] ?? null;
         $addressInput = $billingAddressInput['address'] ?? null;
-        $useForShipping = isset($billingAddressInput['use_for_shipping'])
+        // Need to keep this for BC of `use_for_shipping` field
+        $sameAsShipping = isset($billingAddressInput['use_for_shipping'])
             ? (bool)$billingAddressInput['use_for_shipping'] : false;
+        $sameAsShipping = isset($billingAddressInput['same_as_shipping'])
+            ? (bool)$billingAddressInput['same_as_shipping'] : $sameAsShipping;
 
         if (null === $customerAddressId && null === $addressInput) {
             throw new GraphQlInputException(
@@ -72,15 +84,15 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
         }
 
         $addresses = $cart->getAllShippingAddresses();
-        if ($useForShipping && count($addresses) > 1) {
+        if ($sameAsShipping && count($addresses) > 1) {
             throw new GraphQlInputException(
-                __('Using the "use_for_shipping" option with multishipping is not possible.')
+                __('Using the "same_as_shipping" option with multishipping is not possible.')
             );
         }
 
         $billingAddress = $this->createBillingAddress($context, $customerAddressId, $addressInput);
 
-        $this->assignBillingAddressToCart->execute($cart, $billingAddress, $useForShipping);
+        $this->assignBillingAddressToCart->execute($cart, $billingAddress, $sameAsShipping);
     }
 
     /**
@@ -101,6 +113,15 @@ private function createBillingAddress(
     ): Address {
         if (null === $customerAddressId) {
             $billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
+
+            $customerId = $context->getUserId();
+            // need to save address only for registered user and if save_in_address_book = true
+            if (0 !== $customerId
+                && isset($addressInput['save_in_address_book'])
+                && (bool)$addressInput['save_in_address_book'] === true
+            ) {
+                $this->saveQuoteAddressToCustomerAddressBook->execute($billingAddress, $customerId);
+            }
         } else {
             if (false === $context->getExtensionAttributes()->getIsCustomer()) {
                 throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
@@ -111,6 +132,16 @@ private function createBillingAddress(
                 (int)$context->getUserId()
             );
         }
+        $errors = $billingAddress->validate();
+
+        if (true !== $errors) {
+            $e = new GraphQlInputException(__('Billing address errors'));
+            foreach ($errors as $error) {
+                $e->addError(new GraphQlInputException($error));
+            }
+            throw $e;
+        }
+
         return $billingAddress;
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
index d4f2853467b39..e058913dde1d3 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
@@ -7,10 +7,10 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\Quote\Address;
 
 /**
  * Set single shipping address for a specified shopping cart
@@ -21,6 +21,7 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
      * @var AssignShippingAddressToCart
      */
     private $assignShippingAddressToCart;
+
     /**
      * @var GetShippingAddress
      */
@@ -52,6 +53,15 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
 
         $shippingAddress = $this->getShippingAddress->execute($context, $shippingAddressInput);
 
+        $errors = $shippingAddress->validate();
+
+        if (true !== $errors) {
+            $e = new GraphQlInputException(__('Shipping address errors'));
+            foreach ($errors as $error) {
+                $e->addError(new GraphQlInputException($error));
+            }
+            throw $e;
+        }
         $this->assignShippingAddressToCart->execute($cart, $shippingAddress);
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/UpdateCartItem.php b/app/code/Magento/QuoteGraphQl/Model/Cart/UpdateCartItem.php
index 81a7779eb98b5..7b5c9a57a7be9 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/UpdateCartItem.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/UpdateCartItem.php
@@ -93,8 +93,6 @@ public function execute(Quote $cart, int $cartItemId, float $quantity, array $cu
                 )
             );
         }
-
-        $this->quoteRepository->save($cart);
     }
 
     /**
@@ -105,7 +103,7 @@ public function execute(Quote $cart, int $cartItemId, float $quantity, array $cu
      * @param float $quantity
      * @throws GraphQlNoSuchEntityException
      * @throws NoSuchEntityException
-     * @throws GraphQlNoSuchEntityException
+     * @throws GraphQlInputException
      */
     private function updateItemQuantity(int $itemId, Quote $cart, float $quantity)
     {
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/ValidateAddressFromSchema.php b/app/code/Magento/QuoteGraphQl/Model/Cart/ValidateAddressFromSchema.php
new file mode 100644
index 0000000000000..69fb7d3c2fe28
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/ValidateAddressFromSchema.php
@@ -0,0 +1,55 @@
+<?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\Schema\Type\TypeRegistry;
+
+/**
+ * Validates address against required fields from schema
+ */
+class ValidateAddressFromSchema
+{
+    /**
+     * @var TypeRegistry
+     */
+    private $typeRegistry;
+
+    /**
+     * @param TypeRegistry $typeRegistry
+     */
+    public function __construct(
+        TypeRegistry $typeRegistry
+    ) {
+        $this->typeRegistry = $typeRegistry;
+    }
+
+    /**
+     * Validate data from address against mandatory fields from graphql schema for address
+     *
+     * @param array $address
+     * @return bool
+     */
+    public function execute(array $address = []) : bool
+    {
+        /** @var \Magento\Framework\GraphQL\Schema\Type\Input\InputObjectType $cartAddressInput */
+        $cartAddressInput = $this->typeRegistry->get('CartAddressInput');
+        $fields = $cartAddressInput->getFields();
+
+        foreach ($fields as $field) {
+            if ($field->getType() instanceof \Magento\Framework\GraphQL\Schema\Type\NonNull) {
+                // an array key has to exist but it's value should not be null
+                if (array_key_exists($field->name, $address)
+                    && !is_array($address[$field->name])
+                    && !isset($address[$field->name])) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
index a6bb0b0d04df1..b0e621789ebd0 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
@@ -13,6 +13,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\QuoteGraphQl\Model\Cart\ExtractQuoteAddressData;
+use Magento\QuoteGraphQl\Model\Cart\ValidateAddressFromSchema;
 
 /**
  * @inheritdoc
@@ -24,12 +25,21 @@ class BillingAddress implements ResolverInterface
      */
     private $extractQuoteAddressData;
 
+    /**
+     * @var ValidateAddressFromSchema
+     */
+    private $validateAddressFromSchema;
+
     /**
      * @param ExtractQuoteAddressData $extractQuoteAddressData
+     * @param ValidateAddressFromSchema $validateAddressFromSchema
      */
-    public function __construct(ExtractQuoteAddressData $extractQuoteAddressData)
-    {
+    public function __construct(
+        ExtractQuoteAddressData $extractQuoteAddressData,
+        ValidateAddressFromSchema $validateAddressFromSchema
+    ) {
         $this->extractQuoteAddressData = $extractQuoteAddressData;
+        $this->validateAddressFromSchema = $validateAddressFromSchema;
     }
 
     /**
@@ -44,11 +54,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $cart = $value['model'];
 
         $billingAddress = $cart->getBillingAddress();
-        if (null === $billingAddress) {
+        $addressData = $this->extractQuoteAddressData->execute($billingAddress);
+        if (!$this->validateAddressFromSchema->execute($addressData)) {
             return null;
         }
-
-        $addressData = $this->extractQuoteAddressData->execute($billingAddress);
         return $addressData;
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemPrices.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemPrices.php
index b66327ac1dbba..f0d97780845e8 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemPrices.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemPrices.php
@@ -93,12 +93,11 @@ private function getDiscountValues($cartItem, $currencyCode)
             foreach ($itemDiscounts as $value) {
                 $discount = [];
                 $amount = [];
-                /* @var \Magento\SalesRule\Model\Rule\Action\Discount\Data $discountData */
-                $discountData = $value['discount'];
-                /* @var \Magento\SalesRule\Model\Rule $rule */
-                $rule = $value['rule'];
-                $discount['label'] = $rule->getStoreLabel($cartItem->getQuote()->getStore()) ?: __('Discount');
-                $amount['value'] = $discountData->getAmount();
+                /* @var \Magento\SalesRule\Api\Data\DiscountDataInterface $discountData */
+                $discountData = $value->getDiscountData();
+                $discountAmount = $discountData->getAmount();
+                $discount['label'] = $value->getRuleLabel() ?: __('Discount');
+                $amount['value'] = $discountAmount;
                 $amount['currency'] = $currencyCode;
                 $discount['amount'] = $amount;
                 $discountValues[] = $discount;
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomerCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomerCart.php
new file mode 100644
index 0000000000000..0be95eccc39e5
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomerCart.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\Resolver;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+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\CreateEmptyCartForCustomer;
+use Magento\GraphQl\Model\Query\ContextInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResourceModel;
+
+/**
+ * Get cart for the customer
+ */
+class CustomerCart implements ResolverInterface
+{
+    /**
+     * @var CreateEmptyCartForCustomer
+     */
+    private $createEmptyCartForCustomer;
+
+    /**
+     * @var CartManagementInterface
+     */
+    private $cartManagement;
+
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private $quoteIdMaskFactory;
+
+    /**
+     * @var QuoteIdMaskResourceModel
+     */
+    private $quoteIdMaskResourceModel;
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedQuoteId;
+
+    /**
+     * @param CreateEmptyCartForCustomer $createEmptyCartForCustomer
+     * @param CartManagementInterface $cartManagement
+     * @param QuoteIdMaskFactory $quoteIdMaskFactory
+     * @param QuoteIdMaskResourceModel $quoteIdMaskResourceModel
+     * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
+     */
+    public function __construct(
+        CreateEmptyCartForCustomer $createEmptyCartForCustomer,
+        CartManagementInterface $cartManagement,
+        QuoteIdMaskFactory $quoteIdMaskFactory,
+        QuoteIdMaskResourceModel $quoteIdMaskResourceModel,
+        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
+    ) {
+        $this->createEmptyCartForCustomer = $createEmptyCartForCustomer;
+        $this->cartManagement = $cartManagement;
+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
+        $this->quoteIdMaskResourceModel = $quoteIdMaskResourceModel;
+         $this->quoteIdToMaskedQuoteId = $quoteIdToMaskedQuoteId;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $currentUserId = $context->getUserId();
+
+        /** @var ContextInterface $context */
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
+            throw new GraphQlAuthorizationException(__('The request is allowed for logged in customer'));
+        }
+        try {
+            $cart = $this->cartManagement->getCartForCustomer($currentUserId);
+        } catch (NoSuchEntityException $e) {
+            $this->createEmptyCartForCustomer->execute($currentUserId, null);
+            $cart =  $this->cartManagement->getCartForCustomer($currentUserId);
+        }
+
+        $maskedId = $this->quoteIdToMaskedQuoteId->execute((int) $cart->getId());
+        if (empty($maskedId)) {
+            $quoteIdMask = $this->quoteIdMaskFactory->create();
+            $quoteIdMask->setQuoteId((int) $cart->getId());
+            $this->quoteIdMaskResourceModel->save($quoteIdMask);
+        }
+
+        return [
+            'model' => $cart
+        ];
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Discounts.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Discounts.php
index 2c3f6d0e69f4a..703015fd7ddb1 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/Discounts.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Discounts.php
@@ -12,27 +12,12 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Quote\Model\Quote;
-use Magento\QuoteGraphQl\Model\Cart\DiscountAggregator;
 
 /**
  * @inheritdoc
  */
 class Discounts implements ResolverInterface
 {
-    /**
-     * @var DiscountAggregator
-     */
-    private $discountAggregator;
-
-    /**
-     * @param DiscountAggregator|null $discountAggregator
-     */
-    public function __construct(
-        DiscountAggregator $discountAggregator
-    ) {
-        $this->discountAggregator = $discountAggregator;
-    }
-
     /**
      * @inheritdoc
      */
@@ -55,15 +40,16 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
     private function getDiscountValues(Quote $quote)
     {
         $discountValues=[];
-        $totalDiscounts = $this->discountAggregator->aggregateDiscountPerRule($quote);
-        if ($totalDiscounts) {
+        $address = $quote->getShippingAddress();
+        $totalDiscounts = $address->getExtensionAttributes()->getDiscounts();
+        if ($totalDiscounts && is_array($totalDiscounts)) {
             foreach ($totalDiscounts as $value) {
                 $discount = [];
                 $amount = [];
-                /* @var \Magento\SalesRule\Model\Rule $rule*/
-                $rule = $value['rule'];
-                $discount['label'] = $rule->getStoreLabel($quote->getStore()) ?: __('Discount');
-                $amount['value'] = $value['discount'];
+                $discount['label'] = $value->getRuleLabel() ?: __('Discount');
+                /* @var \Magento\SalesRule\Api\Data\DiscountDataInterface $discountData */
+                $discountData = $value->getDiscountData();
+                $amount['value'] = $discountData->getAmount();
                 $amount['currency'] = $quote->getQuoteCurrencyCode();
                 $discount['amount'] = $amount;
                 $discountValues[] = $discount;
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/MaskedCartId.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/MaskedCartId.php
new file mode 100644
index 0000000000000..755f79569f09a
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/MaskedCartId.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+
+/**
+ * Get cart id from the cart
+ */
+class MaskedCartId implements ResolverInterface
+{
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedQuoteId;
+
+    /**
+     * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
+     */
+    public function __construct(
+        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
+    ) {
+        $this->quoteIdToMaskedQuoteId = $quoteIdToMaskedQuoteId;
+    }
+
+    /**
+     * @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 Quote $cart */
+        $cart = $value['model'];
+        $cartId = (int) $cart->getId();
+        $maskedCartId = $this->getQuoteMaskId($cartId);
+        return $maskedCartId;
+    }
+
+    /**
+     * Get masked id for cart
+     *
+     * @param int $quoteId
+     * @return string
+     * @throws GraphQlNoSuchEntityException
+     */
+    private function getQuoteMaskId(int $quoteId): string
+    {
+        try {
+            $maskedId = $this->quoteIdToMaskedQuoteId->execute($quoteId);
+        } catch (NoSuchEntityException $exception) {
+            throw new GraphQlNoSuchEntityException(__('Current user does not have an active cart.'));
+        }
+        return $maskedId;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php
new file mode 100644
index 0000000000000..d77d19df55603
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php
@@ -0,0 +1,80 @@
+<?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\QuoteGraphQl\Model\Cart\GetCartForUser;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\GraphQl\Model\Query\ContextInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+
+/**
+ * Merge Carts Resolver
+ */
+class MergeCarts implements ResolverInterface
+{
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
+    /**
+     * @param GetCartForUser $getCartForUser
+     * @param CartRepositoryInterface $cartRepository
+     */
+    public function __construct(
+        GetCartForUser $getCartForUser,
+        CartRepositoryInterface $cartRepository
+    ) {
+        $this->getCartForUser = $getCartForUser;
+        $this->cartRepository = $cartRepository;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (empty($args['source_cart_id'])) {
+            throw new GraphQlInputException(__('Required parameter "source_cart_id" is missing'));
+        }
+
+        if (empty($args['destination_cart_id'])) {
+            throw new GraphQlInputException(__('Required parameter "destination_cart_id" is missing'));
+        }
+
+        /** @var ContextInterface $context */
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
+        }
+
+        $guestMaskedCartId = $args['source_cart_id'];
+        $customerMaskedCartId = $args['destination_cart_id'];
+
+        $currentUserId = $context->getUserId();
+        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
+        // passing customerId as null enforces source cart should always be a guestcart
+        $guestCart = $this->getCartForUser->execute($guestMaskedCartId, null, $storeId);
+        $customerCart = $this->getCartForUser->execute($customerMaskedCartId, $currentUserId, $storeId);
+        $customerCart->merge($guestCart);
+        $guestCart->setIsActive(false);
+        $this->cartRepository->save($customerCart);
+        $this->cartRepository->save($guestCart);
+        return [
+            'model' => $customerCart,
+        ];
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
index ae97f7efda45f..ac0bfe36627ce 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php
@@ -13,8 +13,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\ExtractQuoteAddressData;
-use Magento\Framework\GraphQl\Schema\Type\TypeRegistry;
-use Magento\Framework\App\ObjectManager;
+use Magento\QuoteGraphQl\Model\Cart\ValidateAddressFromSchema;
 
 /**
  * @inheritdoc
@@ -27,20 +26,20 @@ class ShippingAddresses implements ResolverInterface
     private $extractQuoteAddressData;
 
     /**
-     * @var TypeRegistry
+     * @var ValidateAddressFromSchema
      */
-    private $typeRegistry;
+    private $validateAddressFromSchema;
 
     /**
      * @param ExtractQuoteAddressData $extractQuoteAddressData
-     * @param TypeRegistry|null $typeRegistry
+     * @param ValidateAddressFromSchema $validateAddressFromSchema
      */
     public function __construct(
         ExtractQuoteAddressData $extractQuoteAddressData,
-        TypeRegistry $typeRegistry = null
+        ValidateAddressFromSchema $validateAddressFromSchema
     ) {
         $this->extractQuoteAddressData = $extractQuoteAddressData;
-        $this->typeRegistry = $typeRegistry ?: ObjectManager::getInstance()->get(TypeRegistry::class);
+        $this->validateAddressFromSchema = $validateAddressFromSchema;
     }
 
     /**
@@ -61,36 +60,11 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             foreach ($shippingAddresses as $shippingAddress) {
                 $address = $this->extractQuoteAddressData->execute($shippingAddress);
 
-                if ($this->validateAddressFromSchema($address)) {
+                if ($this->validateAddressFromSchema->execute($address)) {
                     $addressesData[] = $address;
                 }
             }
         }
         return $addressesData;
     }
-
-    /**
-     * Validate data from address against mandatory fields from graphql schema for address
-     *
-     * @param array $address
-     * @return bool
-     */
-    private function validateAddressFromSchema(array $address) : bool
-    {
-        /** @var \Magento\Framework\GraphQL\Schema\Type\Input\InputObjectType $cartAddressInput */
-        $cartAddressInput = $this->typeRegistry->get('CartAddressInput');
-        $fields = $cartAddressInput->getFields();
-
-        foreach ($fields as $field) {
-            if ($field->getType() instanceof \Magento\Framework\GraphQL\Schema\Type\NonNull) {
-                // an array key has to exist but it's value should not be null
-                if (array_key_exists($field->name, $address)
-                    && !is_array($address[$field->name])
-                    && !isset($address[$field->name])) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php
index 8066c28e9e48a..fa90f08e4b553 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/UpdateCartItems.php
@@ -15,6 +15,7 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Quote\Api\CartItemRepositoryInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
 use Magento\QuoteGraphQl\Model\Cart\UpdateCartItem;
@@ -39,19 +40,27 @@ class UpdateCartItems implements ResolverInterface
      */
     private $cartItemRepository;
 
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
     /**
      * @param GetCartForUser $getCartForUser
      * @param CartItemRepositoryInterface $cartItemRepository
      * @param UpdateCartItem $updateCartItem
+     * @param CartRepositoryInterface $cartRepository
      */
     public function __construct(
         GetCartForUser $getCartForUser,
         CartItemRepositoryInterface $cartItemRepository,
-        UpdateCartItem $updateCartItem
+        UpdateCartItem $updateCartItem,
+        CartRepositoryInterface $cartRepository
     ) {
         $this->getCartForUser = $getCartForUser;
         $this->cartItemRepository = $cartItemRepository;
         $this->updateCartItem = $updateCartItem;
+        $this->cartRepository = $cartRepository;
     }
 
     /**
@@ -76,6 +85,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         try {
             $this->processCartItems($cart, $cartItems);
+            $this->cartRepository->save($cart);
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
         } catch (LocalizedException $e) {
@@ -106,6 +116,11 @@ private function processCartItems(Quote $cart, array $items): void
             $itemId = (int)$item['cart_item_id'];
             $customizableOptions = $item['customizable_options'] ?? [];
 
+            $cartItem = $cart->getItemById($itemId);
+            if ($cartItem && $cartItem->getParentItemId()) {
+                throw new GraphQlInputException(__('Child items may not be updated.'));
+            }
+
             if (count($customizableOptions) === 0 && !isset($item['quantity'])) {
                 throw new GraphQlInputException(__('Required parameter "quantity" for "cart_items" is missing.'));
             }
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 221f8ba2e620b..d334d56c85aac 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -3,6 +3,7 @@
 
 type Query {
     cart(cart_id: String!): Cart @resolver (class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\Cart") @doc(description:"Returns information about shopping cart") @cache(cacheable: false)
+    customerCart: Cart! @resolver (class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CustomerCart") @doc(description:"Returns information about the customer shopping cart") @cache(cacheable: false)
 }
 
 type Mutation {
@@ -19,6 +20,7 @@ type Mutation {
     setPaymentMethodOnCart(input: SetPaymentMethodOnCartInput): SetPaymentMethodOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetPaymentMethodOnCart")
     setGuestEmailOnCart(input: SetGuestEmailOnCartInput): SetGuestEmailOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetGuestEmailOnCart")
     setPaymentMethodAndPlaceOrder(input: SetPaymentMethodAndPlaceOrderInput): PlaceOrderOutput @deprecated(reason: "Should use setPaymentMethodOnCart and placeOrder mutations in single request.") @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetPaymentAndPlaceOrder")
+    mergeCarts(source_cart_id: String!, destination_cart_id: String!): Cart! @doc(description:"Merges the source cart into the destination cart") @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\MergeCarts")
     placeOrder(input: PlaceOrderInput): PlaceOrderOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\PlaceOrder")
 }
 
@@ -96,7 +98,8 @@ input SetBillingAddressOnCartInput {
 input BillingAddressInput {
     customer_address_id: Int
     address: CartAddressInput
-    use_for_shipping: Boolean
+    use_for_shipping: Boolean @doc(description: "Deprecated: use `same_as_shipping` field instead")
+    same_as_shipping: Boolean @doc(description: "Set billing address same as shipping")
 }
 
 input CartAddressInput {
@@ -109,7 +112,7 @@ input CartAddressInput {
     postcode: String
     country_code: String!
     telephone: String!
-    save_in_address_book: Boolean!
+    save_in_address_book: Boolean
 }
 
 input SetShippingMethodsOnCartInput {
@@ -191,12 +194,13 @@ type PlaceOrderOutput {
 }
 
 type Cart {
+    id: ID! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\MaskedCartId") @doc(description: "The ID of the cart.")
     items: [CartItemInterface] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartItems")
     applied_coupon: AppliedCoupon @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\AppliedCoupon") @doc(description:"An array of coupons that have been applied to the cart") @deprecated(reason: "Use applied_coupons instead ")
     applied_coupons: [AppliedCoupon] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\AppliedCoupons") @doc(description:"An array of `AppliedCoupon` objects. Each object contains the `code` text attribute, which specifies the coupon code")
     email: String @resolver (class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartEmail")
     shipping_addresses: [ShippingCartAddress]! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddresses")
-    billing_address: BillingCartAddress! @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\BillingAddress")
+    billing_address: BillingCartAddress @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\BillingAddress")
     available_payment_methods: [AvailablePaymentMethod] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AvailablePaymentMethods") @doc(description: "Available payment methods")
     selected_payment_method: SelectedPaymentMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SelectedPaymentMethod")
     prices: CartPrices @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartPrices")
@@ -205,42 +209,43 @@ type Cart {
 }
 
 interface CartAddressInterface @typeResolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartAddressTypeResolver") {
-    firstname: String
-    lastname: String
+    firstname: String!
+    lastname: String!
     company: String
-    street: [String]
-    city: String
+    street: [String!]!
+    city: String!
     region: CartAddressRegion
     postcode: String
-    country: CartAddressCountry
-    telephone: String
+    country: CartAddressCountry!
+    telephone: String!
 }
 
 type ShippingCartAddress implements CartAddressInterface {
     available_shipping_methods: [AvailableShippingMethod] @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddress\\AvailableShippingMethods")
     selected_shipping_method: SelectedShippingMethod @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\ShippingAddress\\SelectedShippingMethod")
-    items_weight: Float
-    cart_items: [CartItemQuantity]
     customer_notes: String
+    items_weight: Float @deprecated(reason: "This information shoud not be exposed on frontend")
+    cart_items: [CartItemQuantity] @deprecated(reason: "`cart_items_v2` should be used instead")
+    cart_items_v2: [CartItemInterface]
 }
 
 type BillingCartAddress implements CartAddressInterface {
     customer_notes: String @deprecated (reason: "The field is used only in shipping address")
 }
 
-type CartItemQuantity {
-    cart_item_id: Int!
-    quantity: Float!
+type CartItemQuantity @doc(description:"Deprecated: `cart_items` field of `ShippingCartAddress` returns now  `CartItemInterface` instead of `CartItemQuantity`") {
+    cart_item_id: Int! @deprecated(reason: "`cart_items` field of `ShippingCartAddress` returns now `CartItemInterface` instead of `CartItemQuantity`")
+    quantity: Float! @deprecated(reason: "`cart_items` field of `ShippingCartAddress` returns now `CartItemInterface` instead of `CartItemQuantity`")
 }
 
 type CartAddressRegion {
-    code: String
-    label: String
+    code: String!
+    label: String!
 }
 
 type CartAddressCountry {
-    code: String
-    label: String
+    code: String!
+    label: String!
 }
 
 type SelectedShippingMethod {
diff --git a/app/code/Magento/RelatedProductGraphQl/Model/DataProvider/RelatedProductDataProvider.php b/app/code/Magento/RelatedProductGraphQl/Model/DataProvider/RelatedProductDataProvider.php
index 173c0a94312ee..e5084d4c9f9b6 100644
--- a/app/code/Magento/RelatedProductGraphQl/Model/DataProvider/RelatedProductDataProvider.php
+++ b/app/code/Magento/RelatedProductGraphQl/Model/DataProvider/RelatedProductDataProvider.php
@@ -7,9 +7,12 @@
 
 namespace Magento\RelatedProductGraphQl\Model\DataProvider;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Link;
 use Magento\Catalog\Model\Product\LinkFactory;
+use Magento\Framework\EntityManager\HydratorPool;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * Related Products Data Provider
@@ -21,13 +24,31 @@ class RelatedProductDataProvider
      */
     private $linkFactory;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var HydratorPool
+     */
+    private $hydratorPool;
+
     /**
      * @param LinkFactory $linkFactory
+     * @param MetadataPool|null $metadataPool
+     * @param HydratorPool|null $hydratorPool
      */
     public function __construct(
-        LinkFactory $linkFactory
+        LinkFactory $linkFactory,
+        ?MetadataPool $metadataPool = null,
+        ?HydratorPool $hydratorPool = null
     ) {
         $this->linkFactory = $linkFactory;
+        $this->metadataPool = $metadataPool
+            ?? \Magento\Framework\App\ObjectManager::getInstance()->get(MetadataPool::class);
+        $this->hydratorPool = $hydratorPool
+            ?? \Magento\Framework\App\ObjectManager::getInstance()->get(HydratorPool::class);
     }
 
     /**
@@ -62,9 +83,7 @@ public function getData(Product $product, array $fields, int $linkType): array
     private function getRelatedProducts(Product $product, array $fields, int $linkType): array
     {
         /** @var Link $link */
-        $link = $this->linkFactory->create([ 'data' => [
-            'link_type_id' => $linkType,
-        ]]);
+        $link = $this->linkFactory->create(['data' => ['link_type_id' => $linkType]]);
 
         $collection = $link->getProductCollection();
         $collection->setIsStrongMode();
@@ -75,4 +94,42 @@ private function getRelatedProducts(Product $product, array $fields, int $linkTy
 
         return $collection->getItems();
     }
+
+    /**
+     * Get related product IDs for given products.
+     *
+     * @param \Magento\Catalog\Api\Data\ProductInterface[] $products
+     * @param int $linkType
+     * @return string[][] keys - IDs, values - list of linked product IDs.
+     */
+    public function getRelations(array $products, int $linkType): array
+    {
+        //Links use real IDs for root products, we need to get them
+        $actualIdField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $hydrator = $this->hydratorPool->getHydrator(ProductInterface::class);
+        /** @var ProductInterface[] $productsByActualIds */
+        $productsByActualIds = [];
+        foreach ($products as $product) {
+            $productsByActualIds[$hydrator->extract($product)[$actualIdField]] = $product;
+        }
+        //Load all links
+        /** @var Link $link */
+        $link = $this->linkFactory->create(['data' => ['link_type_id' => $linkType]]);
+        $collection = $link->getLinkCollection();
+        $collection->addFieldToFilter('product_id', ['in' => array_keys($productsByActualIds)]);
+        $collection->addLinkTypeIdFilter();
+
+        //Prepare map
+        $map = [];
+        /** @var Link $item */
+        foreach ($collection as $item) {
+            $productId = $productsByActualIds[$item->getProductId()]->getId();
+            if (!array_key_exists($productId, $map)) {
+                $map[$productId] = [];
+            }
+            $map[$productId][] = $item->getLinkedProductId();
+        }
+
+        return $map;
+    }
 }
diff --git a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php
new file mode 100644
index 0000000000000..7ad2e5dde2985
--- /dev/null
+++ b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\RelatedProductGraphQl\Model\Resolver\Batch;
+
+use Magento\CatalogGraphQl\Model\Resolver\Product\ProductFieldsSelector;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\BatchResolverInterface;
+use Magento\Framework\GraphQl\Query\Resolver\BatchResponse;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\RelatedProductGraphQl\Model\DataProvider\RelatedProductDataProvider;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product as ProductDataProvider;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+
+/**
+ * Resolve linked product lists.
+ */
+abstract class AbstractLikedProducts implements BatchResolverInterface
+{
+    /**
+     * @var ProductFieldsSelector
+     */
+    private $productFieldsSelector;
+
+    /**
+     * @var RelatedProductDataProvider
+     */
+    private $relatedProductDataProvider;
+
+    /**
+     * @var ProductDataProvider
+     */
+    private $productDataProvider;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @param ProductFieldsSelector $productFieldsSelector
+     * @param RelatedProductDataProvider $relatedProductDataProvider
+     * @param ProductDataProvider $productDataProvider
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     */
+    public function __construct(
+        ProductFieldsSelector $productFieldsSelector,
+        RelatedProductDataProvider $relatedProductDataProvider,
+        ProductDataProvider $productDataProvider,
+        SearchCriteriaBuilder $searchCriteriaBuilder
+    ) {
+        $this->productFieldsSelector = $productFieldsSelector;
+        $this->relatedProductDataProvider = $relatedProductDataProvider;
+        $this->productDataProvider = $productDataProvider;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+    }
+
+    /**
+     * Node type.
+     *
+     * @return string
+     */
+    abstract protected function getNode(): string;
+
+    /**
+     * Type of linked products to be resolved.
+     *
+     * @return int
+     */
+    abstract protected function getLinkType(): int;
+
+    /**
+     * Find related products.
+     *
+     * @param \Magento\Catalog\Api\Data\ProductInterface[] $products
+     * @param string[] $loadAttributes
+     * @param int $linkType
+     * @return \Magento\Catalog\Api\Data\ProductInterface[][]
+     */
+    private function findRelations(array $products, array $loadAttributes, int $linkType): array
+    {
+        //Loading relations
+        $relations = $this->relatedProductDataProvider->getRelations($products, $linkType);
+        if (!$relations) {
+            return [];
+        }
+        $relatedIds = array_values($relations);
+        $relatedIds = array_unique(array_merge(...$relatedIds));
+        //Loading products data.
+        $this->searchCriteriaBuilder->addFilter('entity_id', $relatedIds, 'in');
+        $relatedSearchResult = $this->productDataProvider->getList(
+            $this->searchCriteriaBuilder->create(),
+            $loadAttributes,
+            false,
+            true
+        );
+        //Filling related products map.
+        /** @var \Magento\Catalog\Api\Data\ProductInterface[] $relatedProducts */
+        $relatedProducts = [];
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $item */
+        foreach ($relatedSearchResult->getItems() as $item) {
+            $relatedProducts[$item->getId()] = $item;
+        }
+
+        //Matching products with related products.
+        $relationsData = [];
+        foreach ($relations as $productId => $relatedIds) {
+            $relationsData[$productId] = array_map(
+                function ($id) use ($relatedProducts) {
+                    return $relatedProducts[$id];
+                },
+                $relatedIds
+            );
+        }
+
+        return $relationsData;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolve(ContextInterface $context, Field $field, array $requests): BatchResponse
+    {
+        /** @var \Magento\Catalog\Api\Data\ProductInterface[] $products */
+        $products = [];
+        $fields = [];
+        /** @var \Magento\Framework\GraphQl\Query\Resolver\BatchRequestItemInterface $request */
+        foreach ($requests as $request) {
+            //Gathering fields and relations to load.
+            if (empty($request->getValue()['model'])) {
+                throw new LocalizedException(__('"model" value should be specified'));
+            }
+            $products[] = $request->getValue()['model'];
+            $fields[] = $this->productFieldsSelector->getProductFieldsFromInfo($request->getInfo(), $this->getNode());
+        }
+        $fields = array_unique(array_merge(...$fields));
+
+        //Finding relations.
+        $related = $this->findRelations($products, $fields, $this->getLinkType());
+
+        //Matching requests with responses.
+        $response = new BatchResponse();
+        /** @var \Magento\Framework\GraphQl\Query\Resolver\BatchRequestItemInterface $request */
+        foreach ($requests as $request) {
+            /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+            $product = $request->getValue()['model'];
+            $result = [];
+            if (array_key_exists($product->getId(), $related)) {
+                $result = array_map(
+                    function ($relatedProduct) {
+                        $data = $relatedProduct->getData();
+                        $data['model'] = $relatedProduct;
+
+                        return $data;
+                    },
+                    $related[$product->getId()]
+                );
+            }
+            $response->addResponse($request, $result);
+        }
+
+        return $response;
+    }
+}
diff --git a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/CrossSellProducts.php b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/CrossSellProducts.php
new file mode 100644
index 0000000000000..d636d980597c6
--- /dev/null
+++ b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/CrossSellProducts.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\RelatedProductGraphQl\Model\Resolver\Batch;
+
+use Magento\Catalog\Model\Product\Link;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\BatchResponse;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+
+/**
+ * CrossSell Products Resolver
+ */
+class CrossSellProducts extends AbstractLikedProducts
+{
+    /**
+     * @inheritDoc
+     */
+    protected function getNode(): string
+    {
+        return 'crosssell_products';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function getLinkType(): int
+    {
+        return Link::LINK_TYPE_CROSSSELL;
+    }
+}
diff --git a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/RelatedProducts.php b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/RelatedProducts.php
new file mode 100644
index 0000000000000..cefa4db912328
--- /dev/null
+++ b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/RelatedProducts.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\RelatedProductGraphQl\Model\Resolver\Batch;
+
+use Magento\Catalog\Model\Product\Link;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\BatchResponse;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+
+/**
+ * Related Products Resolver
+ */
+class RelatedProducts extends AbstractLikedProducts
+{
+    /**
+     * @inheritDoc
+     */
+    protected function getNode(): string
+    {
+        return 'related_products';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function getLinkType(): int
+    {
+        return Link::LINK_TYPE_RELATED;
+    }
+}
diff --git a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/UpSellProducts.php b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/UpSellProducts.php
new file mode 100644
index 0000000000000..42807772a2282
--- /dev/null
+++ b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/UpSellProducts.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\RelatedProductGraphQl\Model\Resolver\Batch;
+
+use Magento\Catalog\Model\Product\Link;
+
+/**
+ * UpSell Products Resolver
+ */
+class UpSellProducts extends AbstractLikedProducts
+{
+    /**
+     * @inheritDoc
+     */
+    protected function getNode(): string
+    {
+        return 'upsell_products';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function getLinkType(): int
+    {
+        return Link::LINK_TYPE_UPSELL;
+    }
+}
diff --git a/app/code/Magento/RelatedProductGraphQl/etc/schema.graphqls b/app/code/Magento/RelatedProductGraphQl/etc/schema.graphqls
index 81c51f5035ea6..849f8fb679806 100644
--- a/app/code/Magento/RelatedProductGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/RelatedProductGraphQl/etc/schema.graphqls
@@ -2,7 +2,7 @@
 # See COPYING.txt for license details.
 
 interface ProductInterface {
-    related_products: [ProductInterface] @doc(description: "Related Products") @resolver(class: "Magento\\RelatedProductGraphQl\\Model\\Resolver\\RelatedProducts")
-    upsell_products: [ProductInterface] @doc(description: "Upsell Products")  @resolver(class: "Magento\\RelatedProductGraphQl\\Model\\Resolver\\UpSellProducts")
-    crosssell_products: [ProductInterface] @doc(description: "Crosssell Products") @resolver(class: "Magento\\RelatedProductGraphQl\\Model\\Resolver\\CrossSellProducts")
+    related_products: [ProductInterface] @doc(description: "Related Products") @resolver(class: "Magento\\RelatedProductGraphQl\\Model\\Resolver\\Batch\\RelatedProducts")
+    upsell_products: [ProductInterface] @doc(description: "Upsell Products")  @resolver(class: "Magento\\RelatedProductGraphQl\\Model\\Resolver\\Batch\\UpSellProducts")
+    crosssell_products: [ProductInterface] @doc(description: "Crosssell Products") @resolver(class: "Magento\\RelatedProductGraphQl\\Model\\Resolver\\Batch\\CrossSellProducts")
 }
diff --git a/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php b/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php
index a7f619863af56..813c5f28bf4d9 100644
--- a/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php
+++ b/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php
@@ -12,7 +12,6 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Backend\Model\Auth\Session;
 use Magento\Framework\App\CacheInterface;
-use Magento\User\Model\User;
 
 /**
  * Class CanViewNotificationTest
@@ -37,11 +36,6 @@ class CanViewNotificationTest extends \PHPUnit\Framework\TestCase
     /** @var  $cacheStorageMock \PHPUnit_Framework_MockObject_MockObject|CacheInterface */
     private $cacheStorageMock;
 
-    /**
-     * @var User|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $userMock;
-
     public function setUp()
     {
         $this->cacheStorageMock = $this->getMockBuilder(CacheInterface::class)
@@ -50,6 +44,7 @@ public function setUp()
             ->getMock();
         $this->sessionMock = $this->getMockBuilder(Session::class)
             ->disableOriginalConstructor()
+            ->setMethods(['getUser', 'getId'])
             ->getMock();
         $this->viewerLoggerMock = $this->getMockBuilder(Logger::class)
             ->disableOriginalConstructor()
@@ -57,7 +52,6 @@ public function setUp()
         $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->userMock = $this->createMock(User::class);
         $objectManager = new ObjectManager($this);
         $this->canViewNotification = $objectManager->getObject(
             CanViewNotification::class,
@@ -74,8 +68,8 @@ public function testIsVisibleLoadDataFromCache()
     {
         $this->sessionMock->expects($this->once())
             ->method('getUser')
-            ->willReturn($this->userMock);
-        $this->userMock->expects($this->once())
+            ->willReturn($this->sessionMock);
+        $this->sessionMock->expects($this->once())
             ->method('getId')
             ->willReturn(1);
         $this->cacheStorageMock->expects($this->once())
@@ -99,8 +93,8 @@ public function testIsVisible($expected, $version, $lastViewVersion)
             ->willReturn(false);
         $this->sessionMock->expects($this->once())
             ->method('getUser')
-            ->willReturn($this->userMock);
-        $this->userMock->expects($this->once())
+            ->willReturn($this->sessionMock);
+        $this->sessionMock->expects($this->once())
             ->method('getId')
             ->willReturn(1);
         $this->productMetadataMock->expects($this->once())
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
index 2fbff13a5b644..d5d8d32744e49 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
@@ -18,6 +18,7 @@
 /**
  * Reports api controller
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @since 100.0.2
  * @SuppressWarnings(PHPMD.AllPurposeAction)
@@ -140,7 +141,7 @@ protected function _showLastExecutionTime($flagCode, $refreshCode)
         $flag = $this->_objectManager->create(\Magento\Reports\Model\Flag::class)
             ->setReportFlagCode($flagCode)
             ->loadSelf();
-        $updatedAt = 'undefined';
+        $updatedAt = __('Never');
         if ($flag->hasData()) {
             $updatedAt = $this->timezone->formatDate(
                 $flag->getLastUpdate(),
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
index 8c985238efe47..ab76cad8da5c4 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Collection.php
@@ -77,7 +77,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @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
@@ -111,7 +111,7 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \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,
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php
index ec514f45ff65a..5b4cf39d65def 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Index/Collection/AbstractCollection.php
@@ -44,7 +44,7 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\ResourceModel\P
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @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
@@ -69,7 +69,7 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \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,
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
index c02de01117a74..39d673911111f 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
@@ -63,7 +63,7 @@ class Collection extends \Magento\Reports\Model\ResourceModel\Product\Collection
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @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
@@ -94,7 +94,7 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \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,
diff --git a/app/code/Magento/Reports/Setup/Patch/Data/ReportDisableNotification.php b/app/code/Magento/Reports/Setup/Patch/Data/ReportDisableNotification.php
new file mode 100644
index 0000000000000..e34d7f1144341
--- /dev/null
+++ b/app/code/Magento/Reports/Setup/Patch/Data/ReportDisableNotification.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Reports\Setup\Patch\Data;
+
+use Magento\Framework\Notification\NotifierInterface;
+
+/**
+ * Report Disable Notification
+ */
+class ReportDisableNotification implements \Magento\Framework\Setup\Patch\DataPatchInterface
+{
+    /**
+     * @var NotifierInterface
+     */
+    private $notifier;
+
+    /**
+     * @param NotifierInterface $notifier
+     */
+    public function __construct(
+        NotifierInterface $notifier
+    ) {
+        $this->notifier = $notifier;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $message = <<<"MESSAGE"
+To improve performance, collecting statistics for the Magento Report module is disabled by default. 
+You can enable it in System Config.
+MESSAGE;
+        $this->notifier->addNotice(__('Disable Notice'), __($message));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml b/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml
index 29bbe91afbd11..1250c7b0ac370 100644
--- a/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml
+++ b/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml
@@ -16,29 +16,11 @@
             <argument name="orderFromDate" type="string"/>
             <argument name="orderToDate" type="string"/>
         </arguments>
-        
+
         <click selector="{{OrderReportMainSection.here}}" stepKey="clickOnHere"/>
         <fillField selector="{{OrderReportFilterSection.dateFrom}}" userInput="{{orderFromDate}}" stepKey="fillFromDate"/>
         <fillField selector="{{OrderReportFilterSection.dateTo}}" userInput="{{orderToDate}}" stepKey="fillToDate"/>
         <selectOption selector="{{OrderReportFilterSection.orderStatus}}" userInput="Any" stepKey="selectAnyOption"/>
         <click selector="{{OrderReportMainSection.showReport}}" stepKey="showReport"/>
     </actionGroup>
-    
-    <actionGroup name="GenerateOrderReportForNotCancelActionGroup">
-        <annotations>
-            <description>Clicks on 'here' to refresh the grid data. Enters the provided Order From/To Dates and provided Order Status. Clicks on 'Show Report'.</description>
-        </annotations>
-        <arguments>
-            <argument name="orderFromDate" type="string"/>
-            <argument name="orderToDate" type="string"/>
-            <argument name="statuses" type="string"/>
-        </arguments>
-        
-        <click selector="{{OrderReportMainSection.here}}" stepKey="clickOnHere"/>
-        <fillField selector="{{OrderReportFilterSection.dateFrom}}" userInput="{{orderFromDate}}" stepKey="fillFromDate"/>
-        <fillField selector="{{OrderReportFilterSection.dateTo}}" userInput="{{orderToDate}}" stepKey="fillToDate"/>
-        <selectOption selector="{{OrderReportFilterSection.orderStatus}}" userInput="Specified" stepKey="selectSpecifiedOption"/>
-        <selectOption selector="{{OrderReportFilterSection.orderStatusSpecified}}" parameterArray="{{statuses}}" stepKey="selectSpecifiedOptionStatus"/>
-        <click selector="{{OrderReportMainSection.showReport}}" stepKey="showReport"/>
-    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportForNotCancelActionGroup.xml b/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportForNotCancelActionGroup.xml
new file mode 100644
index 0000000000000..32c82308c8f99
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportForNotCancelActionGroup.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="GenerateOrderReportForNotCancelActionGroup">
+        <annotations>
+            <description>Clicks on 'here' to refresh the grid data. Enters the provided Order From/To Dates and provided Order Status. Clicks on 'Show Report'.</description>
+        </annotations>
+        <arguments>
+            <argument name="orderFromDate" type="string"/>
+            <argument name="orderToDate" type="string"/>
+            <argument name="statuses" type="string"/>
+        </arguments>
+
+        <click selector="{{OrderReportMainSection.here}}" stepKey="clickOnHere"/>
+        <fillField selector="{{OrderReportFilterSection.dateFrom}}" userInput="{{orderFromDate}}" stepKey="fillFromDate"/>
+        <fillField selector="{{OrderReportFilterSection.dateTo}}" userInput="{{orderToDate}}" stepKey="fillToDate"/>
+        <selectOption selector="{{OrderReportFilterSection.orderStatus}}" userInput="Specified" stepKey="selectSpecifiedOption"/>
+        <selectOption selector="{{OrderReportFilterSection.orderStatusSpecified}}" parameterArray="{{statuses}}" stepKey="selectSpecifiedOptionStatus"/>
+        <click selector="{{OrderReportMainSection.showReport}}" stepKey="showReport"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Reports/Test/Mftf/Page/ReportsSearchTermsPage.xml b/app/code/Magento/Reports/Test/Mftf/Page/ReportsSearchTermsPage.xml
new file mode 100644
index 0000000000000..e9e60c6d6dccb
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Page/ReportsSearchTermsPage.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="ReportsSearchTermPage" url="search/term/report/" area="admin" module="Magento_Reports">
+        <section name="ReportsSearchTermSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Product/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
index 3f1857b352dbc..23067457081a6 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
@@ -29,7 +29,7 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\Module\ModuleManagerInterface as Manager;
+use Magento\Framework\Module\Manager as Manager;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
diff --git a/app/code/Magento/Reports/etc/config.xml b/app/code/Magento/Reports/etc/config.xml
index ffd2299eb6884..5e4bf56cff50c 100644
--- a/app/code/Magento/Reports/etc/config.xml
+++ b/app/code/Magento/Reports/etc/config.xml
@@ -20,7 +20,7 @@
                 <mtd_start>1</mtd_start>
             </dashboard>
             <options>
-                <enabled>1</enabled>
+                <enabled>0</enabled>
                 <product_view_enabled>1</product_view_enabled>
                 <product_send_enabled>1</product_send_enabled>
                 <product_compare_enabled>1</product_compare_enabled>
diff --git a/app/code/Magento/Reports/i18n/en_US.csv b/app/code/Magento/Reports/i18n/en_US.csv
index 3225f2fc41409..169d3cc2b74b4 100644
--- a/app/code/Magento/Reports/i18n/en_US.csv
+++ b/app/code/Magento/Reports/i18n/en_US.csv
@@ -224,3 +224,5 @@ Action,Action
 Report,Report
 Description,Description
 undefined,undefined
+Never,Never
+
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
index 55ca286ad3d47..2d33ca3c6a872 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
@@ -40,6 +40,7 @@
                     <argument name="id" xsi:type="string">accounts</argument>
                     <argument name="column_css_class" xsi:type="string">col-qty</argument>
                     <argument name="header_css_class" xsi:type="string">col-qty</argument>
+                    <argument name="sortable" xsi:type="string">0</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml
index 649dc7ceeb065..5b841e3523649 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml
@@ -71,7 +71,7 @@
                                 <argument name="sortable" xsi:type="string">0</argument>
                                 <argument name="id" xsi:type="string">updated_at</argument>
                                 <argument name="index" xsi:type="string">updated_at</argument>
-                                <argument name="default" xsi:type="string" translate="true">undefined</argument>
+                                <argument name="default" xsi:type="string" translate="true">Never</argument>
                                 <argument name="column_css_class" xsi:type="string">col-period</argument>
                                 <argument name="header_css_class" xsi:type="string">col-period</argument>
                             </arguments>
diff --git a/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
index 509e826e6f7d3..d3bbdf9a7eb40 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
@@ -29,7 +29,7 @@ class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
      * @param \Magento\Catalog\Model\Product\Type $type
      * @param \Magento\Catalog\Model\Product\Attribute\Source\Status $status
      * @param \Magento\Catalog\Model\Product\Visibility $visibility
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Store\Model\ResourceModel\Website\CollectionFactory $websitesFactory
      * @param array $data
      *
@@ -44,7 +44,7 @@ public function __construct(
         \Magento\Catalog\Model\Product\Type $type,
         \Magento\Catalog\Model\Product\Attribute\Source\Status $status,
         \Magento\Catalog\Model\Product\Visibility $visibility,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Store\Model\ResourceModel\Website\CollectionFactory $websitesFactory,
         array $data = []
     ) {
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 e4b4da23ac629..a8a39b3326edd 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
@@ -111,13 +111,16 @@ protected function addRatingFieldset()
             ]
         );
 
-        foreach ($this->systemStore->getStoreCollection() as $store) {
-            $this->getFieldset('rating_form')->addField(
-                'rating_code_' . $store->getId(),
-                'text',
-                ['label' => $store->getName(), 'name' => 'rating_codes[' . $store->getId() . ']']
-            );
+        if (!$this->_storeManager->isSingleStoreMode()) {
+            foreach ($this->systemStore->getStoreCollection() as $store) {
+                $this->getFieldset('rating_form')->addField(
+                    'rating_code_' . $store->getId(),
+                    'text',
+                    ['label' => $store->getName(), 'name' => 'rating_codes[' . $store->getId() . ']']
+                );
+            }
         }
+
         $this->setRatingData();
     }
 
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
index 1b9c9eaa22be7..14a3271e7196d 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
@@ -33,7 +33,7 @@ public function execute()
         try {
             $this->getModel()->aggregate()->delete();
 
-            $this->messageManager->addSuccess(__('The review has been deleted.'));
+            $this->messageManager->addSuccessMessage(__('The review has been deleted.'));
             if ($this->getRequest()->getParam('ret') == 'pending') {
                 $resultRedirect->setPath('review/*/pending');
             } else {
@@ -41,9 +41,9 @@ public function execute()
             }
             return $resultRedirect;
         } 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  deleting this review.'));
+            $this->messageManager->addExceptionMessage($e, __('Something went wrong  deleting this review.'));
         }
 
         return $resultRedirect->setPath('review/*/edit/', ['id' => $reviewId]);
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
index 95f9ca3aa79d2..44b267dc5aa7c 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
@@ -59,19 +59,19 @@ public function execute()
     {
         $reviewsIds = $this->getRequest()->getParam('reviews');
         if (!is_array($reviewsIds)) {
-            $this->messageManager->addError(__('Please select review(s).'));
+            $this->messageManager->addErrorMessage(__('Please select review(s).'));
         } else {
             try {
                 foreach ($this->getCollection() as $model) {
                     $model->delete();
                 }
-                $this->messageManager->addSuccess(
+                $this->messageManager->addSuccessMessage(
                     __('A total of %1 record(s) have been deleted.', count($reviewsIds))
                 );
             } catch (LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __('Something went wrong while deleting these records.'));
+                $this->messageManager->addExceptionMessage($e, __('Something went wrong while deleting these records.'));
             }
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
index 9e93fb8fce63e..ff4acfb964898 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
@@ -59,20 +59,20 @@ public function execute()
     {
         $reviewsIds = $this->getRequest()->getParam('reviews');
         if (!is_array($reviewsIds)) {
-            $this->messageManager->addError(__('Please select review(s).'));
+            $this->messageManager->addErrorMessage(__('Please select review(s).'));
         } else {
             try {
                 $status = $this->getRequest()->getParam('status');
                 foreach ($this->getCollection() as $model) {
                     $model->setStatusId($status)->save()->aggregate();
                 }
-                $this->messageManager->addSuccess(
+                $this->messageManager->addSuccessMessage(
                     __('A total of %1 record(s) have been updated.', count($reviewsIds))
                 );
             } catch (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 these review(s).')
                 );
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php
index eca37d3fe24da..1f82d4846ede3 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php
@@ -5,20 +5,27 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
 
-class MassVisibleIn extends ProductController
+/**
+ * Class MassVisibleIn
+ */
+class MassVisibleIn extends ProductController implements HttpPostActionInterface
 {
+
     /**
+     * Execute action
+     *
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
     {
         $reviewsIds = $this->getRequest()->getParam('reviews');
         if (!is_array($reviewsIds)) {
-            $this->messageManager->addError(__('Please select review(s).'));
+            $this->messageManager->addErrorMessage(__('Please select review(s).'));
         } else {
             try {
                 $stores = $this->getRequest()->getParam('stores');
@@ -27,13 +34,13 @@ public function execute()
                     $model->setSelectStores($stores);
                     $model->save();
                 }
-                $this->messageManager->addSuccess(
+                $this->messageManager->addSuccessMessage(
                     __('A total of %1 record(s) have been updated.', count($reviewsIds))
                 );
             } catch (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 these review(s).')
                 );
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
index b42dd3b3063f6..96e6cc48fb496 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
@@ -56,7 +56,7 @@ public function execute()
 
                 $review->aggregate();
 
-                $this->messageManager->addSuccess(__('You saved the review.'));
+                $this->messageManager->addSuccessMessage(__('You saved the review.'));
                 if ($this->getRequest()->getParam('ret') == 'pending') {
                     $resultRedirect->setPath('review/*/pending');
                 } else {
@@ -64,9 +64,9 @@ public function execute()
                 }
                 return $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 this review.'));
+                $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving this review.'));
             }
         }
         $resultRedirect->setPath('review/*/');
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
index 5b8ad106987e5..a7a0c96b7e48f 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
@@ -34,7 +34,7 @@ public function execute()
         if (($data = $this->getRequest()->getPostValue()) && ($reviewId = $this->getRequest()->getParam('id'))) {
             $review = $this->getModel();
             if (!$review->getId()) {
-                $this->messageManager->addError(__('The review was removed by another user or does not exist.'));
+                $this->messageManager->addErrorMessage(__('The review was removed by another user or does not exist.'));
             } else {
                 try {
                     $review->addData($data)->save();
@@ -63,11 +63,11 @@ public function execute()
 
                     $review->aggregate();
 
-                    $this->messageManager->addSuccess(__('You saved the review.'));
+                    $this->messageManager->addSuccessMessage(__('You saved the review.'));
                 } 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 this review.'));
+                    $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving this review.'));
                 }
             }
 
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
index b25db6e498fe0..03a73d431221f 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
@@ -9,9 +9,14 @@
 use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * Class Delete
+ */
 class Delete extends RatingController implements HttpPostActionInterface
 {
     /**
+     * Delete action
+     *
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
@@ -23,9 +28,9 @@ public function execute()
                 /** @var \Magento\Review\Model\Rating $model */
                 $model = $this->_objectManager->create(\Magento\Review\Model\Rating::class);
                 $model->load($this->getRequest()->getParam('id'))->delete();
-                $this->messageManager->addSuccess(__('You deleted the rating.'));
+                $this->messageManager->addSuccessMessage(__('You deleted the rating.'));
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $resultRedirect->setPath('review/rating/edit', ['id' => $this->getRequest()->getParam('id')]);
                 return $resultRedirect;
             }
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
index 5dd464f7eb611..ebb4b2a01e286 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
@@ -9,6 +9,9 @@
 use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * Class Save
+ */
 class Save extends RatingController implements HttpPostActionInterface
 {
     /**
@@ -58,10 +61,10 @@ public function execute()
                     }
                 }
 
-                $this->messageManager->addSuccess(__('You saved the rating.'));
+                $this->messageManager->addSuccessMessage(__('You saved the rating.'));
                 $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setRatingData(false);
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $this->_objectManager->get(\Magento\Backend\Model\Session::class)
                     ->setRatingData($this->getRequest()->getPostValue());
                 $resultRedirect->setPath('review/rating/edit', ['id' => $this->getRequest()->getParam('id')]);
diff --git a/app/code/Magento/Review/Controller/Product/Post.php b/app/code/Magento/Review/Controller/Product/Post.php
index 32838eb6acbbb..2928fdce16c9b 100644
--- a/app/code/Magento/Review/Controller/Product/Post.php
+++ b/app/code/Magento/Review/Controller/Product/Post.php
@@ -10,6 +10,9 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Review\Model\Review;
 
+/**
+ * Class Post
+ */
 class Post extends ProductController implements HttpPostActionInterface
 {
     /**
@@ -63,19 +66,19 @@ public function execute()
                     }
 
                     $review->aggregate();
-                    $this->messageManager->addSuccess(__('You submitted your review for moderation.'));
+                    $this->messageManager->addSuccessMessage(__('You submitted your review for moderation.'));
                 } catch (\Exception $e) {
                     $this->reviewSession->setFormData($data);
-                    $this->messageManager->addError(__('We can\'t post your review right now.'));
+                    $this->messageManager->addErrorMessage(__('We can\'t post your review right now.'));
                 }
             } else {
                 $this->reviewSession->setFormData($data);
                 if (is_array($validate)) {
                     foreach ($validate as $errorMessage) {
-                        $this->messageManager->addError($errorMessage);
+                        $this->messageManager->addErrorMessage($errorMessage);
                     }
                 } else {
-                    $this->messageManager->addError(__('We can\'t post your review right now.'));
+                    $this->messageManager->addErrorMessage(__('We can\'t post your review right now.'));
                 }
             }
         }
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating.php b/app/code/Magento/Review/Model/ResourceModel/Rating.php
index 42c14e16a50e2..37a93d40b1107 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Rating.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Rating.php
@@ -29,7 +29,7 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     protected $_storeManager;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
@@ -46,7 +46,7 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Review\Summary $reviewSummary
      * @param string $connectionName
@@ -55,7 +55,7 @@ class Rating extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Psr\Log\LoggerInterface $logger,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Review\Model\ResourceModel\Review\Summary $reviewSummary,
         $connectionName = null,
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 7175baa92a2f8..ab264ef1b6179 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
@@ -75,7 +75,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @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
@@ -103,7 +103,7 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \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,
diff --git a/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAssertStoreViewRatingTitleWhenSingleStoreModeIsNoActionGroup.xml b/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAssertStoreViewRatingTitleWhenSingleStoreModeIsNoActionGroup.xml
new file mode 100644
index 0000000000000..05fad32dabe51
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAssertStoreViewRatingTitleWhenSingleStoreModeIsNoActionGroup.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="AdminAssertStoreViewRatingTitleWhenSingleStoreModeIsNoActionGroup">
+        <annotations>
+            <description>If Single Store Mode is disabled, default store view title label should be displayed.</description>
+        </annotations>
+        <seeElement selector="{{AdminEditAndNewRatingSection.defaultStoreViewTitleLabel}}" stepKey="seeLabel"/>
+        <seeElement selector="{{AdminEditAndNewRatingSection.defaultStoreViewTitleInput}}" stepKey="seeInput"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAssertStoreViewRatingTitleWhenSingleStoreModeIsYesActionGroup.xml b/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAssertStoreViewRatingTitleWhenSingleStoreModeIsYesActionGroup.xml
new file mode 100644
index 0000000000000..6e5586bfa1252
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAssertStoreViewRatingTitleWhenSingleStoreModeIsYesActionGroup.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="AdminAssertStoreViewRatingTitleWhenSingleStoreModeIsYesActionGroup">
+        <annotations>
+            <description>If Single Store Mode is enabled, default store view title label should not be displayed.</description>
+        </annotations>
+        <dontSeeElement selector="{{AdminEditAndNewRatingSection.defaultStoreViewTitleLabel}}" stepKey="dontSeeLabel"/>
+        <dontSeeElement selector="{{AdminEditAndNewRatingSection.defaultStoreViewTitleInput}}" stepKey="dontSeeInput"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminNavigateToNewRatingFormActionGroup.xml b/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminNavigateToNewRatingFormActionGroup.xml
new file mode 100644
index 0000000000000..3659405c52b69
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminNavigateToNewRatingFormActionGroup.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="AdminNavigateToNewRatingFormActionGroup">
+        <annotations>
+            <description>Open New Rating Form</description>
+        </annotations>
+        <amOnPage url="{{AdminNewRatingPage.url}}" stepKey="amOnUrlNewRatingPage"/>
+        <waitForPageLoad stepKey="waitForNewRatingPage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminSaveReviewActionGroup.xml b/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminSaveReviewActionGroup.xml
index 62c93764ab61d..1937905ae2849 100644
--- a/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminSaveReviewActionGroup.xml
+++ b/app/code/Magento/Review/Test/Mftf/ActionGroup/AdminSaveReviewActionGroup.xml
@@ -9,7 +9,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminSaveReviewActionGroup">
         <click selector="{{AdminEditReviewSection.saveReview}}" stepKey="saveReview"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You saved the review." stepKey="seeSuccessMessage"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the review." stepKey="seeSuccessMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Review/Test/Mftf/Page/AdminNewRatingPage.xml b/app/code/Magento/Review/Test/Mftf/Page/AdminNewRatingPage.xml
new file mode 100644
index 0000000000000..8dfc2182e228c
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/Page/AdminNewRatingPage.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="AdminNewRatingPage" url="review/rating/new/" area="admin" module="Review">
+        <section name="AdminEditAndNewRatingSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/StoresSubmenuSection.xml b/app/code/Magento/Review/Test/Mftf/Section/AdminEditAndNewRatingSection.xml
similarity index 56%
rename from app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/StoresSubmenuSection.xml
rename to app/code/Magento/Review/Test/Mftf/Section/AdminEditAndNewRatingSection.xml
index e54f9808fd49e..59dd3d2004790 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/StoresSubmenuSection.xml
+++ b/app/code/Magento/Review/Test/Mftf/Section/AdminEditAndNewRatingSection.xml
@@ -8,7 +8,8 @@
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="StoresSubmenuSection">
-        <element name="configuration" type="button" selector="#menu-magento-backend-stores li[data-ui-id='menu-magento-config-system-config']"/>
+    <section name="AdminEditAndNewRatingSection">
+        <element name="defaultStoreViewTitleLabel" type="text" selector=".field-rating_code_1 label"/>
+        <element name="defaultStoreViewTitleInput" type="input" selector=".field-rating_code_1 input"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminVerifyNewRatingFormSingleStoreModeNoTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminVerifyNewRatingFormSingleStoreModeNoTest.xml
new file mode 100644
index 0000000000000..77789dd172bdd
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminVerifyNewRatingFormSingleStoreModeNoTest.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="AdminVerifyNewRatingFormSingleStoreModeNoTest">
+        <annotations>
+            <features value="Review"/>
+            <stories value="Rating Form"/>
+            <title value="Verify New Rating Form if single store mode is No"/>
+            <description value="New Rating Form should have Default store view field if single store mode is No"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-21818"/>
+            <group value="review"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set general/single_store_mode/enabled 0" stepKey="enabledSingleStoreMode"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateToNewRatingFormActionGroup" stepKey="navigateToNewRatingPage" />
+        <actionGroup ref="AdminAssertStoreViewRatingTitleWhenSingleStoreModeIsNoActionGroup" stepKey="verifyForm" />
+    </test>
+</tests>
diff --git a/app/code/Magento/Review/Test/Mftf/Test/AdminVerifyNewRatingFormSingleStoreModeYesTest.xml b/app/code/Magento/Review/Test/Mftf/Test/AdminVerifyNewRatingFormSingleStoreModeYesTest.xml
new file mode 100644
index 0000000000000..e5368e9192c98
--- /dev/null
+++ b/app/code/Magento/Review/Test/Mftf/Test/AdminVerifyNewRatingFormSingleStoreModeYesTest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminVerifyNewRatingFormSingleStoreModeYesTest">
+        <annotations>
+            <features value="Review"/>
+            <stories value="Rating Form"/>
+            <title value="Verify New Rating Form if single store mode is Yes"/>
+            <description value="New Rating Form should not have Default store view field if single store mode is Yes"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-21818"/>
+            <group value="review"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set general/single_store_mode/enabled 1" stepKey="enabledSingleStoreMode"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set general/single_store_mode/enabled 0" stepKey="enabledSingleStoreMode"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateToNewRatingFormActionGroup" stepKey="navigateToNewRatingPage" />
+        <actionGroup ref="AdminAssertStoreViewRatingTitleWhenSingleStoreModeIsYesActionGroup" stepKey="verifyForm" />
+    </test>
+</tests>
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 1526e80f8190a..e5fd52bf8cf97 100644
--- a/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php
+++ b/app/code/Magento/Review/Test/Unit/Controller/Product/PostTest.php
@@ -299,7 +299,7 @@ public function testExecute()
             ->willReturnSelf();
         $this->review->expects($this->once())->method('aggregate')
             ->willReturnSelf();
-        $this->messageManager->expects($this->once())->method('addSuccess')
+        $this->messageManager->expects($this->once())->method('addSuccessMessage')
             ->with(__('You submitted your review for moderation.'))
             ->willReturnSelf();
         $this->reviewSession->expects($this->once())->method('getRedirectUrl')
diff --git a/app/code/Magento/Review/Test/Unit/Helper/DataTest.php b/app/code/Magento/Review/Test/Unit/Helper/DataTest.php
new file mode 100644
index 0000000000000..7473018c0eaa2
--- /dev/null
+++ b/app/code/Magento/Review/Test/Unit/Helper/DataTest.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Review\Test\Unit\Helper;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Review\Helper\Data as HelperData;
+use Magento\Framework\Escaper;
+use Magento\Framework\Filter\FilterManager;
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Class \Magento\Review\Test\Unit\Helper\DataTest
+ */
+class DataTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManager;
+
+    /**
+     * @var HelperData
+     */
+    private $helper;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Escaper
+     */
+    private $escaper;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|FilterManager
+     */
+    private $filter;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Context
+     */
+    private $context;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Setup environment
+     */
+    protected function setUp()
+    {
+        $this->context = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->filter = $this->getMockBuilder(FilterManager::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['truncate'])
+            ->getMock();
+
+        $this->escaper = $this->getMockBuilder(Escaper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->context->expects($this->once())
+            ->method('getScopeConfig')
+            ->willReturn($this->scopeConfig);
+
+        $this->objectManager = new ObjectManagerHelper($this);
+        $this->helper = $this->objectManager->getObject(
+            HelperData::class,
+            [
+                'context' => $this->context,
+                'escaper' => $this->escaper,
+                'filter' => $this->filter
+            ]
+        );
+    }
+
+    /**
+     * Test getDetail() function
+     */
+    public function testGetDetail()
+    {
+        $origDetail = "This\nis\na\nstring";
+        $expected = "This<br />"."\n"."is<br />"."\n"."a<br />"."\n"."string";
+
+        $this->filter->expects($this->any())->method('truncate')
+            ->with($origDetail, ['length' => 50])
+            ->willReturn($origDetail);
+
+        $this->assertEquals($expected, $this->helper->getDetail($origDetail));
+    }
+
+    /**
+     * Test getDetailHtml() function
+     */
+    public function getDetailHtml()
+    {
+        $origDetail = "<span>This\nis\na\nstring</span>";
+        $origDetailEscapeHtml = "This\nis\na\nstring";
+        $expected = "This<br />"."\n"."is<br />"."\n"."a<br />"."\n"."string";
+
+        $this->escaper->expects($this->any())->method('escapeHtml')
+            ->with($origDetail)
+            ->willReturn($origDetailEscapeHtml);
+
+        $this->filter->expects($this->any())->method('truncate')
+            ->with($origDetailEscapeHtml, ['length' => 50])
+            ->willReturn($origDetailEscapeHtml);
+
+        $this->assertEquals($expected, $this->helper->getDetail($origDetail));
+    }
+
+    /**
+     * Test getIsGuestAllowToWrite() function
+     */
+    public function testGetIsGuestAllowToWrite()
+    {
+        $this->scopeConfig->expects($this->any())->method('isSetFlag')
+            ->with('catalog/review/allow_guest', ScopeInterface::SCOPE_STORE)
+            ->willReturn('1');
+
+        $this->assertEquals(true, $this->helper->getIsGuestAllowToWrite());
+    }
+
+    /**
+     * Test getReviewStatuses() function
+     */
+    public function testGetReviewStatuses()
+    {
+        $expected = [
+            1 => __('Approved'),
+            2 => __('Pending'),
+            3 => __('Not Approved')
+        ];
+        $this->assertEquals($expected, $this->helper->getReviewStatuses());
+    }
+
+    /**
+     * Test getReviewStatusesOptionArray() function
+     */
+    public function testGetReviewStatusesOptionArray()
+    {
+        $expected = [
+            ['value' => 1, 'label' => __('Approved')],
+            ['value' => 2, 'label' => __('Pending')],
+            ['value' => 3, 'label' => __('Not Approved')]
+        ];
+        $this->assertEquals($expected, $this->helper->getReviewStatusesOptionArray());
+    }
+}
diff --git a/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ReviewTest.php b/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ReviewTest.php
index e1e5503ad475f..1000821dd1897 100644
--- a/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ReviewTest.php
+++ b/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ReviewTest.php
@@ -8,7 +8,7 @@
 use Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier\AbstractModifierTest;
 use Magento\Framework\UrlInterface;
 use Magento\Review\Ui\DataProvider\Product\Form\Modifier\Review;
-use \Magento\Framework\Module\Manager as ModuleManager;
+use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Ui\DataProvider\Modifier\ModifierInterface;
 
 /**
diff --git a/app/code/Magento/Review/Ui/DataProvider/Product/Form/Modifier/Review.php b/app/code/Magento/Review/Ui/DataProvider/Product/Form/Modifier/Review.php
index 433be1c860988..5f1401a201e3f 100644
--- a/app/code/Magento/Review/Ui/DataProvider/Product/Form/Modifier/Review.php
+++ b/app/code/Magento/Review/Ui/DataProvider/Product/Form/Modifier/Review.php
@@ -12,7 +12,7 @@
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Ui\Component\Form;
 use Magento\Framework\UrlInterface;
-use \Magento\Framework\Module\ModuleManagerInterface as ModuleManager;
+use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Framework\App\ObjectManager;
 
 /**
diff --git a/app/code/Magento/Review/view/frontend/templates/form.phtml b/app/code/Magento/Review/view/frontend/templates/form.phtml
index f1340945043e9..6b00bf681c1e3 100644
--- a/app/code/Magento/Review/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/form.phtml
@@ -5,28 +5,29 @@
  */
 
 /** @var \Magento\Review\Block\Form $block */
+//phpcs:disable Generic.Files.LineLength
 ?>
 <div class="block review-add">
     <div class="block-title"><strong><?= $block->escapeHtml(__('Write Your Own Review')) ?></strong></div>
 <div class="block-content">
-<?php if ($block->getAllowWriteReviewFlag()) : ?>
+<?php if ($block->getAllowWriteReviewFlag()):?>
 <form action="<?= $block->escapeUrl($block->getAction()) ?>" class="review-form" method="post" id="review-form" data-role="product-review-form" data-bind="scope: 'review-form'">
     <?= $block->getBlockHtml('formkey') ?>
     <?= $block->getChildHtml('form_fields_before') ?>
     <fieldset class="fieldset review-fieldset" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
         <legend class="legend review-legend"><span><?= $block->escapeHtml(__("You're reviewing:")) ?></span><strong><?= $block->escapeHtml($block->getProductInfo()->getName()) ?></strong></legend><br />
-        <?php if ($block->getRatings() && $block->getRatings()->getSize()) : ?>
+        <?php if ($block->getRatings() && $block->getRatings()->getSize()): ?>
         <span id="input-message-box"></span>
         <fieldset class="field required review-field-ratings">
             <legend class="label"><span><?= $block->escapeHtml(__('Your Rating')) ?></span></legend><br/>
             <div class="control">
                 <div class="nested" id="product-review-table">
-                    <?php foreach ($block->getRatings() as $_rating) : ?>
+                    <?php foreach ($block->getRatings() as $_rating): ?>
                         <div class="field choice review-field-rating">
                             <label class="label" id="<?= $block->escapeHtml($_rating->getRatingCode()) ?>_rating_label"><span><?= $block->escapeHtml($_rating->getRatingCode()) ?></span></label>
                             <div class="control review-control-vote">
                             <?php $options = $_rating->getOptions();?>
-                            <?php $iterator = 1; foreach ($options as $_option) : ?>
+                            <?php $iterator = 1; foreach ($options as $_option): ?>
                                 <input
                                     type="radio"
                                     name="ratings[<?= $block->escapeHtmlAttr($_rating->getId()) ?>]"
@@ -84,11 +85,12 @@
     },
     "#review-form": {
         "Magento_Review/js/error-placement": {},
-        "Magento_Review/js/validate-review": {}
+        "Magento_Review/js/validate-review": {},
+        "Magento_Review/js/submit-review": {}
     }
 }
 </script>
-<?php else : ?>
+<?php else: ?>
     <div class="message info notlogged" id="review-form">
         <div>
             <?= $block->escapeHtml(__('Only registered users can write reviews. Please <a href="%1">Sign in</a> or <a href="%2">create an account</a>', $block->getLoginLink(), $block->getRegisterUrl()), ['a']) ?>
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 9d1083d662d5a..999161d45b586 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
@@ -54,7 +54,7 @@ define([
 
                 event.preventDefault();
                 anchor = $(this).attr('href').replace(/^.*?(#|$)/, '');
-                addReviewBlock = $('.block.review-add .block-content #' + anchor);
+                addReviewBlock = $('#' + anchor);
 
                 if (addReviewBlock.length) {
                     $('.product.data.items [data-role="content"]').each(function (index) { //eslint-disable-line
diff --git a/app/code/Magento/Review/view/frontend/web/js/submit-review.js b/app/code/Magento/Review/view/frontend/web/js/submit-review.js
new file mode 100644
index 0000000000000..6399ce22ffe88
--- /dev/null
+++ b/app/code/Magento/Review/view/frontend/web/js/submit-review.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    return function (config, element) {
+        $(element).on('submit', function () {
+            if ($(this).valid()) {
+                $(this).find('.submit').attr('disabled', true);
+            }
+        });
+    };
+});
diff --git a/app/code/Magento/Rss/Controller/Feed.php b/app/code/Magento/Rss/Controller/Feed.php
index 8fbe7addb560d..4c5acf97bde8c 100644
--- a/app/code/Magento/Rss/Controller/Feed.php
+++ b/app/code/Magento/Rss/Controller/Feed.php
@@ -76,6 +76,8 @@ public function __construct(
     }
 
     /**
+     * Authenticate not logged in customer.
+     *
      * @return bool
      */
     protected function auth()
@@ -85,7 +87,6 @@ protected function auth()
             try {
                 $customer = $this->customerAccountManagement->authenticate($login, $password);
                 $this->customerSession->setCustomerDataAsLoggedIn($customer);
-                $this->customerSession->regenerateId();
             } catch (\Exception $e) {
                 $this->logger->critical($e);
             }
diff --git a/app/code/Magento/Rule/Model/AbstractModel.php b/app/code/Magento/Rule/Model/AbstractModel.php
index 72b3528532be5..58c18093c3bab 100644
--- a/app/code/Magento/Rule/Model/AbstractModel.php
+++ b/app/code/Magento/Rule/Model/AbstractModel.php
@@ -12,6 +12,7 @@
  * Abstract Rule entity data model
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @since 100.0.2
  */
@@ -342,7 +343,7 @@ protected function _convertFlatToRecursive(array $data)
                 foreach ($value as $id => $data) {
                     $path = explode('--', $id);
                     $node = & $arr;
-                    for ($i = 0, $l = sizeof($path); $i < $l; $i++) {
+                    for ($i = 0, $l = count($path); $i < $l; $i++) {
                         if (!isset($node[$key][$path[$i]])) {
                             $node[$key][$path[$i]] = [];
                         }
@@ -483,6 +484,8 @@ public function getWebsiteIds()
     }
 
     /**
+     * Get extension factory
+     *
      * @return \Magento\Framework\Api\ExtensionAttributesFactory
      * @deprecated 100.1.0
      */
@@ -493,6 +496,8 @@ private function getExtensionFactory()
     }
 
     /**
+     * Get custom attribute factory
+     *
      * @return \Magento\Framework\Api\AttributeValueFactory
      * @deprecated 100.1.0
      */
diff --git a/app/code/Magento/Rule/Model/Action/Collection.php b/app/code/Magento/Rule/Model/Action/Collection.php
index 3fd1d59df3315..33e385e264f72 100644
--- a/app/code/Magento/Rule/Model/Action/Collection.php
+++ b/app/code/Magento/Rule/Model/Action/Collection.php
@@ -3,9 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Rule\Model\Action;
 
 /**
+ * Collections
+ *
  * @api
  * @since 100.0.2
  */
@@ -61,6 +64,8 @@ public function asArray(array $arrAttributes = [])
     }
 
     /**
+     * Load array
+     *
      * @param array $arr
      * @return $this
      */
@@ -80,6 +85,8 @@ public function loadArray(array $arr)
     }
 
     /**
+     * Add actions
+     *
      * @param ActionInterface $action
      * @return $this
      */
@@ -91,7 +98,7 @@ public function addAction(ActionInterface $action)
 
         $actions[] = $action;
         if (!$action->getId()) {
-            $action->setId($this->getId() . '.' . sizeof($actions));
+            $action->setId($this->getId() . '.' . count($actions));
         }
 
         $this->setActions($actions);
@@ -99,6 +106,8 @@ public function addAction(ActionInterface $action)
     }
 
     /**
+     * As html
+     *
      * @return string
      */
     public function asHtml()
@@ -111,6 +120,8 @@ public function asHtml()
     }
 
     /**
+     * Return new child element
+     *
      * @return $this
      */
     public function getNewChildElement()
@@ -129,6 +140,8 @@ public function getNewChildElement()
     }
 
     /**
+     * Return as html recursive
+     *
      * @return string
      */
     public function asHtmlRecursive()
@@ -142,6 +155,8 @@ public function asHtmlRecursive()
     }
 
     /**
+     * Add string
+     *
      * @param string $format
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -153,6 +168,8 @@ public function asString($format = '')
     }
 
     /**
+     * Return string as recursive
+     *
      * @param int $level
      * @return string
      */
@@ -166,6 +183,8 @@ public function asStringRecursive($level = 0)
     }
 
     /**
+     * Process
+     *
      * @return $this
      */
     public function process()
diff --git a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
index 6729fe722de56..67fc3590ac501 100644
--- a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
+++ b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
@@ -17,6 +17,7 @@
  * @method setFormName()
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @since 100.0.2
  */
@@ -385,12 +386,12 @@ public function getValueSelectOptions()
     public function getValueParsed()
     {
         if (!$this->hasValueParsed()) {
-            $value = $this->getData('value');
+            $value = $this->getValue();
             if (is_array($value) && count($value) === 1) {
                 $value = reset($value);
             }
             if (!is_array($value) && $this->isArrayOperatorType() && $value) {
-                $value = preg_split('#\s*[,;]\s*#', $value, null, PREG_SPLIT_NO_EMPTY);
+                $value = preg_split('#\s*[,;]\s*#', (string) $value, -1, PREG_SPLIT_NO_EMPTY);
             }
             $this->setValueParsed($value);
         }
@@ -419,8 +420,11 @@ public function getValue()
     {
         if ($this->getInputType() == 'date' && !$this->getIsValueParsed()) {
             // date format intentionally hard-coded
+            $date = $this->getData('value');
+            $date = (\is_numeric($date) ? '@' : '') . $date;
             $this->setValue(
-                (new \DateTime($this->getData('value')))->format('Y-m-d H:i:s')
+                (new \DateTime($date, new \DateTimeZone((string) $this->_localeDate->getConfigTimezone())))
+                    ->format('Y-m-d H:i:s')
             );
             $this->setIsValueParsed(true);
         }
@@ -432,6 +436,7 @@ public function getValue()
      *
      * @return array|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * phpcs:disable Generic.Metrics.NestingLevel
      */
     public function getValueName()
     {
@@ -469,6 +474,7 @@ public function getValueName()
         }
         return $value;
     }
+    //phpcs:enable Generic.Metrics.NestingLevel
 
     /**
      * Get inherited conditions selectors
@@ -674,6 +680,9 @@ public function getValueElement()
             $elementParams['placeholder'] = \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT;
             $elementParams['autocomplete'] = 'off';
             $elementParams['readonly'] = 'true';
+            $elementParams['value_name'] =
+                (new \DateTime($elementParams['value'], new \DateTimeZone($this->_localeDate->getConfigTimezone())))
+                    ->format('Y-m-d');
         }
         return $this->getForm()->addField(
             $this->getPrefix() . '__' . $this->getId() . '__value',
@@ -756,7 +765,7 @@ public function asStringRecursive($level = 0)
     /**
      * Validate product attribute value for condition
      *
-     * @param   object|array|int|string|float|bool $validatedValue product attribute value
+     * @param   object|array|int|string|float|bool|null $validatedValue product attribute value
      * @return  bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -821,6 +830,7 @@ public function validateAttribute($validatedValue)
             case '{}':
             case '!{}':
                 if (is_scalar($validatedValue) && is_array($value)) {
+                    $validatedValue = (string)$validatedValue;
                     foreach ($value as $item) {
                         if (stripos($validatedValue, (string)$item) !== false) {
                             $result = true;
@@ -868,18 +878,19 @@ public function validateAttribute($validatedValue)
     /**
      * Case and type insensitive comparison of values
      *
-     * @param string|int|float $validatedValue
-     * @param string|int|float $value
+     * @param string|int|float|null $validatedValue
+     * @param string|int|float|null $value
      * @param bool $strict
      * @return bool
      */
     protected function _compareValues($validatedValue, $value, $strict = true)
     {
-        if ($strict && is_numeric($validatedValue) && is_numeric($value)) {
+        if (null === $value || null === $validatedValue ||
+            $strict && is_numeric($validatedValue) && is_numeric($value)) {
             return $validatedValue == $value;
         }
 
-        $validatePattern = preg_quote($validatedValue, '~');
+        $validatePattern = preg_quote((string) $validatedValue, '~');
         if ($strict) {
             $validatePattern = '^' . $validatePattern . '$';
         }
diff --git a/app/code/Magento/Rule/Model/Condition/Combine.php b/app/code/Magento/Rule/Model/Condition/Combine.php
index 48873aec66295..a8a8e5fb0f843 100644
--- a/app/code/Magento/Rule/Model/Condition/Combine.php
+++ b/app/code/Magento/Rule/Model/Condition/Combine.php
@@ -6,6 +6,8 @@
 namespace Magento\Rule\Model\Condition;
 
 /**
+ * Combine
+ *
  * @api
  * @since 100.0.2
  */
@@ -22,6 +24,8 @@ class Combine extends AbstractCondition
     protected $_logger;
 
     /**
+     * Construct
+     *
      * @param Context $context
      * @param array $data
      */
@@ -54,6 +58,8 @@ public function __construct(Context $context, array $data = [])
     /* start aggregator methods */
 
     /**
+     * Load aggregation options
+     *
      * @return $this
      */
     public function loadAggregatorOptions()
@@ -63,6 +69,8 @@ public function loadAggregatorOptions()
     }
 
     /**
+     * Return agregator selected options
+     *
      * @return array
      */
     public function getAggregatorSelectOptions()
@@ -75,6 +83,8 @@ public function getAggregatorSelectOptions()
     }
 
     /**
+     * Get Agregator name
+     *
      * @return string
      */
     public function getAggregatorName()
@@ -83,6 +93,8 @@ public function getAggregatorName()
     }
 
     /**
+     * Return agregator element
+     *
      * @return object
      */
     public function getAggregatorElement()
@@ -112,6 +124,8 @@ public function getAggregatorElement()
     /* end aggregator methods */
 
     /**
+     * Load value options
+     *
      * @return $this
      */
     public function loadValueOptions()
@@ -121,6 +135,8 @@ public function loadValueOptions()
     }
 
     /**
+     * Adds condition
+     *
      * @param object $condition
      * @return $this
      */
@@ -134,7 +150,7 @@ public function addCondition($condition)
         $conditions[] = $condition;
 
         if (!$condition->getId()) {
-            $condition->setId($this->getId() . '--' . sizeof($conditions));
+            $condition->setId($this->getId() . '--' . count($conditions));
         }
 
         $this->setData($this->getPrefix(), $conditions);
@@ -142,6 +158,8 @@ public function addCondition($condition)
     }
 
     /**
+     * Return value element type
+     *
      * @return string
      */
     public function getValueElementType()
@@ -181,6 +199,8 @@ public function asArray(array $arrAttributes = [])
     }
 
     /**
+     * As xml
+     *
      * @param string $containerKey
      * @param string $itemKey
      * @return string
@@ -202,6 +222,8 @@ public function asXml($containerKey = 'conditions', $itemKey = 'condition')
     }
 
     /**
+     * Load array
+     *
      * @param array $arr
      * @param string $key
      * @return $this
@@ -230,6 +252,8 @@ public function loadArray($arr, $key = 'conditions')
     }
 
     /**
+     * Load xml
+     *
      * @param array|string $xml
      * @return $this
      */
@@ -247,6 +271,8 @@ public function loadXml($xml)
     }
 
     /**
+     * As html
+     *
      * @return string
      */
     public function asHtml()
@@ -263,6 +289,8 @@ public function asHtml()
     }
 
     /**
+     * Get new child element
+     *
      * @return $this
      */
     public function getNewChildElement()
@@ -282,6 +310,8 @@ public function getNewChildElement()
     }
 
     /**
+     * As html recursive
+     *
      * @return string
      */
     public function asHtmlRecursive()
@@ -300,6 +330,8 @@ public function asHtmlRecursive()
     }
 
     /**
+     * As string
+     *
      * @param string $format
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -311,6 +343,8 @@ public function asString($format = '')
     }
 
     /**
+     * As string recursive
+     *
      * @param int $level
      * @return string
      */
@@ -324,6 +358,8 @@ public function asStringRecursive($level = 0)
     }
 
     /**
+     * Validate
+     *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return bool
      */
@@ -374,6 +410,8 @@ protected function _isValid($entity)
     }
 
     /**
+     * Set js From object
+     *
      * @param \Magento\Framework\Data\Form $form
      * @return $this
      */
diff --git a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
index 33e1bf97c3474..a0812aeaa9c5e 100644
--- a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
+++ b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
@@ -152,9 +152,11 @@ protected function _getMappedSqlCondition(
     ): string {
         $argument = $condition->getMappedSqlField();
 
-        // If rule hasn't valid argument - create negative expression to prevent incorrect rule behavior.
+        // If rule hasn't valid argument - prevent incorrect rule behavior.
         if (empty($argument)) {
             return $this->_expressionFactory->create(['expression' => '1 = -1']);
+        } elseif (preg_match('/[^a-z0-9\-_\.\`]/i', $argument) > 0) {
+            throw new \Magento\Framework\Exception\LocalizedException(__('Invalid field'));
         }
 
         $conditionOperator = $condition->getOperatorForValidate();
@@ -195,7 +197,6 @@ protected function _getMappedSqlCondition(
                 );
             }
         }
-
         return $this->_expressionFactory->create(
             ['expression' => $expression]
         );
@@ -241,6 +242,7 @@ protected function _getMappedSqlCombination(
      * @param AbstractCollection $collection
      * @param Combine $combine
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function attachConditionToCollection(
         AbstractCollection $collection,
@@ -250,29 +252,42 @@ public function attachConditionToCollection(
         $this->_joinTablesToCollection($collection, $combine);
         $whereExpression = (string)$this->_getMappedSqlCombination($combine);
         if (!empty($whereExpression)) {
-            if (!empty($combine->getConditions())) {
-                $conditions = '';
-                $attributeField = '';
-                foreach ($combine->getConditions() as $condition) {
-                    if ($condition->getData('attribute') === \Magento\Catalog\Api\Data\ProductInterface::SKU) {
-                        $conditions = $condition->getData('value');
-                        $attributeField = $condition->getMappedSqlField();
-                    }
-                }
-
-                $collection->getSelect()->where($whereExpression);
+            $collection->getSelect()->where($whereExpression);
+            $this->buildConditions($collection, $combine);
+        }
+    }
 
-                if (!empty($conditions) && !empty($attributeField)) {
-                    $conditions = explode(',', $conditions);
-                    foreach ($conditions as &$condition) {
-                        $condition = "'" . trim($condition) . "'";
-                    }
-                    $conditions = implode(', ', $conditions);
-                    $collection->getSelect()->order("FIELD($attributeField, $conditions)");
+    /**
+     * Build sql conditions from combination.
+     *
+     * @param AbstractCollection $collection
+     * @param Combine $combine
+     * @return void
+     */
+    private function buildConditions(AbstractCollection $collection, Combine $combine) : void
+    {
+        if (!empty($combine->getConditions())) {
+            $conditions = '';
+            $attributeField = '';
+            foreach ($combine->getConditions() as $condition) {
+                if ($condition->getData('attribute') === \Magento\Catalog\Api\Data\ProductInterface::SKU
+                    && $condition->getData('operator') === '()'
+                ) {
+                    $conditions = $condition->getData('value');
+                    $attributeField = $this->_connection->quoteIdentifier($condition->getMappedSqlField());
                 }
-            } else {
-                // Select ::where method adds braces even on empty expression
-                $collection->getSelect()->where($whereExpression);
+            }
+
+            if (!empty($conditions) && !empty($attributeField)) {
+                $conditions = $this->_connection->quote(
+                    array_map('trim', explode(',', $conditions))
+                );
+                $collection->getSelect()->reset(Select::ORDER);
+                $collection->getSelect()->order(
+                    $this->_expressionFactory->create(
+                        ['expression' => "FIELD($attributeField, $conditions)"]
+                    )
+                );
             }
         }
     }
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 12e59e63f6f7c..06f2edba878ae 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
@@ -108,6 +108,7 @@ protected function _prepareForm()
     {
         parent::_prepareForm();
         $this->_form->setId('edit_form');
+        $this->_form->setClass('admin__fieldset');
         $this->_form->setMethod('post');
         $this->_form->setAction(
             $this->getUrl('sales/*/addressSave', ['address_id' => $this->_getAddress()->getId()])
@@ -136,4 +137,12 @@ public function getFormValues()
     {
         return $this->_getAddress()->getData();
     }
+
+    /**
+     * @inheritDoc
+     */
+    protected function getAddressStoreId()
+    {
+        return $this->_getAddress()->getOrder()->getStoreId();
+    }
 }
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 e4b9dd4c63b93..bcdeb4e7d67de 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
@@ -14,6 +14,7 @@
 
 /**
  * Order create address form
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
@@ -216,15 +217,12 @@ public function getAddressCollectionJson()
      * Prepare Form and add elements to form
      *
      * @return $this
-     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function _prepareForm()
     {
-        $storeId = $this->getCreateOrderModel()
-            ->getSession()
-            ->getStoreId();
+        $storeId = $this->getAddressStoreId();
         $this->_storeManager->setCurrentStore($storeId);
 
         $fieldset = $this->_form->addFieldset('main', ['no_container' => true]);
@@ -271,21 +269,24 @@ protected function _prepareForm()
 
         $this->_form->setValues($this->getFormValues());
 
-        if ($this->_form->getElement('country_id')->getValue()) {
-            $countryId = $this->_form->getElement('country_id')->getValue();
-            $this->_form->getElement('country_id')->setValue(null);
-            foreach ($this->_form->getElement('country_id')->getValues() as $country) {
+        $countryElement = $this->_form->getElement('country_id');
+
+        $this->processCountryOptions($countryElement);
+
+        if ($countryElement->getValue()) {
+            $countryId = $countryElement->getValue();
+            $countryElement->setValue(null);
+            foreach ($countryElement->getValues() as $country) {
                 if ($country['value'] == $countryId) {
-                    $this->_form->getElement('country_id')->setValue($countryId);
+                    $countryElement->setValue($countryId);
                 }
             }
         }
-        if ($this->_form->getElement('country_id')->getValue() === null) {
-            $this->_form->getElement('country_id')->setValue(
+        if ($countryElement->getValue() === null) {
+            $countryElement->setValue(
                 $this->directoryHelper->getDefaultCountry($this->getStore())
             );
         }
-        $this->processCountryOptions($this->_form->getElement('country_id'));
         // Set custom renderer for VAT field if needed
         $vatIdElement = $this->_form->getElement('vat_id');
         if ($vatIdElement && $this->getDisplayVatValidationButton() !== false) {
@@ -309,7 +310,7 @@ protected function _prepareForm()
      */
     private function processCountryOptions(\Magento\Framework\Data\Form\Element\AbstractElement $countryElement)
     {
-        $storeId = $this->getBackendQuoteSession()->getStoreId();
+        $storeId = $this->getAddressStoreId();
         $options = $this->getCountriesCollection()
             ->loadByStore($storeId)
             ->toOptionArray();
@@ -388,4 +389,14 @@ public function getAddressAsString(\Magento\Customer\Api\Data\AddressInterface $
 
         return $this->escapeHtml($result);
     }
+
+    /**
+     * Return address store id.
+     *
+     * @return int
+     */
+    protected function getAddressStoreId()
+    {
+        return $this->getBackendQuoteSession()->getStoreId();
+    }
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
index 4a335805f8a1e..b314ee24c3e27 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
@@ -97,7 +97,7 @@ public function getItems()
             }
         }
 
-        if (sizeof($items)) {
+        if (count($items)) {
             return $items;
         }
 
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
index 9a271f741edda..001c581dc0dac 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
@@ -5,8 +5,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Search;
 
-use Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\DataProvider\ProductCollection
-    as ProductCollectionDataProvider;
+use Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\DataProvider\ProductCollection;
 use Magento\Framework\App\ObjectManager;
 
 /**
@@ -48,7 +47,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
     protected $_productFactory;
 
     /**
-     * @var ProductCollectionDataProvider $productCollectionProvider
+     * @var ProductCollection $productCollectionProvider
      */
     private $productCollectionProvider;
 
@@ -60,7 +59,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Backend\Model\Session\Quote $sessionQuote
      * @param \Magento\Sales\Model\Config $salesConfig
      * @param array $data
-     * @param ProductCollectionDataProvider|null $productCollectionProvider
+     * @param ProductCollection|null $productCollectionProvider
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -70,14 +69,14 @@ public function __construct(
         \Magento\Backend\Model\Session\Quote $sessionQuote,
         \Magento\Sales\Model\Config $salesConfig,
         array $data = [],
-        ProductCollectionDataProvider $productCollectionProvider = null
+        ProductCollection $productCollectionProvider = null
     ) {
         $this->_productFactory = $productFactory;
         $this->_catalogConfig = $catalogConfig;
         $this->_sessionQuote = $sessionQuote;
         $this->_salesConfig = $salesConfig;
         $this->productCollectionProvider = $productCollectionProvider
-            ?: ObjectManager::getInstance()->get(ProductCollectionDataProvider::class);
+            ?: ObjectManager::getInstance()->get(ProductCollection::class);
         parent::__construct($context, $backendHelper, $data);
     }
 
@@ -94,6 +93,7 @@ protected function _construct()
         $this->setCheckboxCheckCallback('order.productGridCheckboxCheck.bind(order)');
         $this->setRowInitCallback('order.productGridRowInit.bind(order)');
         $this->setDefaultSort('entity_id');
+        $this->setFilterKeyPressCallback('order.productGridFilterKeyPress');
         $this->setUseAjax(true);
         if ($this->getRequest()->getParam('collapse')) {
             $this->setIsCollapsed(true);
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 06c6a9eb0652b..737ca446bb8e9 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
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Sidebar;
 
 use Magento\Framework\Pricing\PriceCurrencyInterface;
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
index f2200e1c1a108..a927b7177294a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Adminhtml sales order create sidebar cart block
@@ -146,4 +147,30 @@ private function getCartItemCustomPrice(Product $product): ?float
 
         return null;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getItemCount()
+    {
+        $count = $this->getData('item_count');
+        if ($count === null) {
+            $useQty = $this->_scopeConfig->getValue(
+                'checkout/cart_link/use_qty',
+                ScopeInterface::SCOPE_STORE
+            );
+            $allItems = $this->getItems();
+            if ($useQty) {
+                $count = 0;
+                foreach ($allItems as $item) {
+                    $count += $item->getQty();
+                }
+            } else {
+                $count = count($allItems);
+            }
+            $this->setData('item_count', $count);
+        }
+
+        return $count;
+    }
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
index 1210391f70ddb..50d29c195968c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
@@ -111,20 +111,4 @@ public function getShippingLabel()
         }
         return $label;
     }
-
-    /**
-     * Get update totals url.
-     *
-     * @return string
-     */
-    public function getUpdateTotalsUrl(): string
-    {
-        return $this->getUrl(
-            'sales/*/updateQty',
-            [
-                'order_id' => $this->getSource()->getOrderId(),
-                'invoice_id' => $this->getRequest()->getParam('invoice_id', null),
-            ]
-        );
-    }
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php
index 389c29bedf4c3..65163f9ed5d82 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php
@@ -56,12 +56,7 @@ protected function _prepareLayout()
         $this->addChild(
             'update_button',
             \Magento\Backend\Block\Widget\Button::class,
-            ['label' => __('Update Qty\'s'), 'class' => 'update-button secondary', 'onclick' => $onclick]
-        );
-        $this->addChild(
-            'update_totals_button',
-            \Magento\Backend\Block\Widget\Button::class,
-            ['label' => __('Update Totals'), 'class' => 'update-totals-button secondary', 'onclick' => $onclick]
+            ['label' => __('Update Qty\'s'), 'class' => 'update-button', 'onclick' => $onclick]
         );
 
         if ($this->getCreditmemo()->canRefund()) {
@@ -181,16 +176,6 @@ public function getUpdateButtonHtml()
         return $this->getChildHtml('update_button');
     }
 
-    /**
-     * Get update totals button html
-     *
-     * @return string
-     */
-    public function getUpdateTotalsButtonHtml(): string
-    {
-        return $this->getChildHtml('update_totals_button');
-    }
-
     /**
      * Get update url
      *
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
index 8172a3c0db4ad..68843952035c8 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Block\Adminhtml;
 
-use Magento\Sales\Model\Order;
+use Magento\Framework\DataObject;
 
 /**
  * Adminhtml sales totals block
@@ -57,60 +57,65 @@ public function formatValue($total)
     protected function _initTotals()
     {
         $this->_totals = [];
-        $this->_totals['subtotal'] = new \Magento\Framework\DataObject(
+        $order = $this->getSource();
+
+        $this->_totals['subtotal'] = new DataObject(
             [
                 'code' => 'subtotal',
-                'value' => $this->getSource()->getSubtotal(),
-                'base_value' => $this->getSource()->getBaseSubtotal(),
+                'value' => $order->getSubtotal(),
+                'base_value' => $order->getBaseSubtotal(),
                 'label' => __('Subtotal'),
             ]
         );
 
         /**
-         * Add shipping
+         * Add discount
          */
-        if (!$this->getSource()->getIsVirtual() && ((double)$this->getSource()->getShippingAmount() ||
-            $this->getSource()->getShippingDescription())
-        ) {
-            $shippingLabel = __('Shipping & Handling');
-            if ($this->isFreeShipping($this->getOrder()) && $this->getSource()->getDiscountDescription()) {
-                $shippingLabel .= sprintf(' (%s)', $this->getSource()->getDiscountDescription());
+        if ((double)$order->getDiscountAmount() != 0) {
+            if ($order->getDiscountDescription()) {
+                $discountLabel = __('Discount (%1)', $order->getDiscountDescription());
+            } else {
+                $discountLabel = __('Discount');
             }
-            $this->_totals['shipping'] = new \Magento\Framework\DataObject(
+            $this->_totals['discount'] = new DataObject(
                 [
-                    'code' => 'shipping',
-                    'value' => $this->getSource()->getShippingAmount(),
-                    'base_value' => $this->getSource()->getBaseShippingAmount(),
-                    'label' => $shippingLabel,
+                    'code' => 'discount',
+                    'value' => $order->getDiscountAmount(),
+                    'base_value' => $order->getBaseDiscountAmount(),
+                    'label' => $discountLabel,
                 ]
             );
         }
 
         /**
-         * Add discount
+         * Add shipping
          */
-        if ((double)$this->getSource()->getDiscountAmount() != 0) {
-            if ($this->getSource()->getDiscountDescription()) {
-                $discountLabel = __('Discount (%1)', $this->getSource()->getDiscountDescription());
-            } else {
-                $discountLabel = __('Discount');
+        if (!$order->getIsVirtual()
+            && ((double)$order->getShippingAmount()
+            || $order->getShippingDescription())
+        ) {
+            $shippingLabel = __('Shipping & Handling');
+
+            if ($order->getCouponCode() && !isset($this->_totals['discount'])) {
+                $shippingLabel .= " ({$order->getCouponCode()})";
             }
-            $this->_totals['discount'] = new \Magento\Framework\DataObject(
+
+            $this->_totals['shipping'] = new DataObject(
                 [
-                    'code' => 'discount',
-                    'value' => $this->getSource()->getDiscountAmount(),
-                    'base_value' => $this->getSource()->getBaseDiscountAmount(),
-                    'label' => $discountLabel,
+                    'code' => 'shipping',
+                    'value' => $order->getShippingAmount(),
+                    'base_value' => $order->getBaseShippingAmount(),
+                    'label' => $shippingLabel,
                 ]
             );
         }
 
-        $this->_totals['grand_total'] = new \Magento\Framework\DataObject(
+        $this->_totals['grand_total'] = new DataObject(
             [
                 'code' => 'grand_total',
                 'strong' => true,
-                'value' => $this->getSource()->getGrandTotal(),
-                'base_value' => $this->getSource()->getBaseGrandTotal(),
+                'value' => $order->getGrandTotal(),
+                'base_value' => $order->getBaseGrandTotal(),
                 'label' => __('Grand Total'),
                 'area' => 'footer',
             ]
@@ -118,23 +123,4 @@ protected function _initTotals()
 
         return $this;
     }
-
-    /**
-     * Availability of free shipping in at least one order item
-     *
-     * @param Order $order
-     * @return bool
-     */
-    private function isFreeShipping(Order $order): bool
-    {
-        $isFreeShipping = false;
-        foreach ($order->getItems() as $orderItem) {
-            if ($orderItem->getFreeShipping() == '1') {
-                $isFreeShipping = true;
-                break;
-            }
-        }
-
-        return $isFreeShipping;
-    }
 }
diff --git a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
index 83e66bbbce7cc..2e119d0bf887a 100644
--- a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
@@ -182,7 +182,7 @@ public function getFormatedOptionValue($optionValue)
 
         if ($this->string->strlen($optionValue) > 55) {
             $result['value'] = $result['value']
-                . ' <a href="#" class="dots tooltip toggle" onclick="return false">...</a>';
+                . ' ...';
             $optionValue = nl2br($optionValue);
             $result = array_merge($result, ['full_view' => $optionValue]);
         }
diff --git a/app/code/Magento/Sales/Block/Order/Totals.php b/app/code/Magento/Sales/Block/Order/Totals.php
index 3720db76b5778..80ce5e2e689c6 100644
--- a/app/code/Magento/Sales/Block/Order/Totals.php
+++ b/app/code/Magento/Sales/Block/Order/Totals.php
@@ -8,6 +8,8 @@
 use Magento\Sales\Model\Order;
 
 /**
+ * Order totals.
+ *
  * @api
  * @since 100.0.2
  */
@@ -85,6 +87,8 @@ public function getOrder()
     }
 
     /**
+     * Sets order.
+     *
      * @param Order $order
      * @return $this
      */
@@ -118,20 +122,6 @@ protected function _initTotals()
             ['code' => 'subtotal', 'value' => $source->getSubtotal(), 'label' => __('Subtotal')]
         );
 
-        /**
-         * Add shipping
-         */
-        if (!$source->getIsVirtual() && ((double)$source->getShippingAmount() || $source->getShippingDescription())) {
-            $this->_totals['shipping'] = new \Magento\Framework\DataObject(
-                [
-                    'code' => 'shipping',
-                    'field' => 'shipping_amount',
-                    'value' => $this->getSource()->getShippingAmount(),
-                    'label' => __('Shipping & Handling'),
-                ]
-            );
-        }
-
         /**
          * Add discount
          */
@@ -151,6 +141,25 @@ protected function _initTotals()
             );
         }
 
+        /**
+         * Add shipping
+         */
+        if (!$source->getIsVirtual() && ((double)$source->getShippingAmount() || $source->getShippingDescription())) {
+            $label = __('Shipping & Handling');
+            if ($this->getSource()->getCouponCode() && !isset($this->_totals['discount'])) {
+                $label = __('Shipping & Handling (%1)', $this->getSource()->getCouponCode());
+            }
+
+            $this->_totals['shipping'] = new \Magento\Framework\DataObject(
+                [
+                    'code' => 'shipping',
+                    'field' => 'shipping_amount',
+                    'value' => $this->getSource()->getShippingAmount(),
+                    'label' => $label,
+                ]
+            );
+        }
+
         $this->_totals['grand_total'] = new \Magento\Framework\DataObject(
             [
                 'code' => 'grand_total',
@@ -286,7 +295,6 @@ public function removeTotal($code)
      *  $totalCode => $totalSortOrder
      * )
      *
-     *
      * @param   array $order
      * @return  $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -303,7 +311,7 @@ function ($code1, $code2) use ($order) {
     }
 
     /**
-     * get totals array for visualization
+     * Get totals array for visualization
      *
      * @param array|null $area
      * @return array
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 300b7ee37f2ef..6e7c2e5ce5609 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php
@@ -1,17 +1,22 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice;
 
 use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\ForwardFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Registry;
 use Magento\Sales\Api\InvoiceRepositoryInterface;
-use Magento\Sales\Model\Order\InvoiceRepository;
 
+/**
+ * Class View
+ */
 abstract class View extends \Magento\Backend\App\Action
 {
     /**
@@ -27,7 +32,7 @@ abstract class View extends \Magento\Backend\App\Action
     protected $registry;
 
     /**
-     * @var \Magento\Backend\Model\View\Result\ForwardFactory
+     * @var ForwardFactory
      */
     protected $resultForwardFactory;
 
@@ -39,16 +44,20 @@ abstract class View extends \Magento\Backend\App\Action
     /**
      * @param Context $context
      * @param Registry $registry
-     * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+     * @param ForwardFactory $resultForwardFactory
+     * @param InvoiceRepositoryInterface $invoiceRepository
      */
     public function __construct(
         Context $context,
         Registry $registry,
-        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+        ForwardFactory $resultForwardFactory,
+        InvoiceRepositoryInterface $invoiceRepository = null
     ) {
-        $this->registry = $registry;
         parent::__construct($context);
+        $this->registry = $registry;
         $this->resultForwardFactory = $resultForwardFactory;
+        $this->invoiceRepository = $invoiceRepository ?:
+            ObjectManager::getInstance()->get(InvoiceRepositoryInterface::class);
     }
 
     /**
@@ -70,13 +79,14 @@ public function execute()
     }
 
     /**
+     * Get invoice using invoice Id from request params
+     *
      * @return \Magento\Sales\Model\Order\Invoice|bool
      */
     protected function getInvoice()
     {
         try {
-            $invoice = $this->getInvoiceRepository()
-                ->get($this->getRequest()->getParam('invoice_id'));
+            $invoice = $this->invoiceRepository->get($this->getRequest()->getParam('invoice_id'));
             $this->registry->register('current_invoice', $invoice);
         } catch (\Exception $e) {
             $this->messageManager->addErrorMessage(__('Invoice capturing error'));
@@ -85,19 +95,4 @@ protected function getInvoice()
 
         return $invoice;
     }
-
-    /**
-     * @return InvoiceRepository
-     *
-     * @deprecated 100.1.0
-     */
-    private function getInvoiceRepository()
-    {
-        if ($this->invoiceRepository === null) {
-            $this->invoiceRepository = ObjectManager::getInstance()
-                ->get(InvoiceRepositoryInterface::class);
-        }
-
-        return $this->invoiceRepository;
-    }
 }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
index 341ee16ae910b..45cd504be201a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
@@ -188,7 +188,7 @@ protected function _processActionData($action = null)
             && $this->_getOrderCreateModel()->getShippingAddress()->getSameAsBilling() && empty($shippingMethod)
             ) {
                 $this->_getOrderCreateModel()->setShippingAsBilling(1);
-            } else {
+            } elseif ($syncFlag !== null) {
                 $this->_getOrderCreateModel()->setShippingAsBilling((int)$syncFlag);
             }
         }
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 515c0753542a0..23dcae3a858cc 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php
@@ -1,23 +1,30 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
 use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\ForwardFactory;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
 use Magento\Sales\Model\Order\Email\Sender\InvoiceCommentSender;
-use Magento\Sales\Model\Order\Invoice;
-use Magento\Backend\App\Action;
 use Magento\Framework\Registry;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\Controller\Result\RawFactory;
 
-class AddComment extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
+/**
+ * Class AddComment
+ */
+class AddComment extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View implements
+    HttpPostActionInterface
 {
     /**
      * @var InvoiceCommentSender
@@ -39,29 +46,38 @@ class AddComment extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInv
      */
     protected $resultRawFactory;
 
+    /**
+     * @var InvoiceRepositoryInterface
+     */
+    protected $invoiceRepository;
+
     /**
      * @param Context $context
      * @param Registry $registry
-     * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+     * @param ForwardFactory $resultForwardFactory
      * @param InvoiceCommentSender $invoiceCommentSender
      * @param JsonFactory $resultJsonFactory
      * @param PageFactory $resultPageFactory
      * @param RawFactory $resultRawFactory
+     * @param InvoiceRepositoryInterface $invoiceRepository
      */
     public function __construct(
         Context $context,
         Registry $registry,
-        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory,
+        ForwardFactory $resultForwardFactory,
         InvoiceCommentSender $invoiceCommentSender,
         JsonFactory $resultJsonFactory,
         PageFactory $resultPageFactory,
-        RawFactory $resultRawFactory
+        RawFactory $resultRawFactory,
+        InvoiceRepositoryInterface $invoiceRepository = null
     ) {
         $this->invoiceCommentSender = $invoiceCommentSender;
         $this->resultJsonFactory = $resultJsonFactory;
         $this->resultPageFactory = $resultPageFactory;
         $this->resultRawFactory = $resultRawFactory;
-        parent::__construct($context, $registry, $resultForwardFactory);
+        $this->invoiceRepository = $invoiceRepository ?:
+            ObjectManager::getInstance()->get(InvoiceRepositoryInterface::class);
+        parent::__construct($context, $registry, $resultForwardFactory, $invoiceRepository);
     }
 
     /**
@@ -90,7 +106,7 @@ public function execute()
             );
 
             $this->invoiceCommentSender->send($invoice, !empty($data['is_customer_notified']), $data['comment']);
-            $invoice->save();
+            $this->invoiceRepository->save($invoice);
 
             /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
             $resultPage = $this->resultPageFactory->create();
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 b4fa6fed6cdf5..f66ca37a47655 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
@@ -16,6 +16,7 @@
 use Magento\Sales\Model\Order\ShipmentFactory;
 use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Model\Service\InvoiceService;
+use Magento\Sales\Helper\Data as SalesData;
 
 /**
  * Save invoice controller.
@@ -56,6 +57,11 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac
      */
     private $invoiceService;
 
+    /**
+     * @var SalesData
+     */
+    private $salesData;
+
     /**
      * @param Action\Context $context
      * @param Registry $registry
@@ -63,6 +69,7 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac
      * @param ShipmentSender $shipmentSender
      * @param ShipmentFactory $shipmentFactory
      * @param InvoiceService $invoiceService
+     * @param SalesData $salesData
      */
     public function __construct(
         Action\Context $context,
@@ -70,7 +77,8 @@ public function __construct(
         InvoiceSender $invoiceSender,
         ShipmentSender $shipmentSender,
         ShipmentFactory $shipmentFactory,
-        InvoiceService $invoiceService
+        InvoiceService $invoiceService,
+        SalesData $salesData = null
     ) {
         $this->registry = $registry;
         $this->invoiceSender = $invoiceSender;
@@ -78,6 +86,7 @@ public function __construct(
         $this->shipmentFactory = $shipmentFactory;
         $this->invoiceService = $invoiceService;
         parent::__construct($context);
+        $this->salesData = $salesData ?? $this->_objectManager->get(SalesData::class);
     }
 
     /**
@@ -204,7 +213,7 @@ public function execute()
 
             // send invoice/shipment emails
             try {
-                if (!empty($data['send_email'])) {
+                if (!empty($data['send_email']) || $this->salesData->canSendNewInvoiceEmail()) {
                     $this->invoiceSender->send($invoice);
                 }
             } catch (\Exception $e) {
@@ -213,7 +222,7 @@ public function execute()
             }
             if ($shipment) {
                 try {
-                    if (!empty($data['send_email'])) {
+                    if (!empty($data['send_email']) || $this->salesData->canSendNewShipmentEmail()) {
                         $this->shipmentSender->send($shipment);
                     }
                 } catch (\Exception $e) {
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 48deddb2fe5ac..89564f97ccf16 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -5,8 +5,11 @@
  */
 namespace Magento\Sales\Model;
 
+use Magento\Config\Model\Config\Source\Nooptreq;
 use Magento\Directory\Model\Currency;
 use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Locale\ResolverInterface;
@@ -14,6 +17,7 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Api\Data\OrderStatusHistoryInterface;
+use Magento\Sales\Api\OrderItemRepositoryInterface;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\Order\ProductOption;
 use Magento\Sales\Model\ResourceModel\Order\Address\Collection;
@@ -24,8 +28,7 @@
 use Magento\Sales\Model\ResourceModel\Order\Shipment\Collection as ShipmentCollection;
 use Magento\Sales\Model\ResourceModel\Order\Shipment\Track\Collection as TrackCollection;
 use Magento\Sales\Model\ResourceModel\Order\Status\History\Collection as HistoryCollection;
-use Magento\Sales\Api\OrderItemRepositoryInterface;
-use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Order model
@@ -299,6 +302,11 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      */
     private $searchCriteriaBuilder;
 
+    /**
+     * @var ScopeConfigInterface;
+     */
+    private $scopeConfig;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -331,6 +339,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      * @param ProductOption|null $productOption
      * @param OrderItemRepositoryInterface $itemRepository
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param ScopeConfigInterface $scopeConfig
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -364,7 +373,8 @@ public function __construct(
         ResolverInterface $localeResolver = null,
         ProductOption $productOption = null,
         OrderItemRepositoryInterface $itemRepository = null,
-        SearchCriteriaBuilder $searchCriteriaBuilder = null
+        SearchCriteriaBuilder $searchCriteriaBuilder = null,
+        ScopeConfigInterface $scopeConfig = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_orderConfig = $orderConfig;
@@ -392,6 +402,7 @@ public function __construct(
             ->get(OrderItemRepositoryInterface::class);
         $this->searchCriteriaBuilder = $searchCriteriaBuilder ?: ObjectManager::getInstance()
             ->get(SearchCriteriaBuilder::class);
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
 
         parent::__construct(
             $context,
@@ -1111,7 +1122,7 @@ public function addStatusHistoryComment($comment, $status = false)
     {
         return $this->addCommentToStatusHistory($comment, $status, false);
     }
-    
+
     /**
      * Add a comment to order status history.
      *
@@ -1503,7 +1514,7 @@ public function getItemById($itemId)
      * Get item by quote item id
      *
      * @param mixed $quoteItemId
-     * @return  \Magento\Framework\DataObject|null
+     * @return \Magento\Framework\DataObject|null
      */
     public function getItemByQuoteItemId($quoteItemId)
     {
@@ -1967,11 +1978,23 @@ public function getRelatedObjects()
      */
     public function getCustomerName()
     {
-        if ($this->getCustomerFirstname()) {
-            $customerName = $this->getCustomerFirstname() . ' ' . $this->getCustomerLastname();
-        } else {
-            $customerName = (string)__('Guest');
+        if (null === $this->getCustomerFirstname()) {
+            return (string)__('Guest');
         }
+
+        $customerName = '';
+        if ($this->isVisibleCustomerPrefix() && strlen($this->getCustomerPrefix())) {
+            $customerName .= $this->getCustomerPrefix() . ' ';
+        }
+        $customerName .= $this->getCustomerFirstname();
+        if ($this->isVisibleCustomerMiddlename() && strlen($this->getCustomerMiddlename())) {
+            $customerName .= ' ' . $this->getCustomerMiddlename();
+        }
+        $customerName .= ' ' . $this->getCustomerLastname();
+        if ($this->isVisibleCustomerSuffix() && strlen($this->getCustomerSuffix())) {
+            $customerName .= ' ' . $this->getCustomerSuffix();
+        }
+
         return $customerName;
     }
 
@@ -4534,5 +4557,48 @@ public function setShippingMethod($shippingMethod)
         return $this->setData('shipping_method', $shippingMethod);
     }
 
+    /**
+     * Is visible customer middlename
+     *
+     * @return bool
+     */
+    private function isVisibleCustomerMiddlename(): bool
+    {
+        return $this->scopeConfig->isSetFlag(
+            'customer/address/middlename_show',
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Is visible customer prefix
+     *
+     * @return bool
+     */
+    private function isVisibleCustomerPrefix(): bool
+    {
+        $prefixShowValue = $this->scopeConfig->getValue(
+            'customer/address/prefix_show',
+            ScopeInterface::SCOPE_STORE
+        );
+
+        return $prefixShowValue !== Nooptreq::VALUE_NO;
+    }
+
+    /**
+     * Is visible customer suffix
+     *
+     * @return bool
+     */
+    private function isVisibleCustomerSuffix(): bool
+    {
+        $prefixShowValue = $this->scopeConfig->getValue(
+            'customer/address/suffix_show',
+            ScopeInterface::SCOPE_STORE
+        );
+
+        return $prefixShowValue !== Nooptreq::VALUE_NO;
+    }
+
     //@codeCoverageIgnoreEnd
 }
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 d4c2e7b2d6854..95dace13d832f 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
@@ -41,7 +41,7 @@ public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
             $baseOrderItemTax = (double)$orderItem->getBaseTaxInvoiced();
             $orderItemQty = (double)$orderItem->getQtyInvoiced();
 
-            if ($orderItemTax && $orderItemQty) {
+            if ($orderItemQty) {
                 /**
                  * Check item tax amount
                  */
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
index dc920ab62e0b7..f9efb9f56f504 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
@@ -3,10 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order\Email\Container;
 
+/**
+ * Class \Magento\Sales\Model\Order\Email\Container\CreditmemoCommentIdentity
+ */
 class CreditmemoCommentIdentity extends Container implements IdentityInterface
 {
+    /**
+     * Configuration paths
+     */
     const XML_PATH_EMAIL_COPY_METHOD = 'sales_email/creditmemo_comment/copy_method';
     const XML_PATH_EMAIL_COPY_TO = 'sales_email/creditmemo_comment/copy_to';
     const XML_PATH_EMAIL_IDENTITY = 'sales_email/creditmemo_comment/identity';
@@ -15,6 +23,8 @@ class CreditmemoCommentIdentity extends Container implements IdentityInterface
     const XML_PATH_EMAIL_ENABLED = 'sales_email/creditmemo_comment/enabled';
 
     /**
+     * Is email enabled
+     *
      * @return bool
      */
     public function isEnabled()
@@ -27,18 +37,22 @@ public function isEnabled()
     }
 
     /**
+     * Return email copy_to list
+     *
      * @return array|bool
      */
     public function getEmailCopyTo()
     {
         $data = $this->getConfigValue(self::XML_PATH_EMAIL_COPY_TO, $this->getStore()->getStoreId());
         if (!empty($data)) {
-            return explode(',', $data);
+            return array_map('trim', explode(',', $data));
         }
         return false;
     }
 
     /**
+     * Return email copy method
+     *
      * @return mixed
      */
     public function getCopyMethod()
@@ -47,6 +61,8 @@ public function getCopyMethod()
     }
 
     /**
+     * Return guest template id
+     *
      * @return mixed
      */
     public function getGuestTemplateId()
@@ -55,6 +71,8 @@ public function getGuestTemplateId()
     }
 
     /**
+     * Return template id
+     *
      * @return mixed
      */
     public function getTemplateId()
@@ -63,6 +81,8 @@ public function getTemplateId()
     }
 
     /**
+     * Return email identity
+     *
      * @return mixed
      */
     public function getEmailIdentity()
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
index f60ef03800cf0..4c1fcfb501e3a 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
@@ -3,10 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order\Email\Container;
 
+/**
+ * Class \Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity
+ */
 class CreditmemoIdentity extends Container implements IdentityInterface
 {
+    /**
+     * Configuration paths
+     */
     const XML_PATH_EMAIL_COPY_METHOD = 'sales_email/creditmemo/copy_method';
     const XML_PATH_EMAIL_COPY_TO = 'sales_email/creditmemo/copy_to';
     const XML_PATH_EMAIL_IDENTITY = 'sales_email/creditmemo/identity';
@@ -15,6 +23,8 @@ class CreditmemoIdentity extends Container implements IdentityInterface
     const XML_PATH_EMAIL_ENABLED = 'sales_email/creditmemo/enabled';
 
     /**
+     * Is email enabled
+     *
      * @return bool
      */
     public function isEnabled()
@@ -27,18 +37,22 @@ public function isEnabled()
     }
 
     /**
+     * Return email copy_to list
+     *
      * @return array|bool
      */
     public function getEmailCopyTo()
     {
         $data = $this->getConfigValue(self::XML_PATH_EMAIL_COPY_TO, $this->getStore()->getStoreId());
         if (!empty($data)) {
-            return explode(',', $data);
+            return array_map('trim', explode(',', $data));
         }
         return false;
     }
 
     /**
+     * Return email copy method
+     *
      * @return mixed
      */
     public function getCopyMethod()
@@ -47,6 +61,8 @@ public function getCopyMethod()
     }
 
     /**
+     * Return guest template id
+     *
      * @return mixed
      */
     public function getGuestTemplateId()
@@ -55,6 +71,8 @@ public function getGuestTemplateId()
     }
 
     /**
+     * Return template id
+     *
      * @return mixed
      */
     public function getTemplateId()
@@ -63,6 +81,8 @@ public function getTemplateId()
     }
 
     /**
+     * Return email identity
+     *
      * @return mixed
      */
     public function getEmailIdentity()
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
index 81584a61b7452..fd0a384a4bc6f 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
@@ -3,10 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order\Email\Container;
 
+/**
+ * Class \Magento\Sales\Model\Order\Email\Container\InvoiceCommentIdentity
+ */
 class InvoiceCommentIdentity extends Container implements IdentityInterface
 {
+    /**
+     * Configuration paths
+     */
     const XML_PATH_EMAIL_COPY_METHOD = 'sales_email/invoice_comment/copy_method';
     const XML_PATH_EMAIL_COPY_TO = 'sales_email/invoice_comment/copy_to';
     const XML_PATH_EMAIL_GUEST_TEMPLATE = 'sales_email/invoice_comment/guest_template';
@@ -15,6 +23,8 @@ class InvoiceCommentIdentity extends Container implements IdentityInterface
     const XML_PATH_EMAIL_ENABLED = 'sales_email/invoice_comment/enabled';
 
     /**
+     * Is email enabled
+     *
      * @return bool
      */
     public function isEnabled()
@@ -27,18 +37,22 @@ public function isEnabled()
     }
 
     /**
+     * Return email copy_to list
+     *
      * @return array|bool
      */
     public function getEmailCopyTo()
     {
         $data = $this->getConfigValue(self::XML_PATH_EMAIL_COPY_TO, $this->getStore()->getStoreId());
         if (!empty($data)) {
-            return explode(',', $data);
+            return array_map('trim', explode(',', $data));
         }
         return false;
     }
 
     /**
+     * Return email copy method
+     *
      * @return mixed
      */
     public function getCopyMethod()
@@ -47,6 +61,8 @@ public function getCopyMethod()
     }
 
     /**
+     * Return guest template id
+     *
      * @return mixed
      */
     public function getGuestTemplateId()
@@ -55,6 +71,8 @@ public function getGuestTemplateId()
     }
 
     /**
+     * Return template id
+     *
      * @return mixed
      */
     public function getTemplateId()
@@ -63,6 +81,8 @@ public function getTemplateId()
     }
 
     /**
+     * Return email identity
+     *
      * @return mixed
      */
     public function getEmailIdentity()
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
index db063b87271fb..6bb4eb0f0fd7f 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
@@ -3,10 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order\Email\Container;
 
+/**
+ * Class \Magento\Sales\Model\Order\Email\Container\InvoiceIdentity
+ */
 class InvoiceIdentity extends Container implements IdentityInterface
 {
+    /**
+     * Configuration paths
+     */
     const XML_PATH_EMAIL_COPY_METHOD = 'sales_email/invoice/copy_method';
     const XML_PATH_EMAIL_COPY_TO = 'sales_email/invoice/copy_to';
     const XML_PATH_EMAIL_IDENTITY = 'sales_email/invoice/identity';
@@ -15,6 +23,8 @@ class InvoiceIdentity extends Container implements IdentityInterface
     const XML_PATH_EMAIL_ENABLED = 'sales_email/invoice/enabled';
 
     /**
+     * Is email enabled
+     *
      * @return bool
      */
     public function isEnabled()
@@ -27,18 +37,22 @@ public function isEnabled()
     }
 
     /**
+     * Return email copy_to list
+     *
      * @return array|bool
      */
     public function getEmailCopyTo()
     {
         $data = $this->getConfigValue(self::XML_PATH_EMAIL_COPY_TO, $this->getStore()->getStoreId());
         if (!empty($data)) {
-            return explode(',', $data);
+            return array_map('trim', explode(',', $data));
         }
         return false;
     }
 
     /**
+     * Return email copy method
+     *
      * @return mixed
      */
     public function getCopyMethod()
@@ -47,6 +61,8 @@ public function getCopyMethod()
     }
 
     /**
+     * Return guest template id
+     *
      * @return mixed
      */
     public function getGuestTemplateId()
@@ -55,6 +71,8 @@ public function getGuestTemplateId()
     }
 
     /**
+     * Return template id
+     *
      * @return mixed
      */
     public function getTemplateId()
@@ -63,6 +81,8 @@ public function getTemplateId()
     }
 
     /**
+     * Return email identity
+     *
      * @return mixed
      */
     public function getEmailIdentity()
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
index 3a79402913cc1..f43cd71ddd39a 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
@@ -3,10 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order\Email\Container;
 
+/**
+ * Class \Magento\Sales\Model\Order\Email\Container\OrderCommentIdentity
+ */
 class OrderCommentIdentity extends Container implements IdentityInterface
 {
+    /**
+     * Configuration paths
+     */
     const XML_PATH_EMAIL_COPY_METHOD = 'sales_email/order_comment/copy_method';
     const XML_PATH_EMAIL_COPY_TO = 'sales_email/order_comment/copy_to';
     const XML_PATH_EMAIL_GUEST_TEMPLATE = 'sales_email/order_comment/guest_template';
@@ -15,6 +23,8 @@ class OrderCommentIdentity extends Container implements IdentityInterface
     const XML_PATH_EMAIL_ENABLED = 'sales_email/order_comment/enabled';
 
     /**
+     * Is email enabled
+     *
      * @return bool
      */
     public function isEnabled()
@@ -27,18 +37,22 @@ public function isEnabled()
     }
 
     /**
+     * Return email copy_to list
+     *
      * @return array|bool
      */
     public function getEmailCopyTo()
     {
         $data = $this->getConfigValue(self::XML_PATH_EMAIL_COPY_TO, $this->getStore()->getStoreId());
         if (!empty($data)) {
-            return explode(',', $data);
+            return array_map('trim', explode(',', $data));
         }
         return false;
     }
 
     /**
+     * Return email copy method
+     *
      * @return mixed
      */
     public function getCopyMethod()
@@ -47,6 +61,8 @@ public function getCopyMethod()
     }
 
     /**
+     * Return guest template id
+     *
      * @return mixed
      */
     public function getGuestTemplateId()
@@ -55,6 +71,8 @@ public function getGuestTemplateId()
     }
 
     /**
+     * Return template id
+     *
      * @return mixed
      */
     public function getTemplateId()
@@ -63,6 +81,8 @@ public function getTemplateId()
     }
 
     /**
+     * Return email identity
+     *
      * @return mixed
      */
     public function getEmailIdentity()
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
index 68d269b4b4fc8..168869c67fb2d 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
@@ -3,8 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order\Email\Container;
 
+/**
+ * Class \Magento\Sales\Model\Order\Email\Container\OrderIdentity
+ */
 class OrderIdentity extends Container implements IdentityInterface
 {
     /**
@@ -18,6 +23,8 @@ class OrderIdentity extends Container implements IdentityInterface
     const XML_PATH_EMAIL_ENABLED = 'sales_email/order/enabled';
 
     /**
+     * Is email enabled
+     *
      * @return bool
      */
     public function isEnabled()
@@ -38,7 +45,7 @@ public function getEmailCopyTo()
     {
         $data = $this->getConfigValue(self::XML_PATH_EMAIL_COPY_TO, $this->getStore()->getStoreId());
         if (!empty($data)) {
-            return explode(',', $data);
+            return array_map('trim', explode(',', $data));
         }
         return false;
     }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
index 0c2f1d592dd19..db408ceecb4cc 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
@@ -3,10 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order\Email\Container;
 
+/**
+ * Class \Magento\Sales\Model\Order\Email\Container\ShipmentCommentIdentity
+ */
 class ShipmentCommentIdentity extends Container implements IdentityInterface
 {
+    /**
+     * Configuration paths
+     */
     const XML_PATH_EMAIL_COPY_METHOD = 'sales_email/shipment_comment/copy_method';
     const XML_PATH_EMAIL_COPY_TO = 'sales_email/shipment_comment/copy_to';
     const XML_PATH_EMAIL_IDENTITY = 'sales_email/shipment_comment/identity';
@@ -15,6 +23,8 @@ class ShipmentCommentIdentity extends Container implements IdentityInterface
     const XML_PATH_EMAIL_ENABLED = 'sales_email/shipment_comment/enabled';
 
     /**
+     * Is email enabled
+     *
      * @return bool
      */
     public function isEnabled()
@@ -27,18 +37,22 @@ public function isEnabled()
     }
 
     /**
+     * Return email copy_to list
+     *
      * @return array|bool
      */
     public function getEmailCopyTo()
     {
         $data = $this->getConfigValue(self::XML_PATH_EMAIL_COPY_TO, $this->getStore()->getStoreId());
         if (!empty($data)) {
-            return explode(',', $data);
+            return array_map('trim', explode(',', $data));
         }
         return false;
     }
 
     /**
+     * Return copy method
+     *
      * @return mixed
      */
     public function getCopyMethod()
@@ -47,6 +61,8 @@ public function getCopyMethod()
     }
 
     /**
+     * Return guest template id
+     *
      * @return mixed
      */
     public function getGuestTemplateId()
@@ -55,6 +71,8 @@ public function getGuestTemplateId()
     }
 
     /**
+     * Return template id
+     *
      * @return mixed
      */
     public function getTemplateId()
@@ -63,6 +81,8 @@ public function getTemplateId()
     }
 
     /**
+     * Return email identity
+     *
      * @return mixed
      */
     public function getEmailIdentity()
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
index ddf682d92fc87..d2f4c03f95b1f 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
@@ -3,9 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Sales\Model\Order\Email\Container;
 
+/**
+ * Class \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity
+ */
 class ShipmentIdentity extends Container implements IdentityInterface
 {
     /**
@@ -41,7 +45,7 @@ public function getEmailCopyTo()
     {
         $data = $this->getConfigValue(self::XML_PATH_EMAIL_COPY_TO, $this->getStore()->getStoreId());
         if (!empty($data)) {
-            return explode(',', $data);
+            return array_map('trim', explode(',', $data));
         }
         return false;
     }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
index 09360d0685cf3..930791532539f 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
@@ -73,6 +73,10 @@ public function send(Creditmemo $creditmemo, $notify = true, $comment = '')
             'store' => $order->getStore(),
             'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
             'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+            'order_data' => [
+                'customer_name' => $order->getCustomerName(),
+                'frontend_status_label' => $order->getFrontendStatusLabel()
+            ]
         ];
         $transportObject = new DataObject($transport);
 
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
index 3cbd063641366..e6d528fb93a34 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
@@ -115,6 +115,12 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false)
                 'store' => $order->getStore(),
                 'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
                 'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+                'order_data' => [
+                    'customer_name' => $order->getCustomerName(),
+                    'is_not_virtual' => $order->getIsNotVirtual(),
+                    'email_customer_note' => $order->getEmailCustomerNote(),
+                    'frontend_status_label' => $order->getFrontendStatusLabel()
+                ]
             ];
             $transportObject = new DataObject($transport);
 
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
index 32855f78c1571..9441f0e842925 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
@@ -73,6 +73,10 @@ public function send(Invoice $invoice, $notify = true, $comment = '')
             'store' => $order->getStore(),
             'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
             'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+            'order_data' => [
+                'customer_name' => $order->getCustomerName(),
+                'frontend_status_label' => $order->getFrontendStatusLabel()
+            ]
         ];
         $transportObject = new DataObject($transport);
 
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
index 3ac5342de74a6..79133af6d6fb8 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
@@ -114,7 +114,13 @@ public function send(Invoice $invoice, $forceSyncMode = false)
                 'payment_html' => $this->getPaymentHtml($order),
                 'store' => $order->getStore(),
                 'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
-                'formattedBillingAddress' => $this->getFormattedBillingAddress($order)
+                'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+                'order_data' => [
+                    'customer_name' => $order->getCustomerName(),
+                    'is_not_virtual' => $order->getIsNotVirtual(),
+                    'email_customer_note' => $order->getEmailCustomerNote(),
+                    'frontend_status_label' => $order->getFrontendStatusLabel()
+                ]
             ];
             $transportObject = new DataObject($transport);
 
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
index e162e01bd7555..4d37fc1b7769a 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
@@ -70,6 +70,10 @@ public function send(Order $order, $notify = true, $comment = '')
             'store' => $order->getStore(),
             'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
             'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+            'order_data' => [
+                'customer_name' => $order->getCustomerName(),
+                'frontend_status_label' => $order->getFrontendStatusLabel()
+            ]
         ];
         $transportObject = new DataObject($transport);
 
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 bfbe1fb4fd7ff..c67804475cd65 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
@@ -130,6 +130,13 @@ protected function prepareTemplate(Order $order)
             'store' => $order->getStore(),
             'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
             'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+            'created_at_formatted' => $order->getCreatedAtFormatted(2),
+            'order_data' => [
+                'customer_name' => $order->getCustomerName(),
+                'is_not_virtual' => $order->getIsNotVirtual(),
+                'email_customer_note' => $order->getEmailCustomerNote(),
+                'frontend_status_label' => $order->getFrontendStatusLabel()
+            ]
         ];
         $transportObject = new DataObject($transport);
 
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
index b0b4907b96e70..ad305c8b7199f 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
@@ -73,6 +73,10 @@ public function send(Shipment $shipment, $notify = true, $comment = '')
             'store' => $order->getStore(),
             'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
             'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+            'order_data' => [
+                'customer_name' => $order->getCustomerName(),
+                'frontend_status_label' => $order->getFrontendStatusLabel()
+            ]
         ];
         $transportObject = new DataObject($transport);
 
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
index df28dec701290..4dbc10308f3be 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
@@ -114,7 +114,13 @@ public function send(Shipment $shipment, $forceSyncMode = false)
                 'payment_html' => $this->getPaymentHtml($order),
                 'store' => $order->getStore(),
                 'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
-                'formattedBillingAddress' => $this->getFormattedBillingAddress($order)
+                'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+                'order_data' => [
+                    'customer_name' => $order->getCustomerName(),
+                    'is_not_virtual' => $order->getIsNotVirtual(),
+                    'email_customer_note' => $order->getEmailCustomerNote(),
+                    'frontend_status_label' => $order->getFrontendStatusLabel()
+                ]
             ];
             $transportObject = new DataObject($transport);
 
diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
index c4523981ac729..ae188309ea646 100644
--- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
+++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -85,8 +85,8 @@ public function sendCopyTo()
         $copyTo = $this->identityContainer->getEmailCopyTo();
 
         if (!empty($copyTo)) {
-            $this->configureEmailTemplate();
             foreach ($copyTo as $email) {
+                $this->configureEmailTemplate();
                 $this->transportBuilder->addTo($email);
                 $transport = $this->transportBuilder->getTransport();
                 $transport->sendMessage();
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/TrackRepository.php b/app/code/Magento/Sales/Model/Order/Shipment/TrackRepository.php
index 5bcf579a1cbf4..24ccf45d60145 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/TrackRepository.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/TrackRepository.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order\Shipment;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
@@ -14,7 +16,13 @@
 use Magento\Sales\Api\Data\ShipmentTrackSearchResultInterfaceFactory;
 use Magento\Sales\Api\ShipmentTrackRepositoryInterface;
 use Magento\Sales\Model\Spi\ShipmentTrackResourceInterface;
+use Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory;
+use Magento\Framework\App\ObjectManager;
+use Psr\Log\LoggerInterface;
 
+/**
+ * Repository of shipment tracking information
+ */
 class TrackRepository implements ShipmentTrackRepositoryInterface
 {
     /**
@@ -37,23 +45,40 @@ class TrackRepository implements ShipmentTrackRepositoryInterface
      */
     private $collectionProcessor;
 
+    /**
+     * @var CollectionFactory
+     */
+    private $shipmentCollection;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param ShipmentTrackResourceInterface $trackResource
      * @param ShipmentTrackInterfaceFactory $trackFactory
      * @param ShipmentTrackSearchResultInterfaceFactory $searchResultFactory
      * @param CollectionProcessorInterface $collectionProcessor
+     * @param CollectionFactory|null $shipmentCollection
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         ShipmentTrackResourceInterface $trackResource,
         ShipmentTrackInterfaceFactory $trackFactory,
         ShipmentTrackSearchResultInterfaceFactory $searchResultFactory,
-        CollectionProcessorInterface $collectionProcessor
+        CollectionProcessorInterface $collectionProcessor,
+        CollectionFactory $shipmentCollection = null,
+        LoggerInterface $logger = null
     ) {
-
         $this->trackResource = $trackResource;
         $this->trackFactory = $trackFactory;
         $this->searchResultFactory = $searchResultFactory;
         $this->collectionProcessor = $collectionProcessor;
+        $this->shipmentCollection = $shipmentCollection ?:
+            ObjectManager::getInstance()->get(CollectionFactory::class);
+        $this->logger = $logger ?:
+            ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -95,6 +120,16 @@ public function delete(ShipmentTrackInterface $entity)
      */
     public function save(ShipmentTrackInterface $entity)
     {
+        $shipments = $this->shipmentCollection->create()
+            ->addFieldToFilter('order_id', $entity['order_id'])
+            ->addFieldToFilter('entity_id', $entity['parent_id'])
+            ->toArray();
+
+        if (empty($shipments['items'])) {
+            $this->logger->error('The shipment doesn\'t belong to the order.');
+            throw new CouldNotSaveException(__('Could not save the shipment tracking.'));
+        }
+
         try {
             $this->trackResource->save($entity);
         } catch (\Exception $e) {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Status/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Status/Collection.php
index 23d835db603df..83346d4528c22 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Status/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Status/Collection.php
@@ -1,12 +1,13 @@
 <?php
 /**
- * Oder statuses grid collection
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Sales\Model\ResourceModel\Status;
 
+/**
+ * Order statuses grid collection.
+ */
 class Collection extends \Magento\Sales\Model\ResourceModel\Order\Status\Collection
 {
     /**
diff --git a/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php b/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php
index a698276332af8..a05ed2be9c82c 100644
--- a/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php
+++ b/app/code/Magento/Sales/Model/Service/PaymentFailuresService.php
@@ -130,10 +130,12 @@ public function handle(
         foreach ($sendTo as $recipient) {
             $transport = $this->transportBuilder
                 ->setTemplateIdentifier($template)
-                ->setTemplateOptions([
-                    'area' => FrontNameResolver::AREA_CODE,
-                    'store' => Store::DEFAULT_STORE_ID,
-                ])
+                ->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'])
@@ -170,6 +172,8 @@ private function getTemplateVars(Quote $quote, string $message, string $checkout
             'customerEmail' => $quote->getBillingAddress()->getEmail(),
             'billingAddress' => $quote->getBillingAddress(),
             'shippingAddress' => $quote->getShippingAddress(),
+            'billingAddressHtml' => $quote->getBillingAddress()->format('html'),
+            'shippingAddressHtml' => $quote->getShippingAddress()->format('html'),
             'shippingMethod' => $this->getConfigValue(
                 'carriers/' . $this->getShippingMethod($quote) . '/title',
                 $quote
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/UpdateCreditmemoGridCurrencyCode.php b/app/code/Magento/Sales/Setup/Patch/Data/UpdateCreditmemoGridCurrencyCode.php
deleted file mode 100644
index b143ae7c3ba7f..0000000000000
--- a/app/code/Magento/Sales/Setup/Patch/Data/UpdateCreditmemoGridCurrencyCode.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Sales\Setup\Patch\Data;
-
-use Magento\Framework\DB\Adapter\Pdo\Mysql;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\Patch\DataPatchInterface;
-use Magento\Framework\Setup\Patch\PatchVersionInterface;
-use Magento\Sales\Setup\SalesSetup;
-use Magento\Sales\Setup\SalesSetupFactory;
-
-/**
- * Update credit memo grid currency code.
- */
-class UpdateCreditmemoGridCurrencyCode implements DataPatchInterface, PatchVersionInterface
-{
-    /**
-     * @var ModuleDataSetupInterface
-     */
-    private $moduleDataSetup;
-
-    /**
-     * @var SalesSetupFactory
-     */
-    private $salesSetupFactory;
-
-    /**
-     * @param ModuleDataSetupInterface $moduleDataSetup
-     * @param SalesSetupFactory $salesSetupFactory
-     */
-    public function __construct(
-        ModuleDataSetupInterface $moduleDataSetup,
-        SalesSetupFactory $salesSetupFactory
-    ) {
-        $this->moduleDataSetup = $moduleDataSetup;
-        $this->salesSetupFactory = $salesSetupFactory;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function apply()
-    {
-        /** @var SalesSetup $salesSetup */
-        $salesSetup = $this->salesSetupFactory->create(['setup' => $this->moduleDataSetup]);
-        /** @var Mysql $connection */
-        $connection = $salesSetup->getConnection();
-        $creditMemoGridTable = $salesSetup->getTable('sales_creditmemo_grid');
-        $orderTable = $salesSetup->getTable('sales_order');
-        $select = $connection->select();
-        $condition = 'so.entity_id = scg.order_id';
-        $select->join(['so' => $orderTable], $condition, ['order_currency_code', 'base_currency_code']);
-        $sql = $connection->updateFromSelect($select, ['scg' => $creditMemoGridTable]);
-        $connection->query($sql);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public static function getDependencies()
-    {
-        return [];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public static function getVersion()
-    {
-        return '2.0.13';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getAliases()
-    {
-        return [];
-    }
-}
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertRefundOrderStatusInCommentsHistoryActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertRefundOrderStatusInCommentsHistoryActionGroup.xml
index aefc8abc3f05c..e5b581e14d8b0 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertRefundOrderStatusInCommentsHistoryActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertRefundOrderStatusInCommentsHistoryActionGroup.xml
@@ -20,7 +20,7 @@
         <!-- Assert refund order status in Comments History -->
         <click selector="{{AdminOrderDetailsOrderViewSection.commentsHistory}}" stepKey="clickOnTabCommentsHistory"/>
         <waitForPageLoad stepKey="waitForComments"/>
-        <see userInput="{{orderStatus}}" selector="{{ViewOrderSection.orderStatus}}" stepKey="assertRefundOrderStatusInCommentsHistory"/>
-        <see userInput="{{refundMessage}}" selector="{{ViewOrderSection.capturedAmountTextUnsubmitted}}" stepKey="assertOrderStatus"/>
+        <see userInput="{{orderStatus}}" selector="{{AdminOrderCommentsTabSection.orderNotesList}}" stepKey="assertRefundOrderStatusInCommentsHistory"/>
+        <see userInput="{{refundMessage}}" selector="{{AdminOrderCommentsTabSection.orderComment}}" stepKey="assertOrderStatus"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml
index 68cd1c42e1dd8..75d41d835bed2 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminCreditMemoActionGroup.xml
@@ -19,7 +19,7 @@
             <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"/>
@@ -42,7 +42,7 @@
         <arguments>
             <argument name="product"/>
         </arguments>
-        
+
         <see selector="{{AdminCreditMemoItemsSection.skuColumn}}" userInput="{{product.sku}}" stepKey="seeProductSkuInGrid"/>
     </actionGroup>
 
@@ -59,8 +59,8 @@
         <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
         <waitForElementVisible selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="waitButtonEnabled"/>
         <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickSubmitCreditMemo"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You created the credit memo." stepKey="seeCreditMemoCreateSuccess"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You created the credit memo." stepKey="seeCreditMemoCreateSuccess"/>
         <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}$grabOrderId" stepKey="seeViewOrderPageCreditMemo"/>
     </actionGroup>
     <actionGroup name="UpdateCreditMemoTotalsActionGroup">
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
index 03639546631d1..8451f9de03293 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
@@ -99,8 +99,8 @@
         </annotations>
 
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
         <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
         <seeInCurrentUrl url="{{AdminOrderDetailsPage.url('$grabOrderId')}}" stepKey="seeViewOrderPageInvoice"/>
     </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenAndFillCreditMemoRefundActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenAndFillCreditMemoRefundActionGroup.xml
index 60134ee7e039c..da4c80bb28586 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenAndFillCreditMemoRefundActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenAndFillCreditMemoRefundActionGroup.xml
@@ -34,8 +34,9 @@
         <fillField userInput="{{shippingRefund}}" selector="{{AdminCreditMemoTotalSection.refundShipping}}" stepKey="fillShipping"/>
         <fillField userInput="{{adjustmentRefund}}" selector="{{AdminCreditMemoTotalSection.adjustmentRefund}}" stepKey="fillAdjustmentRefund"/>
         <fillField userInput="{{adjustmentFee}}" selector="{{AdminCreditMemoTotalSection.adjustmentFee}}" stepKey="fillAdjustmentFee"/>
+        <waitForElementVisible selector="{{AdminCreditMemoTotalSection.updateTotals}}" stepKey="waitForUpdateTotalsButton"/>
+        <click selector="{{AdminCreditMemoTotalSection.updateTotals}}" stepKey="clickUpdateTotals"/>
         <checkOption selector="{{AdminCreditMemoTotalSection.emailCopy}}" stepKey="checkSendEmailCopy"/>
-        <conditionalClick selector="{{AdminCreditMemoTotalSection.updateTotals}}" dependentSelector="{{AdminCreditMemoTotalSection.disabledUpdateTotals}}" visible="false" stepKey="clickUpdateTotalsButton"/>
     </actionGroup>
     
     <!-- Open and fill CreditMemo refund with back to stock -->
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index 3f178ae02102a..90e2aa8e12527 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -92,7 +92,7 @@
         <annotations>
             <description>Clears the Email, First Name, Last Name, Street Line 1, City, Postal Code and Phone fields when adding an Order and then verifies that they are required after attempting to Save.</description>
         </annotations>
-        
+
         <seeElement selector="{{AdminOrderFormAccountSection.requiredGroup}}" stepKey="seeCustomerGroupRequired"/>
         <seeElement selector="{{AdminOrderFormAccountSection.requiredEmail}}" stepKey="seeEmailRequired"/>
         <clearField selector="{{AdminOrderFormAccountSection.email}}" stepKey="clearEmailField"/>
@@ -181,7 +181,7 @@
         <annotations>
             <description>EXTENDS: addConfigurableProductToOrder. Selects the provided Option to the Configurable Product.</description>
         </annotations>
-        
+
         <waitForElementVisible selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_frontend_label)}}" stepKey="waitForConfigurablePopover"/>
         <selectOption selector="{{AdminOrderFormConfigureProductSection.optionSelect(attribute.default_frontend_label)}}" userInput="{{option.label}}" stepKey="selectionConfigurableOption"/>
     </actionGroup>
@@ -195,7 +195,7 @@
             <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"/>
@@ -213,7 +213,7 @@
             <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"/>
@@ -235,7 +235,7 @@
         <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>
@@ -320,6 +320,22 @@
         <selectOption selector="{{AdminOrderFormPaymentSection.flatRateOption}}" userInput="flatrate_flatrate" stepKey="checkFlatRate"/>
     </actionGroup>
 
+    <actionGroup name="changeShippingMethod">
+        <annotations>
+            <description>Change Shipping Method on the Admin 'Create New Order for' page.</description>
+        </annotations>
+        <arguments>
+            <argument name="shippingMethod" defaultValue="flatrate_flatrate" type="string"/>
+        </arguments>
+        <click selector="{{AdminOrderFormPaymentSection.header}}" stepKey="unfocus"/>
+        <waitForPageLoad stepKey="waitForJavascriptToFinish"/>
+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="clickShippingMethods1"/>
+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="waitForChangeShippingMethod"/>
+        <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="clickShippingMethods2"/>
+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.shippingMethod}}" stepKey="waitForShippingOptions2"/>
+        <selectOption selector="{{AdminOrderFormPaymentSection.shippingMethod}}" userInput="{{shippingMethod}}" stepKey="checkFlatRate"/>
+    </actionGroup>
+
     <!--Select free shipping method-->
     <actionGroup name="orderSelectFreeShipping">
         <annotations>
@@ -516,7 +532,7 @@
             <argument name="product"/>
             <argument name="customer"/>
         </arguments>
-        
+
         <amOnPage stepKey="navigateToNewOrderPage" url="{{AdminOrderCreatePage.url}}"/>
         <waitForPageLoad stepKey="waitForNewOrderPageOpened"/>
         <click stepKey="chooseCustomer" selector="{{AdminOrdersGridSection.customerInOrdersSection(customer.firstname)}}"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderSelectShippingMethodActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderSelectShippingMethodActionGroup.xml
new file mode 100644
index 0000000000000..b8493bf288378
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderSelectShippingMethodActionGroup.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="AdminOrderSelectShippingMethodActionGroup">
+        <annotations>
+            <description>Select Shipping method from admin order page.</description>
+        </annotations>
+        <arguments>
+            <argument name="methodTitle" type="string" defaultValue="flatrate"/>
+            <argument name="methodName" type="string" defaultValue="fixed"/>
+        </arguments>
+        <waitForElementVisible selector="{{AdminInvoicePaymentShippingSection.getShippingMethod}}" stepKey="waitForShippingMethodsOpen"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethod}}" stepKey="openShippingMethod"/>
+        <conditionalClick selector="{{AdminInvoicePaymentShippingSection.getShippingMethod}}" dependentSelector="{{AdminInvoicePaymentShippingSection.fixedPriceShippingMethod(methodTitle, methodName)}}" visible="false" stepKey="openShippingMethodSecondTime"/>
+        <waitForElementVisible selector="{{AdminInvoicePaymentShippingSection.fixedPriceShippingMethod(methodName, methodTitle)}}" stepKey="waitForShippingMethod"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.fixedPriceShippingMethod(methodName, methodTitle)}}" stepKey="chooseShippingMethod"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminShippingDescriptionInOrderViewActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminShippingDescriptionInOrderViewActionGroup.xml
new file mode 100644
index 0000000000000..1e4c0a958b2e4
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminShippingDescriptionInOrderViewActionGroup.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="AssertAdminShippingDescriptionInOrderViewActionGroup">
+        <annotations>
+            <description>Validates that the Shipping Description will shown in Shipping total description.</description>
+        </annotations>
+
+        <arguments>
+            <argument name="description" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{AdminOrderTotalSection.shippingDescription}}" time="30" stepKey="waitForElement"/>
+        <see selector="{{AdminOrderTotalSection.shippingDescription}}" userInput="{{description}}" stepKey="seeOrderTotalShippingDescription"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertStorefrontShippingDescriptionInOrderViewActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertStorefrontShippingDescriptionInOrderViewActionGroup.xml
new file mode 100644
index 0000000000000..27e91883eb15c
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertStorefrontShippingDescriptionInOrderViewActionGroup.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="AssertStorefrontShippingDescriptionInOrderViewActionGroup">
+        <annotations>
+            <description>Validates that the Shipping Description will shown in Shipping total description.</description>
+        </annotations>
+
+        <arguments>
+            <argument name="description" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{StorefrontOrderDetailsSection.shippingTotalDescription}}" time="30" stepKey="waitForElement"/>
+        <see selector="{{StorefrontOrderDetailsSection.shippingTotalDescription}}" userInput="{{description}}" stepKey="seeShippingTotalDescription"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml
index bc9486d61fbfe..680d44ebb34fe 100644
--- a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderCreatePage.xml
@@ -19,5 +19,6 @@
         <section name="AdminOrderFormTotalSection"/>
         <section name="AdminOrderFormStoreSelectorSection"/>
         <section name="AdminOrderFormDiscountSection"/>
+        <section name="AdminOrderFormMessagesSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
index fda886a839802..32e987bea919b 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
@@ -17,5 +17,7 @@
         <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']" timeout="60"/>
         <element name="shippingMethod" type="button" selector="//label[contains(text(), 'Fixed')]" timeout="60"/>
+        <element name="fixedPriceShippingMethod" type="button" selector="#s_method_{{methodName}}_{{methodTitle}}"  parameterized="true"/>
+        <element name="getShippingMethod" type="button" selector="#order-shipping-method-summary a"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml
index 19f447117959a..dce0875e29336 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCommentsTabSection.xml
@@ -11,5 +11,6 @@
     <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"/>
+        <element name="orderComment" type="text" selector="#Order_History .comments-block-item-comment"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml
index 71a96dc109385..653b1d48686e3 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml
@@ -13,6 +13,8 @@
         <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="orderInformationTable" type="block" selector=".order-information-table"/>
+        <element name="rate" type="text" selector="//table[contains(@class, 'order-information-table')]//th[contains(text(), 'rate:')]"/>
         <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"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml
index 2d1a4d5a4cbae..4fde9db1d21d8 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml
@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormBillingAddressSection">
+        <element name="selectAddress" type="select" selector="//select[@id='order-billing_address_customer_address_id']"/>
         <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"/>
@@ -38,4 +39,4 @@
         <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
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
index 8c093891ac46d..4f065ec7eb748 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormConfigureProductSection.xml
@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormConfigureProductSection">
+        <element name="configure" type="button" selector="//a[@product_id='{{productId}}']" parameterized="true"/>
         <element name="optionSelect" type="select" selector="//div[contains(@class,'product-options')]//select[//label[text() = '{{option}}']]" parameterized="true"/>
         <element name="optionSelectNew" type="select" selector="//label[text()='{{option1}}']/following-sibling::div/select" parameterized="true"/>
         <element name="quantity" type="input" selector="#product_composite_configure_input_qty"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormMessagesSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormMessagesSection.xml
new file mode 100644
index 0000000000000..b5e6f6b6ede83
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormMessagesSection.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="AdminOrderFormMessagesSection">
+        <element name="success" type="text" selector="#order-message div.message-success"/>
+        <element name="error" type="text" selector="#order-message div.message-error"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
index b31582552cccc..a478d79d8553f 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormPaymentSection">
+        <element name="shippingMethod" type="radio" selector="//input[@name='order[shipping_method]']"/>
         <element name="header" type="text" selector="#order-methods span.title"/>
         <element name="getShippingMethods" type="text" selector="#order-shipping_method a.action-default" timeout="30"/>
         <element name="flatRateOption" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml
index 88d90bc716576..83eb733c8d298 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml
@@ -17,7 +17,7 @@
         <element name="filters" type="button" selector="//div[@id='sales_order_view_tabs_order_invoices_content']//button[@data-action='grid-filter-expand']" timeout="30"/>
         <element name="applyFilters" type="button" selector="//div[@id='sales_order_view_tabs_order_invoices_content']//button[@data-action='grid-filter-apply']" timeout="30"/>
         <element name="invoiceId" type="input" selector="//div[@id='sales_order_view_tabs_order_invoices_content']//input[@name='increment_id']" timeout="30"/>
-        <element name="amountFrom" type="input" selector="[name='base_grand_total[from]']" timeout="30"/>
-        <element name="amountTo" type="input" selector="[name='base_grand_total[to]']" timeout="30"/>
+        <element name="amountFrom" type="input" selector="[name='grand_total[from]']" timeout="30"/>
+        <element name="amountTo" type="input" selector="[name='grand_total[to]']" timeout="30"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml
index 9b7356127df69..eb9c32d6ced9f 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderTotalSection.xml
@@ -11,6 +11,7 @@
     <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="shippingDescription" type="text" selector="//table[contains(@class, 'order-subtotal-table')]//td[contains(text(), 'Shipping &amp; Handling')]"/>
         <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>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderDetailsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderDetailsSection.xml
index c255e15cd6ecf..d262dfa9b010c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderDetailsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderDetailsSection.xml
@@ -12,6 +12,7 @@
         <element name="orderDetailsBlock" type="block" selector=".block-order-details-view"/>
         <element name="billingAddressBlock" type="block" selector=".box-order-billing-address > .box-content > address"/>
         <element name="discountSalesRule" type="text" selector="tr.discount span.price"/>
+        <element name="shippingTotalDescription" type="text" selector="#my-orders-table tr.shipping th.mark"/>
         <element name="grandTotalPrice" type="text" selector="tr.grand_total span.price"/>
         <element name="paymentMethod" type="text" selector=".box-order-billing-method dt.title"/>
         <element name="shippingMethod" type="text" selector=".box-order-shipping-method div.box-content"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml
index 76be3a1094327..589da3e49dc89 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml
@@ -46,8 +46,9 @@
         </actionGroup>
 
         <!-- Add product to cart -->
-        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
+        <actionGroup ref="StorefrontAddSimpleProductWithQtyActionGroup" stepKey="addSimpleProductToCart">
             <argument name="product" value="$$createProduct$$"/>
+            <argument name="quantity" value="2"/>
         </actionGroup>
 
         <!-- Login as admin -->
@@ -64,6 +65,7 @@
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
 
         <!-- Check product in customer's activities in shopping cart section -->
+        <see selector="{{AdminCreateOrderShoppingCartSection.shoppingCartBlock}}" userInput="Shopping Cart (2)" stepKey="seeCorrectNumberInCart"/>
         <see selector="{{AdminCustomerActivitiesShoppingCartSection.productName}}" userInput="$$createProduct.name$$" stepKey="seeProductNameInShoppingCartSection"/>
         <see selector="{{AdminCustomerActivitiesShoppingCartSection.productPrice}}" userInput="$$createProduct.price$$" stepKey="seeProductPriceInShoppingCartSection"/>
 
@@ -75,6 +77,6 @@
         <!-- Assert product in items ordered grid -->
         <see selector="{{AdminCustomerCreateNewOrderSection.productName}}" userInput="$$createProduct.name$$" stepKey="seeProductName"/>
         <see selector="{{AdminCustomerCreateNewOrderSection.productPrice}}" userInput="$$createProduct.price$$" stepKey="seeProductPrice"/>
-        <seeInField selector="{{AdminCustomerCreateNewOrderSection.productQty}}" userInput="{{ApiSimpleSingleQty.quantity}}" stepKey="seeProductQty"/>
+        <seeInField selector="{{AdminCustomerCreateNewOrderSection.productQty}}" userInput="2" stepKey="seeProductQty"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
index 1ad736ade37fc..4310d412d1c98 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
@@ -55,6 +55,9 @@
         <amOnPage url="{{AdminProductEditPage.url($$createBundleProduct.id$$)}}" stepKey="goToProductEditPage"/>
         <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
 
+        <!--Run re-index task-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <!--Go to bundle product page-->
         <amOnPage url="{{StorefrontProductPage.url($$createCategory.name$$)}}" stepKey="navigateToBundleProductPage"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
index f79ab822d964a..37a9b97fab064 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
@@ -64,8 +64,8 @@
         <!-- Create Invoice -->
         <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startInvoice"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
 
         <!-- Go to Sales > Orders > find out placed order and open -->
         <grabTextFrom selector="|Order # (\d+)|" stepKey="grabOrderId" />
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoConfigurableProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoConfigurableProductTest.xml
index 0522960a032fa..8a9369537f0a4 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoConfigurableProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoConfigurableProductTest.xml
@@ -123,8 +123,8 @@
         <!-- Create Invoice -->
         <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startInvoice"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
 
         <!-- Go to Sales > Orders > find out placed order and open -->
         <grabTextFrom selector="|Order # (\d+)|" stepKey="grabOrderId" />
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
index e9b37521259a0..4b618495f19d5 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
@@ -59,8 +59,8 @@
         <!-- Create Invoice -->
         <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startInvoice"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
 
         <!-- Go to Sales > Orders > find out placed order and open -->
         <grabTextFrom selector="|Order # (\d+)|" stepKey="grabOrderId" />
@@ -80,6 +80,7 @@
         <waitForPageLoad stepKey="waitForResultPage"/>
 
         <!-- Perform all assertions: assert refund success create message -->
+        <waitForElementVisible selector="{{AdminIndexManagementSection.successMessage}}" stepKey="waitForSuccessMessage"/>
         <see selector="{{AdminIndexManagementSection.successMessage}}" userInput="You created the credit memo." stepKey="assertRefundSuccessCreateMessage"/>
 
         <!-- Assert Credit Memo button -->
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
index 791792d0879a7..c552f93e62a4a 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
@@ -65,8 +65,8 @@
         <!-- Create Invoice -->
         <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startInvoice"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
 
         <!-- Go to Sales > Orders > find out placed order and open -->
         <grabTextFrom selector="|Order # (\d+)|" stepKey="grabOrderId" />
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
index 0a8e78d743c1d..57d9222d85096 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
@@ -68,8 +68,8 @@
         <!-- Create Invoice -->
         <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startInvoice"/>
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
 
         <!-- Go to Sales > Orders > find out placed order and open -->
         <grabTextFrom selector="|Order # (\d+)|" stepKey="grabOrderId" />
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderAddProductCheckboxTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderAddProductCheckboxTest.xml
new file mode 100644
index 0000000000000..bd13f7c847c34
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderAddProductCheckboxTest.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="AdminCreateOrderAddProductCheckboxTest">
+        <annotations>
+            <title value="Create Order in Admin and Add Product"/>
+            <stories value="Create order and add product using checkbox"/>
+            <description value="Create order in Admin panel, add product by clicking checkbox, and verify it is checked"/>
+            <features value="Sales"/>
+            <severity value="AVERAGE"/>
+            <group value="Sales"/>
+        </annotations>
+
+        <before>
+            <!-- Create simple customer -->
+            <createData entity="Simple_US_Customer_CA" stepKey="createSimpleCustomer"/>
+
+            <!-- Create simple product -->
+            <createData entity="ApiProductWithDescription" stepKey="createSimpleProduct"/>
+
+            <!-- Login to Admin Panel -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <!-- Initiate create new order -->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
+            <argument name="customer" value="$$createSimpleCustomer$$"/>
+        </actionGroup>
+
+        <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
+        <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="$$createSimpleProduct.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="selectProduct"/>
+        <seeCheckboxIsChecked selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="verifyProductChecked"/>
+
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createSimpleCustomer" stepKey="deleteSimpleCustomer"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderAndCheckTheReorderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderAndCheckTheReorderTest.xml
new file mode 100644
index 0000000000000..80697fd57736a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderAndCheckTheReorderTest.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="AdminCreateOrderAndCheckTheReorderTest">
+        <annotations>
+            <title value="'Reorder' button is not visible for customer if ordered item is out of stock"/>
+            <stories value="MAGETWO-63924: 'Reorder' button is not visible for customer if ordered item is out of stock"/>
+            <description value="'Reorder' button is not visible for customer if ordered item is out of stock"/>
+            <features value="Sales"/>
+            <testCaseId value="MC-22109"/>
+            <severity value="MAJOR"/>
+            <group value="Sales"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
+            <createData entity="CashOnDeliveryPaymentMethodDefault" stepKey="cashOnDeliveryPaymentMethod"/>
+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
+            <createData entity="SimpleProduct_25" stepKey="simpleProduct">
+                <field key="price">5</field>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
+            <argument name="customer" value="$$simpleCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder">
+            <argument name="product" value="$$simpleProduct$$"/>
+            <argument name="productQty" value="{{SimpleProduct_25.quantity}}"/>
+        </actionGroup>
+        <actionGroup ref="SelectCashOnDeliveryPaymentMethodActionGroup" stepKey="selectPaymentMethod"/>
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="orderSelectFlatRateShippingMethod"/>
+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
+        <actionGroup ref="OpenOrderById" stepKey="openOrder">
+            <argument name="orderId" value="$getOrderId"/>
+        </actionGroup>
+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="frontendCustomerLogIn">
+            <argument name="Customer" value="$$simpleCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontNavigateToCustomerOrdersHistoryPageActionGroup" stepKey="goToOrderHistoryPage"/>
+        <actionGroup ref="StorefrontCustomerReorderButtonNotVisibleActionGroup" stepKey="checkReorderButton"/>
+        <after>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
+            <actionGroup ref="logout" stepKey="adminLogout"/>
+            <magentoCLI command="config:set payment/cashondelivery/active 0" stepKey="disableCashOnDeliveryMethod"/>
+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderForCustomerWithTwoAddressesTaxableAndNonTaxableTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderForCustomerWithTwoAddressesTaxableAndNonTaxableTest.xml
new file mode 100644
index 0000000000000..d6bf0eec301db
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderForCustomerWithTwoAddressesTaxableAndNonTaxableTest.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="AdminCreateOrderForCustomerWithTwoAddressesTaxableAndNonTaxableTest">
+        <annotations>
+            <title value="Tax should not be displayed for non taxable address"/>
+            <stories value="MC-21699: Tax does not change when changing the billing address from Admin Panel"/>
+            <description value="Tax should not be displayed for non taxable address when switching from taxable address"/>
+            <testCaseId value="MC-21721"/>
+            <features value="Sales"/>
+            <severity value="MAJOR"/>
+            <group value="Sales"/>
+        </annotations>
+        <before>
+            <!--Enable flat rate shipping-->
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
+            <!--Enable free shipping method -->
+            <magentoCLI command="config:set {{EnableFreeShippingConfigData.path}} {{EnableFreeShippingConfigData.value}}" stepKey="enableFreeShipping"/>
+            <!--Create customer-->
+            <createData entity="Customer_With_Different_Default_Billing_Shipping_Addresses" stepKey="simpleCustomer"/>
+            <!--Create category-->
+            <createData entity="_defaultCategory" stepKey="category1"/>
+            <!--Create product1-->
+            <createData entity="_defaultProduct" stepKey="product1">
+                <requiredEntity createDataKey="category1"/>
+            </createData>
+            <!--Create tax rule for US-CA-->
+            <createData entity="defaultTaxRule" stepKey="createTaxRule"/>
+            <!--Login as admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <!--Step 1: Create new order for customer-->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
+            <argument name="customer" value="$$simpleCustomer$$"/>
+        </actionGroup>
+        <!--Step 2: Add product1 to the order-->
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder">
+            <argument name="product" value="$$product1$$"/>
+        </actionGroup>
+        <!--Step 2: Select taxable address as billing address-->
+        <selectOption selector="{{AdminOrderFormBillingAddressSection.selectAddress}}" userInput="{{US_Address_CA.state}}" stepKey="selectTaxableAddress" />
+        <!--Step 3: Select FlatRate shipping method-->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShippingMethod"/>
+        <!--Step 4: Verify that tax is applied to the order-->
+        <seeElement selector="{{AdminOrderFormTotalSection.total('Tax')}}" stepKey="seeTax" />
+        <!--Step 5: Select non taxable address as billing address-->
+        <selectOption selector="{{AdminOrderFormBillingAddressSection.selectAddress}}" userInput="{{US_Address_TX.state}}" stepKey="selectNonTaxableAddress" />
+        <!--Step 6: Change shipping method to Free-->
+        <actionGroup ref="changeShippingMethod" stepKey="changeShippingMethod">
+            <argument name="shippingMethod" value="freeshipping_freeshipping"/>
+        </actionGroup>
+        <!--Step 7: Verify that tax is not applied to the order-->
+        <dontSeeElement selector="{{AdminOrderFormTotalSection.total('Tax')}}" stepKey="dontSeeTax" />
+        <after>
+            <!--Delete product1-->
+            <deleteData createDataKey="product1" stepKey="deleteProduct1"/>
+            <!--Delete category-->
+            <deleteData createDataKey="category1" stepKey="deleteCategory1"/>
+            <!--Delete customer-->
+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
+            <!--Delete tax rule-->
+            <deleteData createDataKey="createTaxRule" stepKey="deleteTaxRule"/>
+            <!--Logout-->
+            <actionGroup ref="logout" stepKey="logout"/>
+            <!--Disable free shipping method -->
+            <magentoCLI command="config:set {{DisableFreeShippingConfigData.path}} {{DisableFreeShippingConfigData.value}}" stepKey="disableFreeShipping"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithSimpleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithSimpleProductTest.xml
new file mode 100644
index 0000000000000..85567374e36e4
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithSimpleProductTest.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="AdminCreateOrderWithSimpleProductTest">
+        <annotations>
+            <title value="Create Order in Admin with simple product"/>
+            <stories value="MAGETWO-12798: Create order with condition available product qty = ordered product qty"/>
+            <description value="Create order with simple product and assert if it gets out of stock after ordering it."/>
+            <features value="Sales"/>
+            <testCaseId value="MC-22110"/>
+            <severity value="MAJOR"/>
+            <group value="Sales"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
+            <createData entity="CashOnDeliveryPaymentMethodDefault" stepKey="cashOnDeliveryPaymentMethod"/>
+            <createData entity="Simple_US_Customer_CA" stepKey="simpleCustomer"/>
+            <createData entity="SimpleProduct_25" stepKey="simpleProduct">
+                <field key="price">5</field>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
+            <argument name="customer" value="$$simpleCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToOrder">
+            <argument name="product" value="$$simpleProduct$$"/>
+            <argument name="productQty" value="{{SimpleProduct_25.quantity}}"/>
+        </actionGroup>
+        <actionGroup ref="SelectCashOnDeliveryPaymentMethodActionGroup" stepKey="selectPaymentMethod"/>
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="orderSelectFlatRateShippingMethod"/>
+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
+        <actionGroup ref="verifyCreatedOrderInformation" stepKey="verifyCreatedOrderInformation"/>
+        <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
+        <actionGroup ref="OpenOrderById" stepKey="openOrder">
+            <argument name="orderId" value="$getOrderId"/>
+        </actionGroup>
+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
+        <actionGroup ref="AssertAdminProductStockStatusActionGroup" stepKey="checkProductStockStatus">
+            <argument name="productId" value="$$simpleProduct.id$$"/>
+            <argument name="stockStatus" value="Out of Stock"/>
+        </actionGroup>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <magentoCLI command="config:set payment/cashondelivery/active 0" stepKey="disableCashOnDeliveryMethod"/>
+            <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
index 5f6ea0937b52a..8bfcaf67c4332 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
@@ -57,7 +57,7 @@
         <!--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"/>
+        <dontSeeElement selector="{{AdminOrderFormMessagesSection.success}}" stepKey="seeSuccessMessage"/>
+        <seeElement selector="{{AdminOrderFormMessagesSection.error}}" stepKey="seeErrorMessage"/>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceTest.xml
index 587b23e857c0c..bddc114f5dd5e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceTest.xml
@@ -18,9 +18,6 @@
             <useCaseId value="MAGETWO-99691"/>
             <group value="sales"/>
             <group value="catalogRule"/>
-            <skip>
-                <issueId value="MC-17140"/>
-            </skip>
         </annotations>
         <before>
             <!--Create the catalog price rule -->
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
index 4c1f16192c88c..9da5afffb48e5 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
@@ -87,6 +87,8 @@
             <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigurableProduct"/>
             <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteProductAttribute"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomerIndexPage"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearCustomerGridFilter"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
@@ -98,6 +100,7 @@
         <waitForPageLoad stepKey="waitForCustomerEditPageToLoad"/>
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickOnCreateOrderButton"/>
         <waitForPageLoad stepKey="waitForOrderPageToLoad"/>
+        <conditionalClick selector="{{AdminOrderStoreScopeTreeSection.storeOption(_defaultStore.name)}}" dependentSelector="{{AdminOrderStoreScopeTreeSection.storeOption(_defaultStore.name)}}" visible="true" stepKey="selectStoreViewIfAppears"/>
 
         <!--Add configurable product to order-->
         <actionGroup ref="addConfigurableProductToOrderFromAdmin" stepKey="addConfigurableProductToOrder">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
index 9e794ce079b6e..0a39e8a0ac852 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
@@ -54,6 +54,9 @@
                 <requiredEntity createDataKey="createBundleOption"/>
                 <requiredEntity createDataKey="createSecondProduct"/>
             </createData>
+            <!-- Change configuration -->
+            <magentoCLI command="config:set reports/options/enabled 1" stepKey="enableReportModule"/>
+
             <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         </before>
         <after>
@@ -73,6 +76,9 @@
 
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Change configuration -->
+            <magentoCLI command="config:set reports/options/enabled 0" stepKey="disableReportModule"/>
         </after>
 
         <!-- Login as customer -->
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml
index 35dc49d2b8a43..aed7447050e5f 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml
@@ -57,6 +57,8 @@
                 <requiredEntity createDataKey="createConfigProduct"/>
                 <requiredEntity createDataKey="createConfigChildProduct"/>
             </createData>
+            <!-- Change configuration -->
+            <magentoCLI command="config:set reports/options/enabled 1" stepKey="enableReportModule"/>
         </before>
         <after>
             <!-- Admin logout -->
@@ -75,6 +77,9 @@
 
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Change configuration -->
+            <magentoCLI command="config:set reports/options/enabled 0" stepKey="disableReportModule"/>
         </after>
 
         <!-- Login as customer -->
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml
index 5c0d405102464..0bd8ab4855e97 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml
@@ -19,6 +19,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI command="downloadable:domains:add" arguments="example.com static.magento.com" stepKey="addDownloadableDomain"/>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
             <createData entity="ApiCategory" stepKey="createCategory"/>
 
@@ -207,6 +208,7 @@
             <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRate"/>
         </before>
         <after>
+            <magentoCLI command="downloadable:domains:remove" arguments="example.com static.magento.com" stepKey="removeDownloadableDomain"/>
             <deleteData createDataKey="downloadableProduct" stepKey="deleteProduct"/>
 
             <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
@@ -275,4 +277,4 @@
         <see userInput="Flat Rate - Fixed" selector="{{StorefrontOrderDetailsSection.shippingMethod}}" stepKey="assertShippingMethodOnPrintOrder"/>
         <switchToPreviousTab stepKey="switchToPreviousTab"/>
     </test>
-</tests>
\ No newline at end of file
+</tests>
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
index 94148cc515382..2b08daf02134e 100644
--- 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
@@ -95,6 +95,11 @@ protected function setUp()
                 '_orderCreate' => $this->orderCreate
             ]
         );
+
+        // Do not display VAT validation button on edit order address form
+        // Emulate fix done in controller
+        /** @see \Magento\Sales\Controller\Adminhtml\Order\Address::execute */
+        $this->addressBlock->setDisplayVatValidationButton(false);
     }
 
     public function testGetForm()
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/AddCommentTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
index 053df53949296..9fe3042fa6bdf 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order\Invoice;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -186,7 +189,8 @@ protected function setUp()
                 'invoiceCommentSender' => $this->commentSenderMock,
                 'resultPageFactory' => $this->resultPageFactoryMock,
                 'resultRawFactory' => $this->resultRawFactoryMock,
-                'resultJsonFactory' => $this->resultJsonFactoryMock
+                'resultJsonFactory' => $this->resultJsonFactoryMock,
+                'invoiceRepository' => $this->invoiceRepository
             ]
         );
 
@@ -230,8 +234,9 @@ public function testExecute()
         $invoiceMock->expects($this->once())
             ->method('addComment')
             ->with($data['comment'], false, false);
-        $invoiceMock->expects($this->once())
-            ->method('save');
+        $this->invoiceRepository->expects($this->once())
+            ->method('save')
+            ->with($invoiceMock);
 
         $this->invoiceRepository->expects($this->once())
             ->method('get')
@@ -307,11 +312,11 @@ public function testExecuteModelException()
     public function testExecuteException()
     {
         $response = ['error' => true, 'message' => 'Cannot add new comment.'];
-        $e = new \Exception('test');
+        $error = new \Exception('test');
 
         $this->requestMock->expects($this->once())
             ->method('getParam')
-            ->will($this->throwException($e));
+            ->will($this->throwException($error));
 
         $this->resultJsonFactoryMock->expects($this->once())
             ->method('create')
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 565d51ff515a2..f32ce7aa4715b 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
@@ -100,16 +100,18 @@ public function testCollect($orderData, $creditmemoData, $expectedResults)
         }
         $this->creditmemo->expects($this->any())
             ->method('roundPrice')
-            ->will($this->returnCallback(
-                function ($price, $type) use (&$roundingDelta) {
-                    if (!isset($roundingDelta[$type])) {
-                        $roundingDelta[$type] = 0;
+            ->will(
+                $this->returnCallback(
+                    function ($price, $type) use (&$roundingDelta) {
+                        if (!isset($roundingDelta[$type])) {
+                            $roundingDelta[$type] = 0;
+                        }
+                        $roundedPrice = round($price + $roundingDelta[$type], 2);
+                        $roundingDelta[$type] = $price - $roundedPrice;
+                        return $roundedPrice;
                     }
-                    $roundedPrice = round($price + $roundingDelta[$type], 2);
-                    $roundingDelta[$type] = $price - $roundedPrice;
-                    return $roundedPrice;
-                }
-            ));
+                )
+            );
 
         $this->model->collect($this->creditmemo);
 
@@ -610,6 +612,143 @@ public function collectDataProvider()
             ],
         ];
 
+        // scenario 6: 2 items, 2 invoiced, price includes tax, full discount, free shipping
+        // partial credit memo, make sure that discount tax compensation (with 100 % discount) is calculated correctly
+        $result['collect_with_full_discount_product_price'] = [
+            'order_data' => [
+                'data_fields' => [
+                    'discount_amount' => -200.00,
+                    'discount_invoiced' => -200.00,
+                    'subtotal' => 181.82,
+                    'subtotal_incl_tax' => 200,
+                    'base_subtotal' => 181.82,
+                    'base_subtotal_incl_tax' => 200,
+                    'subtotal_invoiced' => 181.82,
+                    'discount_tax_compensation_amount' => 18.18,
+                    'discount_tax_compensation_invoiced' => 18.18,
+                    'base_discount_tax_compensation_amount' => 18.18,
+                    'base_discount_tax_compensation_invoiced' => 18.18,
+                    'grand_total' => 0,
+                    'base_grand_total' => 0,
+                    'shipping_tax_amount' => 0,
+                    'base_shipping_tax_amount' => 0,
+                    'shipping_discount_tax_compensation_amount' => 0,
+                    'base_shipping_discount_tax_compensation_amount' => 0,
+                    'tax_amount' => 0,
+                    'base_tax_amount' => 0,
+                    'tax_invoiced' => 0,
+                    'base_tax_invoiced' => 0,
+                    'tax_refunded' => 0,
+                    'base_tax_refunded' => 0,
+                    'base_shipping_amount' => 0,
+                ],
+            ],
+            'creditmemo_data' => [
+                'items' => [
+                    'item_1' => [
+                        'order_item' => [
+                            'qty_invoiced' => 1,
+                            'tax_amount' => 0,
+                            'tax_invoiced' => 0,
+                            'tax_refunded' => null,
+                            'base_tax_amount' => 0,
+                            'base_tax_invoiced' => 0,
+                            'base_tax_refunded' => 0,
+                            'tax_percent' => 10,
+                            'qty_refunded' => 0,
+                            'discount_percent' => 100,
+                            'discount_amount' => 100,
+                            'base_discount_amount' => 100,
+                            'discount_invoiced' => 100,
+                            'base_discount_invoiced' => 100,
+                            'row_total' => 90.91,
+                            'base_row_total' => 90.91,
+                            'row_invoiced' => 90.91,
+                            'base_row_invoiced' => 90.91,
+                            'price_incl_tax' => 100,
+                            'base_price_incl_tax' => 100,
+                            'row_total_incl_tax' => 100,
+                            'base_row_total_incl_tax' => 100,
+                            'discount_tax_compensation_amount' => 9.09,
+                            'base_discount_tax_compensation_amount' => 9.09,
+                            'discount_tax_compensation_invoiced' => 9.09,
+                            'base_discount_tax_compensation_invoiced' => 9.09,
+                        ],
+                        'is_last' => true,
+                        'qty' => 1,
+                    ],
+                    'item_2' => [
+                        'order_item' => [
+                            'qty_invoiced' => 1,
+                            'tax_amount' => 0,
+                            'tax_invoiced' => 0,
+                            'tax_refunded' => null,
+                            'base_tax_amount' => 0,
+                            'base_tax_invoiced' => 0,
+                            'base_tax_refunded' => null,
+                            'tax_percent' => 10,
+                            'qty_refunded' => 0,
+                            'discount_percent' => 100,
+                            'discount_amount' => 100,
+                            'base_discount_amount' => 100,
+                            'discount_invoiced' => 100,
+                            'base_discount_invoiced' => 100,
+                            'row_total' => 90.91,
+                            'base_row_total' => 90.91,
+                            'row_invoiced' => 90.91,
+                            'base_row_invoiced' => 90.91,
+                            'price_incl_tax' => 100,
+                            'base_price_incl_tax' => 100,
+                            'row_total_incl_tax' => 100,
+                            'base_row_total_incl_tax' => 100,
+                            'discount_tax_compensation_amount' => 9.09,
+                            'base_discount_tax_compensation_amount' => 9.09,
+                            'discount_tax_compensation_invoiced' => 9.09,
+                            'base_discount_tax_compensation_invoiced' => 9.09,
+                        ],
+                        'is_last' => false,
+                        'qty' => 0,
+                    ],
+                ],
+                'is_last' => false,
+                'data_fields' => [
+                    'grand_total' => -9.09,
+                    'base_grand_total' => -9.09,
+                    'base_shipping_amount' => 0,
+                    'tax_amount' => 0,
+                    'base_tax_amount' => 0,
+                    'invoice' => new MagentoObject(
+                        [
+                            'shipping_tax_amount' => 0,
+                            'base_shipping_tax_amount' => 0,
+                            'shipping_discount_tax_compensation_amount' => 0,
+                            'base_shipping_discount_tax_compensation_amount' => 0,
+                        ]
+                    ),
+                ],
+            ],
+            'expected_results' => [
+                'creditmemo_items' => [
+                    'item_1' => [
+                        'tax_amount' => 0,
+                        'base_tax_amount' => 0,
+                    ],
+                    'item_2' => [
+                        'tax_amount' => 0,
+                        'base_tax_amount' => 0,
+                    ],
+                ],
+                'creditmemo_data' => [
+                    'grand_total' => 0,
+                    'base_grand_total' => 0,
+                    'tax_amount' => 0,
+                    'base_tax_amount' => 0,
+                    'shipping_tax_amount' => 0,
+                    'base_shipping_tax_amount' => 0,
+                ],
+            ],
+        ];
+
         return $result;
     }
 
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 68e1c7c17cd1c..d255f88dea359 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
@@ -78,6 +78,21 @@ public function testGetEmailCopyTo()
         $this->assertEquals(['test_value', 'test_value2'], $result);
     }
 
+    public function testGetEmailCopyToWithSpaceEmail()
+    {
+        $this->scopeConfigInterfaceMock->expects($this->once())
+            ->method('getValue')
+            ->with(
+                $this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_COPY_TO),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+                $this->equalTo($this->storeId)
+            )
+            ->will($this->returnValue('test_value, test_value2'));
+        $this->identity->setStore($this->storeMock);
+        $result = $this->identity->getEmailCopyTo();
+        $this->assertEquals(['test_value', 'test_value2'], $result);
+    }
+
     public function testGetEmailCopyToEmptyResult()
     {
         $this->scopeConfigInterfaceMock->expects($this->once())
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 3da6dfe78eb40..1e3ff11ea73c1 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
@@ -78,6 +78,21 @@ public function testGetEmailCopyTo()
         $this->assertEquals(['test_value', 'test_value2'], $result);
     }
 
+    public function testGetEmailCopyToWithSpaceEmail()
+    {
+        $this->scopeConfigInterfaceMock->expects($this->once())
+            ->method('getValue')
+            ->with(
+                $this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_COPY_TO),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+                $this->equalTo($this->storeId)
+            )
+            ->will($this->returnValue('test_value, test_value2'));
+        $this->identity->setStore($this->storeMock);
+        $result = $this->identity->getEmailCopyTo();
+        $this->assertEquals(['test_value', 'test_value2'], $result);
+    }
+
     public function testGetEmailCopyToEmptyResult()
     {
         $this->scopeConfigInterfaceMock->expects($this->once())
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 b7ec911212254..5eeaa12a736f6 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
@@ -78,6 +78,21 @@ public function testGetEmailCopyTo()
         $this->assertEquals(['test_value', 'test_value2'], $result);
     }
 
+    public function testGetEmailCopyToWithSpaceEmail()
+    {
+        $this->scopeConfigInterfaceMock->expects($this->once())
+            ->method('getValue')
+            ->with(
+                $this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_COPY_TO),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+                $this->equalTo($this->storeId)
+            )
+            ->will($this->returnValue('test_value, test_value2'));
+        $this->identity->setStore($this->storeMock);
+        $result = $this->identity->getEmailCopyTo();
+        $this->assertEquals(['test_value', 'test_value2'], $result);
+    }
+
     public function testGetEmailCopyToEmptyResult()
     {
         $this->scopeConfigInterfaceMock->expects($this->once())
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 4a63541bc05f2..3328d2f35b2b3 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
@@ -78,6 +78,21 @@ public function testGetEmailCopyTo()
         $this->assertEquals(['test_value', 'test_value2'], $result);
     }
 
+    public function testGetEmailCopyToWithSpaceEmail()
+    {
+        $this->scopeConfigInterfaceMock->expects($this->once())
+            ->method('getValue')
+            ->with(
+                $this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_COPY_TO),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+                $this->equalTo($this->storeId)
+            )
+            ->will($this->returnValue('test_value, test_value2'));
+        $this->identity->setStore($this->storeMock);
+        $result = $this->identity->getEmailCopyTo();
+        $this->assertEquals(['test_value', 'test_value2'], $result);
+    }
+
     public function testGetEmailCopyToEmptyResult()
     {
         $this->scopeConfigInterfaceMock->expects($this->once())
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 1dc53b97711ab..0892ba34114be 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
@@ -78,6 +78,21 @@ public function testGetEmailCopyTo()
         $this->assertEquals(['test_value', 'test_value2'], $result);
     }
 
+    public function testGetEmailCopyToWithSpaceEmail()
+    {
+        $this->scopeConfigInterfaceMock->expects($this->once())
+            ->method('getValue')
+            ->with(
+                $this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_COPY_TO),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+                $this->equalTo($this->storeId)
+            )
+            ->will($this->returnValue('test_value, test_value2'));
+        $this->identity->setStore($this->storeMock);
+        $result = $this->identity->getEmailCopyTo();
+        $this->assertEquals(['test_value', 'test_value2'], $result);
+    }
+
     public function testGetEmailCopyToEmptyResult()
     {
         $this->scopeConfigInterfaceMock->expects($this->once())
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 f554c2aeef168..54d1ab872fb1d 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
@@ -78,6 +78,21 @@ public function testGetEmailCopyTo()
         $this->assertEquals(['test_value', 'test_value2'], $result);
     }
 
+    public function testGetEmailCopyToWithSpaceEmail()
+    {
+        $this->scopeConfigInterfaceMock->expects($this->once())
+            ->method('getValue')
+            ->with(
+                $this->equalTo(OrderIdentity::XML_PATH_EMAIL_COPY_TO),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+                $this->equalTo($this->storeId)
+            )
+            ->will($this->returnValue('test_value, test_value2'));
+        $this->identity->setStore($this->storeMock);
+        $result = $this->identity->getEmailCopyTo();
+        $this->assertEquals(['test_value', 'test_value2'], $result);
+    }
+
     public function testGetEmailCopyToEmptyResult()
     {
         $this->scopeConfigInterfaceMock->expects($this->once())
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 a8d676be2a2f1..ff62b46e0cac9 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
@@ -78,6 +78,21 @@ public function testGetEmailCopyTo()
         $this->assertEquals(['test_value', 'test_value2'], $result);
     }
 
+    public function testGetEmailCopyToWithSpaceEmail()
+    {
+        $this->scopeConfigInterfaceMock->expects($this->once())
+            ->method('getValue')
+            ->with(
+                $this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_COPY_TO),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+                $this->equalTo($this->storeId)
+            )
+            ->will($this->returnValue('test_value, test_value2'));
+        $this->identity->setStore($this->storeMock);
+        $result = $this->identity->getEmailCopyTo();
+        $this->assertEquals(['test_value', 'test_value2'], $result);
+    }
+
     public function testGetEmailCopyToEmptyResult()
     {
         $this->scopeConfigInterfaceMock->expects($this->once())
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 503646a5eac61..bccf109783913 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
@@ -78,6 +78,21 @@ public function testGetEmailCopyTo()
         $this->assertEquals(['test_value', 'test_value2'], $result);
     }
 
+    public function testGetEmailCopyToWithSpaceEmail()
+    {
+        $this->scopeConfigInterfaceMock->expects($this->once())
+            ->method('getValue')
+            ->with(
+                $this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_COPY_TO),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
+                $this->equalTo($this->storeId)
+            )
+            ->will($this->returnValue('test_value, test_value2'));
+        $this->identity->setStore($this->storeMock);
+        $result = $this->identity->getEmailCopyTo();
+        $this->assertEquals(['test_value', 'test_value2'], $result);
+    }
+
     public function testGetEmailCopyToEmptyResult()
     {
         $this->scopeConfigInterfaceMock->expects($this->once())
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 2297d6aa711cf..2f4e0e927db2c 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
@@ -92,12 +92,16 @@ public function stepMockSetup()
 
         $this->storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getStoreId', '__wakeup']);
 
-        $this->orderMock = $this->createPartialMock(\Magento\Sales\Model\Order::class, [
+        $this->orderMock = $this->createPartialMock(
+            \Magento\Sales\Model\Order::class,
+            [
                 'getStore', 'getBillingAddress', 'getPayment',
                 '__wakeup', 'getCustomerIsGuest', 'getCustomerName',
                 'getCustomerEmail', 'getShippingAddress', 'setSendEmail',
-                'setEmailSent'
-            ]);
+                'setEmailSent', 'getCreatedAtFormatted', 'getIsNotVirtual',
+                'getEmailCustomerNote', 'getFrontendStatusLabel'
+            ]
+        );
         $this->orderMock->expects($this->any())
             ->method('getStore')
             ->will($this->returnValue($this->storeMock));
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php
index 3b97c8451d32c..40e7ce4568d20 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php
@@ -59,6 +59,16 @@ public function testSendVirtualOrder()
     {
         $this->orderMock->setData(\Magento\Sales\Api\Data\OrderInterface::IS_VIRTUAL, true);
         $billingAddress = $this->addressMock;
+        $customerName = 'test customer';
+        $frontendStatusLabel = 'Complete';
+
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+        $this->orderMock->expects($this->once())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
+
         $this->templateContainerMock->expects($this->once())
             ->method('setTemplateVars')
             ->with(
@@ -70,7 +80,11 @@ public function testSendVirtualOrder()
                         'billing' => $billingAddress,
                         'store' => $this->storeMock,
                         'formattedShippingAddress' => null,
-                        'formattedBillingAddress' => 1
+                        'formattedBillingAddress' => 1,
+                        'order_data' => [
+                            'customer_name' => $customerName,
+                            'frontend_status_label' => $frontendStatusLabel
+                        ]
                     ]
                 )
             );
@@ -83,6 +97,15 @@ public function testSendTrueWithCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
+        $customerName = 'test customer';
+        $frontendStatusLabel = 'Complete';
+
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+        $this->orderMock->expects($this->once())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
 
         $this->orderMock->expects($this->once())
             ->method('getCustomerIsGuest')
@@ -102,7 +125,11 @@ public function testSendTrueWithCustomerCopy()
                         'billing' => $billingAddress,
                         'store' => $this->storeMock,
                         'formattedShippingAddress' => 1,
-                        'formattedBillingAddress' => 1
+                        'formattedBillingAddress' => 1,
+                        'order_data' => [
+                            'customer_name' => $customerName,
+                            'frontend_status_label' => $frontendStatusLabel
+                        ]
                     ]
                 )
             );
@@ -115,6 +142,15 @@ public function testSendTrueWithoutCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
+        $customerName = 'test customer';
+        $frontendStatusLabel = 'Complete';
+
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+        $this->orderMock->expects($this->once())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
 
         $this->orderMock->expects($this->once())
             ->method('getCustomerIsGuest')
@@ -134,7 +170,11 @@ public function testSendTrueWithoutCustomerCopy()
                         'comment' => $comment,
                         'store' => $this->storeMock,
                         'formattedShippingAddress' => 1,
-                        'formattedBillingAddress' => 1
+                        'formattedBillingAddress' => 1,
+                        'order_data' => [
+                            'customer_name' => $customerName,
+                            'frontend_status_label' => $frontendStatusLabel
+                        ]
                     ]
                 )
             );
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
index 287daa2fba4b9..72a51a15db592 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
@@ -90,6 +90,9 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
         $comment = 'comment_test';
         $address = 'address_test';
         $configPath = 'sales_email/general/async_sending';
+        $customerName = 'test customer';
+        $frontendStatusLabel = 'Processing';
+        $isNotVirtual = true;
 
         $this->creditmemoMock->expects($this->once())
             ->method('setSendEmail')
@@ -118,6 +121,22 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                 ->method('getCustomerNote')
                 ->willReturn($comment);
 
+            $this->orderMock->expects($this->any())
+                ->method('getCustomerName')
+                ->willReturn($customerName);
+
+            $this->orderMock->expects($this->once())
+                ->method('getIsNotVirtual')
+                ->willReturn($isNotVirtual);
+
+            $this->orderMock->expects($this->once())
+                ->method('getEmailCustomerNote')
+                ->willReturn('');
+
+            $this->orderMock->expects($this->once())
+                ->method('getFrontendStatusLabel')
+                ->willReturn($frontendStatusLabel);
+
             $this->templateContainerMock->expects($this->once())
                 ->method('setTemplateVars')
                 ->with(
@@ -129,7 +148,13 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                         'payment_html' => 'payment',
                         'store' => $this->storeMock,
                         'formattedShippingAddress' => $address,
-                        'formattedBillingAddress' => $address
+                        'formattedBillingAddress' => $address,
+                        'order_data' => [
+                            'customer_name' => $customerName,
+                            'is_not_virtual' => $isNotVirtual,
+                            'email_customer_note' => '',
+                            'frontend_status_label' => $frontendStatusLabel
+                        ]
                     ]
                 );
 
@@ -211,9 +236,28 @@ public function sendDataProvider()
     public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expectedShippingAddress)
     {
         $billingAddress = 'address_test';
+        $customerName = 'test customer';
+        $frontendStatusLabel = 'Complete';
+        $isNotVirtual = false;
 
         $this->orderMock->setData(\Magento\Sales\Api\Data\OrderInterface::IS_VIRTUAL, $isVirtualOrder);
 
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+
+        $this->orderMock->expects($this->once())
+            ->method('getIsNotVirtual')
+            ->willReturn($isNotVirtual);
+
+        $this->orderMock->expects($this->once())
+            ->method('getEmailCustomerNote')
+            ->willReturn('');
+
+        $this->orderMock->expects($this->once())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
+
         $this->creditmemoMock->expects($this->once())
             ->method('setSendEmail')
             ->with(false);
@@ -247,7 +291,14 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
                     'payment_html' => 'payment',
                     'store' => $this->storeMock,
                     'formattedShippingAddress' => $expectedShippingAddress,
-                    'formattedBillingAddress' => $billingAddress
+                    'formattedBillingAddress' => $billingAddress,
+                    'order_data' => [
+                        'customer_name' => $customerName,
+                        'is_not_virtual' => $isNotVirtual,
+                        'email_customer_note' => '',
+                        'frontend_status_label' => $frontendStatusLabel
+                    ]
+
                 ]
             );
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
index 3e29bf04e358d..f0a05586cd972 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
@@ -63,9 +63,20 @@ public function testSendTrueWithCustomerCopy()
         $billingAddress = $this->addressMock;
         $this->stepAddressFormat($billingAddress);
         $comment = 'comment_test';
+        $customerName = 'Test Customer';
+        $frontendStatusLabel = 'Processing';
         $this->orderMock->expects($this->once())
             ->method('getCustomerIsGuest')
             ->will($this->returnValue(false));
+
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+
+        $this->orderMock->expects($this->any())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
+
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
             ->will($this->returnValue(true));
@@ -80,7 +91,11 @@ public function testSendTrueWithCustomerCopy()
                         'billing' => $billingAddress,
                         'store' => $this->storeMock,
                         'formattedShippingAddress' => 1,
-                        'formattedBillingAddress' => 1
+                        'formattedBillingAddress' => 1,
+                        'order_data' => [
+                            'customer_name' => $customerName,
+                            'frontend_status_label' => $frontendStatusLabel
+                        ]
                     ]
                 )
             );
@@ -93,12 +108,22 @@ public function testSendTrueWithCustomerCopy()
     public function testSendTrueWithoutCustomerCopy()
     {
         $billingAddress = $this->addressMock;
+        $customerName = 'Test Customer';
+        $frontendStatusLabel = 'Processing';
         $this->stepAddressFormat($billingAddress);
         $comment = 'comment_test';
         $this->orderMock->expects($this->once())
             ->method('getCustomerIsGuest')
             ->will($this->returnValue(false));
 
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+
+        $this->orderMock->expects($this->any())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
+
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
             ->will($this->returnValue(true));
@@ -113,7 +138,11 @@ public function testSendTrueWithoutCustomerCopy()
                         'comment' => $comment,
                         'store' => $this->storeMock,
                         'formattedShippingAddress' => 1,
-                        'formattedBillingAddress' => 1
+                        'formattedBillingAddress' => 1,
+                        'order_data' => [
+                            'customer_name' => $customerName,
+                            'frontend_status_label' => $frontendStatusLabel
+                        ]
                     ]
                 )
             );
@@ -127,6 +156,16 @@ public function testSendVirtualOrder()
         $isVirtualOrder = true;
         $this->orderMock->setData(\Magento\Sales\Api\Data\OrderInterface::IS_VIRTUAL, $isVirtualOrder);
         $this->stepAddressFormat($this->addressMock, $isVirtualOrder);
+        $customerName = 'Test Customer';
+        $frontendStatusLabel = 'Complete';
+
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+
+        $this->orderMock->expects($this->any())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
 
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
@@ -142,7 +181,11 @@ public function testSendVirtualOrder()
                         'comment' => '',
                         'store' => $this->storeMock,
                         'formattedShippingAddress' => null,
-                        'formattedBillingAddress' => 1
+                        'formattedBillingAddress' => 1,
+                        'order_data' => [
+                            'customer_name' => $customerName,
+                            'frontend_status_label' => $frontendStatusLabel
+                        ]
                     ]
                 )
             );
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
index 3315ec8eb4196..00a1855055a84 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
@@ -90,6 +90,9 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
         $comment = 'comment_test';
         $address = 'address_test';
         $configPath = 'sales_email/general/async_sending';
+        $customerName = 'Test Customer';
+        $isNotVirtual = true;
+        $frontendStatusLabel = 'Processing';
 
         $this->invoiceMock->expects($this->once())
             ->method('setSendEmail')
@@ -116,6 +119,22 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                 ->method('getShippingAddress')
                 ->willReturn($addressMock);
 
+            $this->orderMock->expects($this->any())
+                ->method('getCustomerName')
+                ->willReturn($customerName);
+
+            $this->orderMock->expects($this->once())
+                ->method('getIsNotVirtual')
+                ->willReturn($isNotVirtual);
+
+            $this->orderMock->expects($this->once())
+                ->method('getEmailCustomerNote')
+                ->willReturn('');
+
+            $this->orderMock->expects($this->once())
+                ->method('getFrontendStatusLabel')
+                ->willReturn($frontendStatusLabel);
+
             $this->invoiceMock->expects($this->once())
                 ->method('getCustomerNoteNotify')
                 ->willReturn($customerNoteNotify);
@@ -135,7 +154,13 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                         'payment_html' => 'payment',
                         'store' => $this->storeMock,
                         'formattedShippingAddress' => $address,
-                        'formattedBillingAddress' => $address
+                        'formattedBillingAddress' => $address,
+                        'order_data' => [
+                            'customer_name' => $customerName,
+                            'is_not_virtual' => $isNotVirtual,
+                            'email_customer_note' => '',
+                            'frontend_status_label' => $frontendStatusLabel
+                        ]
                     ]
                 );
 
@@ -216,6 +241,9 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
     {
         $billingAddress = 'address_test';
         $this->orderMock->setData(\Magento\Sales\Api\Data\OrderInterface::IS_VIRTUAL, $isVirtualOrder);
+        $customerName = 'Test Customer';
+        $frontendStatusLabel = 'Complete';
+        $isNotVirtual = false;
 
         $this->invoiceMock->expects($this->once())
             ->method('setSendEmail')
@@ -238,6 +266,21 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
         $this->invoiceMock->expects($this->once())
             ->method('getCustomerNoteNotify')
             ->willReturn(false);
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+
+        $this->orderMock->expects($this->once())
+            ->method('getIsNotVirtual')
+            ->willReturn($isNotVirtual);
+
+        $this->orderMock->expects($this->once())
+            ->method('getEmailCustomerNote')
+            ->willReturn('');
+
+        $this->orderMock->expects($this->once())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
 
         $this->templateContainerMock->expects($this->once())
             ->method('setTemplateVars')
@@ -250,7 +293,13 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
                     'payment_html' => 'payment',
                     'store' => $this->storeMock,
                     'formattedShippingAddress' => $expectedShippingAddress,
-                    'formattedBillingAddress' => $billingAddress
+                    'formattedBillingAddress' => $billingAddress,
+                    'order_data' => [
+                        'customer_name' => $customerName,
+                        'is_not_virtual' => false,
+                        'email_customer_note' => '',
+                        'frontend_status_label' => $frontendStatusLabel
+                    ]
                 ]
             );
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php
index e5d6cacb25637..049cc75d3e42c 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php
@@ -40,10 +40,18 @@ public function testSendTrue()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
+        $customerName='Test Customer';
+        $frontendStatusLabel='Processing';
         $this->stepAddressFormat($billingAddress);
         $this->orderMock->expects($this->once())
             ->method('getCustomerIsGuest')
             ->will($this->returnValue(false));
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+        $this->orderMock->expects($this->once())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
 
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
@@ -58,7 +66,11 @@ public function testSendTrue()
                         'comment' => $comment,
                         'store' => $this->storeMock,
                         'formattedShippingAddress' => 1,
-                        'formattedBillingAddress' => 1
+                        'formattedBillingAddress' => 1,
+                        'order_data' => [
+                            'customer_name' => $customerName,
+                            'frontend_status_label' => $frontendStatusLabel
+                        ]
                     ]
                 )
             );
@@ -72,10 +84,18 @@ public function testSendVirtualOrder()
         $isVirtualOrder = true;
         $this->orderMock->setData(\Magento\Sales\Api\Data\OrderInterface::IS_VIRTUAL, $isVirtualOrder);
         $this->stepAddressFormat($this->addressMock, $isVirtualOrder);
+        $customerName='Test Customer';
+        $frontendStatusLabel='Complete';
 
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
             ->will($this->returnValue(false));
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+        $this->orderMock->expects($this->once())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
         $this->templateContainerMock->expects($this->once())
             ->method('setTemplateVars')
             ->with(
@@ -86,7 +106,11 @@ public function testSendVirtualOrder()
                         'billing' => $this->addressMock,
                         'store' => $this->storeMock,
                         'formattedShippingAddress' => null,
-                        'formattedBillingAddress' => 1
+                        'formattedBillingAddress' => 1,
+                        'order_data' => [
+                            'customer_name' => $customerName,
+                            'frontend_status_label' => $frontendStatusLabel
+                        ]
                     ]
                 )
             );
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 bfea2d63ef1bb..a033e41dd8e8b 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
@@ -56,11 +56,16 @@ protected function setUp()
      * @param $senderSendException
      * @return void
      * @dataProvider sendDataProvider
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testSend($configValue, $forceSyncMode, $emailSendingResult, $senderSendException)
     {
         $address = 'address_test';
         $configPath = 'sales_email/general/async_sending';
+        $createdAtFormatted='Oct 14, 2019, 4:11:58 PM';
+        $customerName = 'test customer';
+        $frontendStatusLabel = 'Processing';
+        $isNotVirtual = true;
 
         $this->orderMock->expects($this->once())
             ->method('setSendEmail')
@@ -96,6 +101,27 @@ public function testSend($configValue, $forceSyncMode, $emailSendingResult, $sen
                     ->method('getShippingAddress')
                     ->willReturn($addressMock);
 
+                $this->orderMock->expects($this->once())
+                    ->method('getCreatedAtFormatted')
+                    ->with(2)
+                    ->willReturn($createdAtFormatted);
+
+                $this->orderMock->expects($this->any())
+                    ->method('getCustomerName')
+                    ->willReturn($customerName);
+
+                $this->orderMock->expects($this->once())
+                    ->method('getIsNotVirtual')
+                    ->willReturn($isNotVirtual);
+
+                $this->orderMock->expects($this->once())
+                    ->method('getEmailCustomerNote')
+                    ->willReturn('');
+
+                $this->orderMock->expects($this->once())
+                    ->method('getFrontendStatusLabel')
+                    ->willReturn($frontendStatusLabel);
+
                 $this->templateContainerMock->expects($this->once())
                     ->method('setTemplateVars')
                     ->with(
@@ -105,7 +131,15 @@ public function testSend($configValue, $forceSyncMode, $emailSendingResult, $sen
                             'payment_html' => 'payment',
                             'store' => $this->storeMock,
                             'formattedShippingAddress' => $address,
-                            'formattedBillingAddress' => $address
+                            'formattedBillingAddress' => $address,
+                            'created_at_formatted'=>$createdAtFormatted,
+                            'order_data' => [
+                                'customer_name' => $customerName,
+                                'is_not_virtual' => $isNotVirtual,
+                                'email_customer_note' => '',
+                                'frontend_status_label' => $frontendStatusLabel
+                            ]
+
                         ]
                     );
 
@@ -204,6 +238,10 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
     {
         $address = 'address_test';
         $this->orderMock->setData(\Magento\Sales\Api\Data\OrderInterface::IS_VIRTUAL, $isVirtualOrder);
+        $createdAtFormatted='Oct 14, 2019, 4:11:58 PM';
+        $customerName = 'test customer';
+        $frontendStatusLabel = 'Complete';
+        $isNotVirtual = false;
 
         $this->orderMock->expects($this->once())
             ->method('setSendEmail')
@@ -231,6 +269,27 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
 
         $this->stepAddressFormat($addressMock, $isVirtualOrder);
 
+        $this->orderMock->expects($this->once())
+            ->method('getCreatedAtFormatted')
+            ->with(2)
+            ->willReturn($createdAtFormatted);
+
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+
+        $this->orderMock->expects($this->once())
+            ->method('getIsNotVirtual')
+            ->willReturn($isNotVirtual);
+
+        $this->orderMock->expects($this->once())
+            ->method('getEmailCustomerNote')
+            ->willReturn('');
+
+        $this->orderMock->expects($this->once())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
+
         $this->templateContainerMock->expects($this->once())
             ->method('setTemplateVars')
             ->with(
@@ -240,7 +299,14 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
                     'payment_html' => 'payment',
                     'store' => $this->storeMock,
                     'formattedShippingAddress' => $expectedShippingAddress,
-                    'formattedBillingAddress' => $address
+                    'formattedBillingAddress' => $address,
+                    'created_at_formatted'=>$createdAtFormatted,
+                    'order_data' => [
+                        'customer_name' => $customerName,
+                        'is_not_virtual' => $isNotVirtual,
+                        'email_customer_note' => '',
+                        'frontend_status_label' => $frontendStatusLabel
+                    ]
                 ]
             );
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
index f5a2e4d0148cd..90664216e87bc 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
@@ -56,6 +56,8 @@ public function testSendTrueWithCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
+        $customerName='Test Customer';
+        $frontendStatusLabel='Processing';
 
         $this->orderMock->expects($this->once())
             ->method('getCustomerIsGuest')
@@ -65,6 +67,12 @@ public function testSendTrueWithCustomerCopy()
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
             ->will($this->returnValue(true));
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+        $this->orderMock->expects($this->once())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
         $this->templateContainerMock->expects($this->once())
             ->method('setTemplateVars')
             ->with(
@@ -76,7 +84,11 @@ public function testSendTrueWithCustomerCopy()
                         'comment' => $comment,
                         'store' => $this->storeMock,
                         'formattedShippingAddress' => 1,
-                        'formattedBillingAddress' => 1
+                        'formattedBillingAddress' => 1,
+                        'order_data' => [
+                            'customer_name' => $customerName,
+                            'frontend_status_label' => $frontendStatusLabel
+                        ]
                     ]
                 )
             );
@@ -89,6 +101,8 @@ public function testSendTrueWithoutCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
+        $customerName='Test Customer';
+        $frontendStatusLabel='Processing';
 
         $this->orderMock->expects($this->once())
             ->method('getCustomerIsGuest')
@@ -98,6 +112,12 @@ public function testSendTrueWithoutCustomerCopy()
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
             ->will($this->returnValue(true));
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+        $this->orderMock->expects($this->once())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
         $this->templateContainerMock->expects($this->once())
             ->method('setTemplateVars')
             ->with(
@@ -109,7 +129,11 @@ public function testSendTrueWithoutCustomerCopy()
                         'comment' => $comment,
                         'store' => $this->storeMock,
                         'formattedShippingAddress' => 1,
-                        'formattedBillingAddress' => 1
+                        'formattedBillingAddress' => 1,
+                        'order_data' => [
+                            'customer_name' => $customerName,
+                            'frontend_status_label' => $frontendStatusLabel
+                        ]
                     ]
                 )
             );
@@ -123,10 +147,18 @@ public function testSendVirtualOrder()
         $isVirtualOrder = true;
         $this->orderMock->setData(\Magento\Sales\Api\Data\OrderInterface::IS_VIRTUAL, $isVirtualOrder);
         $this->stepAddressFormat($this->addressMock, $isVirtualOrder);
+        $customerName='Test Customer';
+        $frontendStatusLabel='Complete';
 
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
             ->will($this->returnValue(false));
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+        $this->orderMock->expects($this->once())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
         $this->templateContainerMock->expects($this->once())
             ->method('setTemplateVars')
             ->with(
@@ -138,7 +170,12 @@ public function testSendVirtualOrder()
                         'comment' => '',
                         'store' => $this->storeMock,
                         'formattedShippingAddress' => null,
-                        'formattedBillingAddress' => 1
+                        'formattedBillingAddress' => 1,
+                        'order_data' => [
+                            'customer_name' => $customerName,
+                            'frontend_status_label' => $frontendStatusLabel
+                        ]
+
                     ]
                 )
             );
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
index 96bbb1aea7abd..dc6fc53e5ec43 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
@@ -90,6 +90,9 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
         $comment = 'comment_test';
         $address = 'address_test';
         $configPath = 'sales_email/general/async_sending';
+        $customerName = 'Test Customer';
+        $isNotVirtual = true;
+        $frontendStatusLabel = 'Processing';
 
         $this->shipmentMock->expects($this->once())
             ->method('setSendEmail')
@@ -124,6 +127,22 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                 ->method('getCustomerNote')
                 ->willReturn($comment);
 
+            $this->orderMock->expects($this->any())
+                ->method('getCustomerName')
+                ->willReturn($customerName);
+
+            $this->orderMock->expects($this->once())
+                ->method('getIsNotVirtual')
+                ->willReturn($isNotVirtual);
+
+            $this->orderMock->expects($this->once())
+                ->method('getEmailCustomerNote')
+                ->willReturn('');
+
+            $this->orderMock->expects($this->once())
+                ->method('getFrontendStatusLabel')
+                ->willReturn($frontendStatusLabel);
+
             $this->templateContainerMock->expects($this->once())
                 ->method('setTemplateVars')
                 ->with(
@@ -135,7 +154,13 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                         'payment_html' => 'payment',
                         'store' => $this->storeMock,
                         'formattedShippingAddress' => $address,
-                        'formattedBillingAddress' => $address
+                        'formattedBillingAddress' => $address,
+                        'order_data' => [
+                            'customer_name' => $customerName,
+                            'is_not_virtual' => $isNotVirtual,
+                            'email_customer_note' => '',
+                            'frontend_status_label' => $frontendStatusLabel
+                        ]
                     ]
                 );
 
@@ -216,6 +241,9 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
     {
         $address = 'address_test';
         $this->orderMock->setData(\Magento\Sales\Api\Data\OrderInterface::IS_VIRTUAL, $isVirtualOrder);
+        $customerName = 'Test Customer';
+        $frontendStatusLabel = 'Complete';
+        $isNotVirtual = false;
 
         $this->shipmentMock->expects($this->once())
             ->method('setSendEmail')
@@ -239,6 +267,22 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
             ->method('getCustomerNoteNotify')
             ->willReturn(false);
 
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($customerName);
+
+        $this->orderMock->expects($this->once())
+            ->method('getIsNotVirtual')
+            ->willReturn($isNotVirtual);
+
+        $this->orderMock->expects($this->once())
+            ->method('getEmailCustomerNote')
+            ->willReturn('');
+
+        $this->orderMock->expects($this->once())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($frontendStatusLabel);
+
         $this->templateContainerMock->expects($this->once())
             ->method('setTemplateVars')
             ->with(
@@ -250,7 +294,13 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
                     'payment_html' => 'payment',
                     'store' => $this->storeMock,
                     'formattedShippingAddress' => $expectedShippingAddress,
-                    'formattedBillingAddress' => $address
+                    'formattedBillingAddress' => $address,
+                    'order_data' => [
+                        'customer_name' => $customerName,
+                        'is_not_virtual' => false,
+                        'email_customer_note' => '',
+                        'frontend_status_label' => $frontendStatusLabel
+                    ]
                 ]
             );
 
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 adfb697e70331..756048d287e46 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
@@ -37,11 +37,6 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $templateId = 'test_template_id';
-        $templateOptions = ['option1', 'option2'];
-        $templateVars = ['var1', 'var2'];
-        $emailIdentity = 'email_identity_test';
-        $emailCopyTo = ['example@mail.com'];
 
         $this->templateContainerMock = $this->createPartialMock(
             \Magento\Sales\Model\Order\Email\Container\Template::class,
@@ -83,36 +78,6 @@ protected function setUp()
             ]
         );
 
-        $this->templateContainerMock->expects($this->once())
-            ->method('getTemplateId')
-            ->will($this->returnValue($templateId));
-        $this->transportBuilder->expects($this->once())
-            ->method('setTemplateIdentifier')
-            ->with($this->equalTo($templateId));
-        $this->templateContainerMock->expects($this->once())
-            ->method('getTemplateOptions')
-            ->will($this->returnValue($templateOptions));
-        $this->transportBuilder->expects($this->once())
-            ->method('setTemplateOptions')
-            ->with($this->equalTo($templateOptions));
-        $this->templateContainerMock->expects($this->once())
-            ->method('getTemplateVars')
-            ->will($this->returnValue($templateVars));
-        $this->transportBuilder->expects($this->once())
-            ->method('setTemplateVars')
-            ->with($this->equalTo($templateVars));
-
-        $this->identityContainerMock->expects($this->once())
-            ->method('getEmailIdentity')
-            ->will($this->returnValue($emailIdentity));
-        $this->transportBuilder->expects($this->once())
-            ->method('setFromByScope')
-            ->with($this->equalTo($emailIdentity), 1);
-
-        $this->identityContainerMock->expects($this->once())
-            ->method('getEmailCopyTo')
-            ->will($this->returnValue($emailCopyTo));
-
         $this->senderBuilder = new SenderBuilder(
             $this->templateContainerMock,
             $this->identityContainerMock,
@@ -122,6 +87,7 @@ protected function setUp()
 
     public function testSend()
     {
+        $this->setExpectedCount(1);
         $customerName = 'test_name';
         $customerEmail = 'test_email';
         $identity = 'email_identity_test';
@@ -142,20 +108,20 @@ public function testSend()
         $this->identityContainerMock->expects($this->once())
             ->method('getCustomerName')
             ->will($this->returnValue($customerName));
-        $this->identityContainerMock->expects($this->once())
+        $this->identityContainerMock->expects($this->exactly(1))
             ->method('getStore')
             ->willReturn($this->storeMock);
         $this->storeMock->expects($this->once())
             ->method('getId')
             ->willReturn(1);
-        $this->transportBuilder->expects($this->once())
+        $this->transportBuilder->expects($this->exactly(1))
             ->method('setFromByScope')
             ->with($identity, 1);
-        $this->transportBuilder->expects($this->once())
+        $this->transportBuilder->expects($this->exactly(1))
             ->method('addTo')
             ->with($this->equalTo($customerEmail), $this->equalTo($customerName));
 
-        $this->transportBuilder->expects($this->once())
+        $this->transportBuilder->expects($this->exactly(1))
             ->method('getTransport')
             ->will($this->returnValue($transportMock));
 
@@ -164,6 +130,7 @@ public function testSend()
 
     public function testSendCopyTo()
     {
+        $this->setExpectedCount(2);
         $identity = 'email_identity_test';
         $transportMock = $this->createMock(
             \Magento\Sales\Test\Unit\Model\Order\Email\Stub\TransportInterfaceMock::class
@@ -172,22 +139,66 @@ public function testSendCopyTo()
             ->method('getCustomerEmail');
         $this->identityContainerMock->expects($this->never())
             ->method('getCustomerName');
-        $this->transportBuilder->expects($this->once())
-            ->method('addTo')
-            ->with($this->equalTo('example@mail.com'));
-        $this->transportBuilder->expects($this->once())
+        $this->transportBuilder->expects($this->exactly(2))
+            ->method('addTo');
+        $this->transportBuilder->expects($this->exactly(2))
             ->method('setFromByScope')
             ->with($identity, 1);
-        $this->identityContainerMock->expects($this->once())
+        $this->identityContainerMock->expects($this->exactly(2))
             ->method('getStore')
             ->willReturn($this->storeMock);
-        $this->storeMock->expects($this->once())
+        $this->storeMock->expects($this->exactly(2))
             ->method('getId')
             ->willReturn(1);
-        $this->transportBuilder->expects($this->once())
+        $this->transportBuilder->expects($this->exactly(2))
             ->method('getTransport')
             ->will($this->returnValue($transportMock));
 
         $this->senderBuilder->sendCopyTo();
     }
+
+    /**
+     * Sets expected count invocation.
+     *
+     * @param int $count
+     */
+    private function setExpectedCount(int $count = 1)
+    {
+
+        $templateId = 'test_template_id';
+        $templateOptions = ['option1', 'option2'];
+        $templateVars = ['var1', 'var2'];
+        $emailIdentity = 'email_identity_test';
+        $emailCopyTo = ['example@mail.com', 'example2@mail.com'];
+
+        $this->templateContainerMock->expects($this->exactly($count))
+            ->method('getTemplateId')
+            ->will($this->returnValue($templateId));
+        $this->transportBuilder->expects($this->exactly($count))
+            ->method('setTemplateIdentifier')
+            ->with($this->equalTo($templateId));
+        $this->templateContainerMock->expects($this->exactly($count))
+            ->method('getTemplateOptions')
+            ->will($this->returnValue($templateOptions));
+        $this->transportBuilder->expects($this->exactly($count))
+            ->method('setTemplateOptions')
+            ->with($this->equalTo($templateOptions));
+        $this->templateContainerMock->expects($this->exactly($count))
+            ->method('getTemplateVars')
+            ->will($this->returnValue($templateVars));
+        $this->transportBuilder->expects($this->exactly($count))
+            ->method('setTemplateVars')
+            ->with($this->equalTo($templateVars));
+
+        $this->identityContainerMock->expects($this->exactly($count))
+            ->method('getEmailIdentity')
+            ->will($this->returnValue($emailIdentity));
+        $this->transportBuilder->expects($this->exactly($count))
+            ->method('setFromByScope')
+            ->with($this->equalTo($emailIdentity), 1);
+
+        $this->identityContainerMock->expects($this->once())
+            ->method('getEmailCopyTo')
+            ->will($this->returnValue($emailCopyTo));
+    }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
index 705d2face2308..bd6487caff7dd 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -17,6 +18,8 @@
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SearchCriteria;
 use Magento\Sales\Api\Data\OrderItemSearchResultInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Test class for \Magento\Sales\Model\Order
@@ -24,6 +27,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class OrderTest extends \PHPUnit\Framework\TestCase
 {
@@ -102,6 +106,11 @@ class OrderTest extends \PHPUnit\Framework\TestCase
      */
     private $searchCriteriaBuilder;
 
+    /**
+     * @var MockObject|ScopeConfigInterface $scopeConfigMock
+     */
+    private $scopeConfigMock;
+
     protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -125,14 +134,17 @@ protected function setUp()
             \Magento\Sales\Model\ResourceModel\Order\CollectionFactory::class,
             ['create']
         );
-        $this->item = $this->createPartialMock(\Magento\Sales\Model\ResourceModel\Order\Item::class, [
+        $this->item = $this->createPartialMock(
+            \Magento\Sales\Model\ResourceModel\Order\Item::class,
+            [
                 'isDeleted',
                 'getQtyToInvoice',
                 'getParentItemId',
                 'getQuoteItemId',
                 'getLockedDoInvoice',
                 'getProductId',
-            ]);
+            ]
+        );
         $this->salesOrderCollectionMock = $this->getMockBuilder(
             \Magento\Sales\Model\ResourceModel\Order\Collection::class
         )->disableOriginalConstructor()
@@ -168,6 +180,7 @@ protected function setUp()
             ->setMethods(['addFilter', 'create'])
             ->disableOriginalConstructor()->getMockForAbstractClass();
 
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
         $this->order = $helper->getObject(
             \Magento\Sales\Model\Order::class,
             [
@@ -182,7 +195,8 @@ protected function setUp()
                 'localeResolver' => $this->localeResolver,
                 'timezone' => $this->timezone,
                 'itemRepository' => $this->itemRepository,
-                'searchCriteriaBuilder' => $this->searchCriteriaBuilder
+                'searchCriteriaBuilder' => $this->searchCriteriaBuilder,
+                'scopeConfig' => $this->scopeConfigMock
             ]
         );
     }
@@ -354,6 +368,51 @@ public function testCanInvoice()
         $this->assertTrue($this->order->canInvoice());
     }
 
+    /**
+     * Ensure customer name returned correctly.
+     *
+     * @dataProvider customerNameProvider
+     * @param array $expectedData
+     */
+    public function testGetCustomerName(array $expectedData)
+    {
+        $this->order->setCustomerFirstname($expectedData['first_name']);
+        $this->order->setCustomerSuffix($expectedData['customer_suffix']);
+        $this->order->setCustomerPrefix($expectedData['customer_prefix']);
+        $this->scopeConfigMock->expects($this->exactly($expectedData['invocation']))
+            ->method('isSetFlag')
+            ->willReturn(true);
+        $this->assertEquals($expectedData['expected_name'], $this->order->getCustomerName());
+    }
+
+    /**
+     * Customer name data provider
+     */
+    public function customerNameProvider()
+    {
+        return
+            [
+                [
+                    [
+                        'first_name' => null,
+                        'invocation' => 0,
+                        'expected_name' => 'Guest',
+                        'customer_suffix' => 'smith',
+                        'customer_prefix' => 'mr.'
+                    ]
+                ],
+                [
+                    [
+                        'first_name' => 'Smith',
+                        'invocation' => 1,
+                        'expected_name' => 'mr. Smith  Carl',
+                        'customer_suffix' => 'Carl',
+                        'customer_prefix' => 'mr.'
+                    ]
+                ]
+            ];
+    }
+
     /**
      * @param string $status
      *
@@ -819,9 +878,10 @@ public function testCanVoidPayment($actionFlags, $orderState)
         if ($orderState == \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW) {
             $canVoidOrder = false;
         }
-        if ($orderState == \Magento\Sales\Model\Order::STATE_HOLDED && (!isset(
-            $actionFlags[\Magento\Sales\Model\Order::ACTION_FLAG_UNHOLD]
-        ) || $actionFlags[\Magento\Sales\Model\Order::ACTION_FLAG_UNHOLD] !== false)
+        if ($orderState == \Magento\Sales\Model\Order::STATE_HOLDED &&
+            (!isset($actionFlags[\Magento\Sales\Model\Order::ACTION_FLAG_UNHOLD]) ||
+                $actionFlags[\Magento\Sales\Model\Order::ACTION_FLAG_UNHOLD] !== false
+            )
         ) {
             $canVoidOrder = false;
         }
@@ -1193,6 +1253,9 @@ public function testGetCreatedAtFormattedUsesCorrectLocale()
         $this->order->getCreatedAtFormatted(\IntlDateFormatter::SHORT);
     }
 
+    /**
+     * @return array
+     */
     public function notInvoicingStatesProvider()
     {
         return [
@@ -1202,6 +1265,9 @@ public function notInvoicingStatesProvider()
         ];
     }
 
+    /**
+     * @return array
+     */
     public function canNotCreditMemoStatesProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
index 99a411c43c247..30513571fb71d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
@@ -103,6 +103,9 @@ public function testCheck(
         $this->assertEquals($expectedState, $this->orderMock->getState());
     }
 
+    /**
+     * @return array
+     */
     public function stateCheckDataProvider()
     {
         return [
diff --git a/app/code/Magento/Sales/ViewModel/CreditMemo/Create/UpdateTotalsButton.php b/app/code/Magento/Sales/ViewModel/CreditMemo/Create/UpdateTotalsButton.php
new file mode 100644
index 0000000000000..707f5ef363f66
--- /dev/null
+++ b/app/code/Magento/Sales/ViewModel/CreditMemo/Create/UpdateTotalsButton.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\ViewModel\CreditMemo\Create;
+
+use Magento\Backend\Block\Widget\Button;
+use Magento\Framework\View\Element\BlockInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items;
+
+/**
+ * View model to add Update Totals button for new Credit Memo
+ */
+class UpdateTotalsButton implements \Magento\Framework\View\Element\Block\ArgumentInterface
+{
+    /**
+     * @var LayoutInterface
+     */
+    private $layout;
+
+    /**
+     * @var Items
+     */
+    private $items;
+
+    /**
+     * @param LayoutInterface $layout
+     * @param Items $items
+     */
+    public function __construct(
+        LayoutInterface $layout,
+        Items $items
+    ) {
+        $this->layout = $layout;
+        $this->items = $items;
+    }
+
+    /**
+     * Get Update Totals block html.
+     *
+     * @return string
+     */
+    public function getUpdateTotalsButton(): string
+    {
+        $block = $this->createUpdateTotalsBlock();
+
+        return $block->toHtml();
+    }
+
+    /**
+     * Create Update Totals block.
+     *
+     * @return BlockInterface
+     */
+    private function createUpdateTotalsBlock(): BlockInterface
+    {
+        $onclick = "submitAndReloadArea($('creditmemo_item_container'),'" . $this->items->getUpdateUrl() . "')";
+        $block = $this->layout->addBlock(Button::class, 'update_totals_button', 'order_items');
+        $block->setData(
+            [
+                'label' => __('Update Totals'),
+                'class' => 'update-totals-button secondary',
+                'onclick' => $onclick,
+            ]
+        );
+
+        return $block;
+    }
+}
diff --git a/app/code/Magento/Sales/etc/adminhtml/system.xml b/app/code/Magento/Sales/etc/adminhtml/system.xml
index d1e5680b883c2..473d3068d69c7 100644
--- a/app/code/Magento/Sales/etc/adminhtml/system.xml
+++ b/app/code/Magento/Sales/etc/adminhtml/system.xml
@@ -93,12 +93,12 @@
                 <field id="amount" translate="label comment" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Minimum Amount</label>
                     <validate>validate-number validate-greater-than-zero</validate>
-                    <comment>Subtotal after discount</comment>
+                    <comment>Subtotal after discount.</comment>
                 </field>
                 <field id="include_discount_amount" translate="label" sortOrder="12" type="select" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Include Discount Amount</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment>Choosing yes will be used subtotal after discount, otherwise only subtotal will be used</comment>
+                    <comment>Choosing yes will be used subtotal after discount, otherwise only subtotal will be used.</comment>
                 </field>
                 <field id="tax_including" translate="label" sortOrder="15" type="select" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Include Tax to Amount</label>
@@ -182,7 +182,7 @@
                 </field>
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Order Email Copy To</label>
-                    <comment>Comma-separated</comment>
+                    <comment>Comma-separated.</comment>
                     <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -212,7 +212,7 @@
                 </field>
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Order Comment Email Copy To</label>
-                    <comment>Comma-separated</comment>
+                    <comment>Comma-separated.</comment>
                     <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -242,7 +242,7 @@
                 </field>
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Invoice Email Copy To</label>
-                    <comment>Comma-separated</comment>
+                    <comment>Comma-separated.</comment>
                     <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -272,7 +272,7 @@
                 </field>
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Invoice Comment Email Copy To</label>
-                    <comment>Comma-separated</comment>
+                    <comment>Comma-separated.</comment>
                     <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -302,7 +302,7 @@
                 </field>
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Shipment Email Copy To</label>
-                    <comment>Comma-separated</comment>
+                    <comment>Comma-separated.</comment>
                     <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -332,7 +332,7 @@
                 </field>
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Shipment Comment Email Copy To</label>
-                    <comment>Comma-separated</comment>
+                    <comment>Comma-separated.</comment>
                     <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -362,7 +362,7 @@
                 </field>
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Credit Memo Email Copy To</label>
-                    <comment>Comma-separated</comment>
+                    <comment>Comma-separated.</comment>
                     <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -392,7 +392,7 @@
                 </field>
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Credit Memo Comment Email Copy To</label>
-                    <comment>Comma-separated</comment>
+                    <comment>Comma-separated.</comment>
                     <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
diff --git a/app/code/Magento/Sales/etc/db_schema.xml b/app/code/Magento/Sales/etc/db_schema.xml
index eb508af8daf25..ea7c768b0a786 100644
--- a/app/code/Magento/Sales/etc/db_schema.xml
+++ b/app/code/Magento/Sales/etc/db_schema.xml
@@ -1386,8 +1386,6 @@
                 comment="Adjustment Negative"/>
         <column xsi:type="decimal" name="order_base_grand_total" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Order Grand Total"/>
-        <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"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
         </constraint>
diff --git a/app/code/Magento/Sales/etc/db_schema_whitelist.json b/app/code/Magento/Sales/etc/db_schema_whitelist.json
index a7215d08c1f10..087fe6c9eb5ac 100644
--- a/app/code/Magento/Sales/etc/db_schema_whitelist.json
+++ b/app/code/Magento/Sales/etc/db_schema_whitelist.json
@@ -815,9 +815,7 @@
             "shipping_and_handling": true,
             "adjustment_positive": true,
             "adjustment_negative": true,
-            "order_base_grand_total": true,
-            "order_currency_code": true,
-            "base_currency_code": true
+            "order_base_grand_total": true
         },
         "index": {
             "SALES_CREDITMEMO_GRID_ORDER_INCREMENT_ID": true,
@@ -1247,4 +1245,4 @@
             "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 a0dbb0488acb3..f6618c9884d60 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -641,8 +641,6 @@
                 <item name="adjustment_positive" xsi:type="string">sales_creditmemo.adjustment_positive</item>
                 <item name="adjustment_negative" xsi:type="string">sales_creditmemo.adjustment_negative</item>
                 <item name="order_base_grand_total" xsi:type="string">sales_order.base_grand_total</item>
-                <item name="order_currency_code" xsi:type="string">sales_order.order_currency_code</item>
-                <item name="base_currency_code" xsi:type="string">sales_order.base_currency_code</item>
             </argument>
         </arguments>
     </virtualType>
diff --git a/app/code/Magento/Sales/etc/module.xml b/app/code/Magento/Sales/etc/module.xml
index e8af6b761a8a4..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">
+    <module name="Magento_Sales" >
         <sequence>
             <module name="Magento_Rule"/>
             <module name="Magento_Catalog"/>
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
index d09ee8376b2ed..f30315437533f 100644
--- a/app/code/Magento/Sales/i18n/en_US.csv
+++ b/app/code/Magento/Sales/i18n/en_US.csv
@@ -797,5 +797,5 @@ Created,Created
 Refunds,Refunds
 "Allow Zero GrandTotal for Creditmemo","Allow Zero GrandTotal for Creditmemo"
 "Allow Zero GrandTotal","Allow Zero GrandTotal"
+"Could not save the shipment tracking","Could not save the shipment tracking"
 "Please enter a coupon code!","Please enter a coupon code!"
-
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 71490553aff17..cd7ca1d7e0d42 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
@@ -18,6 +18,9 @@
                     </block>
                     <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
                     <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items" name="order_items" template="Magento_Sales::order/creditmemo/create/items.phtml">
+                        <arguments>
+                            <argument name="viewModel" xsi:type="object">Magento\Sales\ViewModel\CreditMemo\Create\UpdateTotalsButton</argument>
+                        </arguments>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" name="order_items.default" as="default" template="Magento_Sales::order/creditmemo/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"/>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
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 8375bec965794..94ef0bf9d7a03 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
@@ -9,6 +9,9 @@
     <update handle="sales_order_item_price"/>
     <body>
         <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items" name="order_items" template="Magento_Sales::order/creditmemo/create/items.phtml">
+            <arguments>
+                <argument name="viewModel" xsi:type="object">Magento\Sales\ViewModel\CreditMemo\Create\UpdateTotalsButton</argument>
+            </arguments>
             <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" name="order_items.default" as="default" template="Magento_Sales::order/creditmemo/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"/>
             <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
index a7f3b3c1cc8f5..0cc23056b3c2f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
@@ -4,13 +4,19 @@
  * See COPYING.txt for license details.
  */
 ?>
-<div class="message message-notice">
-    <div class="message-inner">
-        <div class="message-content"><?= $block->escapeHtml(__('Changing address information will not recalculate shipping, tax or other order amount.')) ?></div>
+<div class="messages">
+    <div class="message message-notice">
+        <div class="message-inner">
+            <div class="message-content">
+                <?= $block->escapeHtml(
+                    __('Changing address information will not recalculate shipping, tax or other order amount.')
+                ) ?>
+            </div>
+        </div>
     </div>
 </div>
 
-<fieldset class="fieldset admin__fieldset-wrapper">
+<div class="fieldset admin__fieldset-wrapper">
     <legend class="legend admin__legend">
         <span><?= $block->escapeHtml($block->getHeaderText()) ?></span>
     </legend>
@@ -18,4 +24,4 @@
     <div class="form-inline" data-mage-init='{"Magento_Sales/order/edit/address/form":{}}'>
         <?= $block->getForm()->toHtml() ?>
     </div>
-</fieldset>
+</div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
index 31aefd8d2ca57..81dc778cff2df 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
@@ -6,7 +6,11 @@
 
 /* @var \Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items $block */
 ?>
-<?php $_items = $block->getCreditmemo()->getAllItems() ?>
+<?php
+/** @var Magento\Sales\ViewModel\CreditMemo\Create\UpdateTotalsButton $viewModel */
+$viewModel = $block->getData('viewModel');
+$_items = $block->getCreditmemo()->getAllItems();
+?>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
@@ -34,11 +38,11 @@
             <?php if ($block->canEditQty()) : ?>
             <tfoot>
                 <tr>
-                    <td colspan="3">&nbsp;</td>
-                    <td colspan="3">
+                    <td colspan="4">&nbsp;</td>
+                    <td>
                         <?= $block->getUpdateButtonHtml() ?>
                     </td>
-                    <td colspan="3" class="last">&nbsp;</td>
+                    <td colspan="4" class="last">&nbsp;</td>
                 </tr>
             </tfoot>
             <?php endif; ?>
@@ -100,7 +104,7 @@
                 <span class="title"><?= $block->escapeHtml(__('Refund Totals')) ?></span>
             </div>
             <?= $block->getChildHtml('creditmemo_totals') ?>
-            <div class="totals-actions"><?= $block->getUpdateTotalsButtonHtml() ?></div>
+            <div class="totals-actions"><?= /* @noEscape */ $viewModel->getUpdateTotalsButton() ?></div>
             <div class="order-totals-actions">
                 <div class="field choice admin__field admin__field-option field-append-comments">
                     <input id="notify_customer"
@@ -140,9 +144,8 @@ require(['jquery'], function(jQuery){
 
 //<![CDATA[
 var submitButtons = jQuery('.submit-button');
-var updateButtons = jQuery('.update-button,.update-totals-button');
-var fields = jQuery('.qty-input,.order-subtotal-table input[type="text"]');
-
+var updateButtons = jQuery('.update-button, .update-totals-button');
+var fields = jQuery('.qty-input, .order-subtotal-table input[type="text"]');
 function enableButtons(buttons) {
     buttons.removeClass('disabled').prop('disabled', false);
 }
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
index b700f1b3a65ad..70373f177d8be 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
@@ -81,8 +81,8 @@ $_order = $block->getOrder() ?>
             </tr>
         <?php endif; ?>
         <tr bgcolor="#DEE5E8">
-            <td colspan="2" align="right" style="padding:3px 9px"><strong><big><?= $block->escapeHtml(__('Grand Total')) ?></big></strong></td>
-            <td align="right" style="padding:6px 9px"><strong><big><?= /* @noEscape */ $_order->formatPrice($_order->getGrandTotal()) ?></big></strong></td>
+            <td colspan="2" align="right" style="padding:3px 9px"><strong style="font-size: larger"><?= $block->escapeHtml(__('Grand Total')) ?></strong></td>
+            <td align="right" style="padding:6px 9px"><strong style="font-size: larger"><?= /* @noEscape */ $_order->formatPrice($_order->getGrandTotal()) ?></strong></td>
         </tr>
     </tfoot>
 </table>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
index 87d7c85c2d9ed..f8e914a2c9b2f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
@@ -6,7 +6,7 @@
 ?>
 <?php if ($block->getCanDisplayTotalDue()) : ?>
 <tr>
-    <td class="label"><big><strong><?= $block->escapeHtml(__('Total Due')) ?></strong></big></td>
-    <td class="emph"><big><?= /* @noEscape */ $block->displayPriceAttribute('total_due', true) ?></big></td>
+    <td class="label"><strong style="font-size: larger"><?= $block->escapeHtml(__('Total Due')) ?></strong></td>
+    <td class="emph" style="font-size: larger"><?= /* @noEscape */ $block->displayPriceAttribute('total_due', true) ?></td>
 </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
index dc76799251c7a..af5d58d47fce1 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
@@ -9,13 +9,13 @@
 
 <tr>
     <td class="label">
-        <strong><big>
+        <strong style="font-size: larger">
         <?php if ($block->getGrandTotalTitle()) : ?>
             <?= $block->escapeHtml($block->getGrandTotalTitle()) ?>
         <?php else : ?>
             <?= $block->escapeHtml(__('Grand Total')) ?>
         <?php endif; ?>
-        </big></strong>
+        </strong>
     </td>
-    <td class="emph"><big><?= /* @noEscape */ $block->displayPriceAttribute('grand_total', true) ?></big></td>
+    <td class="emph" style="font-size: larger"><?= /* @noEscape */ $block->displayPriceAttribute('grand_total', true) ?></td>
 </tr>
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 ab5cd49449ece..825ac8205772e 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
@@ -9,6 +9,10 @@
  */
 $order = $block->getOrder();
 
+$baseCurrencyCode = (string)$order->getBaseCurrencyCode();
+$globalCurrencyCode = (string)$order->getGlobalCurrencyCode();
+$orderCurrencyCode = (string)$order->getOrderCurrencyCode();
+
 $orderAdminDate = $block->formatDate(
     $block->getOrderAdminDate($order->getCreatedAt()),
     \IntlDateFormatter::MEDIUM,
@@ -23,6 +27,7 @@ $orderStoreDate = $block->formatDate(
 );
 
 $customerUrl = $block->getCustomerViewUrl();
+
 $allowedAddressHtmlTags = ['b', 'br', 'em', 'i', 'li', 'ol', 'p', 'strong', 'sub', 'sup', 'ul'];
 ?>
 
@@ -93,15 +98,15 @@ $allowedAddressHtmlTags = ['b', 'br', 'em', 'i', 'li', 'ol', 'p', 'strong', 'sub
                         <td><?= $block->escapeHtml($order->getRemoteIp()); ?><?= $order->getXForwardedFor() ? ' (' . $block->escapeHtml($order->getXForwardedFor()) . ')' : ''; ?></td>
                     </tr>
                 <?php endif; ?>
-                <?php if ($order->getGlobalCurrencyCode() != $order->getBaseCurrencyCode()) : ?>
+                <?php if ($globalCurrencyCode !== $baseCurrencyCode) : ?>
                     <tr>
-                        <th><?= $block->escapeHtml(__('%1 / %2 rate:', $order->getGlobalCurrencyCode(), $order->getBaseCurrencyCode())) ?></th>
+                        <th><?= $block->escapeHtml(__('%1 / %2 rate:', $globalCurrencyCode, $baseCurrencyCode)) ?></th>
                         <td><?= $block->escapeHtml($order->getBaseToGlobalRate()) ?></td>
                     </tr>
                 <?php endif; ?>
-                <?php if ($order->getBaseCurrencyCode() != $order->getOrderCurrencyCode()) : ?>
+                <?php if ($baseCurrencyCode !== $orderCurrencyCode && $globalCurrencyCode !== $orderCurrencyCode) : ?>
                     <tr>
-                        <th><?= $block->escapeHtml(__('%1 / %2 rate:', $order->getOrderCurrencyCode(), $order->getBaseCurrencyCode())) ?></th>
+                        <th><?= $block->escapeHtml(__('%1 / %2 rate:', $orderCurrencyCode, $baseCurrencyCode)) ?></th>
                         <td><?= $block->escapeHtml($order->getBaseToOrderRate()) ?></td>
                     </tr>
                 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml
index 98f8b1edecf34..e0b7dae8fdb1a 100644
--- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml
@@ -119,7 +119,7 @@
         <column name="base_grand_total" class="Magento\Sales\Ui\Component\Listing\Column\Price">
             <settings>
                 <filter>textRange</filter>
-                <label translate="true">Refunded (Base)</label>
+                <label translate="true">Refunded</label>
             </settings>
         </column>
         <column name="order_status" component="Magento_Ui/js/grid/columns/select">
@@ -194,7 +194,7 @@
                 <visible>false</visible>
             </settings>
         </column>
-        <column name="subtotal" class="Magento\Sales\Ui\Component\Listing\Column\PurchasedPrice">
+        <column name="subtotal" class="Magento\Sales\Ui\Component\Listing\Column\Price">
             <settings>
                 <filter>textRange</filter>
                 <label translate="true">Subtotal</label>
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 c0ed1e01460bc..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
@@ -130,7 +130,7 @@
                 <label translate="true">Status</label>
             </settings>
         </column>
-        <column name="base_grand_total" class="Magento\Sales\Ui\Component\Listing\Column\Price">
+        <column name="grand_total" class="Magento\Sales\Ui\Component\Listing\Column\PurchasedPrice">
             <settings>
                 <filter>textRange</filter>
                 <label translate="true">Amount</label>
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 3fe9d08782880..8803e2ea48f02 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
@@ -482,11 +482,6 @@ define([
         },
 
         switchPaymentMethod: function(method){
-            jQuery('#edit_form')
-                .off('submitOrder')
-                .on('submitOrder', function(){
-                    jQuery(this).trigger('realOrder');
-                });
             jQuery('#edit_form').trigger('changePaymentMethod', [method]);
             this.setPaymentMethod(method);
             var data = {};
@@ -795,6 +790,20 @@ define([
             grid.reloadParams = {'products[]':this.gridProducts.keys()};
         },
 
+        productGridFilterKeyPress: function (grid, event) {
+            var returnKey = parseInt(Event.KEY_RETURN || 13, 10);
+
+            if (event.keyCode === returnKey) {
+                if (typeof event.stopPropagation === 'function') {
+                    event.stopPropagation();
+                }
+
+                if (typeof event.preventDefault === 'function') {
+                    event.preventDefault();
+                }
+            }
+        },
+
         /**
          * Submit configured products to quote
          */
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_new.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_new.html
index ca89446a2f7c0..5ae6f5f9d82c7 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_new.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_new.html
@@ -4,28 +4,34 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var comment":"Credit Memo Comment",
+"var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
 "layout handle=\"sales_email_order_creditmemo_items\" creditmemo=$creditmemo order=$order":"Credit Memo Items Grid",
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var order.getCustomerName()":"Customer Name",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.customer_name":"Customer Name",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description",
-"var order.shipping_description":"Shipping Description"
+"var order.shipping_description":"Shipping Description",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email",
+"var store_phone":"Store Phone",
+"var store_hours":"Store Hours",
+"var creditmemo":"Credit Memo",
+"var order":"Order",
+"var order_data.is_not_virtual":"Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
                 {{depend store_hours}}
@@ -56,7 +62,7 @@ <h1>{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_i
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -68,10 +74,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                     </td>
                     {{/depend}}
                 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html
index b21f659814368..657de2aae2045 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html
@@ -4,27 +4,33 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var comment":"Credit Memo Comment",
+"var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
 "layout handle=\"sales_email_order_creditmemo_items\" creditmemo=$creditmemo order=$order":"Credit Memo Items Grid",
-"var billing.getName()":"Guest Customer Name (Billing)",
+"var billing.name":"Guest Customer Name (Billing)",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description",
-"var order.shipping_description":"Shipping Description"
+"var order.shipping_description":"Shipping Description",
+"var store.frontend_name":"Store Frontend Name",
+"var store_phone":"Store Phone",
+"var store_email":"Store Email",
+"var store_hours":"Store Hours",
+"var creditmemo":"Credit Memo",
+"var order":"Order",
+"var order_data.is_not_virtual":"Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
                 {{depend store_hours}}
                     {{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours |raw}}
@@ -54,7 +60,7 @@ <h1>{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_i
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -66,10 +72,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                     </td>
                     {{/depend}}
                 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html
index a6a10fb49e3f5..7e7930f33f1b9 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html
@@ -4,27 +4,31 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var comment":"Credit Memo Comment",
+"var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var order.getCustomerName()":"Customer Name",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.customer_name":"Customer Name",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status"
+"var order_data.frontend_status_label":"Order Status",
+"var store.frontend_name":"Store Frontend Name",
+"var store_phone":"Store Phone",
+"var store_email":"Store Email",
+"var store_hours":"Store Hours"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
             </p>
             <p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
index b7411d80d2ba6..ed8f592b59638 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
@@ -4,26 +4,30 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var comment":"Credit Memo Comment",
+"var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
-"var billing.getName()":"Guest Customer Name",
+"var billing.name":"Guest Customer Name",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status"
+"var order_data.frontend_status_label":"Order Status",
+"var store.frontend_name":"Store Frontend Name",
+"var store_phone":"Store Phone",
+"var store_email":"Store Email",
+"var store_hours":"Store Hours"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
             </p>
             <p>
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_new.html b/app/code/Magento/Sales/view/frontend/email/invoice_new.html
index ca5f7ee632e22..68773ee9d7570 100644
--- a/app/code/Magento/Sales/view/frontend/email/invoice_new.html
+++ b/app/code/Magento/Sales/view/frontend/email/invoice_new.html
@@ -4,28 +4,34 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var order.getCustomerName()":"Customer Name",
-"var comment":"Invoice Comment",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.customer_name":"Customer Name",
+"var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "layout area=\"frontend\" handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
 "var order.shipping_description":"Shipping Description",
-"var order.getShippingDescription()":"Shipping Description"
+"var store.frontend_name":"Store Frontend Name",
+"var store_phone":"Store Phone",
+"var store_email":"Store Email",
+"var store_hours":"Store Hours",
+"var invoice": "Invoice",
+"var order": "Order",
+"var order_data.is_not_virtual": "Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
                 {{depend store_hours}}
@@ -56,7 +62,7 @@ <h1>{{trans "Your Invoice #%invoice_id for Order #%order_id" invoice_id=$invoice
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -68,10 +74,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                     </td>
                     {{/depend}}
                 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html b/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html
index c93df9f9e8efb..5053ccc2ac635 100644
--- a/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html
@@ -4,27 +4,33 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var billing.getName()":"Guest Customer Name",
-"var comment":"Invoice Comment",
+"var billing.name":"Guest Customer Name",
+"var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "layout handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description",
-"var order.shipping_description":"Shipping Description"
+"var order.shipping_description":"Shipping Description",
+"var store.frontend_name":"Store Frontend Name",
+"var store_phone":"Store Phone",
+"var store_email":"Store Email",
+"var store_hours":"Store Hours",
+"var invoice": "Invoice",
+"var order": "Order",
+"var order_data.is_not_virtual": "Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
                 {{depend store_hours}}
                     {{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours |raw}}
@@ -54,7 +60,7 @@ <h1>{{trans "Your Invoice #%invoice_id for Order #%order_id" invoice_id=$invoice
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -66,10 +72,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                     </td>
                     {{/depend}}
                 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_update.html b/app/code/Magento/Sales/view/frontend/email/invoice_update.html
index 4043e59f9d7d6..a8f98a238e314 100644
--- a/app/code/Magento/Sales/view/frontend/email/invoice_update.html
+++ b/app/code/Magento/Sales/view/frontend/email/invoice_update.html
@@ -4,27 +4,31 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var order.getCustomerName()":"Customer Name",
-"var comment":"Invoice Comment",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.customer_name":"Customer Name",
+"var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status"
+"var order_data.frontend_status_label":"Order Status",
+"var store.frontend_name":"Store Frontend Name",
+"var store_phone":"Store Phone",
+"var store_email":"Store Email",
+"var store_hours":"Store Hours"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
             </p>
             <p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html b/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
index 40cdec7fb4cab..289c5113fe285 100644
--- a/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
@@ -4,26 +4,30 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.getName()":"Guest Customer Name",
-"var comment":"Invoice Comment",
+"var billing.name":"Guest Customer Name",
+"var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status"
+"var order_data.frontend_status_label":"Order Status",
+"var store.frontend_name":"Store Frontend Name",
+"var store_phone":"Store Phone",
+"var store_email":"Store Email",
+"var store_hours":"Store Hours"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
             </p>
             <p>
diff --git a/app/code/Magento/Sales/view/frontend/email/order_new.html b/app/code/Magento/Sales/view/frontend/email/order_new.html
index 370bdb0f2f336..13c436b131b82 100644
--- a/app/code/Magento/Sales/view/frontend/email/order_new.html
+++ b/app/code/Magento/Sales/view/frontend/email/order_new.html
@@ -4,16 +4,25 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Your %store_name order confirmation" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Your %store_name order confirmation" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var order.getEmailCustomerNote()":"Email Order Note",
+"var order_data.email_customer_note|escape|nl2br":"Email Order Note",
 "var order.increment_id":"Order Id",
 "layout handle=\"sales_email_order_items\" order=$order area=\"frontend\"":"Order Items Grid",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description",
-"var shipping_msg":"Shipping message"
+"var order.shipping_description":"Shipping Description",
+"var shipping_msg":"Shipping message",
+"var created_at_formatted":"Order Created At (datetime)",
+"var store.frontend_name":"Store Frontend Name",
+"var store_phone":"Store Phone",
+"var store_email":"Store Email",
+"var store_hours":"Store Hours",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.is_not_virtual":"Order Type",
+"var order":"Order",
+"var order_data.customer_name":"Customer Name"
 } @-->
 
 {{template config_path="design/email/header_template"}}
@@ -21,9 +30,9 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%customer_name," customer_name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%customer_name," customer_name=$order_data.customer_name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans "Once your package ships we will send you a tracking number."}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
             </p>
@@ -38,16 +47,16 @@
     <tr class="email-summary">
         <td>
             <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_id=$order.increment_id |raw}}</h1>
-            <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$order.getCreatedAtFormatted(2) |raw}}</p>
+            <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$created_at_formatted |raw}}</p>
         </td>
     </tr>
     <tr class="email-information">
         <td>
-            {{depend order.getEmailCustomerNote()}}
+            {{depend order_data.email_customer_note}}
             <table class="message-info">
                 <tr>
                     <td>
-                        {{var order.getEmailCustomerNote()|escape|nl2br}}
+                        {{var order_data.email_customer_note|escape|nl2br}}
                     </td>
                 </tr>
             </table>
@@ -58,7 +67,7 @@ <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_i
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -70,10 +79,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                         {{if shipping_msg}}
                         <p>{{var shipping_msg}}</p>
                         {{/if}}
diff --git a/app/code/Magento/Sales/view/frontend/email/order_new_guest.html b/app/code/Magento/Sales/view/frontend/email/order_new_guest.html
index cfd99e5b0936e..866a1ad87f9b1 100644
--- a/app/code/Magento/Sales/view/frontend/email/order_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/order_new_guest.html
@@ -4,27 +4,33 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Your %store_name order confirmation" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Your %store_name order confirmation" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var order.getEmailCustomerNote()":"Email Order Note",
-"var order.getBillingAddress().getName()":"Guest Customer Name",
-"var order.getCreatedAtFormatted(2)":"Order Created At (datetime)",
+"var order_data.email_customer_note|escape|nl2br":"Email Order Note",
+"var order.billing_address.name":"Guest Customer Name",
+"var created_at_formatted":"Order Created At (datetime)",
 "var order.increment_id":"Order Id",
 "layout handle=\"sales_email_order_items\" order=$order":"Order Items Grid",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description",
-"var shipping_msg":"Shipping message"
+"var order.shipping_description":"Shipping Description",
+"var shipping_msg":"Shipping message",
+"var store.frontend_name":"Store Frontend Name",
+"var store_phone":"Store Phone",
+"var store_email":"Store Email",
+"var store_hours":"Store Hours",
+"var order_data.is_not_virtual":"Order Type",
+"var order":"Order"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getBillingAddress().getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order.billing_address.name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans "Once your package ships we will send an email with a link to track your order."}}
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
                 {{depend store_hours}}
@@ -36,16 +42,16 @@
     <tr class="email-summary">
         <td>
             <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_id=$order.increment_id |raw}}</h1>
-            <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$order.getCreatedAtFormatted(2) |raw}}</p>
+            <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$created_at_formatted |raw}}</p>
         </td>
     </tr>
     <tr class="email-information">
         <td>
-            {{depend order.getEmailCustomerNote()}}
+            {{depend order_data.email_customer_note}}
             <table class="message-info">
                 <tr>
                     <td>
-                        {{var order.getEmailCustomerNote()|escape|nl2br}}
+                        {{var order_data.email_customer_note|escape|nl2br}}
                     </td>
                 </tr>
             </table>
@@ -56,7 +62,7 @@ <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_i
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -68,10 +74,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                         {{if shipping_msg}}
                         <p>{{var shipping_msg}}</p>
                         {{/if}}
diff --git a/app/code/Magento/Sales/view/frontend/email/order_update.html b/app/code/Magento/Sales/view/frontend/email/order_update.html
index a8f0068b70e87..b2c4e86654f6f 100644
--- a/app/code/Magento/Sales/view/frontend/email/order_update.html
+++ b/app/code/Magento/Sales/view/frontend/email/order_update.html
@@ -4,26 +4,30 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name order" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var order.getCustomerName()":"Customer Name",
-"var comment":"Order Comment",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.customer_name":"Customer Name",
+"var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status"
+"var order_data.frontend_status_label":"Order Status",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email",
+"var store_phone":"Store Phone",
+"var store_hours":"Store Hours"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
             </p>
             <p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
diff --git a/app/code/Magento/Sales/view/frontend/email/order_update_guest.html b/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
index 749fa3b60ad59..1ce0d162ed76e 100644
--- a/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
@@ -4,25 +4,29 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name order" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.getName()":"Guest Customer Name",
-"var comment":"Order Comment",
+"var billing.name":"Guest Customer Name",
+"var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status"
+"var order_data.frontend_status_label":"Order Status",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email",
+"var store_phone":"Store Phone",
+"var store_hours":"Store Hours"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
             </p>
             <p>
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new.html b/app/code/Magento/Sales/view/frontend/email/shipment_new.html
index 84f5acb29ea3b..39823a0c9d80b 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_new.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new.html
@@ -4,29 +4,35 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Your %store_name order has shipped" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Your %store_name order has shipped" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var order.getCustomerName()":"Customer Name",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.customer_name":"Customer Name",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
-"var comment":"Shipment Comment",
+"var comment|escape|nl2br":"Shipment Comment",
 "var shipment.increment_id":"Shipment Id",
 "layout handle=\"sales_email_order_shipment_items\" shipment=$shipment order=$order":"Shipment Items Grid",
 "block class='Magento\\\\Framework\\\\View\\\\Element\\\\Template' area='frontend' template='Magento_Sales::email\/shipment\/track.phtml' shipment=$shipment order=$order":"Shipment Track Details",
 "var formattedShippingAddress|raw":"Shipping Address",
 "var order.shipping_description":"Shipping Description",
-"var order.getShippingDescription()":"Shipping Description"
+"var store.frontend_name":"Store Frontend Name",
+"var store_phone":"Store Phone",
+"var store_email":"Store Email",
+"var store_hours":"Store Hours",
+"var order_data.is_not_virtual": "Order Type",
+"var shipment": "Shipment",
+"var order": "Order"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
                 {{depend store_hours}}
@@ -60,7 +66,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -72,10 +78,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                     </td>
                     {{/depend}}
                 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
index bb181126724da..ed2f52ed85066 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
@@ -4,28 +4,34 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Your %store_name order has shipped" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Your %store_name order has shipped" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var billing.getName()":"Guest Customer Name",
+"var billing.name":"Guest Customer Name",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
-"var comment":"Shipment Comment",
+"var comment|escape|nl2br":"Shipment Comment",
 "var shipment.increment_id":"Shipment Id",
 "layout handle=\"sales_email_order_shipment_items\" shipment=$shipment order=$order":"Shipment Items Grid",
 "block class='Magento\\\\Framework\\\\View\\\\Element\\\\Template' area='frontend' template='Magento_Sales::email\/shipment\/track.phtml' shipment=$shipment order=$order":"Shipment Track Details",
 "var formattedShippingAddress|raw":"Shipping Address",
 "var order.shipping_description":"Shipping Description",
-"var order.getShippingDescription()":"Shipping Description"
+"var store.frontend_name":"Store Frontend Name",
+"var store_phone":"Store Phone",
+"var store_email":"Store Email",
+"var store_hours":"Store Hours",
+"var order_data.is_not_virtual": "Order Type",
+"var shipment": "Shipment",
+"var order": "Order"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
                 {{depend store_hours}}
                     {{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours |raw}}
@@ -58,7 +64,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -70,10 +76,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                     </td>
                     {{/depend}}
                 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_update.html b/app/code/Magento/Sales/view/frontend/email/shipment_update.html
index 9d1c93287549a..9d0057f78df7f 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_update.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_update.html
@@ -4,27 +4,31 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name shipment" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name shipment" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var order.getCustomerName()":"Customer Name",
-"var comment":"Order Comment",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.customer_name":"Customer Name",
+"var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status",
-"var shipment.increment_id":"Shipment Id"
+"var order_data.frontend_status_label":"Order Status",
+"var shipment.increment_id":"Shipment Id",
+"var store.frontend_name":"Store Frontend Name",
+"var store_phone":"Store Phone",
+"var store_email":"Store Email",
+"var store_hours":"Store Hours"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
             </p>
             <p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
index 0d2dccd3377d2..087cb0ddbf5bc 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
@@ -4,26 +4,30 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name shipment" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name shipment" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.getName()":"Guest Customer Name",
-"var comment":"Order Comment",
+"var billing.name":"Guest Customer Name",
+"var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status",
-"var shipment.increment_id":"Shipment Id"
+"var order_data.frontend_status_label":"Order Status",
+"var shipment.increment_id":"Shipment Id",
+"var store.frontend_name":"Store Frontend Name",
+"var store_phone":"Store Phone",
+"var store_email":"Store Email",
+"var store_hours":"Store Hours"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
             </p>
             <p>
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 9c0bf0182c62e..b2e84691a45cf 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
@@ -17,7 +17,7 @@
                 <?php if (!$block->getPrintStatus()) : ?>
                     <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                     <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
-                        <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
+                        <?= $block->escapeHtml($_formatedOptionValue['value'], ['a', 'img']) ?>
                         <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                         <div class="tooltip content">
                             <dl class="item options">
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
index ef56ad69dcb1b..a785ca93511ad 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
@@ -5,6 +5,7 @@
  */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
+// @codingStandardsIgnoreFile
 
 /** @var \Magento\Sales\Block\Order\History $block */
 ?>
@@ -19,7 +20,6 @@
                     <th scope="col" class="col id"><?= $block->escapeHtml(__('Order #')) ?></th>
                     <th scope="col" class="col date"><?= $block->escapeHtml(__('Date')) ?></th>
                     <?= $block->getChildHtml('extra.column.header') ?>
-                    <th scope="col" class="col shipping"><?= $block->escapeHtml(__('Ship To')) ?></th>
                     <th scope="col" class="col total"><?= $block->escapeHtml(__('Order Total')) ?></th>
                     <th scope="col" class="col status"><?= $block->escapeHtml(__('Status')) ?></th>
                     <th scope="col" class="col actions"><?= $block->escapeHtml(__('Action')) ?></th>
@@ -35,7 +35,6 @@
                             <?php $extra->setOrder($_order); ?>
                             <?= $extra->getChildHtml() ?>
                         <?php endif; ?>
-                        <td data-th="<?= $block->escapeHtml(__('Ship To')) ?>" class="col shipping"><?= $_order->getShippingAddress() ? $block->escapeHtml($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
                         <td data-th="<?= $block->escapeHtml(__('Order Total')) ?>" class="col total"><?= /* @noEscape */ $_order->formatPrice($_order->getGrandTotal()) ?></td>
                         <td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status"><?= $block->escapeHtml($_order->getStatusLabel()) ?></td>
                         <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
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 1c427e8b6d4e2..0176582f0fcd7 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
@@ -17,7 +17,7 @@
                 <?php if (!$block->getPrintStatus()) : ?>
                     <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                     <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
-                        <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
+                        <?= $block->escapeHtml($_formatedOptionValue['value'], ['a', 'img']) ?>
                         <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                             <div class="tooltip content">
                                 <dl class="item options">
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 4042fe52bb5a8..51e43476238be 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
@@ -16,17 +16,19 @@ $_item = $block->getItem();
                 <dt><?= $block->escapeHtml($_option['label']) ?></dt>
                 <?php if (!$block->getPrintStatus()) : ?>
                     <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                    <dd>
+                    <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
+                        <?= $block->escapeHtml($_formatedOptionValue['value'], ['a', 'img']) ?>
                         <?php if (isset($_formatedOptionValue['full_view'])) : ?>
-                            <?= $block->escapeHtml($_formatedOptionValue['full_view'], ['a']) ?>
-                        <?php else : ?>
-                            <?=$block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
+                            <div class="tooltip content">
+                                <dl class="item options">
+                                    <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                                    <dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
+                                </dl>
+                            </div>
                         <?php endif; ?>
                     </dd>
                 <?php else : ?>
-                    <dd>
-                        <?= /* @noEscape */ nl2br($block->escapeHtml($_option['print_value'] ?? $_option['value'])) ?>
-                    </dd>
+                    <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
                 <?php endif; ?>
             <?php endforeach; ?>
             </dl>
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 57aeffb26f823..26fe74b0fc454 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
@@ -16,7 +16,7 @@
                 <?php if (!$block->getPrintStatus()) : ?>
                     <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                     <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
-                        <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
+                        <?= $block->escapeHtml($_formatedOptionValue['value'], ['a', 'img']) ?>
                         <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                         <div class="tooltip content">
                             <dl class="item options">
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index a7c30f582e752..a687ee59031ea 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -7,7 +7,7 @@ type Query {
 
 type CustomerOrder @doc(description: "Order mapping fields") {
     id: Int
-    increment_id: String @deprecated(reason: "Use the order_number instaed.")
+    increment_id: String @deprecated(reason: "Use the order_number instead.")
     order_number: String! @doc(description: "The order number")
     created_at: String
     grand_total: Float
diff --git a/app/code/Magento/SalesRule/Api/Data/DiscountDataInterface.php b/app/code/Magento/SalesRule/Api/Data/DiscountDataInterface.php
new file mode 100644
index 0000000000000..38ac93dc9762f
--- /dev/null
+++ b/app/code/Magento/SalesRule/Api/Data/DiscountDataInterface.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Api\Data;
+
+/**
+ * Discount Data Interface
+ */
+interface DiscountDataInterface
+{
+    /**
+     * Get Amount
+     *
+     * @return float
+     */
+    public function getAmount();
+
+    /**
+     * Get Base Amount
+     *
+     * @return float
+     */
+    public function getBaseAmount();
+
+    /**
+     * Get Original Amount
+     *
+     * @return float
+     */
+    public function getOriginalAmount();
+
+    /**
+     * Get Base Original Amount
+     *
+     * @return float
+     */
+    public function getBaseOriginalAmount();
+}
diff --git a/app/code/Magento/SalesRule/Api/Data/RuleDiscountInterface.php b/app/code/Magento/SalesRule/Api/Data/RuleDiscountInterface.php
new file mode 100644
index 0000000000000..8d2b73476af46
--- /dev/null
+++ b/app/code/Magento/SalesRule/Api/Data/RuleDiscountInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Api\Data;
+
+/**
+ * Rule discount Interface
+ */
+interface RuleDiscountInterface
+{
+    /**
+     * Get Discount Data
+     *
+     * @return \Magento\SalesRule\Api\Data\DiscountDataInterface
+     */
+    public function getDiscountData();
+
+    /**
+     * Get Rule Label
+     *
+     * @return string
+     */
+    public function getRuleLabel();
+
+    /**
+     * Get Rule ID
+     *
+     * @return int
+     */
+    public function getRuleID();
+}
diff --git a/app/code/Magento/SalesRule/Api/Data/RuleInterface.php b/app/code/Magento/SalesRule/Api/Data/RuleInterface.php
index 34341e16cfb64..94e6ed8b4584a 100644
--- a/app/code/Magento/SalesRule/Api/Data/RuleInterface.php
+++ b/app/code/Magento/SalesRule/Api/Data/RuleInterface.php
@@ -5,13 +5,15 @@
  */
 namespace Magento\SalesRule\Api\Data;
 
+use Magento\Framework\Api\ExtensibleDataInterface;
+
 /**
  * Interface RuleInterface
  *
  * @api
  * @since 100.0.2
  */
-interface RuleInterface extends \Magento\Framework\Api\ExtensibleDataInterface
+interface RuleInterface extends ExtensibleDataInterface
 {
     const FREE_SHIPPING_NONE = 'NONE';
     const FREE_SHIPPING_MATCHING_ITEMS_ONLY = 'MATCHING_ITEMS_ONLY';
@@ -173,7 +175,7 @@ public function getIsActive();
      * Set whether the coupon is active
      *
      * @param bool $isActive
-     * @return bool
+     * @return $this
      */
     public function setIsActive($isActive);
 
@@ -232,6 +234,8 @@ public function setStopRulesProcessing($stopRulesProcessing);
     public function getIsAdvanced();
 
     /**
+     * Set if rule is advanced
+     *
      * @param bool $isAdvanced
      * @return $this
      */
@@ -260,6 +264,8 @@ public function setProductIds(array $productIds = null);
     public function getSortOrder();
 
     /**
+     * Set sort order
+     *
      * @param int $sortOrder
      * @return $this
      */
@@ -446,5 +452,5 @@ public function getExtensionAttributes();
      * @param \Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes
      * @return $this
      */
-    public function setExtensionAttributes(\Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes);
+    public function setExtensionAttributes(RuleExtensionInterface $extensionAttributes);
 }
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
index bf92e21827a01..b021b3e539a9d 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
@@ -100,7 +100,7 @@ protected function _prepareColumns()
         $this->addColumn(
             'used',
             [
-                'header' => __('Uses'),
+                'header' => __('Used'),
                 'index' => 'times_used',
                 'width' => '100',
                 'type' => 'options',
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 7d55d18b770e2..3513331913492 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php
@@ -61,7 +61,8 @@ public function __construct(
      */
     public function execute()
     {
-        if ($this->getRequest()->getPostValue()) {
+        $data = $this->getRequest()->getPostValue();
+        if ($data) {
             try {
                 /** @var $model \Magento\SalesRule\Model\Rule */
                 $model = $this->_objectManager->create(\Magento\SalesRule\Model\Rule::class);
@@ -69,7 +70,6 @@ public function execute()
                     'adminhtml_controller_salesrule_prepare_save',
                     ['request' => $this->getRequest()]
                 );
-                $data = $this->getRequest()->getPostValue();
                 if (empty($data['from_date'])) {
                     $data['from_date'] = $this->timezone->formatDate();
                 }
diff --git a/app/code/Magento/SalesRule/Model/Data/DiscountData.php b/app/code/Magento/SalesRule/Model/Data/DiscountData.php
new file mode 100644
index 0000000000000..cfad4b5c09c55
--- /dev/null
+++ b/app/code/Magento/SalesRule/Model/Data/DiscountData.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Model\Data;
+
+use Magento\SalesRule\Api\Data\DiscountDataInterface;
+use Magento\Framework\Api\ExtensionAttributesInterface;
+
+/**
+ * Discount Data Model
+ */
+class DiscountData extends \Magento\Framework\Api\AbstractExtensibleObject implements DiscountDataInterface
+{
+
+    const AMOUNT = 'amount';
+    const BASE_AMOUNT = 'base_amount';
+    const ORIGINAL_AMOUNT = 'original_amount';
+    const BASE_ORIGINAL_AMOUNT = 'base_original_amount';
+
+    /**
+     * Get Amount
+     *
+     * @return float
+     */
+    public function getAmount()
+    {
+        return $this->_get(self::AMOUNT);
+    }
+
+    /**
+     * Set Amount
+     *
+     * @param float $amount
+     * @return $this
+     */
+    public function setAmount(float $amount)
+    {
+        return $this->setData(self::AMOUNT, $amount);
+    }
+
+    /**
+     * Get Base Amount
+     *
+     * @return float
+     */
+    public function getBaseAmount()
+    {
+        return $this->_get(self::BASE_AMOUNT);
+    }
+
+    /**
+     * Set Base Amount
+     *
+     * @param float $amount
+     * @return $this
+     */
+    public function setBaseAmount(float $amount)
+    {
+        return $this->setData(self::BASE_AMOUNT, $amount);
+    }
+
+    /**
+     * Get Original Amount
+     *
+     * @return float
+     */
+    public function getOriginalAmount()
+    {
+        return $this->_get(self::ORIGINAL_AMOUNT);
+    }
+
+    /**
+     * Set Original Amount
+     *
+     * @param float $amount
+     * @return $this
+     */
+    public function setOriginalAmount(float $amount)
+    {
+        return $this->setData(self::ORIGINAL_AMOUNT, $amount);
+    }
+
+    /**
+     * Get Base Original Amount
+     *
+     * @return float
+     */
+    public function getBaseOriginalAmount()
+    {
+        return $this->_get(self::BASE_ORIGINAL_AMOUNT);
+    }
+
+    /**
+     * Set Base Original Amount
+     *
+     * @param float $amount
+     * @return $this
+     */
+    public function setBaseOriginalAmount(float $amount)
+    {
+        return $this->setData(self::BASE_ORIGINAL_AMOUNT, $amount);
+    }
+
+    /**
+     * Retrieve existing extension attributes object or create a new one.
+     *
+     * @return ExtensionAttributesInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param ExtensionAttributesInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        ExtensionAttributesInterface $extensionAttributes
+    ) {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+}
diff --git a/app/code/Magento/SalesRule/Model/Data/Rule.php b/app/code/Magento/SalesRule/Model/Data/Rule.php
index 58520831c016b..869822ab917cd 100644
--- a/app/code/Magento/SalesRule/Model/Data/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Data/Rule.php
@@ -5,10 +5,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\SalesRule\Model\Data;
 
+use Magento\Framework\Api\AbstractExtensibleObject;
 use Magento\SalesRule\Api\Data\ConditionInterface;
+use Magento\SalesRule\Api\Data\RuleExtensionInterface;
 use Magento\SalesRule\Api\Data\RuleInterface;
+use Magento\SalesRule\Api\Data\RuleLabelInterface;
 
 /**
  * Class Rule
@@ -16,7 +21,7 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @codeCoverageIgnore
  */
-class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements RuleInterface
+class Rule extends AbstractExtensibleObject implements RuleInterface
 {
     const KEY_RULE_ID = 'rule_id';
     const KEY_NAME = 'name';
@@ -187,7 +192,7 @@ public function getIsActive()
      * Set whether the coupon is active
      *
      * @param bool $isActive
-     * @return bool
+     * @return $this
      */
     public function setIsActive($isActive)
     {
@@ -197,7 +202,7 @@ public function setIsActive($isActive)
     /**
      * Get condition for the rule
      *
-     * @return \Magento\SalesRule\Api\Data\ConditionInterface|null
+     * @return ConditionInterface|null
      */
     public function getCondition()
     {
@@ -207,7 +212,7 @@ public function getCondition()
     /**
      * Set condition for the rule
      *
-     * @param \Magento\SalesRule\Api\Data\ConditionInterface|null $condition
+     * @param ConditionInterface|null $condition
      * @return $this
      */
     public function setCondition(ConditionInterface $condition = null)
@@ -218,7 +223,7 @@ public function setCondition(ConditionInterface $condition = null)
     /**
      * Get action condition
      *
-     * @return \Magento\SalesRule\Api\Data\ConditionInterface|null
+     * @return ConditionInterface|null
      */
     public function getActionCondition()
     {
@@ -228,7 +233,7 @@ public function getActionCondition()
     /**
      * Set action condition
      *
-     * @param \Magento\SalesRule\Api\Data\ConditionInterface|null $actionCondition
+     * @param ConditionInterface|null $actionCondition
      * @return $this
      */
     public function setActionCondition(ConditionInterface $actionCondition = null)
@@ -283,7 +288,7 @@ public function setIsAdvanced($isAdvanced)
     /**
      * Get display label
      *
-     * @return \Magento\SalesRule\Api\Data\RuleLabelInterface[]|null
+     * @return RuleLabelInterface[]|null
      */
     public function getStoreLabels()
     {
@@ -293,7 +298,7 @@ public function getStoreLabels()
     /**
      * Set display label
      *
-     * @param \Magento\SalesRule\Api\Data\RuleLabelInterface[]|null $storeLabels
+     * @param RuleLabelInterface[]|null $storeLabels
      * @return $this
      */
     public function setStoreLabels(array $storeLabels = null)
@@ -622,7 +627,7 @@ public function setSimpleFreeShipping($simpleFreeShipping)
     /**
      * @inheritdoc
      *
-     * @return \Magento\SalesRule\Api\Data\RuleExtensionInterface|null
+     * @return RuleExtensionInterface|null
      */
     public function getExtensionAttributes()
     {
@@ -632,11 +637,11 @@ public function getExtensionAttributes()
     /**
      * @inheritdoc
      *
-     * @param \Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes
+     * @param RuleExtensionInterface $extensionAttributes
      * @return $this
      */
     public function setExtensionAttributes(
-        \Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes
+        RuleExtensionInterface $extensionAttributes
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
diff --git a/app/code/Magento/SalesRule/Model/Data/RuleDiscount.php b/app/code/Magento/SalesRule/Model/Data/RuleDiscount.php
new file mode 100644
index 0000000000000..aaf657c06b4fc
--- /dev/null
+++ b/app/code/Magento/SalesRule/Model/Data/RuleDiscount.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\Model\Data;
+
+use Magento\Framework\Api\ExtensionAttributesInterface;
+use Magento\SalesRule\Api\Data\RuleDiscountInterface;
+use Magento\Framework\Api\AbstractExtensibleObject;
+
+/**
+ * Data Model for Rule Discount
+ */
+class RuleDiscount extends AbstractExtensibleObject implements RuleDiscountInterface
+{
+    const KEY_DISCOUNT_DATA = 'discount';
+    const KEY_RULE_LABEL = 'rule';
+    const KEY_RULE_ID = 'rule_id';
+
+    /**
+     * Get Discount Data
+     *
+     * @return \Magento\SalesRule\Model\Rule\Action\Discount\Data
+     */
+    public function getDiscountData()
+    {
+        return $this->_get(self::KEY_DISCOUNT_DATA);
+    }
+
+    /**
+     * Get Rule Label
+     *
+     * @return string
+     */
+    public function getRuleLabel()
+    {
+        return $this->_get(self::KEY_RULE_LABEL);
+    }
+
+    /**
+     * Get Rule ID
+     *
+     * @return int
+     */
+    public function getRuleID()
+    {
+        return $this->_get(self::KEY_RULE_ID);
+    }
+
+    /**
+     * Retrieve existing extension attributes object or create a new one.
+     *
+     * @return ExtensionAttributesInterface|null
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param ExtensionAttributesInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        ExtensionAttributesInterface $extensionAttributes
+    ) {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
+}
diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
index 315ce874513a3..69abac8309f90 100644
--- a/app/code/Magento/SalesRule/Model/Quote/Discount.php
+++ b/app/code/Magento/SalesRule/Model/Quote/Discount.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\SalesRule\Model\Quote;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\SalesRule\Api\Data\RuleDiscountInterfaceFactory;
+use Magento\SalesRule\Api\Data\DiscountDataInterfaceFactory;
+
 /**
  * Discount totals calculation model.
  */
@@ -36,23 +40,41 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
      */
     protected $priceCurrency;
 
+    /**
+     * @var RuleDiscountInterfaceFactory
+     */
+    private $discountInterfaceFactory;
+
+    /**
+     * @var DiscountDataInterfaceFactory
+     */
+    private $discountDataInterfaceFactory;
+
     /**
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\SalesRule\Model\Validator $validator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+     * @param RuleDiscountInterfaceFactory|null $discountInterfaceFactory
+     * @param DiscountDataInterfaceFactory|null $discountDataInterfaceFactory
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\SalesRule\Model\Validator $validator,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
+        RuleDiscountInterfaceFactory $discountInterfaceFactory = null,
+        DiscountDataInterfaceFactory $discountDataInterfaceFactory = null
     ) {
         $this->setCode(self::COLLECTOR_TYPE_CODE);
         $this->eventManager = $eventManager;
         $this->calculator = $validator;
         $this->storeManager = $storeManager;
         $this->priceCurrency = $priceCurrency;
+        $this->discountInterfaceFactory = $discountInterfaceFactory
+            ?: ObjectManager::getInstance()->get(RuleDiscountInterfaceFactory::class);
+        $this->discountDataInterfaceFactory = $discountDataInterfaceFactory
+            ?: ObjectManager::getInstance()->get(DiscountDataInterfaceFactory::class);
     }
 
     /**
@@ -91,6 +113,8 @@ public function collect(
 
         $address->setDiscountDescription([]);
         $items = $this->calculator->sortItemsByPriority($items, $address);
+        $address->getExtensionAttributes()->setDiscounts([]);
+        $addressDiscountAggregator = [];
 
         /** @var \Magento\Quote\Model\Quote\Item $item */
         foreach ($items as $item) {
@@ -127,13 +151,15 @@ public function collect(
                 $this->calculator->process($item);
                 $this->aggregateItemDiscount($item, $total);
             }
+            if ($item->getExtensionAttributes()) {
+                $this->aggregateDiscountPerRule($item, $address, $addressDiscountAggregator);
+            }
         }
 
         $this->calculator->prepareDescription($address);
         $total->setDiscountDescription($address->getDiscountDescription());
         $total->setSubtotalWithDiscount($total->getSubtotal() + $total->getDiscountAmount());
         $total->setBaseSubtotalWithDiscount($total->getBaseSubtotal() + $total->getBaseDiscountAmount());
-
         $address->setDiscountAmount($total->getDiscountAmount());
         $address->setBaseDiscountAmount($total->getBaseDiscountAmount());
 
@@ -218,4 +244,56 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu
         }
         return $result;
     }
+
+    /**
+     * Aggregates discount per rule
+     *
+     * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
+     * @param \Magento\Quote\Api\Data\AddressInterface $address
+     * @param array $addressDiscountAggregator
+     * @return void
+     */
+    private function aggregateDiscountPerRule(
+        \Magento\Quote\Model\Quote\Item\AbstractItem $item,
+        \Magento\Quote\Api\Data\AddressInterface $address,
+        array &$addressDiscountAggregator
+    ) {
+        $discountBreakdown = $item->getExtensionAttributes()->getDiscounts();
+        if ($discountBreakdown) {
+            foreach ($discountBreakdown as $value) {
+                /* @var \Magento\SalesRule\Api\Data\DiscountDataInterface $discount */
+                $discount = $value->getDiscountData();
+                $ruleLabel = $value->getRuleLabel();
+                $ruleID = $value->getRuleID();
+                if (isset($addressDiscountAggregator[$ruleID])) {
+                    /** @var \Magento\SalesRule\Model\Data\RuleDiscount $cartDiscount */
+                    $cartDiscount = $addressDiscountAggregator[$ruleID];
+                    $discountData = $cartDiscount->getDiscountData();
+                    $discountData->setBaseAmount($discountData->getBaseAmount()+$discount->getBaseAmount());
+                    $discountData->setAmount($discountData->getAmount()+$discount->getAmount());
+                    $discountData->setOriginalAmount($discountData->getOriginalAmount()+$discount->getOriginalAmount());
+                    $discountData->setBaseOriginalAmount(
+                        $discountData->getBaseOriginalAmount()+$discount->getBaseOriginalAmount()
+                    );
+                } else {
+                    $data = [
+                        'amount' => $discount->getAmount(),
+                        'base_amount' => $discount->getBaseAmount(),
+                        'original_amount' => $discount->getOriginalAmount(),
+                        'base_original_amount' => $discount->getBaseOriginalAmount()
+                    ];
+                    $discountData = $this->discountDataInterfaceFactory->create(['data' => $data]);
+                    $data = [
+                        'discount' => $discountData,
+                        'rule' => $ruleLabel,
+                        'rule_id' => $ruleID,
+                    ];
+                    /** @var \Magento\SalesRule\Model\Data\RuleDiscount $cartDiscount */
+                    $cartDiscount = $this->discountInterfaceFactory->create(['data' => $data]);
+                    $addressDiscountAggregator[$ruleID] = $cartDiscount;
+                }
+            }
+        }
+            $address->getExtensionAttributes()->setDiscounts(array_values($addressDiscountAggregator));
+    }
 }
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/Data.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/Data.php
index fe564690e08b8..f9892fb48547c 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/Data.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/Data.php
@@ -6,6 +6,8 @@
 namespace Magento\SalesRule\Model\Rule\Action\Discount;
 
 /**
+ *  Discount Data
+ *
  * @api
  * @since 100.0.2
  */
@@ -43,6 +45,8 @@ public function __construct()
     }
 
     /**
+     * Set Amount
+     *
      * @param float $amount
      * @return $this
      */
@@ -53,6 +57,8 @@ public function setAmount($amount)
     }
 
     /**
+     * Get Amount
+     *
      * @return float
      */
     public function getAmount()
@@ -61,6 +67,8 @@ public function getAmount()
     }
 
     /**
+     * Set Base Amount
+     *
      * @param float $baseAmount
      * @return $this
      */
@@ -71,6 +79,8 @@ public function setBaseAmount($baseAmount)
     }
 
     /**
+     * Get Base Amount
+     *
      * @return float
      */
     public function getBaseAmount()
@@ -79,6 +89,8 @@ public function getBaseAmount()
     }
 
     /**
+     * Set Original Amount
+     *
      * @param float $originalAmount
      * @return $this
      */
@@ -99,6 +111,8 @@ public function getOriginalAmount()
     }
 
     /**
+     * Set Base Original Amount
+     *
      * @param float $baseOriginalAmount
      * @return $this
      */
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
index cf6301cb31a9c..29cdf34c5a784 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
@@ -65,7 +65,6 @@ public function loadAttributeOptions()
             'base_subtotal' => __('Subtotal'),
             'total_qty' => __('Total Items Quantity'),
             'weight' => __('Total Weight'),
-            'payment_method' => __('Payment Method'),
             'shipping_method' => __('Shipping Method'),
             'postcode' => __('Shipping Postcode'),
             'region' => __('Shipping Region'),
diff --git a/app/code/Magento/SalesRule/Model/RulesApplier.php b/app/code/Magento/SalesRule/Model/RulesApplier.php
index 1214e6642b440..270732c8e0278 100644
--- a/app/code/Magento/SalesRule/Model/RulesApplier.php
+++ b/app/code/Magento/SalesRule/Model/RulesApplier.php
@@ -12,6 +12,8 @@
 use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
 use Magento\SalesRule\Model\Rule\Action\Discount\CalculatorFactory;
 use Magento\SalesRule\Model\Rule\Action\Discount\DataFactory;
+use Magento\SalesRule\Api\Data\RuleDiscountInterfaceFactory;
+use Magento\SalesRule\Api\Data\DiscountDataInterfaceFactory;
 
 /**
  * Class RulesApplier
@@ -48,18 +50,38 @@ class RulesApplier
     protected $discountFactory;
 
     /**
+     * @var RuleDiscountInterfaceFactory
+     */
+    private $discountInterfaceFactory;
+
+    /**
+     * @var DiscountDataInterfaceFactory
+     */
+    private $discountDataInterfaceFactory;
+
+    /**
+     * @var array
+     */
+    private $discountAggregator;
+
+    /**
+     * RulesApplier constructor.
      * @param CalculatorFactory $calculatorFactory
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param Utility $utility
      * @param ChildrenValidationLocator|null $childrenValidationLocator
-     * @param DataFactory $discountDataFactory
+     * @param DataFactory|null $discountDataFactory
+     * @param RuleDiscountInterfaceFactory|null $discountInterfaceFactory
+     * @param DiscountDataInterfaceFactory|null $discountDataInterfaceFactory
      */
     public function __construct(
         \Magento\SalesRule\Model\Rule\Action\Discount\CalculatorFactory $calculatorFactory,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\SalesRule\Model\Utility $utility,
         ChildrenValidationLocator $childrenValidationLocator = null,
-        DataFactory $discountDataFactory = null
+        DataFactory $discountDataFactory = null,
+        RuleDiscountInterfaceFactory $discountInterfaceFactory = null,
+        DiscountDataInterfaceFactory $discountDataInterfaceFactory = null
     ) {
         $this->calculatorFactory = $calculatorFactory;
         $this->validatorUtility = $utility;
@@ -67,6 +89,10 @@ public function __construct(
         $this->childrenValidationLocator = $childrenValidationLocator
              ?: ObjectManager::getInstance()->get(ChildrenValidationLocator::class);
         $this->discountFactory = $discountDataFactory ?: ObjectManager::getInstance()->get(DataFactory::class);
+        $this->discountInterfaceFactory = $discountInterfaceFactory
+            ?: ObjectManager::getInstance()->get(RuleDiscountInterfaceFactory::class);
+        $this->discountDataInterfaceFactory = $discountDataInterfaceFactory
+            ?: ObjectManager::getInstance()->get(DiscountDataInterfaceFactory::class);
     }
 
     /**
@@ -83,6 +109,7 @@ public function applyRules($item, $rules, $skipValidation, $couponCode)
     {
         $address = $item->getAddress();
         $appliedRuleIds = [];
+        $this->discountAggregator = [];
         /* @var $rule Rule */
         foreach ($rules as $rule) {
             if (!$this->validatorUtility->canProcessRule($rule, $address)) {
@@ -162,7 +189,7 @@ public function addDiscountDescription($address, $rule)
      */
     protected function applyRule($item, $rule, $address, $couponCode)
     {
-        $discountData = $this->getDiscountData($item, $rule);
+        $discountData = $this->getDiscountData($item, $rule, $address);
         $this->setDiscountData($discountData, $item);
 
         $this->maintainAddressCouponCode($address, $rule, $couponCode);
@@ -175,10 +202,11 @@ protected function applyRule($item, $rule, $address, $couponCode)
      * Get discount Data
      *
      * @param AbstractItem $item
-     * @param Rule $rule
+     * @param \Magento\SalesRule\Model\Rule $rule
+     * @param \Magento\Quote\Model\Quote\Address $address
      * @return \Magento\SalesRule\Model\Rule\Action\Discount\Data
      */
-    protected function getDiscountData($item, $rule)
+    protected function getDiscountData($item, $rule, $address)
     {
         $qty = $this->validatorUtility->getItemQty($item, $rule);
 
@@ -187,7 +215,7 @@ protected function getDiscountData($item, $rule)
         $discountData = $discountCalculator->calculate($rule, $item, $qty);
         $this->eventFix($discountData, $item, $rule, $qty);
         $this->validatorUtility->deltaRoundingFix($discountData, $item);
-        $this->setDiscountBreakdown($discountData, $item, $rule);
+        $this->setDiscountBreakdown($discountData, $item, $rule, $address);
 
         /**
          * We can't use row total here because row total not include tax
@@ -205,21 +233,29 @@ protected function getDiscountData($item, $rule)
      * @param \Magento\SalesRule\Model\Rule\Action\Discount\Data $discountData
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param \Magento\SalesRule\Model\Rule $rule
+     * @param \Magento\Quote\Model\Quote\Address $address
      * @return $this
      */
-    private function setDiscountBreakdown($discountData, $item, $rule)
+    private function setDiscountBreakdown($discountData, $item, $rule, $address)
     {
-        if ($discountData->getAmount() > 0) {
-            /** @var \Magento\SalesRule\Model\Rule\Action\Discount\Data $discount */
-            $discount = $this->discountFactory->create();
-            $discount->setBaseOriginalAmount($discountData->getBaseOriginalAmount());
-            $discount->setAmount($discountData->getAmount());
-            $discount->setBaseAmount($discountData->getBaseAmount());
-            $discount->setOriginalAmount($discountData->getOriginalAmount());
-            $discountBreakdown = $item->getExtensionAttributes()->getDiscounts() ?? [];
-            $discountBreakdown[$rule->getId()]['discount'] = $discount;
-            $discountBreakdown[$rule->getId()]['rule'] = $rule;
-            $item->getExtensionAttributes()->setDiscounts($discountBreakdown);
+        if ($discountData->getAmount() > 0 && $item->getExtensionAttributes()) {
+            $data = [
+                'amount' => $discountData->getAmount(),
+                'base_amount' => $discountData->getBaseAmount(),
+                'original_amount' => $discountData->getOriginalAmount(),
+                'base_original_amount' => $discountData->getBaseOriginalAmount()
+            ];
+            $itemDiscount = $this->discountDataInterfaceFactory->create(['data' => $data]);
+            $ruleLabel = $rule->getStoreLabel($address->getQuote()->getStore()) ?: __('Discount');
+            $data = [
+                'discount' => $itemDiscount,
+                'rule' => $ruleLabel,
+                'rule_id' => $rule->getId(),
+            ];
+            /** @var \Magento\SalesRule\Model\Data\RuleDiscount $itemDiscount */
+            $ruleDiscount = $this->discountInterfaceFactory->create(['data' => $data]);
+            $this->discountAggregator[] = $ruleDiscount;
+            $item->getExtensionAttributes()->setDiscounts($this->discountAggregator);
         }
         return $this;
     }
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
index c840162f0d162..91ecaff7f83a6 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
@@ -105,6 +105,33 @@
         <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.categoryCheckbox(categoryName)}}" stepKey="waitForCategoryVisible" after="openChooser"/>
         <checkOption selector="{{AdminCartPriceRulesFormSection.categoryCheckbox(categoryName)}}" stepKey="checkCategoryName" after="waitForCategoryVisible"/>
     </actionGroup>
+    <actionGroup name="AdminCreateCartPriceRuleActionsWithSubtotalActionGroup" extends="AdminCreateCartPriceRuleActionGroup">
+        <annotations>
+            <description>EXTENDS: AdminCreateCartPriceRuleActionGroup. Removes 'fillDiscountAmount'. Adds sub total conditions for free shipping to a Cart Price Rule.</description>
+        </annotations>
+        <arguments>
+            <argument name="ruleName"/>
+        </arguments>
+        <remove keyForRemoval="fillDiscountAmount"/>
+        <!-- Expand the conditions section -->
+        <grabTextFrom selector="{{AdminCartPriceRulesFormSection.ruleName}}" after="fillRuleName" stepKey="getSubtotalRule"/>
+        <click selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="openConditionsSection" after="selectActionType"/>
+        <click selector="{{AdminCartPriceRulesFormSection.addCondition('1')}}" after="openConditionsSection" stepKey="addFirstCondition"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.conditionSelect}}" userInput="{{ruleName.condition1}}" after="addFirstCondition" stepKey="selectCondition1"/>
+        <waitForPageLoad after="selectCondition1" stepKey="waitForConditionLoad"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition(ruleName.ruleToChange1)}}" after="waitForConditionLoad" stepKey="clickToChooseOption"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.conditionsOperator}}" userInput="{{ruleName.rule1}}" after="clickToChooseOption" stepKey="setOperatorType"/>
+        <click selector="{{AdminCartPriceRulesFormSection.targetEllipsis}}" after="setOperatorType" stepKey="clickEllipsis"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleFieldByIndex('1--1')}}" userInput="{{ruleName.subtotal}}" after="clickEllipsis" stepKey="fillSubtotalParameter"/>
+        <click selector="{{AdminCartPriceRulesFormSection.addNewCondition('1')}}" after="fillSubtotalParameter" stepKey="clickOnTheAddNewCondition"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.conditionSelectDropdown('1')}}" userInput="{{ruleName.condition2}}" after="clickOnTheAddNewCondition" stepKey="selectSecondCondition"/>
+        <waitForPageLoad after="selectSecondCondition" stepKey="waitForConditionLoad2"/>
+        <click selector="{{AdminCartPriceRulesFormSection.targetEllipsis}}" after="waitForConditionLoad2" stepKey="clickEllipsis2"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.ruleFieldByIndex('1--2')}}" userInput="{{ruleName.shippingMethod}}" after="clickEllipsis2" stepKey="selectShippingMethod"/>
+        <click selector="{{AdminCartPriceRulesFormSection.applyToShippingAmount}}" after="selectShippingMethod" stepKey="clickApplyToShipping"/>
+        <click selector="{{AdminCartPriceRulesFormSection.discardSubsequentRules}}" after="clickApplyToShipping" stepKey="clickDiscardSubsequentRules"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.freeShipping}}" userInput="{{ruleName.simple_free_shipping}}" after="clickDiscardSubsequentRules" stepKey="selectForMatchingItemsOnly"/>
+    </actionGroup>
     <actionGroup name="AdminCreateMultiWebsiteCartPriceRuleActionGroup" extends="AdminCreateCartPriceRuleActionGroup">
         <annotations>
             <description>EXTENDS: AdminCreateCartPriceRuleActionGroup. Removes 'clickSaveButton' for the next data changing. Assign cart price rule to 2 websites instead of 1.</description>
@@ -139,4 +166,28 @@
 
         <click selector="{{AdminCartPriceRulesFormSection.active}}" stepKey="clickActiveToDisable" after="fillRuleName"/>
     </actionGroup>
+
+    <actionGroup name="AdminCreateCartPriceRuleWithConditionIsCategoryActionGroup" extends="AdminCreateCartPriceRuleActionGroup">
+        <annotations>
+            <description>EXTENDS: AdminCreateCartPriceRuleActionGroup. Sets the provide Condition (Actions Aggregator/Value, Child Attribute and Action Value) for Actions on the Admin Cart Price Rule creation/edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="actionsAggregator" type="string" defaultValue="ANY"/>
+            <argument name="actionsValue" type="string" defaultValue="FALSE"/>
+            <argument name="childAttribute" type="string" defaultValue="Category"/>
+            <argument name="actionValue" type="string" defaultValue="2"/>
+        </arguments>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" after="fillDiscountAmount" stepKey="clickOnActionTab"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('ALL')}}" after="clickOnActionTab" stepKey="clickToChooseFirstRuleConditionValue"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.actionsAggregator}}" userInput="{{actionsAggregator}}" after="clickToChooseFirstRuleConditionValue" stepKey="changeFirstRuleConditionValue"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('TRUE')}}" after="changeFirstRuleConditionValue" stepKey="clickToChooseSecondRuleConditionValue"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.actionsValue}}" userInput="{{actionsValue}}" after="clickToChooseSecondRuleConditionValue" stepKey="changeSecondRuleConditionValue"/>
+        <click selector="{{AdminCartPriceRulesFormSection.conditions}}" after="changeSecondRuleConditionValue" stepKey="clickConditionDropDownMenu"/>
+        <waitForPageLoad stepKey="waitForDropDownOpened"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.childAttribute}}" userInput="{{childAttribute}}" after="clickConditionDropDownMenu" stepKey="selectConditionAttributeIsCategory"/>
+        <waitForPageLoad after="selectConditionAttributeIsCategory" stepKey="waitForOperatorOpened"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('...')}}" after="waitForOperatorOpened" stepKey="clickToChooserIcon"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.actionValue}}" userInput="{{actionValue}}" after="clickToChooserIcon" stepKey="choseNeededCategoryFromCategoryGrid"/>
+        <click selector="{{AdminCartPriceRulesFormSection.applyAction}}" after="choseNeededCategoryFromCategoryGrid" stepKey="applyAction"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
index c1ec728a6cfb9..4a39e1237841d 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
@@ -89,6 +89,13 @@
         <data key="apply">Percent of product price discount</data>
         <data key="discountAmount">50</data>
     </entity>
+    <entity name="SalesRuleWithFullDiscount" 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">100</data>
+    </entity>
     <entity name="CatPriceRule" type="SalesRule">
         <data key="name" unique="suffix">CartPriceRule</data>
         <data key="websites">Main Website</data>
@@ -457,4 +464,13 @@
         <requiredEntity type="SalesRuleLabel">SalesRuleLabelDefault</requiredEntity>
         <requiredEntity type="SalesRuleLabel">SalesRuleLabelStore1</requiredEntity>
     </entity>
+
+    <entity name="TestSalesRuleWithInvalidData" type="SalesRule">
+        <data key="userPerCustomer">one</data>
+        <data key="userPerCoupon">one</data>
+        <data key="priority">one</data>
+        <data key="discountStep">one</data>
+        <data key="discountAmount">one</data>
+        <data key="maximumQtyDiscount">one</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
index 3849d153be465..b164cdde33248 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
@@ -98,5 +98,7 @@
         <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"/>
+        <element name="couponGridUsedHeader" type="text" selector="#couponCodesGrid thead th[data-sort='used']"/>
+        <element name="fieldError" type="text" selector="//input[@name='{{fieldName}}']/following-sibling::label[@class='admin__field-error']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/PriceRuleConditionsSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/PriceRuleConditionsSection.xml
index 9a74ced2a2c17..89398051fcf67 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/PriceRuleConditionsSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/PriceRuleConditionsSection.xml
@@ -11,6 +11,7 @@
         <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="firstProductAttributeSelected" type="select" selector="#conditions__1__children .rule-param:nth-of-type(2) a:nth-child(1)"/>
         <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"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
index 9d807de409a0c..d719bb90efd59 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
@@ -62,6 +62,9 @@
         <waitForPageLoad stepKey="waitFormToReload1"/>
         <click selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" stepKey="expandCouponSection2"/>
 
+        <!-- Assert coupon codes grid header is correct -->
+        <see selector="{{AdminCartPriceRulesFormSection.couponGridUsedHeader}}" userInput="Used" stepKey="seeCorrectUsedHeader"/>
+
         <!-- Grab a coupon code and hold on to it for later -->
         <grabTextFrom selector="{{AdminCartPriceRulesFormSection.generatedCouponByIndex('1')}}" stepKey="grabCouponCode"/>
 
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateInvalidRuleTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateInvalidRuleTest.xml
new file mode 100644
index 0000000000000..620112e323ff5
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateInvalidRuleTest.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateInvalidRuleTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule with invalid data"/>
+            <title value="Admin can not create rule with invalid data"/>
+            <description value="Admin can not create rule with invalid data"/>
+            <severity value="MAJOR"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <actionGroup ref="logout" stepKey="adminLogout"/>
+        </after>
+
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForRulesPage"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+
+        <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="{{TestSalesRuleWithInvalidData.discountAmount}}" stepKey="fillDiscountAmount"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.maximumQtyDiscount}}" userInput="{{TestSalesRuleWithInvalidData.maximumQtyDiscount}}" stepKey="fillDiscountQty"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountStep}}" userInput="{{TestSalesRuleWithInvalidData.discountStep}}" stepKey="fillDiscountStep"/>
+
+        <fillField selector="{{AdminCartPriceRulesFormSection.userPerCustomer}}" userInput="{{TestSalesRuleWithInvalidData.userPerCustomer}}" stepKey="fillUsePerCustomer"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.userPerCoupon}}" userInput="{{TestSalesRuleWithInvalidData.userPerCoupon}}" stepKey="fillUsePerCoupon"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.priority}}" userInput="{{TestSalesRuleWithInvalidData.priority}}" stepKey="fillPriority"/>
+
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+
+        <see selector="{{AdminNewCatalogPriceRule.fieldError('uses_per_coupon')}}" userInput="Please enter a valid number in this field." stepKey="seePerCouponError"/>
+        <see selector="{{AdminNewCatalogPriceRule.fieldError('uses_per_customer')}}" userInput="Please enter a valid number in this field." stepKey="seePerCustomerError"/>
+        <see selector="{{AdminNewCatalogPriceRule.fieldError('sort_order')}}" userInput="Please enter a valid number in this field." stepKey="seePriorityError"/>
+        <see selector="{{AdminNewCatalogPriceRule.fieldError('discount_amount')}}" userInput="Please enter a valid number in this field." stepKey="seeDiscountAmountError"/>
+        <see selector="{{AdminNewCatalogPriceRule.fieldError('discount_qty')}}" userInput="Please enter a valid number in this field." stepKey="seeMaximumQtyError"/>
+        <see selector="{{AdminNewCatalogPriceRule.fieldError('discount_step')}}" userInput="Please enter a valid number in this field." stepKey="seeDiscountStepError"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteActiveSalesRuleWithComplexConditionsAndVerifyDeleteMessageTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteActiveSalesRuleWithComplexConditionsAndVerifyDeleteMessageTest.xml
index d106c086a6065..9a71210aac1c6 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteActiveSalesRuleWithComplexConditionsAndVerifyDeleteMessageTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminDeleteActiveSalesRuleWithComplexConditionsAndVerifyDeleteMessageTest.xml
@@ -16,9 +16,6 @@
             <severity value="CRITICAL"/>
             <group value="salesRule"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MC-17175"/>
-            </skip>
         </annotations>
 
         <before>
@@ -60,6 +57,8 @@
             <actionGroup ref="AdminCreateCartPriceRuleLabelsSectionActionGroup" stepKey="createActiveCartPriceRuleLabelsSection">
                 <argument name="rule" value="ActiveSalesRuleWithComplexConditions"/>
             </actionGroup>
+            <generateDate date="+1 minute" format="m/d/Y" stepKey="generateStartDate"/>
+            <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{$generateStartDate}" stepKey="fillStartDate"/>
             <actionGroup ref="AssertCartPriceRuleSuccessSaveMessageActionGroup" stepKey="assertVerifyCartPriceRuleSuccessSaveMessage"/>
         </before>
         <after>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index 0d365dc089e43..e4e9a62780948 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -38,6 +38,45 @@
             <argument name="total" value="447.00"/>
         </actionGroup>
 
+        <actionGroup ref="StorefrontCancelCouponActionGroup" stepKey="couponCancelCoupon" after="couponCheckCartWithDiscount"/>
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCartAfterCancelCoupon" after="couponCancelCoupon">
+            <argument name="subtotal" value="480.00"/>
+            <argument name="shipping" value="15.00"/>
+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
+            <argument name="total" value="495.00"/>
+        </actionGroup>
+        <comment userInput="End of using coupon code" stepKey="endOfUsingCouponCode" after="cartAssertCartAfterCancelCoupon" />
+    </test>
+    <test name="EndToEndB2CGuestUserMysqlTest">
+        <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$$"/>
+            <argument name="discount" value="48.00"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="couponCheckCartWithDiscount" after="couponCheckAppliedDiscount">
+            <argument name="subtotal" value="480.00"/>
+            <argument name="shipping" value="15.00"/>
+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
+            <argument name="total" value="447.00"/>
+        </actionGroup>
+
         <actionGroup ref="StorefrontCancelCouponActionGroup" stepKey="couponCancelCoupon" after="couponCheckCartWithDiscount"/>
         <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCartAfterCancelCoupon" after="couponCancelCoupon">
             <argument name="subtotal" value="480.00"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartRuleCouponForFreeShippingTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartRuleCouponForFreeShippingTest.xml
new file mode 100644
index 0000000000000..9e95e39e4791e
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartRuleCouponForFreeShippingTest.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="StorefrontCartRuleCouponForFreeShippingTest">
+        <annotations>
+            <stories value="Create Sales Rule"/>
+            <title value="Create Cart Price Rule for Free Shipping And Verify Coupon Code will shown in Order's totals"/>
+            <description value="Test that Coupon Code of Cart Price Rule without discount for Product price but with Free shipping will shown in Order's totals"/>
+            <testCaseId value="MC-21923"/>
+            <useCaseId value="MC-20387"/>
+            <severity value="MAJOR"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <!-- Create Simple Product -->
+            <createData entity="defaultSimpleProduct" stepKey="createSimpleProduct"/>
+            <!-- Create Cart Price Rule without discount but with free shipping -->
+            <createData entity="ApiSalesRule" stepKey="createCartPriceRule">
+                <field key="simple_free_shipping">1</field>
+                <field key="discount_amount">0</field>
+            </createData>
+            <!-- Create Coupon code for the Cart Price Rule -->
+            <createData entity="ApiSalesRuleCoupon" stepKey="createCartPriceRuleCoupon">
+                <requiredEntity createDataKey="createCartPriceRule"/>
+            </createData>
+            <!-- Create Customer with filled Shipping & Billing Address -->
+            <createData entity="CustomerEntityOne" stepKey="createCustomer"/>
+        </before>
+
+        <after>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutFromStorefront"/>
+            <deleteData createDataKey="createCartPriceRule" stepKey="deleteSalesRule"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logoutFromBackend"/>
+        </after>
+
+        <!-- Login with created Customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!-- Add Simple Product to Cart -->
+        <actionGroup ref="StorefrontAddSimpleProductToShoppingCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+
+        <!-- Go to Checkout -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckout"/>
+
+        <!-- Go to Order review -->
+        <actionGroup ref="StorefrontCheckoutForwardFromShippingStep" stepKey="goToCheckoutReview"/>
+
+        <!-- Apply Discount Coupon to the Order -->
+        <actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyDiscountCoupon">
+            <argument name="discountCode" value="$createCartPriceRuleCoupon.code$"/>
+        </actionGroup>
+
+        <!-- Assert Coupon Code will shown in Shipping total -->
+        <actionGroup ref="AssertStorefrontShippingLabelDescriptionInOrderSummaryActionGroup" stepKey="assertCouponCodeInShippingLabel">
+            <argument name="labelDescription" value="$createCartPriceRuleCoupon.code$"/>
+        </actionGroup>
+
+        <!-- Select payment solution -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="clickCheckMoneyOrderPayment"/>
+
+        <!-- Place Order -->
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
+
+        <!-- Go To Order View -->
+        <click selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="goToViewOrder"/>
+
+        <!-- Assert Coupon Code will shown in Shipping total description in Order View page -->
+        <actionGroup ref="AssertStorefrontShippingDescriptionInOrderViewActionGroup" stepKey="assertCouponCodeInShippingTotalDescription">
+            <argument name="description" value="$createCartPriceRuleCoupon.code$"/>
+        </actionGroup>
+
+        <!-- Keep Order Id -->
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
+
+        <!-- Login to admin -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+        <!-- Go to created Order -->
+        <amOnPage url="{{AdminOrderPage.url({$grabOrderId})}}" stepKey="goToAdminViewOrder"/>
+        <waitForPageLoad stepKey="waitForOrderPage"/>
+
+        <!-- Assert Coupon Code will shown in Shipping total description -->
+        <actionGroup ref="AssertAdminShippingDescriptionInOrderViewActionGroup" stepKey="seeCouponInShippingDescription">
+            <argument name="description" value="$createCartPriceRuleCoupon.code$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml
new file mode 100644
index 0000000000000..903e79b2328bc
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.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="StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Cart total with full discount"/>
+            <title value="Cart Total value when 100% discount applied through Cart Rule"/>
+            <description value="Cart Total value when 100% discount applied through Cart Rule"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-19524"/>
+            <useCaseId value="MC-17869"/>
+            <group value="SalesRule"/>
+        </annotations>
+        <before>
+            <!-- log in -->
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <!-- Set configurations -->
+            <magentoCLI command="config:set carriers/tablerate/active 1"  stepKey="setShippingMethodEnabled"/>
+            <magentoCLI command="config:set carriers/tablerate/condition_name package_value"  stepKey="setShippingMethodConditionName"/>
+            <magentoCLI command="config:set tax/calculation/price_includes_tax 1"  stepKey="setCatalogPrice"/>
+            <magentoCLI command="config:set tax/calculation/shipping_includes_tax 1"  stepKey="setSippingPrice"/>
+            <magentoCLI command="config:set tax/calculation/cross_border_trade_enabled 0"  stepKey="setCrossBorderTrade"/>
+            <magentoCLI command="config:set tax/calculation/discount_tax 1"  stepKey="setDiscount"/>
+            <magentoCLI command="config:set tax/cart_display/price 2"  stepKey="setPrice"/>
+            <magentoCLI command="config:set tax/cart_display/subtotal 2"  stepKey="setSubtotal"/>
+            <magentoCLI command="config:set carriers/freeshipping/active 1"  stepKey="setFreeShipping"/>
+            <createData entity="defaultTaxRule" stepKey="initialTaxRule"/>
+            <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
+            <!-- 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 tax rule with 20% tax rate -->
+            <actionGroup ref="addNewTaxRateNoZip" stepKey="addNYTaxRate">
+                <argument name="taxCode" value="SimpleTaxNYRate"/>
+            </actionGroup>
+            <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
+            <!-- Create cart price rule -->
+            <actionGroup ref="AdminCreateCartPriceRuleActionGroup" stepKey="createCartPriceRule">
+                <argument name="ruleName" value="SalesRuleWithFullDiscount"/>
+            </actionGroup>
+            <!-- Create 3 simple product -->
+            <createData entity="SimpleProduct2" stepKey="createSimpleProductFirst">
+                <field key="price">5.10</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProductSecond">
+                <field key="price">5.10</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProductThird">
+                <field key="price">5.50</field>
+            </createData>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <!-- Removed created Data -->
+            <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>
+            <!-- Delete the tax rate that were created -->
+            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
+            <waitForPageLoad stepKey="waitForRatesPage"/>
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
+                <argument name="name" value="{{SimpleTaxNYRate.state}}-{{SimpleTaxNYRate.rate}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            </actionGroup>
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCartPriceRule">
+                <argument name="ruleName" value="{{SalesRuleWithFullDiscount.name}}"/>
+            </actionGroup>
+            <!-- Delete products -->
+            <deleteData createDataKey="createSimpleProductFirst" stepKey="deleteSimpleProductFirst"/>
+            <deleteData createDataKey="createSimpleProductSecond" stepKey="deleteSimpleProductSecond"/>
+            <deleteData createDataKey="createSimpleProductThird" stepKey="deleteSimpleProductThird"/>
+            <!-- Unset configuration -->
+            <magentoCLI command="config:set carriers/tablerate/active 0"  stepKey="unsetShippingMethodEnabled"/>
+            <magentoCLI command="config:set tax/calculation/price_includes_tax 0"  stepKey="unsetCatalogPrice"/>
+            <magentoCLI command="config:set tax/calculation/shipping_includes_tax 0"  stepKey="unsetSippingPrice"/>
+            <magentoCLI command="config:set tax/calculation/cross_border_trade_enabled 1"  stepKey="unsetCrossBorderTrade"/>
+            <magentoCLI command="config:set tax/calculation/discount_tax 0"  stepKey="unsetDiscount"/>
+            <magentoCLI command="config:set tax/cart_display/price 1"  stepKey="unsetPrice"/>
+            <magentoCLI command="config:set tax/cart_display/subtotal 1"  stepKey="unsetSubtotal"/>
+            <magentoCLI command="config:set carriers/freeshipping/active 0"  stepKey="unsetFreeShipping"/>
+            <!-- Log out -->
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Add testing products to the cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProductFirst.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="2" stepKey="setQuantity"/>
+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addProductToCard">
+            <argument name="productName" value="$$createSimpleProductFirst.name$$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProductSecond.custom_attributes[url_key]$$)}}" stepKey="goToSecondProductPage"/>
+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="2" stepKey="setQuantityForTheSecondProduct"/>
+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addSecondProductToCard">
+            <argument name="productName" value="$$createSimpleProductSecond.name$$"/>
+        </actionGroup>
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProductThird.custom_attributes[url_key]$$)}}" stepKey="goToThirdProductPage"/>
+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="2" stepKey="setQuantityForTheThirdProduct"/>
+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addThirdProductToCard">
+            <argument name="productName" value="$$createSimpleProductThird.name$$"/>
+        </actionGroup>
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="6" stepKey="seeCartQuantity"/>
+        <!-- Go to the shopping cart page -->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageLoad"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.orderTotal}}" stepKey="waitForOrderTotalVisible"/>
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectCountry"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.discountAmount}}" stepKey="waitForOrderTotalUpdate"/>
+        <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$29.00" stepKey="seeDiscountAmount"/>
+        <see selector="{{CheckoutCartSummarySection.subTotal}}" userInput="$29.00" stepKey="seeSubTotal"/>
+        <see selector="{{CheckoutCartSummarySection.orderTotal}}" userInput="0.00" stepKey="seeOrderTotal"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToGroupedProductWithInvisibleIndividualProductTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToGroupedProductWithInvisibleIndividualProductTest.xml
new file mode 100644
index 0000000000000..8900d838fb825
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToGroupedProductWithInvisibleIndividualProductTest.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="StorefrontCategoryRulesShouldApplyToGroupedProductWithInvisibleIndividualProductTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
+            <title value="Category rules should apply to grouped product with invisible individual products"/>
+            <description value="Category rules should apply to grouped product with invisible individual products"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-13608"/>
+            <group value="SalesRule"/>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategoryOne"/>
+            <createData entity="ApiSimpleProduct" stepKey="createFirstSimpleProduct">
+                <field key ="price">100</field>
+                <field key="visibility">1</field>
+                <requiredEntity createDataKey="createCategoryOne"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createSecondSimpleProduct">
+                <field key ="price">200</field>
+                <field key="visibility">1</field>
+                <requiredEntity createDataKey="createCategoryOne"/>
+            </createData>
+            <createData entity="ApiCategory" stepKey="createCategoryTwo"/>
+            <createData entity="ApiSimpleProduct" stepKey="createThirdSimpleProduct">
+                <field key ="price">300</field>
+                <field key="visibility">1</field>
+                <requiredEntity createDataKey="createCategoryTwo"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createFourthSimpleProduct">
+                <field key ="price">400</field>
+                <field key="visibility">1</field>
+                <requiredEntity createDataKey="createCategoryTwo"/>
+            </createData>
+            <createData entity="ApiGroupedProduct2" stepKey="createGroupedProduct">
+                <requiredEntity createDataKey="createCategoryOne"/>
+            </createData>
+            <createData entity="OneSimpleProductLink" stepKey="addFirstProduct">
+                <requiredEntity createDataKey="createGroupedProduct"/>
+                <requiredEntity createDataKey="createFirstSimpleProduct"/>
+            </createData>
+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addFirstProduct" stepKey="addSecondProduct">
+                <requiredEntity createDataKey="createGroupedProduct"/>
+                <requiredEntity createDataKey="createSecondSimpleProduct"/>
+            </updateData>
+            <createData entity="ApiGroupedProduct2" stepKey="createSecondGroupedProduct">
+                <requiredEntity createDataKey="createCategoryTwo"/>
+            </createData>
+            <createData entity="OneSimpleProductLink" stepKey="addThirdProduct">
+                <requiredEntity createDataKey="createSecondGroupedProduct"/>
+                <requiredEntity createDataKey="createThirdSimpleProduct"/>
+            </createData>
+            <updateData entity="OneMoreSimpleProductLink" createDataKey="addThirdProduct" stepKey="addFourthProduct">
+                <requiredEntity createDataKey="createSecondGroupedProduct"/>
+                <requiredEntity createDataKey="createFourthSimpleProduct"/>
+            </updateData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
+            <deleteData createDataKey="createThirdSimpleProduct" stepKey="deleteThirdSimpleProduct"/>
+            <deleteData createDataKey="createFourthSimpleProduct" stepKey="deleteFourthSimpleProduct"/>
+            <deleteData createDataKey="createGroupedProduct" stepKey="deleteGroupedProduct"/>
+            <deleteData createDataKey="createSecondGroupedProduct" stepKey="deleteSecondGroupedProduct"/>
+            <deleteData createDataKey="createCategoryOne" stepKey="deleteCategoryOne"/>
+            <deleteData createDataKey="createCategoryTwo" stepKey="deleteCategoryTwo"/>
+            <actionGroup ref="AdminDeleteCartPriceRuleActionGroup" stepKey="deleteCartPriceRule">
+                <argument name="ruleName" value="TestSalesRule"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Start to create new cart price rule via Category conditions -->
+        <actionGroup ref="AdminCreateCartPriceRuleWithConditionIsCategoryActionGroup" stepKey="createCartPriceRuleWithCondition">
+            <argument name="ruleName" value="TestSalesRule"/>
+            <argument name="actionValue" value="$createCategoryTwo.id$"/>
+        </actionGroup>
+        <!-- Add SecondGroupedProduct to the cart -->
+        <actionGroup ref="StorefrontAddGroupedProductWithTwoLinksToCartActionGroup" stepKey="addSecondGroupedProductToCart">
+            <argument name="product" value="$createSecondGroupedProduct$"/>
+            <argument name="linkedProduct1Name" value="$createThirdSimpleProduct.name$"/>
+            <argument name="linkedProduct2Name" value="$createFourthSimpleProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="openTheCartWithSecondGroupedProduct"/>
+        <!-- Discount  amount is not applied -->
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="checkDiscountIsNotApplied">
+            <argument name="subtotal" value="$700.00"/>
+            <argument name="shipping" value="$10.00"/>
+            <argument name="total" value="$710.00"/>
+         </actionGroup>
+        <!-- Discount is absent in cart subtotal -->
+        <dontSeeElement selector="{{CheckoutCartSummarySection.discountLabel}}" stepKey="discountIsNotApplied"/>
+         <!-- Add FirstGroupedProduct to the cart -->
+        <actionGroup ref="StorefrontAddGroupedProductWithTwoLinksToCartActionGroup" stepKey="addFirsGroupedProductToCart">
+            <argument name="product" value="$createGroupedProduct$"/>
+            <argument name="linkedProduct1Name" value="$createFirstSimpleProduct.name$"/>
+            <argument name="linkedProduct2Name" value="$createSecondSimpleProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="openTheCartWithFirstAndSecondGroupedProducts"/>
+        <!-- Discount amount is applied for product from first category only -->
+        <actionGroup ref="StorefrontCheckCartTotalWithDiscountCategoryActionGroup" stepKey="checkDiscountIsApplied">
+            <argument name="subtotal" value="$1,000.00"/>
+            <argument name="shipping" value="$20.00"/>
+            <argument name="discount" value="150.00"/>
+            <argument name="total" value="$870.00"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Quote/Address/Total/ShippingDiscountTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Quote/Address/Total/ShippingDiscountTest.php
new file mode 100644
index 0000000000000..b5b6d047c3af2
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Quote/Address/Total/ShippingDiscountTest.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Test\Unit\Model\Quote\Address\Total;
+
+use Magento\SalesRule\Model\Quote\Address\Total\ShippingDiscount;
+use Magento\SalesRule\Model\Validator;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\Quote\Api\Data\ShippingInterface;
+use Magento\Quote\Model\Quote\Address\Total;
+
+/**
+ * Class \Magento\SalesRule\Test\Unit\Model\Quote\Address\Total\ShippingDiscountTest
+ */
+class ShippingDiscountTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject | Validator
+     */
+    protected $validatorMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject | Quote
+     */
+    private $quoteMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject | Total
+     */
+    private $totalMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject | Address
+     */
+    private $addressMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject | ShippingAssignmentInterface
+     */
+    private $shippingAssignmentMock;
+
+    /**
+     * @var ShippingDiscount
+     */
+    private $discount;
+
+    protected function setUp()
+    {
+        $this->validatorMock = $this->getMockBuilder(\Magento\SalesRule\Model\Validator::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'reset',
+                    'processShippingAmount',
+                    '__wakeup',
+                ]
+            )
+            ->getMock();
+        $this->quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $this->totalMock = $this->createPartialMock(
+            \Magento\Quote\Model\Quote\Address\Total::class,
+            [
+                'getDiscountAmount',
+                'getDiscountDescription',
+                'addTotalAmount',
+                'addBaseTotalAmount',
+                'setShippingDiscountAmount',
+                'setBaseShippingDiscountAmount',
+                'getSubtotal',
+                'setSubtotalWithDiscount',
+                'setBaseSubtotalWithDiscount',
+                'getBaseSubtotal',
+                'getBaseDiscountAmount',
+                'setDiscountDescription'
+            ]
+        );
+
+        $this->addressMock = $this->createPartialMock(
+            Address::class,
+            [
+                'getQuote',
+                'getShippingAmount',
+                'getShippingDiscountAmount',
+                'getBaseShippingDiscountAmount',
+                'setShippingDiscountAmount',
+                'setBaseShippingDiscountAmount',
+                'getDiscountDescription',
+                'setDiscountAmount',
+                'setBaseDiscountAmount',
+                '__wakeup'
+            ]
+        );
+
+        $shipping = $this->createMock(ShippingInterface::class);
+        $shipping->expects($this->any())->method('getAddress')->willReturn($this->addressMock);
+        $this->shippingAssignmentMock = $this->createMock(ShippingAssignmentInterface::class);
+        $this->shippingAssignmentMock->expects($this->any())->method('getShipping')->willReturn($shipping);
+
+        $this->discount = new ShippingDiscount(
+            $this->validatorMock
+        );
+    }
+
+    /**
+     * Test collect with the quote has no shipping amount discount
+     */
+    public function testCollectNoShippingAmount()
+    {
+        $itemNoDiscount = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
+
+        $this->addressMock->expects($this->any())->method('getQuote')->willReturn($this->quoteMock);
+
+        $this->addressMock->expects($this->any())->method('getShippingAmount')->willReturn(0);
+
+        $this->shippingAssignmentMock->expects($this->any())->method('getItems')
+            ->willReturn([$itemNoDiscount]);
+
+        $this->addressMock->expects($this->once())->method('setShippingDiscountAmount')
+            ->with(0)
+            ->willReturnSelf();
+        $this->addressMock->expects($this->once())->method('setBaseShippingDiscountAmount')
+            ->with(0)
+            ->willReturnSelf();
+
+        /* Assert Collect function */
+        $this->assertInstanceOf(
+            ShippingDiscount::class,
+            $this->discount->collect($this->quoteMock, $this->shippingAssignmentMock, $this->totalMock)
+        );
+    }
+
+    /**
+     * Test collect with the quote has shipping amount discount
+     */
+    public function testCollectWithShippingAmountDiscount()
+    {
+        $shippingAmount = 100;
+        $shippingDiscountAmount = 50;
+        $baseShippingDiscountAmount = 50;
+        $discountDescription = 'Discount $50';
+        $subTotal = 200;
+        $discountAmount = -100;
+        $baseSubTotal = 200;
+        $baseDiscountAmount = -100;
+
+        $itemNoDiscount = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
+
+        $this->addressMock->expects($this->any())->method('getQuote')->willReturn($this->quoteMock);
+
+        $this->addressMock->expects($this->any())->method('getShippingAmount')->willReturn($shippingAmount);
+
+        $this->addressMock->expects($this->any())->method('getShippingDiscountAmount')
+            ->willReturn($shippingDiscountAmount);
+        $this->addressMock->expects($this->any())->method('getBaseShippingDiscountAmount')
+            ->willReturn($baseShippingDiscountAmount);
+
+        $this->addressMock->expects($this->any())->method('getDiscountDescription')
+            ->willReturn($discountDescription);
+
+        $this->shippingAssignmentMock->expects($this->any())->method('getItems')
+            ->willReturn([$itemNoDiscount]);
+
+        $this->totalMock->expects($this->once())->method('addTotalAmount')
+            ->with('discount', -$shippingDiscountAmount)->willReturnSelf();
+        $this->totalMock->expects($this->once())->method('addBaseTotalAmount')
+            ->with('discount', -$baseShippingDiscountAmount)->willReturnSelf();
+
+        $this->totalMock->expects($this->once())->method('setShippingDiscountAmount')
+            ->with($shippingDiscountAmount)->willReturnSelf();
+        $this->totalMock->expects($this->once())->method('setBaseShippingDiscountAmount')
+            ->with($baseShippingDiscountAmount)->willReturnSelf();
+
+        $this->totalMock->expects($this->any())->method('getSubtotal')
+            ->willReturn($subTotal);
+        $this->totalMock->expects($this->any())->method('getDiscountAmount')
+            ->willReturn($discountAmount);
+
+        $this->totalMock->expects($this->any())->method('getBaseSubtotal')
+            ->willReturn($baseSubTotal);
+        $this->totalMock->expects($this->any())->method('getBaseDiscountAmount')
+            ->willReturn($baseDiscountAmount);
+
+        $this->totalMock->expects($this->once())->method('setDiscountDescription')
+            ->with($discountDescription)->willReturnSelf();
+
+        $this->totalMock->expects($this->once())->method('setSubtotalWithDiscount')
+            ->with(100)->willReturnSelf();
+        $this->totalMock->expects($this->once())->method('setBaseSubtotalWithDiscount')
+            ->with(100)->willReturnSelf();
+
+        $this->addressMock->expects($this->once())->method('setDiscountAmount')
+            ->with($discountAmount)->willReturnSelf();
+
+        $this->addressMock->expects($this->once())->method('setBaseDiscountAmount')
+            ->with($baseDiscountAmount)->willReturnSelf();
+
+        /* Assert Collect function */
+        $this->assertInstanceOf(
+            ShippingDiscount::class,
+            $this->discount->collect($this->quoteMock, $this->shippingAssignmentMock, $this->totalMock)
+        );
+    }
+
+    /**
+     * Test fetch function with discount = 100
+     */
+    public function testFetch()
+    {
+        $discountAmount = 100;
+        $discountDescription = 100;
+        $expectedResult = [
+            'code' => 'discount',
+            'value' => 100,
+            'title' => __('Discount (%1)', $discountDescription)
+        ];
+        $this->totalMock->expects($this->once())->method('getDiscountAmount')
+            ->willReturn($discountAmount);
+        $this->totalMock->expects($this->once())->method('getDiscountDescription')
+            ->willReturn($discountDescription);
+        $this->assertEquals($expectedResult, $this->discount->fetch($this->quoteMock, $this->totalMock));
+    }
+}
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 090dbd7fe5d6d..72355625318c5 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php
@@ -47,6 +47,11 @@ class DiscountTest extends \PHPUnit\Framework\TestCase
      */
     protected $addressMock;
 
+    /**
+     * @var \Magento\SalesRule\Model\Rule\Action\Discount\DataFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $discountFactory;
+
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -72,16 +77,35 @@ protected function setUp()
         $priceCurrencyMock = $this->createMock(\Magento\Framework\Pricing\PriceCurrencyInterface::class);
         $priceCurrencyMock->expects($this->any())
             ->method('round')
-            ->will($this->returnCallback(
-                function ($argument) {
-                    return round($argument, 2);
-                }
-            ));
+            ->will(
+                $this->returnCallback(
+                    function ($argument) {
+                        return round($argument, 2);
+                    }
+                )
+            );
 
         $this->addressMock = $this->createPartialMock(
             \Magento\Quote\Model\Quote\Address::class,
-            ['getQuote', 'getAllItems', 'getShippingAmount', '__wakeup', 'getCustomAttributesCodes']
+            [
+                'getQuote',
+                'getAllItems',
+                'getShippingAmount',
+                '__wakeup',
+                'getCustomAttributesCodes',
+                'getExtensionAttributes'
+            ]
         );
+        $addressExtension = $this->getMockBuilder(
+            \Magento\Framework\Api\ExtensionAttributesInterface::class
+        )->setMethods(['setDiscounts', 'getDiscounts'])->getMock();
+        $addressExtension->method('getDiscounts')->willReturn([]);
+        $addressExtension->expects($this->any())
+            ->method('setDiscounts')
+            ->willReturn([]);
+        $this->addressMock->expects(
+            $this->any()
+        )->method('getExtensionAttributes')->will($this->returnValue($addressExtension));
         $this->addressMock->expects($this->any())
             ->method('getCustomAttributesCodes')
             ->willReturn([]);
@@ -90,6 +114,10 @@ function ($argument) {
         $shipping->expects($this->any())->method('getAddress')->willReturn($this->addressMock);
         $this->shippingAssignmentMock = $this->createMock(\Magento\Quote\Api\Data\ShippingAssignmentInterface::class);
         $this->shippingAssignmentMock->expects($this->any())->method('getShipping')->willReturn($shipping);
+        $this->discountFactory = $this->createPartialMock(
+            \Magento\SalesRule\Model\Rule\Action\Discount\DataFactory::class,
+            ['create']
+        );
 
         /** @var \Magento\SalesRule\Model\Quote\Discount $discount */
         $this->discount = $this->objectManager->getObject(
@@ -101,14 +129,38 @@ function ($argument) {
                 'priceCurrency' => $priceCurrencyMock,
             ]
         );
+        $discountData = $this->getMockBuilder(\Magento\SalesRule\Model\Rule\Action\Discount\Data::class)
+            ->setConstructorArgs(
+                [
+                    'amount' => 0,
+                    'baseAmount' => 0,
+                    'originalAmount' => 0,
+                    'baseOriginalAmount' => 0
+                ]
+            )
+            ->getMock();
+        $this->discountFactory->expects($this->any())
+            ->method('create')
+            ->with($this->anything())
+            ->will($this->returnValue($discountData));
     }
 
     public function testCollectItemNoDiscount()
     {
         $itemNoDiscount = $this->createPartialMock(
             \Magento\Quote\Model\Quote\Item::class,
-            ['getNoDiscount', '__wakeup']
+            ['getNoDiscount', '__wakeup', 'getExtensionAttributes']
         );
+        $itemExtension = $this->getMockBuilder(
+            \Magento\Framework\Api\ExtensionAttributesInterface::class
+        )->setMethods(['setDiscounts', 'getDiscounts'])->getMock();
+        $itemExtension->method('getDiscounts')->willReturn([]);
+        $itemExtension->expects($this->any())
+            ->method('setDiscounts')
+            ->willReturn([]);
+        $itemNoDiscount->expects(
+            $this->any()
+        )->method('getExtensionAttributes')->will($this->returnValue($itemExtension));
         $itemNoDiscount->expects($this->once())->method('getNoDiscount')->willReturn(true);
         $this->validatorMock->expects($this->once())->method('sortItemsByPriority')
             ->with([$itemNoDiscount], $this->addressMock)
@@ -178,10 +230,21 @@ public function testCollectItemHasChildren($childItemData, $parentData, $expecte
                     'getHasChildren',
                     'isChildrenCalculated',
                     'getChildren',
+                    'getExtensionAttributes',
                     '__wakeup',
                 ]
             )
             ->getMock();
+        $itemExtension = $this->getMockBuilder(
+            \Magento\Framework\Api\ExtensionAttributesInterface::class
+        )->setMethods(['setDiscounts', 'getDiscounts'])->getMock();
+        $itemExtension->method('getDiscounts')->willReturn([]);
+        $itemExtension->expects($this->any())
+            ->method('setDiscounts')
+            ->willReturn([]);
+        $itemWithChildren->expects(
+            $this->any()
+        )->method('getExtensionAttributes')->will($this->returnValue($itemExtension));
         $itemWithChildren->expects($this->once())->method('getNoDiscount')->willReturn(false);
         $itemWithChildren->expects($this->once())->method('getParentItem')->willReturn(false);
         $itemWithChildren->expects($this->once())->method('getHasChildren')->willReturn(true);
@@ -310,10 +373,21 @@ public function testCollectItemHasNoChildren()
                     'getHasChildren',
                     'isChildrenCalculated',
                     'getChildren',
+                    'getExtensionAttributes',
                     '__wakeup',
                 ]
             )
             ->getMock();
+        $itemExtension = $this->getMockBuilder(
+            \Magento\Framework\Api\ExtensionAttributesInterface::class
+        )->setMethods(['setDiscounts', 'getDiscounts'])->getMock();
+        $itemExtension->method('getDiscounts')->willReturn([]);
+        $itemExtension->expects($this->any())
+            ->method('setDiscounts')
+            ->willReturn([]);
+        $itemWithChildren->expects(
+            $this->any()
+        )->method('getExtensionAttributes')->will($this->returnValue($itemExtension));
         $itemWithChildren->expects($this->once())->method('getNoDiscount')->willReturn(false);
         $itemWithChildren->expects($this->once())->method('getParentItem')->willReturn(false);
         $itemWithChildren->expects($this->once())->method('getHasChildren')->willReturn(false);
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 8ca6b20db3b5a..da358372e0895 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
@@ -247,10 +247,10 @@ public function testValidateCategoriesIgnoresVisibility(): void
      * @param boolean $isValid
      * @param string $conditionValue
      * @param string $operator
-     * @param double $productPrice
+     * @param string $productPrice
      * @dataProvider localisationProvider
      */
-    public function testQuoteLocaleFormatPrice($isValid, $conditionValue, $operator = '>=', $productPrice = 2000.00)
+    public function testQuoteLocaleFormatPrice($isValid, $conditionValue, $operator = '>=', $productPrice = '2000.00')
     {
         $attr = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\Db\AbstractDb::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/SalesRule/etc/di.xml b/app/code/Magento/SalesRule/etc/di.xml
index f44b172d6b479..abb581175e36a 100644
--- a/app/code/Magento/SalesRule/etc/di.xml
+++ b/app/code/Magento/SalesRule/etc/di.xml
@@ -30,6 +30,10 @@
                 type="Magento\SalesRule\Model\Data\CouponMassDeleteResult" />
     <preference for="Magento\SalesRule\Api\CouponManagementInterface"
                 type="Magento\SalesRule\Model\Service\CouponManagementService" />
+    <preference for="Magento\SalesRule\Api\Data\RuleDiscountInterface"
+                type="Magento\SalesRule\Model\Data\RuleDiscount" />
+    <preference for="Magento\SalesRule\Api\Data\DiscountDataInterface"
+                type="Magento\SalesRule\Model\Data\DiscountData" />
     <type name="Magento\SalesRule\Helper\Coupon">
         <arguments>
             <argument name="couponParameters" xsi:type="array">
@@ -178,7 +182,6 @@
             </argument>
         </arguments>
     </type>
-
     <type name="Magento\Quote\Model\Cart\CartTotalRepository">
         <plugin name="coupon_label_plugin" type="Magento\SalesRule\Plugin\CartTotalRepository" />
     </type>
diff --git a/app/code/Magento/SalesRule/etc/extension_attributes.xml b/app/code/Magento/SalesRule/etc/extension_attributes.xml
index 202ced4204f73..c69c309d8741b 100644
--- a/app/code/Magento/SalesRule/etc/extension_attributes.xml
+++ b/app/code/Magento/SalesRule/etc/extension_attributes.xml
@@ -7,6 +7,9 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
     <extension_attributes for="Magento\Quote\Api\Data\CartItemInterface">
-        <attribute code="discounts" type="string" />
+        <attribute code="discounts" type="Magento\SalesRule\Api\Data\RuleDiscountInterface[]" />
+    </extension_attributes>
+    <extension_attributes for="Magento\Quote\Api\Data\AddressInterface">
+        <attribute code="discounts" type="Magento\SalesRule\Api\Data\RuleDiscountInterface[]" />
     </extension_attributes>
 </config>
\ No newline at end of file
diff --git a/app/code/Magento/SalesRule/i18n/en_US.csv b/app/code/Magento/SalesRule/i18n/en_US.csv
index 7511d147ae224..83a5aa76ba0c8 100644
--- a/app/code/Magento/SalesRule/i18n/en_US.csv
+++ b/app/code/Magento/SalesRule/i18n/en_US.csv
@@ -22,6 +22,7 @@ Conditions,Conditions
 Generate,Generate
 "Coupon Code","Coupon Code"
 Created,Created
+Used,Used
 Uses,Uses
 No,No
 Yes,Yes
diff --git a/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml b/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml
index 639e12006232b..e1c12f45012ee 100644
--- a/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml
+++ b/app/code/Magento/SalesRule/view/adminhtml/ui_component/sales_rule_form.xml
@@ -297,6 +297,9 @@
                 </item>
             </argument>
             <settings>
+                <validation>
+                    <rule name="validate-digits" xsi:type="boolean">true</rule>
+                </validation>
                 <dataType>text</dataType>
                 <label translate="true">Uses per Coupon</label>
                 <dataScope>uses_per_coupon</dataScope>
@@ -309,6 +312,9 @@
                 </item>
             </argument>
             <settings>
+                <validation>
+                    <rule name="validate-digits" xsi:type="boolean">true</rule>
+                </validation>
                 <notice translate="true">
                     Usage limit enforced for logged in customers only.
                 </notice>
@@ -356,6 +362,9 @@
                 </item>
             </argument>
             <settings>
+                <validation>
+                    <rule name="validate-digits" xsi:type="boolean">true</rule>
+                </validation>
                 <dataType>text</dataType>
                 <label translate="true">Priority</label>
                 <dataScope>sort_order</dataScope>
@@ -422,6 +431,8 @@
             <settings>
                 <validation>
                     <rule name="required-entry" xsi:type="boolean">true</rule>
+                    <rule name="validate-number" xsi:type="boolean">true</rule>
+                    <rule name="validate-zero-or-greater" xsi:type="boolean">true</rule>
                 </validation>
                 <dataType>text</dataType>
                 <label translate="true">Discount Amount</label>
@@ -435,6 +446,10 @@
                 </item>
             </argument>
             <settings>
+                <validation>
+                    <rule name="validate-number" xsi:type="boolean">true</rule>
+                    <rule name="validate-zero-or-greater" xsi:type="boolean">true</rule>
+                </validation>
                 <dataType>text</dataType>
                 <label translate="true">Maximum Qty Discount is Applied To</label>
                 <dataScope>discount_qty</dataScope>
@@ -447,6 +462,10 @@
                 </item>
             </argument>
             <settings>
+                <validation>
+                    <rule name="validate-number" xsi:type="boolean">true</rule>
+                    <rule name="validate-zero-or-greater" xsi:type="boolean">true</rule>
+                </validation>
                 <dataType>text</dataType>
                 <label translate="true">Discount Qty Step (Buy X)</label>
                 <dataScope>discount_step</dataScope>
diff --git a/app/code/Magento/SalesRule/view/frontend/web/js/action/cancel-coupon.js b/app/code/Magento/SalesRule/view/frontend/web/js/action/cancel-coupon.js
index 72eec1be0766c..35395434cef1e 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/js/action/cancel-coupon.js
+++ b/app/code/Magento/SalesRule/view/frontend/web/js/action/cancel-coupon.js
@@ -16,9 +16,10 @@ define([
     'Magento_Checkout/js/action/get-payment-information',
     'Magento_Checkout/js/model/totals',
     'mage/translate',
-    'Magento_Checkout/js/model/full-screen-loader'
+    'Magento_Checkout/js/model/full-screen-loader',
+    'Magento_Checkout/js/action/recollect-shipping-rates'
 ], function ($, quote, urlManager, errorProcessor, messageContainer, storage, getPaymentInformationAction, totals, $t,
-  fullScreenLoader
+  fullScreenLoader, recollectShippingRates
 ) {
     'use strict';
 
@@ -56,6 +57,7 @@ define([
             var deferred = $.Deferred();
 
             totals.isLoading(true);
+            recollectShippingRates();
             getPaymentInformationAction(deferred);
             $.when(deferred).done(function () {
                 isApplied(false);
diff --git a/app/code/Magento/SalesRule/view/frontend/web/js/action/set-coupon-code.js b/app/code/Magento/SalesRule/view/frontend/web/js/action/set-coupon-code.js
index 994ccf2b395d2..4dbc5820feae9 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/js/action/set-coupon-code.js
+++ b/app/code/Magento/SalesRule/view/frontend/web/js/action/set-coupon-code.js
@@ -17,9 +17,10 @@ define([
     'mage/translate',
     'Magento_Checkout/js/action/get-payment-information',
     'Magento_Checkout/js/model/totals',
-    'Magento_Checkout/js/model/full-screen-loader'
+    'Magento_Checkout/js/model/full-screen-loader',
+    'Magento_Checkout/js/action/recollect-shipping-rates'
 ], function (ko, $, quote, urlManager, errorProcessor, messageContainer, storage, $t, getPaymentInformationAction,
-    totals, fullScreenLoader
+    totals, fullScreenLoader, recollectShippingRates
 ) {
     'use strict';
 
@@ -62,6 +63,7 @@ define([
 
                 isApplied(true);
                 totals.isLoading(true);
+                recollectShippingRates();
                 getPaymentInformationAction(deferred);
                 $.when(deferred).done(function () {
                     fullScreenLoader.stopLoader();
diff --git a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
index ad8d247b2a6fb..ff49f4a15b06a 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Last.php
@@ -24,7 +24,7 @@ class Last extends \Magento\Backend\Block\Dashboard\Grid
     protected $_queriesFactory;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $_moduleManager;
 
@@ -36,14 +36,14 @@ class Last extends \Magento\Backend\Block\Dashboard\Grid
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Search\Model\ResourceModel\Query\CollectionFactory $queriesFactory
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Helper\Data $backendHelper,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Search\Model\ResourceModel\Query\CollectionFactory $queriesFactory,
         array $data = []
     ) {
diff --git a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
index 63893f788673d..3e10e1137d6b6 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
@@ -24,7 +24,7 @@ class Top extends \Magento\Backend\Block\Dashboard\Grid
     protected $_queriesFactory;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $_moduleManager;
 
@@ -36,14 +36,14 @@ class Top extends \Magento\Backend\Block\Dashboard\Grid
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Search\Model\ResourceModel\Query\CollectionFactory $queriesFactory
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Helper\Data $backendHelper,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Search\Model\ResourceModel\Query\CollectionFactory $queriesFactory,
         array $data = []
     ) {
diff --git a/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php b/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php
index e34c841f32bd1..a1bc1df3f9bdb 100644
--- a/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php
+++ b/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php
@@ -130,7 +130,6 @@ public function setQueryFilter($query)
      */
     public function setPopularQueryFilter($storeIds = null)
     {
-
         $this->getSelect()->reset(
             \Magento\Framework\DB\Select::FROM
         )->reset(
@@ -140,13 +139,10 @@ public function setPopularQueryFilter($storeIds = null)
         )->from(
             ['main_table' => $this->getTable('search_query')]
         );
-        if ($storeIds) {
-            $this->addStoreFilter($storeIds);
-            $this->getSelect()->where('num_results > 0');
-        } elseif (null === $storeIds) {
-            $this->addStoreFilter($this->_storeManager->getStore()->getId());
-            $this->getSelect()->where('num_results > 0');
-        }
+
+        $storeIds = $storeIds ?: $this->_storeManager->getStore()->getId();
+        $this->addStoreFilter($storeIds);
+        $this->getSelect()->where('num_results > 0');
 
         $this->getSelect()->order(['popularity desc']);
 
@@ -172,10 +168,9 @@ public function setRecentQueryFilter()
      */
     public function addStoreFilter($storeIds)
     {
-        if (!is_array($storeIds)) {
-            $storeIds = [$storeIds];
-        }
-        $this->getSelect()->where('main_table.store_id IN (?)', $storeIds);
+        $condition = is_array($storeIds) ? 'main_table.store_id IN (?)' : 'main_table.store_id = ?';
+        $this->getSelect()->where($condition, $storeIds);
+
         return $this;
     }
 }
diff --git a/app/code/Magento/Search/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Search/Test/Mftf/Data/ConfigData.xml
new file mode 100644
index 0000000000000..4a742b290c983
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Data/ConfigData.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="SearchEngineMysqlConfigData">
+        <data key="path">catalog/search/engine</data>
+        <data key="scope_id">1</data>
+        <data key="label">MySQL</data>
+        <data key="value">mysql</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Search/Test/Mftf/Data/SearchEngineConfigData.xml b/app/code/Magento/Search/Test/Mftf/Data/SearchEngineConfigData.xml
new file mode 100644
index 0000000000000..7a6eb86a5cf52
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Data/SearchEngineConfigData.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="SetDefaultSearchEngineConfig">
+        <data key="path">catalog/search/engine</data>
+        <data key="value">mysql</data>
+    </entity>
+    <entity name="SetMinQueryLength3Config">
+        <data key="path">catalog/search/min_query_length</data>
+        <data key="value">3</data>
+    </entity>
+    <entity name="SetMinQueryLength2Config">
+        <data key="path">catalog/search/min_query_length</data>
+        <data key="value">2</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Search/Test/Mftf/Suite/SearchEngineMysqlSuite.xml b/app/code/Magento/Search/Test/Mftf/Suite/SearchEngineMysqlSuite.xml
new file mode 100644
index 0000000000000..9ed6ccda62200
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Suite/SearchEngineMysqlSuite.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="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
+    <suite name="SearchEngineMysqlSuite">
+        <before>
+            <magentoCLI stepKey="setSearchEngineToMysql" command="config:set {{SearchEngineMysqlConfigData.path}} {{SearchEngineMysqlConfigData.value}}"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after></after>
+        <include>
+            <group name="SearchEngineMysql" />
+        </include>
+        <exclude>
+            <group name="skip"/>
+        </exclude>
+    </suite>
+</suites>
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml
index 61a89b4610d6a..c5124ac9c74a1 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml
@@ -32,6 +32,10 @@
             <!-- Create product with description -->
             <comment userInput="Create product with description" stepKey="createProductWithDescriptionComment"/>
             <createData entity="SimpleProductWithDescription" stepKey="simpleProduct"/>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <!-- Delete created product -->
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml
index 119faef9f2f59..e49db08954e14 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml
@@ -24,6 +24,10 @@
 
             <!--Create Simple Product -->
             <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <!-- Delete create product -->
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml
index ca48fb8565ca8..a1aa8be999aea 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml
@@ -24,6 +24,10 @@
 
             <!-- Create product with short description -->
             <createData entity="ApiProductWithDescription" stepKey="product"/>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
 
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml
index 6033ea8dee28b..3a8443706c9c7 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml
@@ -24,6 +24,10 @@
 
             <!--Create Simple Product -->
             <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
+
+            <!-- Perform reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
 
diff --git a/app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php b/app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php
index 982d00bd9f648..748e441652f72 100644
--- a/app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php
+++ b/app/code/Magento/Search/Test/Unit/Model/Search/PageSizeProviderTest.php
@@ -50,6 +50,9 @@ public function testGetPageSize($searchEngine, $size)
         $this->assertEquals($size, $this->model->getMaxPageSize());
     }
 
+    /**
+     * @return array
+     */
     public function getPageSizeDataProvider()
     {
         return [
diff --git a/app/code/Magento/Search/Ui/Component/Listing/Column/SynonymActions.php b/app/code/Magento/Search/Ui/Component/Listing/Column/SynonymActions.php
index 8cc9b809ff888..f42ce50d2804b 100644
--- a/app/code/Magento/Search/Ui/Component/Listing/Column/SynonymActions.php
+++ b/app/code/Magento/Search/Ui/Component/Listing/Column/SynonymActions.php
@@ -63,11 +63,13 @@ public function prepareDataSource(array $dataSource)
                     'confirm' => [
                         'title' => __('Delete'),
                         'message' => __('Are you sure you want to delete synonym group with id: %1?', $item['group_id'])
-                    ]
+                    ],
+                    '__disableTmpl' => true
                 ];
                 $item[$name]['edit'] = [
                     'href' => $this->urlBuilder->getUrl(self::SYNONYM_URL_PATH_EDIT, ['group_id' => $item['group_id']]),
                     'label' => __('View/Edit'),
+                    '__disableTmpl' => true
                 ];
             }
         }
diff --git a/app/code/Magento/Search/etc/db_schema.xml b/app/code/Magento/Search/etc/db_schema.xml
index ab4b54298c2a3..1a01ffa42401c 100644
--- a/app/code/Magento/Search/etc/db_schema.xml
+++ b/app/code/Magento/Search/etc/db_schema.xml
@@ -46,6 +46,10 @@
         <index referenceId="SEARCH_QUERY_IS_PROCESSED" indexType="btree">
             <column name="is_processed"/>
         </index>
+        <index referenceId="SEARCH_QUERY_STORE_ID_POPULARITY" indexType="btree">
+            <column name="store_id"/>
+            <column name="popularity"/>
+        </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"
diff --git a/app/code/Magento/Search/etc/db_schema_whitelist.json b/app/code/Magento/Search/etc/db_schema_whitelist.json
index 71adbc68887d0..16bbd0ce9fa3c 100644
--- a/app/code/Magento/Search/etc/db_schema_whitelist.json
+++ b/app/code/Magento/Search/etc/db_schema_whitelist.json
@@ -17,7 +17,8 @@
             "SEARCH_QUERY_QUERY_TEXT_STORE_ID_POPULARITY": true,
             "SEARCH_QUERY_STORE_ID": true,
             "SEARCH_QUERY_IS_PROCESSED": true,
-            "SEARCH_QUERY_SYNONYM_FOR": true
+            "SEARCH_QUERY_SYNONYM_FOR": true,
+            "SEARCH_QUERY_STORE_ID_POPULARITY": true
         },
         "constraint": {
             "PRIMARY": true,
@@ -43,4 +44,4 @@
             "SEARCH_SYNONYMS_WEBSITE_ID_STORE_WEBSITE_WEBSITE_ID": true
         }
     }
-}
\ No newline at end of file
+}
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 766dd4d992bd4..0dd9c819c855a 100644
--- a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
@@ -24,7 +24,8 @@ $helper = $this->helper(\Magento\Search\Helper\Data::class);
                            data-mage-init='{"quickSearch":{
                                 "formSelector":"#search_mini_form",
                                 "url":"<?= $block->escapeUrl($helper->getSuggestUrl())?>",
-                                "destinationSelector":"#search_autocomplete"}
+                                "destinationSelector":"#search_autocomplete",
+                                "minSearchLength":"<?= $block->escapeHtml($helper->getMinQueryLength()) ?>"}
                            }'
                            type="text"
                            name="<?= $block->escapeHtmlAttr($helper->getQueryParamName()) ?>"
diff --git a/app/code/Magento/Search/view/frontend/web/js/form-mini.js b/app/code/Magento/Search/view/frontend/web/js/form-mini.js
index 64e6eceb1eba6..b4493c5f38089 100644
--- a/app/code/Magento/Search/view/frontend/web/js/form-mini.js
+++ b/app/code/Magento/Search/view/frontend/web/js/form-mini.js
@@ -30,7 +30,7 @@ define([
     $.widget('mage.quickSearch', {
         options: {
             autocomplete: 'off',
-            minSearchLength: 2,
+            minSearchLength: 3,
             responseFieldElements: 'ul li',
             selectClass: 'selected',
             template:
diff --git a/app/code/Magento/Security/Test/Mftf/Test/AdminUserLockWhenEditingUserTest.xml b/app/code/Magento/Security/Test/Mftf/Test/AdminUserLockWhenEditingUserTest.xml
index 2ce54d6c0fda5..9f421668bdc4f 100644
--- a/app/code/Magento/Security/Test/Mftf/Test/AdminUserLockWhenEditingUserTest.xml
+++ b/app/code/Magento/Security/Test/Mftf/Test/AdminUserLockWhenEditingUserTest.xml
@@ -20,14 +20,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
-            <!--
-                @TODO: Remove "executeJS" in scope of MQE-1561
-                Hack to be able to pass current admin user password without hardcoding it.
-            -->
-            <executeJS function="return '{{DefaultAdminUser.password}}'" stepKey="adminPassword" />
-            <createData entity="NewAdminUser" stepKey="user">
-                <field key="current_password">{$adminPassword}</field>
-            </createData>
+            <createData entity="NewAdminUser" stepKey="user" />
             <!-- Log in to Admin Panel -->
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
diff --git a/app/code/Magento/Security/Test/Mftf/Test/NewCustomerPasswordComplexityTest.xml b/app/code/Magento/Security/Test/Mftf/Test/NewCustomerPasswordComplexityTest.xml
new file mode 100644
index 0000000000000..74a9c68cb2f79
--- /dev/null
+++ b/app/code/Magento/Security/Test/Mftf/Test/NewCustomerPasswordComplexityTest.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="NewCustomerPasswordComplexityTest">
+        <annotations>
+            <features value="Security"/>
+            <stories value="Checking customer's password complexity"/>
+            <title value="Notify the customer if password complexity does not match the requirements"/>
+            <description value="Notify the customer if password complexity does not match the requirements"/>
+            <testCaseId value="MC-14368"/>
+            <group value="security"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <!-- Go to storefront home page -->
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage"/>
+
+        <!-- See the Registration Link -->
+        <actionGroup ref="StorefrontSeeHeaderLinksActionGroup" stepKey="seeTheLink"/>
+
+        <!-- Click the Registration Link -->
+        <actionGroup ref="StorefrontClickHeaderLinkActionGroup" stepKey="clickTheLink">
+            <argument name="linkName" value="Create an Account"/>
+        </actionGroup>
+
+        <!-- Fill Registration Form with not secure enough password -->
+        <actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="fillRegistrationFormPasswordNotSecure">
+            <argument name="customer" value="Simple_Customer_With_Not_Secure_Password"/>
+        </actionGroup>
+
+        <!-- See the Error -->
+        <actionGroup ref="AssertMessageCustomerCreateAccountPasswordComplexityActionGroup" stepKey="seeTheErrorPasswordSecure">
+            <argument name="message" value="Minimum of different classes of characters in password is 3. Classes of characters: Lower Case, Upper Case, Digits, Special Characters."/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Security/Test/Mftf/Test/NewCustomerPasswordLengthTest.xml b/app/code/Magento/Security/Test/Mftf/Test/NewCustomerPasswordLengthTest.xml
new file mode 100644
index 0000000000000..a10059d0603c5
--- /dev/null
+++ b/app/code/Magento/Security/Test/Mftf/Test/NewCustomerPasswordLengthTest.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="NewCustomerPasswordLengthTest">
+        <annotations>
+            <features value="Security"/>
+            <stories value="Checking customer's password length"/>
+            <title value="Notify the customer if password length does not match the requirements"/>
+            <description value="Notify the customer if password length does not match the requirements"/>
+            <testCaseId value="MC-14367"/>
+            <group value="security"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <!-- Go to storefront home page -->
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage"/>
+
+        <!-- See the Registration Link -->
+        <actionGroup ref="StorefrontSeeHeaderLinksActionGroup" stepKey="seeTheLink"/>
+
+        <!-- Click the Registration Link -->
+        <actionGroup ref="StorefrontClickHeaderLinkActionGroup" stepKey="clickTheLink">
+            <argument name="linkName" value="Create an Account"/>
+        </actionGroup>
+
+        <!-- Fill Registration Form with Password length is bellow 8 Characters -->
+        <actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="fillRegistrationFormPasswordLengthBellowEightCharacters">
+            <argument name="customer" value="Simple_Customer_With_Password_Length_Is_Below_Eight_Characters"/>
+        </actionGroup>
+
+        <!-- See the Error -->
+        <actionGroup ref="AssertMessageCustomerCreateAccountPasswordComplexityActionGroup" stepKey="seeTheErrorPasswordLength">
+            <argument name="message" value="Minimum length of this field must be equal or greater than 8 symbols. Leading and trailing spaces will be ignored."/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/SendFriend/etc/adminhtml/system.xml b/app/code/Magento/SendFriend/etc/adminhtml/system.xml
index 785b7a8bb40c8..5cace4bcf92db 100644
--- a/app/code/Magento/SendFriend/etc/adminhtml/system.xml
+++ b/app/code/Magento/SendFriend/etc/adminhtml/system.xml
@@ -13,8 +13,11 @@
             <resource>Magento_Config::sendfriend</resource>
             <group id="email" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Email Templates</label>
-                <field id="enabled" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="enabled" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enabled</label>
+                    <comment>
+                        <![CDATA[We strongly recommend to enable a <a href="https://devdocs.magento.com/guides/v2.3/security/google-recaptcha.html" target="_blank">CAPTCHA solution</a> alongside enabling "Email to a Friend" to ensure abuse of this feature does not occur.]]>
+                    </comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="template" translate="label comment" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
diff --git a/app/code/Magento/SendFriend/etc/config.xml b/app/code/Magento/SendFriend/etc/config.xml
index d65e5a4a073dd..6239a4da591e2 100644
--- a/app/code/Magento/SendFriend/etc/config.xml
+++ b/app/code/Magento/SendFriend/etc/config.xml
@@ -9,7 +9,7 @@
     <default>
         <sendfriend>
             <email>
-                <enabled>1</enabled>
+                <enabled>0</enabled>
                 <template>sendfriend_email_template</template>
                 <allow_guest>0</allow_guest>
                 <max_recipients>5</max_recipients>
diff --git a/app/code/Magento/SendFriend/i18n/en_US.csv b/app/code/Magento/SendFriend/i18n/en_US.csv
index eee540c89a7b0..8d5b596fe1ca6 100644
--- a/app/code/Magento/SendFriend/i18n/en_US.csv
+++ b/app/code/Magento/SendFriend/i18n/en_US.csv
@@ -45,3 +45,4 @@ Enabled,Enabled
 "Max Recipients","Max Recipients"
 "Max Products Sent in 1 Hour","Max Products Sent in 1 Hour"
 "Limit Sending By","Limit Sending By"
+"We strongly recommend to enable a <a href=""https://devdocs.magento.com/guides/v2.3/security/google-recaptcha.html"" target="_blank">CAPTCHA solution</a> alongside enabling ""Email to a Friend"" to ensure abuse of this feature does not occur.","We strongly recommend to enable a <a href=""https://devdocs.magento.com/guides/v2.3/security/google-recaptcha.html"" target="_blank">CAPTCHA solution</a> alongside enabling ""Email to a Friend"" to ensure abuse of this feature does not occur."
diff --git a/app/code/Magento/SendFriend/view/frontend/email/product_share.html b/app/code/Magento/SendFriend/view/frontend/email/product_share.html
index d2ed441494221..00a4d7b4d5ce5 100644
--- a/app/code/Magento/SendFriend/view/frontend/email/product_share.html
+++ b/app/code/Magento/SendFriend/view/frontend/email/product_share.html
@@ -10,10 +10,11 @@
 "var email":"Recipient Email address",
 "var name":"Recipient name",
 "var message|raw":"Sender custom message",
-"var sender_email":"Sender email",
-"var sender_name":"Sender name",
+"var sender_email":"Sender Email",
+"var sender_name":"Sender Name",
 "var product_url":"URL for Product",
-"var product_image":"URL for product small image (75 px)"
+"var product_image":"URL for product small image (75 px)",
+"var message":"Message"
 } @-->
 
 {{template config_path="design/email/header_template"}}
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 356483c9a5dd7..55eecfa00d6da 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
@@ -43,7 +43,7 @@ public function __construct(
      */
     protected function _prepareLayout()
     {
-        $onclick = "submitAndReloadArea($('shipment_tracking_info').parentNode, '" . $this->getSubmitUrl() . "')";
+        $onclick = "saveTrackingInfo($('shipment_tracking_info').parentNode, '" . $this->getSubmitUrl() . "')";
         $this->addChild(
             'save_button',
             \Magento\Backend\Block\Widget\Button::class,
@@ -86,7 +86,10 @@ public function getRemoveUrl($track)
     }
 
     /**
+     * Get carrier title
+     *
      * @param string $code
+     *
      * @return \Magento\Framework\Phrase|string|bool
      */
     public function getCarrierTitle($code)
diff --git a/app/code/Magento/Shipping/Model/Shipping.php b/app/code/Magento/Shipping/Model/Shipping.php
index 5470f9a96775b..48127469ea984 100644
--- a/app/code/Magento/Shipping/Model/Shipping.php
+++ b/app/code/Magento/Shipping/Model/Shipping.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Shipping\Model;
 
 use Magento\Framework\App\ObjectManager;
@@ -272,7 +273,9 @@ public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $req
      */
     private function prepareCarrier(string $carrierCode, RateRequest $request): AbstractCarrier
     {
-        $carrier = $this->_carrierFactory->create($carrierCode, $request->getStoreId());
+        $carrier = $this->isShippingCarrierAvailable($carrierCode)
+            ? $this->_carrierFactory->create($carrierCode, $request->getStoreId())
+            : null;
         if (!$carrier) {
             throw new \RuntimeException('Failed to initialize carrier');
         }
@@ -360,6 +363,7 @@ public function composePackagesForCarrier($carrier, $request)
     {
         $allItems = $request->getAllItems();
         $fullItems = [];
+        $weightItems = [];
 
         $maxWeight = (double)$carrier->getConfigData('max_package_weight');
 
@@ -425,15 +429,13 @@ public function composePackagesForCarrier($carrier, $request)
 
             if (!empty($decimalItems)) {
                 foreach ($decimalItems as $decimalItem) {
-                    $fullItems = array_merge(
-                        $fullItems,
-                        array_fill(0, $decimalItem['qty'] * $qty, $decimalItem['weight'])
-                    );
+                    $weightItems[] = array_fill(0, $decimalItem['qty'] * $qty, $decimalItem['weight']);
                 }
             } else {
-                $fullItems = array_merge($fullItems, array_fill(0, $qty, $itemWeight));
+                $weightItems[] = array_fill(0, $qty, $itemWeight);
             }
         }
+        $fullItems = array_merge($fullItems, ...$weightItems);
         sort($fullItems);
 
         return $this->_makePieces($fullItems, $maxWeight);
@@ -532,4 +534,18 @@ public function setCarrierAvailabilityConfigField($code = 'active')
         $this->_availabilityConfigField = $code;
         return $this;
     }
+
+    /**
+     * Checks availability of carrier.
+     *
+     * @param string $carrierCode
+     * @return bool
+     */
+    private function isShippingCarrierAvailable(string $carrierCode): bool
+    {
+        return $this->_scopeConfig->isSetFlag(
+            'carriers/' . $carrierCode . '/' . $this->_availabilityConfigField,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
 }
diff --git a/app/code/Magento/Shipping/Model/Tracking/Result/Status.php b/app/code/Magento/Shipping/Model/Tracking/Result/Status.php
index cb24bd8ebb0e8..784b806fa3f86 100644
--- a/app/code/Magento/Shipping/Model/Tracking/Result/Status.php
+++ b/app/code/Magento/Shipping/Model/Tracking/Result/Status.php
@@ -1,21 +1,29 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Shipping\Model\Tracking\Result;
 
 /**
- * Fields:
- * - carrier: carrier code
- * - carrierTitle: carrier title
+ * Tracking Status DataObject
+ *
+ * @method string|null getCarrier()
+ * @method Status setCarrier(string $carrierCode)
+ * @method string|null getCarrierTitle()
+ * @method Status setCarrierTitle(string $carrierTitle)
  */
-class Status extends \Magento\Shipping\Model\Tracking\Result\AbstractResult
+class Status extends AbstractResult
 {
     /**
+     * Returns all Status data
+     *
      * @return array
      */
-    public function getAllData()
+    public function getAllData(): array
     {
         return $this->_data;
     }
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAddTrackingNumberToShipmentActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAddTrackingNumberToShipmentActionGroup.xml
new file mode 100644
index 0000000000000..87f139c9dc770
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAddTrackingNumberToShipmentActionGroup.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="AdminAddTrackingNumberToShipmentActionGroup">
+        <arguments>
+            <argument name="trackingTitle" type="string" defaultValue=""/>
+            <argument name="trackingNumber" type="string"/>
+        </arguments>
+
+        <fillField selector="{{AdminShipmentTrackingSection.trackingTitle}}" userInput="{{trackingTitle}}" stepKey="fillTrackingTitle"/>
+        <fillField selector="{{AdminShipmentTrackingSection.trackingNumber}}" userInput="{{trackingNumber}}" stepKey="fillTrackingNumber"/>
+        <click selector="{{AdminShipmentTrackingSection.addTrackingNumber}}" stepKey="clickAddTrackingNumber"/>
+        <waitForPageLoad stepKey="waitForTrackingInformation"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertCreatedShipmentInShipmentsTabActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertCreatedShipmentInShipmentsTabActionGroup.xml
new file mode 100644
index 0000000000000..1a7d3355e4ee4
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertCreatedShipmentInShipmentsTabActionGroup.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="AdminAssertCreatedShipmentsInShipmentsTabActionGroup">
+        <click stepKey="navigateToShipmentsTab" selector="{{AdminOrderDetailsOrderViewSection.shipments}}"/>
+        <waitForPageLoad stepKey="waitForTabLoad"/>
+        <grabTextFrom selector="{{AdminShipmentsGridSection.shipmentId}}" stepKey="grabShipmentId"/>
+        <assertNotEmpty actual="$grabShipmentId" stepKey="assertShipmentIdIsNotEmpty" after="grabShipmentId"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertExistingTrackingNumberActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertExistingTrackingNumberActionGroup.xml
new file mode 100644
index 0000000000000..03301aa22f583
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertExistingTrackingNumberActionGroup.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="AdminAssertExistingTrackingNumberActionGroup">
+        <arguments>
+            <argument name="trackingNumber" type="string"/>
+        </arguments>
+
+        <see selector="#shipment_tracking_info .col-number" userInput="{{trackingNumber}}" stepKey="seeAvailableTrackingNumber"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertShipmentInShipmentsGridActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertShipmentInShipmentsGridActionGroup.xml
new file mode 100644
index 0000000000000..de293c24a9c5d
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertShipmentInShipmentsGridActionGroup.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="AdminAssertShipmentInShipmentsGrid">
+        <arguments>
+            <argument name="shipmentId" type="string"/>
+        </arguments>
+        <!--Assert Shipment in Shipments Grid-->
+        <amOnPage url="{{AdminShipmentsGridPage.url}}" stepKey="onShipmentsGridPage"/>
+        <waitForPageLoad stepKey="waitForLoadingPage"/>
+        <conditionalClick selector="{{AdminShipmentsGridSection.clearFilters}}" dependentSelector="{{AdminShipmentsGridSection.clearFilters}}" visible="true" stepKey="clearFilter"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFilterLoad"/>
+        <click selector="{{AdminShipmentsGridSection.buttonFilters}}" stepKey="openFilterSearch"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFilterFields"/>
+        <fillField userInput="{{shipmentId}}" selector="{{AdminShipmentsGridSection.fieldShipment}}" stepKey="fillSearchByShipmentId"/>
+        <click selector="{{AdminShipmentsGridSection.applyFilter}}" stepKey="clickSearchButton"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForSearchResult"/>
+        <see userInput="{{shipmentId}}" selector="{{AdminShipmentsGridSection.rowShipments}}" stepKey="seeShipmentId"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertShipmentItemsActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertShipmentItemsActionGroup.xml
new file mode 100644
index 0000000000000..c4a0b4536fe20
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertShipmentItemsActionGroup.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="AdminAssertShipmentItemsActionGroup">
+        <arguments>
+            <argument name="product" defaultValue="" type="string"/>
+            <argument name="qty" defaultValue="" type="string"/>
+        </arguments>
+        <click selector="{{AdminShipmentsGridSection.shipmentId}}" stepKey="clickView"/>
+        <scrollTo selector="{{AdminShipmentItemsSection.itemName('1')}}" stepKey="scrollToShippedItems"/>
+        <see userInput="{{product}}" selector="{{AdminShipmentItemsSection.itemName('1')}}" stepKey="seeProductName"/>
+        <see userInput="{{qty}}" selector="{{AdminShipmentItemsSection.productQty}}" stepKey="seeQty"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertTrackingValidationErrorActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertTrackingValidationErrorActionGroup.xml
new file mode 100644
index 0000000000000..3783a9b1cc4db
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminAssertTrackingValidationErrorActionGroup.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="AdminAssertTrackingValidationErrorActionGroup">
+        <arguments>
+            <argument name="inputName" type="string"/>
+            <argument name="errorMessage" type="string" defaultValue="This is a required field."/>
+        </arguments>
+
+        <see selector="{{AdminShipmentTrackingSection.trackingInfoErrorElement(inputName)}}" userInput="{{errorMessage}}" stepKey="seeTrackingInfoValidationError"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminCreateShipmentFromOrderPageActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminCreateShipmentFromOrderPageActionGroup.xml
new file mode 100644
index 0000000000000..0e1358651c58a
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminCreateShipmentFromOrderPageActionGroup.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">
+         <!--Create Shipment With Tracking Number-->
+            <actionGroup name="AdminCreateShipmentFromOrderPage">
+                <arguments>
+                    <argument name="Title" defaultValue="" type="string"/>
+                    <argument name="Number" defaultValue="" type="string"/>
+                    <argument name="Comment" defaultValue="" type="string"/>
+                    <argument name="Qty" defaultValue="" type="string"/>
+                </arguments>
+
+                <click stepKey="clickShipButton" selector="{{AdminOrderDetailsMainActionsSection.ship}}"/>
+                <click stepKey="clickAddTrackingNumber" selector="{{AdminShipmentPaymentShippingSection.AddTrackingNumber}}"/>
+                <fillField stepKey="fillTitle" userInput="{{Title}}" selector="{{AdminShipmentPaymentShippingSection.Title('1')}}"/>
+                <fillField stepKey="fillNumber" userInput="{{Number}}" selector="{{AdminShipmentPaymentShippingSection.Number('1')}}"/>
+                <fillField stepKey="fillQty" userInput="{{Qty}}" selector="{{AdminShipmentItemsSection.itemQtyToShip('1')}}"/>
+                <fillField stepKey="fillComment" userInput="{{Comment}}" selector="{{AdminShipmentTotalSection.CommentText}}"/>
+                <click stepKey="clickSubmitButton" selector="{{AdminShipmentMainActionsSection.submitShipment}}"/>
+                <see userInput="The shipment has been created." stepKey="seeSuccessMessage"/>
+            </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminDeleteTrackingNumberActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminDeleteTrackingNumberActionGroup.xml
new file mode 100644
index 0000000000000..8c2629293acb7
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminDeleteTrackingNumberActionGroup.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="AdminDeleteTrackingNumberActionGroup">
+        <arguments>
+            <argument name="message" type="string" defaultValue="Are you sure?"/>
+        </arguments>
+
+        <click selector="{{AdminShipmentTrackingSection.deleteTrackingNumber}}" stepKey="clickDeleteButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{AdminGridConfirmActionSection.message}}" stepKey="waitForConfirmModal"/>
+        <see selector="{{AdminGridConfirmActionSection.message}}" userInput="{{message}}" stepKey="seeRemoveMessage"/>
+        <click selector="{{AdminGridConfirmActionSection.ok}}" stepKey="clickOkButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminImportFileTableRatesShippingMethodActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminImportFileTableRatesShippingMethodActionGroup.xml
new file mode 100644
index 0000000000000..bfae3d8b76f19
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminImportFileTableRatesShippingMethodActionGroup.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="AdminImportFileTableRatesShippingMethodActionGroup">
+        <annotations>
+            <description>Import a file in Table Rates tab in Shipping Method config page.</description>
+        </annotations>
+        <arguments>
+            <argument name="file" type="string" defaultValue="test_tablerates.csv"/>
+        </arguments>
+        <conditionalClick selector="{{AdminShippingMethodTableRatesSection.carriersTableRateTab}}" dependentSelector="{{AdminShippingMethodTableRatesSection.carriersTableRateActive}}" visible="false" stepKey="expandTab"/>
+        <attachFile selector="{{AdminShippingMethodTableRatesSection.importFile}}" userInput="{{file}}" stepKey="attachFileForImport"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminSelectFirstGridRowActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminSelectFirstGridRowActionGroup.xml
new file mode 100644
index 0000000000000..fc30d752f201f
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminSelectFirstGridRowActionGroup.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="AdminSelectFirstGridRowActionGroup">
+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickFirstRowInGrid"/>
+        <waitForPageLoad stepKey="waitToProcessPageToLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml
index e9809ae0f3e7f..631db885ab3d9 100644
--- a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminShipmentActionGroup.xml
@@ -62,4 +62,24 @@
         <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPageShipping"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The shipment has been created." stepKey="seeShipmentCreateSuccess"/>
     </actionGroup>
+    <actionGroup name="AdminShipmentCreateShippingLabelActionGroup">
+        <arguments>
+            <argument name="productName" type="string" defaultValue="{{SimpleProduct.name}}"/>
+        </arguments>
+        <waitForElementVisible selector="{{AdminShipmentCreatePackageMainSection.addProductsToPackage}}" stepKey="waitForAddProductElement"/>
+        <click selector="{{AdminShipmentCreatePackageMainSection.addProductsToPackage}}" stepKey="clickAddProducts"/>
+        <waitForElementVisible selector="{{AdminShipmentCreatePackageProductGridSection.concreteProductCheckbox('productName')}}" stepKey="waitForProductBeVisible"/>
+        <checkOption selector="{{AdminShipmentCreatePackageProductGridSection.concreteProductCheckbox('productName')}}" stepKey="checkProductCheckbox"/>
+        <waitForElementVisible selector="{{AdminShipmentCreatePackageMainSection.addSelectedProductToPackage}}" stepKey="waitForAddSelectedProductElement"/>
+        <click selector="{{AdminShipmentCreatePackageMainSection.addSelectedProductToPackage}}" stepKey="clickAddSelectedProduct"/>
+        <waitForElementNotVisible selector="{{AdminShipmentCreatePackageMainSection.saveButtonDisabled}}" stepKey="waitForBeEnabled"/>
+        <click selector="{{AdminShipmentCreatePackageMainSection.save}}" stepKey="clickSave"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear"/>
+        <waitForPageLoad stepKey="waitForSaving"/>
+        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The shipment has been created. You created the shipping label." stepKey="seeShipmentCreateSuccess"/>
+    </actionGroup>
+    <actionGroup name="AdminGoToShipmentTabActionGroup">
+        <click selector="{{AdminOrderDetailsOrderViewSection.shipments}}" stepKey="clickOrderShipmentsTab"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForShipmentTabLoad" after="clickOrderShipmentsTab"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertThereIsNoShipButtonActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertThereIsNoShipButtonActionGroup.xml
new file mode 100644
index 0000000000000..10521769c5070
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/AssertThereIsNoShipButtonActionGroup.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">
+    <!--Create Shipment With Tracking Number-->
+    <actionGroup name="AssertThereIsNoShipButtonActionGroup">
+        <dontSee stepKey="dontSeeShipButton" selector="{{AdminOrderDetailsMainActionsSection.ship}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/ActionGroup/StorefrontSetShippingMethodActionGroup.xml b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/StorefrontSetShippingMethodActionGroup.xml
new file mode 100644
index 0000000000000..7fdfe6d88b8e6
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/ActionGroup/StorefrontSetShippingMethodActionGroup.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="StorefrontSetShippingMethodActionGroup">
+        <annotations>
+            <description>Selects the provided Shipping Method on checkout shipping and wait loading mask.</description>
+        </annotations>
+        <arguments>
+            <argument name="shippingMethodName" type="string" defaultValue="Flat Rate"/>
+        </arguments>
+        <checkOption selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName(shippingMethodName)}}" stepKey="selectFlatRateShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForNextButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Data/AdminShippingSettingsConfigData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/AdminShippingSettingsConfigData.xml
new file mode 100644
index 0000000000000..342472aab6f42
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Data/AdminShippingSettingsConfigData.xml
@@ -0,0 +1,36 @@
+<?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="AdminShippingSettingsOriginCountryConfigData">
+        <data key="path">shipping/origin/country_id</data>
+    </entity>
+    <entity name="AdminShippingSettingsOriginZipCodeConfigData">
+        <data key="path">shipping/origin/postcode</data>
+    </entity>
+    <entity name="AdminShippingSettingsOriginCityConfigData">
+        <data key="path">shipping/origin/city</data>
+    </entity>
+    <entity name="AdminShippingSettingsOriginStreetAddressConfigData">
+        <data key="path">shipping/origin/street_line1</data>
+    </entity>
+    <entity name="AdminShippingSettingsOriginStreetAddress2ConfigData">
+        <data key="path">shipping/origin/street_line2</data>
+    </entity>
+    <entity name="AdminFreeshippingActiveConfigData">
+        <data key="path">carriers/freeshipping/active</data>
+        <data key="enabled">1</data>
+        <data key="disabled">0</data>
+    </entity>
+    <entity name="AdminFreeshippingMinimumOrderAmountConfigData">
+        <data key="path">carriers/freeshipping/free_shipping_subtotal</data>
+        <data key="hundred">100</data>
+        <data key="default">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml
index d700aa622c177..3d3667e59903f 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml
@@ -26,6 +26,7 @@
         <requiredEntity type="title">freeTitleDefault</requiredEntity>
         <requiredEntity type="name">freeNameDefault</requiredEntity>
         <requiredEntity type="free_shipping_subtotal">freeShippingSubtotalDefault</requiredEntity>
+        <requiredEntity type="tax_including">TaxIncludingDefault</requiredEntity>
         <requiredEntity type="specificerrmsg">freeSpecificerrmsgDefault</requiredEntity>
         <requiredEntity type="sallowspecific">freeSallowspecificDefault</requiredEntity>
         <requiredEntity type="specificcountry">freeSpecificcountryDefault</requiredEntity>
@@ -44,6 +45,9 @@
     <entity name="freeShippingSubtotalDefault" type="free_shipping_subtotal">
         <data key="value" />
     </entity>
+    <entity name="TaxIncludingDefault" type="tax_including">
+        <data key="value">0</data>
+    </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>
@@ -66,6 +70,17 @@
     <entity name="freeShippingSubtotal" type="free_shipping_subtotal">
         <data key="value">101</data>
     </entity>
+    <!--Set Free Shipping "Include Tax to Amount" to "Yes"-->
+    <entity name="SetTaxIncluding" type="free_shipping_method">
+        <requiredEntity type="tax_including">TaxIncluding</requiredEntity>
+    </entity>
+    <entity name="TaxIncluding" type="tax_including">
+        <data key="value">1</data>
+    </entity>
+    <!--Set to default Free Shipping "Include Tax to Amount"-->
+    <entity name="SetTaxIncludingToDefault" type="free_shipping_method">
+        <requiredEntity type="tax_including">TaxIncludingDefault</requiredEntity>
+    </entity>
     <!--Set to default Free Shipping Subtotal-->
     <entity name="setFreeShippingSubtotalToDefault" type="free_shipping_method">
         <requiredEntity type="free_shipping_subtotal">freeShippingSubtotalDefault</requiredEntity>
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
index 5781b886386f6..14c0d6d5af725 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Metadata/shipping_methods-meta.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Metadata/shipping_methods-meta.xml
@@ -66,6 +66,9 @@
                     <object key="free_shipping_subtotal" dataType="free_shipping_subtotal">
                         <field key="value">string</field>
                     </object>
+                    <object key="tax_including" dataType="tax_including">
+                        <field key="value">boolean</field>
+                    </object>
                     <object key="specificerrmsg" dataType="specificerrmsg">
                         <field key="value">string</field>
                     </object>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentsGridPage.xml b/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentsGridPage.xml
new file mode 100644
index 0000000000000..61aad55401248
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentsGridPage.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="AdminShipmentsGridPage" url="sales/shipment/" area="admin" module="Magento_Sales">
+        <section name="AdminShipmentsGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentCreatePackageSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentCreatePackageSection.xml
new file mode 100644
index 0000000000000..5f33921b5a44f
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentCreatePackageSection.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="AdminShipmentCreatePackageMainSection">
+        <element name="addProductsToPackage" type="button" selector="#package_block_1 button[data-action='package-add-items']"/>
+        <element name="addSelectedProductToPackage" type="button" selector="#package_block_1 button[data-action='package-save-items']"/>
+        <element name="save" type="button" selector="button[data-action='save-packages']"/>
+        <element name="saveButtonDisabled" type="button" selector="button[data-action='save-packages']._disabled"/>
+    </section>
+    <section name="AdminShipmentCreatePackageProductGridSection">
+        <element name="concreteProductCheckbox" type="checkbox" selector="//td[contains(text(), '{{productName}}')]/parent::tr//input[contains(@class,'checkbox')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml
index 0345c3f2949f4..3630de8978924 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentItemsSection.xml
@@ -16,5 +16,6 @@
         <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"/>
         <element name="itemQtyInvoiced" type="text" selector="(//*[@class='col-ordered-qty']//th[contains(text(), 'Invoiced')]/following-sibling::td)[{{var}}]" parameterized="true"/>
+        <element name="productQty" type="text" selector="td.col-qty"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentPaymentShippingSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentPaymentShippingSection.xml
index 48c7106c2d65e..eb94014d7a50c 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentPaymentShippingSection.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentPaymentShippingSection.xml
@@ -17,7 +17,7 @@
         <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="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
index f2f39d77d8d79..d76ba0493829e 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTotalSection.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTotalSection.xml
@@ -12,5 +12,6 @@
         <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"/>
+        <element name="createShippingLabel" type="checkbox" selector="input#create_shipping_label"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTrackingInformationShippingSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTrackingInformationShippingSection.xml
new file mode 100644
index 0000000000000..bbb61ed013a30
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTrackingInformationShippingSection.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="AdminShipmentTrackingInformationShippingSection">
+        <element name="shippingInfoTable" type="block" selector="#shipment_tracking_info"/>
+        <element name="shippingMethod" type="text" selector="#shipment_tracking_info .odd .col-carrier"/>
+        <element name="shippingMethodTitle" type="text" selector="#shipment_tracking_info .odd .col-title"/>
+        <element name="shippingNumber" type="text" selector="#shipment_tracking_info .odd .col-number"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTrackingSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTrackingSection.xml
new file mode 100644
index 0000000000000..52a5242f2d117
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTrackingSection.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="AdminShipmentTrackingSection">
+        <element name="trackingNumber" type="text" selector="#tracking-shipping-form #tracking_number"/>
+        <element name="trackingTitle" type="text" selector="#tracking-shipping-form #tracking_title"/>
+        <element name="addTrackingNumber" type="button" selector="#tracking-shipping-form button.save"/>
+        <element name="deleteTrackingNumber" type="button" selector="#tracking-shipping-form button.action-delete"/>
+        <element name="trackingInfoErrorElement" type="text" selector="#tracking-shipping-form #{{inputName}}-error" parameterized="true" />
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentsGridSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentsGridSection.xml
new file mode 100644
index 0000000000000..84aed3052c736
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentsGridSection.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="AdminShipmentsGridSection">
+        <element name="shipmentId" type="text" selector="//*[@id='sales_order_view_tabs_order_shipments_content']//tbody/tr/td[2]/div"/>
+        <element name="clearFilters" type="button" selector="button.action-tertiary.action-clear"/>
+        <element name="buttonFilters" type="button" selector=".data-grid-filters-action-wrap > button"/>
+        <element name="fieldShipment" type="input" selector="input[name='increment_id']"/>
+        <element name="applyFilter" type="button" selector="button[data-action='grid-filter-apply']"/>
+        <element name="rowShipments" type="text" selector="div.data-grid-cell-content"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCheckTheConfirmationPopupTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCheckTheConfirmationPopupTest.xml
new file mode 100644
index 0000000000000..87058245c6014
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCheckTheConfirmationPopupTest.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="AdminCheckTheConfirmationPopupTest">
+        <annotations>
+            <stories value="Admin confirmation modal should be in Magento style"/>
+            <title value="Admin confirmation modal should be in Magento style"/>
+            <description value="Testing the confirmation modal for removing the tracking number"/>
+            <severity value="CRITICAL"/>
+            <group value="shipping"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="CreateOrderActionGroup" stepKey="goToCreateOrderPage">
+            <argument name="customer" value="$$createCustomer$$"/>
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
+        <actionGroup ref="AdminShipThePendingOrderActionGroup" stepKey="createShipmentForOrder"/>
+        <actionGroup ref="FilterShipmentGridByOrderIdActionGroup" stepKey="filterForNewlyCreatedShipment">
+            <argument name="orderId" value="$orderId"/>
+        </actionGroup>
+        <actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="selectShipmentFromGrid"/>
+        <actionGroup ref="AdminAddTrackingNumberToShipmentActionGroup" stepKey="addTrackingNumber">
+            <argument name="trackingNumber" value="123123"/>
+        </actionGroup>
+        <actionGroup ref="AdminDeleteTrackingNumberActionGroup" stepKey="deleteTrackingNumber"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateOrderCustomStoreShippingMethodTableRatesTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateOrderCustomStoreShippingMethodTableRatesTest.xml
new file mode 100644
index 0000000000000..b2e3e2516a5c3
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateOrderCustomStoreShippingMethodTableRatesTest.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCreateOrderCustomStoreShippingMethodTableRatesTest">
+        <annotations>
+            <features value="Shipping"/>
+            <stories value="Shipping method Table Rates"/>
+            <title value="Create order on second store with shipping method Table Rates"/>
+            <description value="Create order on second store with shipping method Table Rates"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-6411"/>
+            <useCaseId value="MAGETWO-91702"/>
+            <group value="shipping"/>
+        </annotations>
+        <before>
+            <!--Create product and customer-->
+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create website, store group and store view-->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
+                <argument name="website" value="{{customWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStore"/>
+            </actionGroup>
+            <!--Create customer associated to website-->
+            <actionGroup ref="AdminGoCreatedWebsitePageActionGroup" stepKey="DeleteWebsite">
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
+            </actionGroup>
+            <grabFromCurrentUrl regex="~/website_id/(\d+)/~" stepKey="grabWebsiteIdFromURL"/>
+            <createData entity="Simple_Customer_Without_Address" stepKey="createCustomer">
+                <field key="website_id">$grabWebsiteIdFromURL</field>
+            </createData>
+            <!--Enable Table Rate method and import csv file-->
+            <actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
+            <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="switchDefaultWebsite">
+                <argument name="website" value="_defaultWebsite"/>
+            </actionGroup>
+            <actionGroup ref="AdminChangeTableRatesShippingMethodStatusActionGroup" stepKey="enableTableRatesShippingMethodForDefaultWebsite">
+                <argument name="status" value="0"/>
+            </actionGroup>
+            <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigForDefaultWebsite"/>
+            <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="switchCustomWebsite">
+                <argument name="website" value="customWebsite"/>
+            </actionGroup>
+            <actionGroup ref="AdminChangeTableRatesShippingMethodStatusActionGroup" stepKey="enableTableRatesShippingMethod">
+                <argument name="status" value="1"/>
+            </actionGroup>
+            <actionGroup ref="AdminImportFileTableRatesShippingMethodActionGroup" stepKey="importCSVFile">
+                <argument name="file" value="usa_tablerates.csv"/>
+            </actionGroup>
+            <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Assign product to custom website-->
+        <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="goToProductEditPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="unassignWebsiteFromProductActionGroup" stepKey="unassignWebsiteInProduct">
+            <argument name="website" value="{{_defaultWebsite.name}}"/>
+        </actionGroup>
+        <actionGroup ref="SelectProductInWebsitesActionGroup" stepKey="selectWebsiteInProduct">
+            <argument name="website" value="{{customWebsite.name}}"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        <!--Create order-->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
+            <argument name="customer" value="$$createCustomer$$"/>
+            <argument name="storeView" value="customStore"/>
+        </actionGroup>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addSimpleProductToTheOrder">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerInfo">
+            <argument name="customer" value="$$createCustomer$$"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+        <!--Choose Best Way shipping Method-->
+        <actionGroup ref="AdminOrderSelectShippingMethodActionGroup" stepKey="chooseBestWayMethod">
+            <argument name="methodTitle" value="bestway"/>
+            <argument name="methodName" value="tablerate"/>
+        </actionGroup>
+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreatePartialShipmentEntityTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreatePartialShipmentEntityTest.xml
new file mode 100644
index 0000000000000..30dc98c2f68ca
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreatePartialShipmentEntityTest.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="AdminCreatePartialShipmentEntityTest">
+        <annotations>
+            <stories value="Create Partial Shipment Entity"/>
+            <title value="Create Partial Shipment for Offline Payment Methods"/>
+            <description value="Admin Should be Able to Create Partial Shipments"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-13331"/>
+            <group value="sales"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <!-- Create Data -->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
+            </createData>
+            <!-- Enable payment method one of "Check/Money Order" and  shipping method one of "Free Shipping" -->
+            <magentoCLI command="config:set {{enabledCheckMoneyOrder.label}} {{enabledCheckMoneyOrder.value}}" stepKey="enableCheckMoneyOrder"/>
+            <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
+            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+        </before>
+        <after>
+            <!-- Delete data -->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShippingMethod"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- TEST BODY -->
+        <!-- Create Order -->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="goToCreateOrderPage">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addProductToOrder">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productQty" value="2"/>
+        </actionGroup>
+        <!-- Select Free shipping -->
+        <actionGroup ref="orderSelectFreeShipping" stepKey="selectFreeShippingOption"/>
+        <!--Click *Submit Order* button-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
+        <!-- Create Partial Shipment -->
+        <actionGroup ref="AdminCreateShipmentFromOrderPage" stepKey="createNewShipment">
+            <argument name="Qty" value="1"/>
+            <argument name="Title" value="Title"/>
+            <argument name="Number" value="199"/>
+            <argument name="Comment" value="comments for shipment"/>
+        </actionGroup>
+        <!-- Assert There is no "Ship Button" in Order Information -->
+        <actionGroup ref="AssertThereIsNoShipButtonActionGroup" stepKey="dontSeeShipButton"/>
+        <!-- Assert Created Shipment in Shipments Tab-->
+        <actionGroup ref="AdminAssertCreatedShipmentsInShipmentsTabActionGroup" stepKey="assertCreatedShipment"/>
+        <grabTextFrom selector="{{AdminShipmentsGridSection.shipmentId}}" stepKey="grabShipmentId"/>
+        <!-- Assert Shipment items -->
+        <actionGroup ref="AdminAssertShipmentItemsActionGroup" stepKey="assertShipmentItems">
+            <argument name="product" value="$$createSimpleProduct.name$$"/>
+            <argument name="qty" value="1"/>
+        </actionGroup>
+        <!-- Assert Created Shipment in Shipments Grid-->
+        <actionGroup ref="AdminAssertShipmentInShipmentsGrid" stepKey="assertShipmentInGrid">
+            <argument name="shipmentId" value="{$grabShipmentId}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateShipmentEntityTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateShipmentEntityTest.xml
new file mode 100644
index 0000000000000..3e6bf29b1bf54
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateShipmentEntityTest.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="AdminCreateShipmentEntityWithTrackingNumberTest">
+        <annotations>
+            <stories value="Shipment Entity With Tracking Number"/>
+            <title value="Create Shipment for Offline Payment Methods"/>
+            <description value="Admin Should be Able to Create Shipments"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14330"/>
+            <group value="sales"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <!-- Create Data -->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
+            </createData>
+            <!-- Enable payment method one of "Check/Money Order" and  shipping method one of "Free Shipping" -->
+            <magentoCLI command="config:set {{enabledCheckMoneyOrder.label}} {{enabledCheckMoneyOrder.value}}" stepKey="enableCheckMoneyOrder"/>
+            <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
+            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+        </before>
+        <after>
+            <!-- Delete data -->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShippingMethod"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+     </after>
+
+        <!-- TEST BODY -->
+
+        <!-- Create Order -->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="goToCreateOrderPage">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addProductToOrder">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <!-- Select Free shipping -->
+        <actionGroup ref="orderSelectFreeShipping" stepKey="selectFreeShippingOption"/>
+        <!--Click *Submit Order* button-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
+        <!-- Create Shipment -->
+        <actionGroup ref="AdminCreateShipmentFromOrderPage" stepKey="createNewShipment">
+            <argument name="Title" value="Title"/>
+            <argument name="Number" value="199"/>
+            <argument name="Qty" value="1"/>
+            <argument name="Comment" value="comments for shipment"/>
+        </actionGroup>
+        <!-- Assert There is no "Ship Button" in Order Information -->
+        <actionGroup ref="AssertThereIsNoShipButtonActionGroup" stepKey="dontSeeShipButton"/>
+        <!-- Assert Created Shipment in Shipments Tab-->
+        <actionGroup ref="AdminAssertCreatedShipmentsInShipmentsTabActionGroup" stepKey="assertCreatedShipment"/>
+        <grabTextFrom selector="{{AdminShipmentsGridSection.shipmentId}}" stepKey="grabShipmentId"/>
+        <!-- Assert Shipment items -->
+        <actionGroup ref="AdminAssertShipmentItemsActionGroup" stepKey="assertShipmentItems">
+            <argument name="product" value="$$createSimpleProduct.name$$"/>
+            <argument name="qty" value="1"/>
+        </actionGroup>
+        <!-- Assert Created Shipment in Shipments Grid-->
+        <actionGroup ref="AdminAssertShipmentInShipmentsGrid" stepKey="assertShipmentInGrid">
+        <argument name="shipmentId" value="{$grabShipmentId}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/AdminValidateShippingTrackingNumberTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/AdminValidateShippingTrackingNumberTest.xml
new file mode 100644
index 0000000000000..ca4d731eb82b1
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/AdminValidateShippingTrackingNumberTest.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="AdminValidateShippingTrackingNumberTest">
+        <annotations>
+            <stories value="Admin validate the shipping tracking number for an order"/>
+            <title value="Admin validate the shipping tracking number for an order"/>
+            <description value="Testing for a required tracking number when adding new shipping information"/>
+            <severity value="CRITICAL"/>
+            <group value="shipping"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="CreateOrderActionGroup" stepKey="goToCreateOrderPage">
+            <argument name="customer" value="$$createCustomer$$"/>
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
+        <actionGroup ref="AdminShipThePendingOrderActionGroup" stepKey="createShipmentForOrder"/>
+        <actionGroup ref="FilterShipmentGridByOrderIdActionGroup" stepKey="filterForNewlyCreatedShipment">
+            <argument name="orderId" value="$orderId"/>
+        </actionGroup>
+        <actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="selectShipmentFromGrid"/>
+        <actionGroup ref="AdminAddTrackingNumberToShipmentActionGroup" stepKey="addTrackingInformation">
+            <argument name="trackingNumber" value=""/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertTrackingValidationErrorActionGroup" stepKey="assertValidateTrackingNumber">
+            <argument name="inputName" value="tracking_number"/>
+        </actionGroup>
+        <actionGroup ref="AdminAddTrackingNumberToShipmentActionGroup" stepKey="addTrackingNumber">
+            <argument name="trackingNumber" value="123123"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertExistingTrackingNumberActionGroup" stepKey="checkAddedTrackingNumber">
+            <argument name="trackingNumber" value="123123"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/StorefrontDisplayTableRatesShippingMethodForAETest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/StorefrontDisplayTableRatesShippingMethodForAETest.xml
new file mode 100644
index 0000000000000..bb29a4a28bcf6
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/StorefrontDisplayTableRatesShippingMethodForAETest.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="StorefrontDisplayTableRatesShippingMethodForAETest">
+        <annotations>
+            <features value="Shipping"/>
+            <stories value="Table Rates"/>
+            <title value="Displaying of Table Rates for Armed Forces Europe (AE)"/>
+            <description value="Displaying of Table Rates for Armed Forces Europe (AE)"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-6405"/>
+            <group value="shipping"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer_ArmedForcesEurope" stepKey="createCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <!--Rollback config-->
+            <actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodSystemConfigPage"/>
+            <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreViewToMainWebsite">
+                <argument name="website" value="_defaultWebsite"/>
+            </actionGroup>
+            <actionGroup ref="AdminChangeTableRatesShippingMethodStatusActionGroup" stepKey="disableTableRatesShippingMethod">
+                <argument name="status" value="0"/>
+            </actionGroup>
+            <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveSystemConfig"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Admin Configuration: enable Table Rates and import CSV file with the rates-->
+        <actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
+        <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreView">
+            <argument name="website" value="_defaultWebsite"/>
+        </actionGroup>
+        <actionGroup ref="AdminChangeTableRatesShippingMethodStatusActionGroup" stepKey="enableTableRatesShippingMethod"/>
+        <attachFile selector="{{AdminShippingMethodTableRatesSection.importFile}}" userInput="tablerates.csv" stepKey="attachFileForImport"/>
+        <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig"/>
+        <!--Login as created customer-->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <!--Add the created product to the shopping cart-->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <!--Proceed to Checkout from the mini cart-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
+        <!--Shipping Method: select table rate-->
+        <actionGroup ref="AssertStoreFrontShippingMethodAvailableActionGroup" stepKey="assertShippingMethodAvailable">
+            <argument name="shippingMethodName" value="Best Way"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="setShippingMethodTableRate">
+            <argument name="shippingMethodName" value="Best Way"/>
+        </actionGroup>
+        <!--Proceed to Review and Payments section-->
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickToSaveShippingInfo"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
+        <waitForPageLoad stepKey="waitForReviewAndPaymentsPageIsLoaded"/>
+        <!--Place order and assert the message of success-->
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrderProductSuccessful"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Shipping/Test/Unit/Helper/DataTest.php b/app/code/Magento/Shipping/Test/Unit/Helper/DataTest.php
new file mode 100644
index 0000000000000..b82e3537d26e2
--- /dev/null
+++ b/app/code/Magento/Shipping/Test/Unit/Helper/DataTest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Shipping\Test\Unit\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Magento\Shipping\Helper\Data as HelperData;
+use Magento\Framework\Url\DecoderInterface;
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Data helper test
+ *
+ * Class \Magento\Shipping\Test\Unit\Helper\DataTest
+ */
+class DataTest extends TestCase
+{
+    /**
+     * @var HelperData
+     */
+    private $helper;
+
+    /**
+     * @var DecoderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlDecoderMock;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * Setup environment to test
+     */
+    protected function setUp()
+    {
+        $this->contextMock = $this->createMock(Context::class);
+        $this->urlDecoderMock = $this->createMock(DecoderInterface::class);
+        $this->contextMock->expects($this->any())->method('getUrlDecoder')
+            ->willReturn($this->urlDecoderMock);
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->helper = $this->objectManagerHelper->getObject(
+            HelperData::class,
+            [
+                'context' => $this->contextMock
+            ]
+        );
+    }
+
+    /**
+     * test decodeTrackingHash() with data provider below
+     *
+     * @param string $hash
+     * @param string $urlDecodeResult
+     * @param array $expected
+     * @dataProvider decodeTrackingHashDataProvider
+     */
+    public function testDecodeTrackingHash($hash, $urlDecodeResult, $expected)
+    {
+        $this->urlDecoderMock->expects($this->any())->method('decode')
+            ->with($hash)
+            ->willReturn($urlDecodeResult);
+        $this->assertEquals($expected, $this->helper->decodeTrackingHash($hash));
+    }
+
+    /**
+     * Dataset to test getData()
+     *
+     * @return array
+     */
+    public function decodeTrackingHashDataProvider()
+    {
+        return [
+            'Test with hash key is allowed' => [
+                strtr(base64_encode('order_id:1:protected_code'), '+/=', '-_,'),
+                'order_id:1:protected_code',
+                [
+                    'key' => 'order_id',
+                    'id' => 1,
+                    'hash' => 'protected_code'
+                ]
+            ],
+            'Test with hash key is not allowed' => [
+                strtr(base64_encode('invoice_id:1:protected_code'), '+/=', '-_,'),
+                'invoice_id:1:protected_code',
+                []
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php b/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php
index 1df41aeba076b..e5723c38ac568 100644
--- a/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php
@@ -3,12 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Shipping\Test\Unit\Model;
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Type as ProductType;
 use Magento\CatalogInventory\Model\Stock\Item as StockItem;
 use Magento\CatalogInventory\Model\StockRegistry;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Quote\Model\Quote\Item as QuoteItem;
 use Magento\Shipping\Model\Carrier\AbstractCarrierInterface;
 use Magento\Shipping\Model\CarrierFactory;
@@ -19,12 +21,14 @@
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * @see Shipping
+ * Unit tests for \Magento\Shipping\Model\Shipping class.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ShippingTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * Test identification number of product
+     * Test identification number of product.
      *
      * @var int
      */
@@ -50,22 +54,34 @@ class ShippingTest extends \PHPUnit\Framework\TestCase
      */
     private $carrier;
 
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $scopeConfig;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->stockRegistry = $this->createMock(StockRegistry::class);
         $this->stockItemData = $this->createMock(StockItem::class);
+        $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
 
         $this->shipping = (new ObjectManagerHelper($this))->getObject(
             Shipping::class,
             [
                 'stockRegistry' => $this->stockRegistry,
                 'carrierFactory' => $this->getCarrierFactory(),
+                'scopeConfig' => $this->scopeConfig,
             ]
         );
     }
 
     /**
+     * Compose Packages For Carrier.
      *
+     * @return void
      */
     public function testComposePackages()
     {
@@ -125,14 +141,25 @@ function ($key) {
 
     /**
      * Active flag should be set before collecting carrier rates.
+     *
+     * @return void
      */
     public function testCollectCarrierRatesSetActiveFlag()
     {
+        $carrierCode = 'carrier';
+        $scopeStore = 'store';
+        $this->scopeConfig->expects($this->once())
+            ->method('isSetFlag')
+            ->with(
+                'carriers/' . $carrierCode . '/active',
+                $scopeStore
+            )
+            ->willReturn(true);
         $this->carrier->expects($this->atLeastOnce())
             ->method('setActiveFlag')
             ->with('active');
 
-        $this->shipping->collectCarrierRates('carrier', new RateRequest());
+        $this->shipping->collectCarrierRates($carrierCode, new RateRequest());
     }
 
     /**
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
index cd25cb919adb5..28322d9534926 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
@@ -31,7 +31,7 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
             packaging.sendCreateLabelRequest();
         });
         packaging.setLabelCreatedCallback(function(response){
-            setLocation("<?php $block->escapeJs($block->escapeUrl($block->getUrl(
+            setLocation("<?= $block->escapeJs($block->escapeUrl($block->getUrl(
                 'sales/order/view',
                 ['order_id' => $block->getShipment()->getOrderId()]
             ))); ?>");
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
index 67587f19774c4..a013abfd65f87 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
@@ -9,84 +9,102 @@
 ?>
 <?php /** @var $block Magento\Shipping\Block\Adminhtml\Order\Tracking\View */ ?>
 <div class="admin__control-table-wrapper">
-    <table class="data-table admin__control-table" id="shipment_tracking_info">
-        <thead>
-            <tr class="headings">
-                <th class="col-carrier"><?= $block->escapeHtml(__('Carrier')) ?></th>
-                <th class="col-title"><?= $block->escapeHtml(__('Title')) ?></th>
-                <th class="col-number"><?= $block->escapeHtml(__('Number')) ?></th>
-                <th class="col-delete last"><?= $block->escapeHtml(__('Action')) ?></th>
-            </tr>
-        </thead>
-        <tfoot>
-            <tr>
-                <td class="col-carrier">
-                    <select name="carrier"
-                            class="select admin__control-select"
-                            onchange="selectCarrier(this)">
-                        <?php foreach ($block->getCarriers() as $_code => $_name) : ?>
-                        <option value="<?= $block->escapeHtmlAttr($_code) ?>"><?= $block->escapeHtml($_name) ?></option>
-                        <?php endforeach; ?>
-                    </select>
-                </td>
-                <td class="col-title">
-                    <input class="input-text admin__control-text"
-                           type="text"
-                           id="tracking_title"
-                           name="title"
-                           value="" />
-                </td>
-                <td class="col-number">
-                    <input class="input-text admin__control-text"
-                           type="text"
-                           id="tracking_number"
-                           name="number"
-                           value="" />
-                </td>
-                <td class="col-delete last"><?= $block->getSaveButtonHtml() ?></td>
-            </tr>
-        </tfoot>
-    <?php if ($_tracks = $block->getShipment()->getAllTracks()) : ?>
-        <tbody>
-        <?php $i = 0; foreach ($_tracks as $_track) :$i++ ?>
-            <tr class="<?= /* @noEscape */ ($i%2 == 0) ? 'even' : 'odd' ?>">
-                <td class="col-carrier">
-                    <?= $block->escapeHtml($block->getCarrierTitle($_track->getCarrierCode())) ?>
-                </td>
-                <td class="col-title"><?= $block->escapeHtml($_track->getTitle()) ?></td>
-                <td class="col-number">
-                    <?php if ($_track->isCustom()) : ?>
-                        <?= $block->escapeHtml($_track->getNumber()) ?>
-                    <?php else : ?>
-                    <a href="#" onclick="popWin('<?= $block->escapeJs($block->escapeUrl($this->helper(Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($_track))) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')"><?= $block->escapeHtml($_track->getNumber()) ?></a>
-                    <div id="shipment_tracking_info_response_<?= (int) $_track->getId() ?>"></div>
-                    <?php endif; ?>
-                </td>
-                <td class="col-delete last"><button class="action-delete" type="button" onclick="deleteTrackingNumber('<?= $block->escapeJs($block->escapeUrl($block->getRemoveUrl($_track))) ?>'); return false;"><span><?= $block->escapeHtml(__('Delete')) ?></span></button></td>
-            </tr>
-        <?php endforeach; ?>
-        </tbody>
-    <?php endif; ?>
-    </table>
+    <form id="tracking-shipping-form" data-mage-init='{"validation": {}}'>
+        <table class="data-table admin__control-table" id="shipment_tracking_info">
+            <thead>
+                <tr class="headings">
+                    <th class="col-carrier"><?= $block->escapeHtml(__('Carrier')) ?></th>
+                    <th class="col-title"><?= $block->escapeHtml(__('Title')) ?></th>
+                    <th class="col-number"><?= $block->escapeHtml(__('Number')) ?></th>
+                    <th class="col-delete last"><?= $block->escapeHtml(__('Action')) ?></th>
+                </tr>
+            </thead>
+            <tfoot>
+                <tr>
+                    <td class="col-carrier">
+                        <select name="carrier"
+                                class="select admin__control-select"
+                                onchange="selectCarrier(this)">
+                            <?php foreach ($block->getCarriers() as $_code => $_name) : ?>
+                            <option value="<?= $block->escapeHtmlAttr($_code) ?>"><?= $block->escapeHtml($_name) ?></option>
+                            <?php endforeach; ?>
+                        </select>
+                    </td>
+                    <td class="col-title">
+                        <input class="input-text admin__control-text"
+                               type="text"
+                               id="tracking_title"
+                               name="title"
+                               value="" />
+                    </td>
+                    <td class="col-number">
+                        <input class="input-text admin__control-text required-entry"
+                               type="text"
+                               id="tracking_number"
+                               name="number"
+                               value="" />
+                    </td>
+                    <td class="col-delete last"><?= $block->getSaveButtonHtml() ?></td>
+                </tr>
+            </tfoot>
+        <?php if ($_tracks = $block->getShipment()->getAllTracks()) : ?>
+            <tbody>
+            <?php $i = 0; foreach ($_tracks as $_track) :$i++ ?>
+                <tr class="<?= /* @noEscape */ ($i%2 == 0) ? 'even' : 'odd' ?>">
+                    <td class="col-carrier">
+                        <?= $block->escapeHtml($block->getCarrierTitle($_track->getCarrierCode())) ?>
+                    </td>
+                    <td class="col-title"><?= $block->escapeHtml($_track->getTitle()) ?></td>
+                    <td class="col-number">
+                        <?php if ($_track->isCustom()) : ?>
+                            <?= $block->escapeHtml($_track->getNumber()) ?>
+                        <?php else : ?>
+                        <a href="#" onclick="popWin('<?= $block->escapeJs($block->escapeUrl($this->helper(Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($_track))) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')"><?= $block->escapeHtml($_track->getNumber()) ?></a>
+                        <div id="shipment_tracking_info_response_<?= (int) $_track->getId() ?>"></div>
+                        <?php endif; ?>
+                    </td>
+                    <td class="col-delete last"><button class="action-delete" type="button" onclick="deleteTrackingNumber('<?= $block->escapeJs($block->escapeUrl($block->getRemoveUrl($_track))) ?>'); return false;"><span><?= $block->escapeHtml(__('Delete')) ?></span></button></td>
+                </tr>
+            <?php endforeach; ?>
+            </tbody>
+        <?php endif; ?>
+        </table>
+    </form>
 </div>
 
 <script>
-require(['prototype'], function(){
-
+require(['prototype', 'jquery', 'Magento_Ui/js/modal/confirm'], function(prototype, $j, confirm) {
 //<![CDATA[
 function selectCarrier(elem) {
     var option = elem.options[elem.selectedIndex];
     $('tracking_title').value = option.value && option.value != 'custom' ? option.text : '';
 }
 
-function deleteTrackingNumber(url) {
-    if (confirm('<?= $block->escapeJs($block->escapeHtml(__('Are you sure?'))) ?>')) {
-        submitAndReloadArea($('shipment_tracking_info').parentNode, url)
+function saveTrackingInfo(node, url) {
+    var form = $j('#tracking-shipping-form');
+
+    if (form.validation() && form.validation('isValid')) {
+        submitAndReloadArea(node, url);
     }
 }
 
+function deleteTrackingNumber(url) {
+    confirm({
+        content: '<?= $block->escapeJs($block->escapeHtml(__('Are you sure?'))) ?>',
+        actions: {
+            /**
+             * Confirm action.
+             */
+            confirm: function () {
+                submitAndReloadArea($('shipment_tracking_info').parentNode, url);
+            }
+        }
+    });
+}
+
 window.selectCarrier = selectCarrier;
 window.deleteTrackingNumber = deleteTrackingNumber;
+window.saveTrackingInfo = saveTrackingInfo;
 //]]>
 
 });
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 f105562151082..44fe4b9ccd353 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
@@ -85,7 +85,7 @@ $order = $block->getShipment()->getOrder();
                                 window.packaging.sendCreateLabelRequest();
                             });
                             window.packaging.setLabelCreatedCallback(function () {
-                                setLocation("<?php $block->escapeUrl($block->getUrl('adminhtml/order_shipment/view', ['shipment_id' => $block->getShipment()->getId()])); ?>");
+                                setLocation("<?= $block->escapeUrl($block->getUrl('adminhtml/order_shipment/view', ['shipment_id' => $block->getShipment()->getId()])); ?>");
                             });
                         };
 
diff --git a/app/code/Magento/Signifyd/Test/Mftf/Page/AdminFraudProtectionPage.xml b/app/code/Magento/Signifyd/Test/Mftf/Page/AdminFraudProtectionPage.xml
new file mode 100644
index 0000000000000..07b58b8594843
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Mftf/Page/AdminFraudProtectionPage.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="AdminFraudProtectionPage" url="admin/system_config/edit/section/fraud_protection/" area="admin" module="Magento_Signifyd">
+        <section name="AdminSignifydConfigurationSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Signifyd/Test/Mftf/Section/AdminSignifydConfigurationSection.xml b/app/code/Magento/Signifyd/Test/Mftf/Section/AdminSignifydConfigurationSection.xml
new file mode 100644
index 0000000000000..618e9d520dd87
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Mftf/Section/AdminSignifydConfigurationSection.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="AdminSignifydConfigurationSection">
+        <element name="head" type="button" selector="#fraud_protection_signifyd_config-head"/>
+        <element name="enabled" type="input" selector="#fraud_protection_signifyd_config_active"/>
+        <element name="url" type="text" selector="#fraud_protection_signifyd_config_api_url"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Signifyd/Test/Mftf/Test/AdminSignifydConfigDependentOnActiveFieldTest.xml b/app/code/Magento/Signifyd/Test/Mftf/Test/AdminSignifydConfigDependentOnActiveFieldTest.xml
new file mode 100644
index 0000000000000..dcae0c4091ba6
--- /dev/null
+++ b/app/code/Magento/Signifyd/Test/Mftf/Test/AdminSignifydConfigDependentOnActiveFieldTest.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="AdminSignifydConfigDependentOnActiveFieldTest">
+        <annotations>
+            <features value="Signifyd"/>
+            <title value="Signifyd config dependent on active field" />
+            <description value="Signifyd system configs dependent by Enable this Solution field."/>
+            <severity value="MINOR"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <magentoCLI command="config:set fraud_protection/signifyd/active 1" stepKey="enableSignifyd"/>
+        </before>
+
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+            <magentoCLI command="config:set fraud_protection/signifyd/active 0" stepKey="disableSignifyd"/>
+        </after>
+
+        <amOnPage url="{{AdminFraudProtectionPage.url}}" stepKey="openFraudProtectionPagePage" />
+        <conditionalClick dependentSelector="{{AdminSignifydConfigurationSection.enabled}}" visible="false" selector="{{AdminSignifydConfigurationSection.head}}" stepKey="openCollapsibleBlock"/>
+        <seeInField selector="{{AdminSignifydConfigurationSection.url}}" userInput="https://api.signifyd.com/v2/" stepKey="seeApiUrlField"/>
+        <selectOption selector="{{AdminSignifydConfigurationSection.enabled}}" userInput="0" stepKey="disableSignifydOption"/>
+        <dontSeeElement selector="{{AdminSignifydConfigurationSection.url}}" stepKey="dontSeeApiUrlField"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Signifyd/etc/adminhtml/system.xml b/app/code/Magento/Signifyd/etc/adminhtml/system.xml
index 2dd75d2d91e5b..272ce78aec2e5 100644
--- a/app/code/Magento/Signifyd/etc/adminhtml/system.xml
+++ b/app/code/Magento/Signifyd/etc/adminhtml/system.xml
@@ -38,25 +38,37 @@
                     </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>
+                        <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>
+                        <depends>
+                            <field id="active">1</field>
+                        </depends>
                     </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>
+                        <depends>
+                            <field id="active">1</field>
+                        </depends>
                     </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>
+                        <depends>
+                            <field id="active">1</field>
+                        </depends>
                     </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>
+                        <depends>
+                            <field id="active">1</field>
+                        </depends>
                     </field>
                 </group>
             </group>
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index 0d69634ccfa5e..ea5659cf909ff 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -10,6 +10,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem;
 use Magento\Framework\UrlInterface;
 use Magento\Robots\Model\Config\Value;
 use Magento\Sitemap\Model\ItemProvider\ItemProviderInterface;
@@ -191,6 +192,16 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
      */
     private $lastModMinTsVal;
 
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var DocumentRoot
+     */
+    private $documentRoot;
+
     /**
      * Initialize dependencies.
      *
@@ -238,8 +249,9 @@ public function __construct(
     ) {
         $this->_escaper = $escaper;
         $this->_sitemapData = $sitemapData;
-        $documentRoot = $documentRoot ?: ObjectManager::getInstance()->get(DocumentRoot::class);
-        $this->_directory = $filesystem->getDirectoryWrite($documentRoot->getPath());
+        $this->documentRoot = $documentRoot ?: ObjectManager::getInstance()->get(DocumentRoot::class);
+        $this->filesystem = $filesystem;
+        $this->_directory = $filesystem->getDirectoryWrite($this->documentRoot->getPath());
         $this->_categoryFactory = $categoryFactory;
         $this->_productFactory = $productFactory;
         $this->_cmsFactory = $cmsFactory;
@@ -727,6 +739,9 @@ protected function _getFormattedLastmodDate($date)
      */
     protected function _getDocumentRoot()
     {
+        if (PHP_SAPI === 'cli') {
+            return $this->getDocumentRootFromBaseDir() ?? '';
+        }
         // phpcs:ignore Magento2.Functions.DiscouragedFunction
         return realpath($this->_request->getServer('DOCUMENT_ROOT'));
     }
@@ -742,10 +757,14 @@ protected function _getStoreBaseDomain()
         $storeParsedUrl = parse_url($this->_getStoreBaseUrl());
         $url = $storeParsedUrl['scheme'] . '://' . $storeParsedUrl['host'];
 
-        $documentRoot = trim(str_replace('\\', '/', $this->_getDocumentRoot()), '/');
-        $baseDir = trim(str_replace('\\', '/', $this->_getBaseDir()), '/');
+        // Set document root to false if we were unable to get it
+        $documentRoot = $this->_getDocumentRoot() ?: false;
+        if ($documentRoot) {
+            $documentRoot = trim(str_replace(DIRECTORY_SEPARATOR, '/', $documentRoot), '/');
+        }
+        $baseDir = trim(str_replace(DIRECTORY_SEPARATOR, '/', $this->_getBaseDir()), '/');
 
-        if (strpos($baseDir, (string) $documentRoot) === 0) {
+        if ($documentRoot !== false && strpos($baseDir, (string) $documentRoot) === 0) {
             //case when basedir is in document root
             $installationFolder = trim(str_replace($documentRoot, '', $baseDir), '/');
             $storeDomain = rtrim($url . '/' . $installationFolder, '/');
@@ -866,4 +885,30 @@ public function getIdentities()
             Value::CACHE_TAG . '_' . $this->getStoreId(),
         ];
     }
+
+    /**
+     * Get document root using base directory (root directory) and base path (base url path)
+     *
+     * Document root is determined using formula: BaseDir = DocumentRoot + BasePath.
+     * Returns <b>NULL</b> if BaseDir does not end with BasePath (e.g document root contains a symlink to BaseDir).
+     *
+     * @return string|null
+     */
+    private function getDocumentRootFromBaseDir(): ?string
+    {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $basePath = rtrim(parse_url($this->_getStoreBaseUrl(UrlInterface::URL_TYPE_WEB), PHP_URL_PATH) ?: '', '/');
+        $basePath = str_replace('/', DIRECTORY_SEPARATOR, $basePath);
+        $basePath = rtrim($basePath, DIRECTORY_SEPARATOR);
+        $baseDir = rtrim($this->_getBaseDir(), DIRECTORY_SEPARATOR);
+        $length = strlen($basePath);
+        if (!$length) {
+            $documentRoot = $baseDir;
+        } elseif (substr($baseDir, -$length) === $basePath) {
+            $documentRoot = rtrim(substr($baseDir, 0, strlen($baseDir) - $length), DIRECTORY_SEPARATOR);
+        } else {
+            $documentRoot = null;
+        }
+        return $documentRoot;
+    }
 }
diff --git a/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AdminMarketingSiteDeleteByNameActionGroup.xml b/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AdminMarketingSiteDeleteByNameActionGroup.xml
new file mode 100644
index 0000000000000..16bf43da2e690
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AdminMarketingSiteDeleteByNameActionGroup.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="AdminMarketingSiteDeleteByNameActionGroup">
+        <annotations>
+            <description>Go to the Site map page. Delete a site map based on the provided Name.</description>
+        </annotations>
+        <arguments>
+            <argument name="filename" type="string"/>
+        </arguments>
+
+        <amOnPage url="{{AdminMarketingSiteMapGridPage.url}}" stepKey="amOnSiteMapGridPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click selector="{{AdminMarketingSiteMapGridSection.resetButton}}" stepKey="resetSearchFilter"/>
+        <fillField selector="{{AdminMarketingSiteMapGridSection.fileNameTextField}}" userInput="{{filename}}" stepKey="fillFileNameField"/>
+        <click selector="{{AdminMarketingSiteMapGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <see userInput="{{filename}}" selector="{{AdminMarketingSiteMapGridSection.firstSearchResult}}" stepKey="verifyThatCorrectStoreGroupFound"/>
+        <click selector="{{AdminMarketingSiteMapGridSection.firstSearchResult}}" stepKey="clickEditExistingRow"/>
+        <waitForPageLoad stepKey="waitForSiteMapToLoad"/>
+        <click selector="{{AdminMarketingSiteMapEditActionSection.delete}}" stepKey="deleteSiteMap"/>
+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
+        <waitForPageLoad stepKey="waitForDeleteLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AdminMarketingSiteMapFillFormActionGroup.xml b/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AdminMarketingSiteMapFillFormActionGroup.xml
new file mode 100644
index 0000000000000..06e992736bf06
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AdminMarketingSiteMapFillFormActionGroup.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="AdminMarketingSiteMapFillFormActionGroup">
+        <annotations>
+            <description>Fill data to Site map form</description>
+        </annotations>
+        <arguments>
+            <argument name="sitemap" type="entity" defaultValue="DefaultSiteMap"/>
+        </arguments>
+        <fillField selector="{{AdminMarketingSiteMapEditActionSection.filename}}" userInput="{{sitemap.filename}}" stepKey="fillFilename"/>
+        <fillField selector="{{AdminMarketingSiteMapEditActionSection.path}}" userInput="{{sitemap.path}}" stepKey="fillPath"/>
+        <click selector="{{AdminMarketingSiteMapEditActionSection.save}}" stepKey="saveSiteMap"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AdminMarketingSiteMapNavigateNewActionGroup.xml b/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AdminMarketingSiteMapNavigateNewActionGroup.xml
new file mode 100644
index 0000000000000..78cfeab66f1c4
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AdminMarketingSiteMapNavigateNewActionGroup.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="AdminMarketingSiteMapNavigateNewActionGroup">
+        <annotations>
+            <description>Navigate to New Site Map</description>
+        </annotations>
+        <amOnPage url="{{AdminMarketingSiteMapNewPage.url}}" stepKey="openNewSiteMapPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AssertSiteMapCreateSuccessActionGroup.xml b/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AssertSiteMapCreateSuccessActionGroup.xml
new file mode 100644
index 0000000000000..77f26063e8034
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AssertSiteMapCreateSuccessActionGroup.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="AssertSiteMapCreateSuccessActionGroup">
+        <annotations>
+            <description>Validate the success message after creating site map.</description>
+        </annotations>
+
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the sitemap." stepKey="seeSuccess"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AssertSiteMapDeleteSuccessActionGroup.xml b/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AssertSiteMapDeleteSuccessActionGroup.xml
new file mode 100644
index 0000000000000..15df8aa2f25f1
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AssertSiteMapDeleteSuccessActionGroup.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="AssertSiteMapDeleteSuccessActionGroup">
+        <annotations>
+            <description>Validate the success message after delete site map.</description>
+        </annotations>
+
+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the sitemap." stepKey="seeSuccess"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sitemap/Test/Mftf/Data/SitemapData.xml b/app/code/Magento/Sitemap/Test/Mftf/Data/SitemapData.xml
new file mode 100644
index 0000000000000..0b5d5d3dcdefe
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/Data/SitemapData.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="DefaultSiteMap">
+        <data key="filename">sitemap.xml</data>
+        <data key="path">/</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Sitemap/Test/Mftf/Page/AdminMarketingSiteMapGridPage.xml b/app/code/Magento/Sitemap/Test/Mftf/Page/AdminMarketingSiteMapGridPage.xml
new file mode 100644
index 0000000000000..b15a16bf134ad
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/Page/AdminMarketingSiteMapGridPage.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="AdminMarketingSiteMapGridPage" url="admin/sitemap/" area="admin" module="Sitemap">
+        <section name="AdminMarketingSiteMapGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sitemap/Test/Mftf/Page/AdminMarketingSiteMapNewPage.xml b/app/code/Magento/Sitemap/Test/Mftf/Page/AdminMarketingSiteMapNewPage.xml
new file mode 100644
index 0000000000000..5450ece5bb3c2
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/Page/AdminMarketingSiteMapNewPage.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="AdminMarketingSiteMapNewPage" url="admin/sitemap/new/" area="admin" module="Sitemap">
+        <section name="AdminMarketingSiteMapEditActionSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sitemap/Test/Mftf/Section/AdminMarketingSiteMapEditActionSection.xml b/app/code/Magento/Sitemap/Test/Mftf/Section/AdminMarketingSiteMapEditActionSection.xml
new file mode 100644
index 0000000000000..841071350526a
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/Section/AdminMarketingSiteMapEditActionSection.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="AdminMarketingSiteMapEditActionSection">
+        <element name="save" type="button" selector="#save" timeout="10"/>
+        <element name="delete" type="button" selector="#delete" timeout="10"/>
+        <element name="saveAndGenerate" type="button" selector="#generate" timeout="10"/>
+        <element name="reset" type="button" selector="#reset"/>
+        <element name="back" type="button" selector="#back"/>
+        <element name="filename" type="input" selector="input[name='sitemap_filename']"/>
+        <element name="path" type="input" selector="input[name='sitemap_path']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sitemap/Test/Mftf/Section/AdminMarketingSiteMapGridSection.xml b/app/code/Magento/Sitemap/Test/Mftf/Section/AdminMarketingSiteMapGridSection.xml
new file mode 100644
index 0000000000000..50c96ae6748ce
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/Section/AdminMarketingSiteMapGridSection.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="AdminMarketingSiteMapGridSection">
+        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
+        <element name="searchButton" type="button" selector=".admin__filter-actions [title='Search']"/>
+        <element name="firstSearchResult" type="text" selector="#sitemapGrid_table>tbody>tr:nth-child(1)"/>
+        <element name="fileNameTextField" type="input" selector="#sitemapGrid_filter_sitemap_filename" timeout="90"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingSiteMapCreateNewTest.xml b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingSiteMapCreateNewTest.xml
new file mode 100644
index 0000000000000..57d8f8c75d23d
--- /dev/null
+++ b/app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingSiteMapCreateNewTest.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="AdminMarketingSiteMapCreateNewTest">
+        <annotations>
+            <features value="Sitemap"/>
+            <stories value="Create Site Map"/>
+            <title value="Create New Site Map with valid data"/>
+            <description value="Create New Site Map with valid data"/>
+            <severity value="CRITICAL"/>
+            <group value="sitemap"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminMarketingSiteDeleteByNameActionGroup" stepKey="deleteSiteMap">
+                <argument name="filename" value="{{DefaultSiteMap.filename}}" />
+            </actionGroup>
+            <actionGroup ref="AssertSiteMapDeleteSuccessActionGroup" stepKey="assertDeleteSuccessMessage"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminMarketingSiteMapNavigateNewActionGroup" stepKey="navigateNewSiteMap"/>
+        <actionGroup ref="AdminMarketingSiteMapFillFormActionGroup" stepKey="fillSiteMapForm">
+            <argument name="sitemap" value="DefaultSiteMap" />
+        </actionGroup>
+        <actionGroup ref="AssertSiteMapCreateSuccessActionGroup" stepKey="seeSuccessMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
index a5e40bf3fcff7..16d506c1cdfa3 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Sitemap\Test\Unit\Model;
 
+use Magento\Framework\App\Request\Http;
 use Magento\Framework\DataObject;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\Write as DirectoryWrite;
@@ -86,6 +87,15 @@ class SitemapTest extends \PHPUnit\Framework\TestCase
      */
     private $configReaderMock;
 
+    /**
+     * @var Http|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $request;
+    /**
+     * @var Store|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $store;
+
     /**
      * @inheritdoc
      */
@@ -143,6 +153,12 @@ protected function setUp()
 
         $this->configReaderMock = $this->getMockForAbstractClass(SitemapConfigReaderInterface::class);
         $this->itemProviderMock = $this->getMockForAbstractClass(ItemProviderInterface::class);
+        $this->request = $this->createMock(Http::class);
+        $this->store = $this->createPartialMock(Store::class, ['isFrontUrlSecure', 'getBaseUrl']);
+        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
+        $this->storeManagerMock->expects($this->any())
+            ->method('getStore')
+            ->willReturn($this->store);
     }
 
     /**
@@ -476,25 +492,15 @@ function ($from, $to) {
 
         $model = $this->getModelMock(true);
 
-        $storeMock = $this->getMockBuilder(Store::class)
-            ->setMethods(['isFrontUrlSecure', 'getBaseUrl'])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $storeMock->expects($this->atLeastOnce())
+        $this->store->expects($this->atLeastOnce())
             ->method('isFrontUrlSecure')
             ->willReturn(false);
 
-        $storeMock->expects($this->atLeastOnce())
+        $this->store->expects($this->atLeastOnce())
             ->method('getBaseUrl')
             ->with($this->isType('string'), false)
             ->willReturn('http://store.com/');
 
-        $this->storeManagerMock->expects($this->atLeastOnce())
-            ->method('getStore')
-            ->with(1)
-            ->willReturn($storeMock);
-
         return $model;
     }
 
@@ -599,10 +605,6 @@ private function getModelConstructorArgs()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
-            ->setMethods(['getStore'])
-            ->getMockForAbstractClass();
-
         $objectManager = new ObjectManager($this);
         $escaper = $objectManager->getObject(\Magento\Framework\Escaper::class);
 
@@ -617,7 +619,8 @@ private function getModelConstructorArgs()
                 'filesystem' => $this->filesystemMock,
                 'itemProvider' => $this->itemProviderMock,
                 'configReader' => $this->configReaderMock,
-                'escaper' => $escaper
+                'escaper' => $escaper,
+                'request' => $this->request,
             ]
         );
         $constructArguments['resource'] = null;
@@ -732,4 +735,62 @@ public static function siteUrlDataProvider()
             ]
         ];
     }
+
+    /**
+     * Check site URL getter
+     *
+     * @param string $storeBaseUrl
+     * @param string $baseDir
+     * @param string $documentRoot
+     * @dataProvider getDocumentRootFromBaseDirUrlDataProvider
+     */
+    public function testGetDocumentRootFromBaseDir(
+        string $storeBaseUrl,
+        string $baseDir,
+        ?string $documentRoot
+    ) {
+        $this->store->setCode('store');
+        $this->store->method('getBaseUrl')->willReturn($storeBaseUrl);
+        $this->directoryMock->method('getAbsolutePath')->willReturn($baseDir);
+        /** @var $model Sitemap */
+        $model = $this->getMockBuilder(Sitemap::class)
+            ->setMethods(['_construct'])
+            ->setConstructorArgs($this->getModelConstructorArgs())
+            ->getMock();
+
+        $method = new \ReflectionMethod($model, 'getDocumentRootFromBaseDir');
+        $method->setAccessible(true);
+        $this->assertSame($documentRoot, $method->invoke($model));
+    }
+
+    /**
+     * Provides test cases for document root testing
+     *
+     * @return array
+     */
+    public function getDocumentRootFromBaseDirUrlDataProvider(): array
+    {
+        return [
+            [
+                'http://magento.com/',
+                '/var/www',
+                '/var/www',
+            ],
+            [
+                'http://magento.com/usa',
+                '/var/www/usa',
+                '/var/www',
+            ],
+            [
+                'http://magento.com/usa/tx',
+                '/var/www/usa/tx',
+                '/var/www',
+            ],
+            'symlink <document root>/usa/txt -> /var/www/html' => [
+                'http://magento.com/usa/tx',
+                '/var/www/html',
+                null,
+            ],
+        ];
+    }
 }
diff --git a/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php b/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php
index 77ccce5d23bde..f732871114061 100644
--- a/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php
+++ b/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php
@@ -44,6 +44,7 @@ public function __construct(
 
     /**
      * Return whole scopes config data from db.
+     *
      * Ignore $path argument due to config source must return all config data
      *
      * @param string $path
@@ -64,6 +65,8 @@ public function get($path = '')
     }
 
     /**
+     * Retrieve default connection
+     *
      * @return AdapterInterface
      */
     private function getConnection()
@@ -83,12 +86,17 @@ private function getConnection()
      */
     private function getEntities($table, $keyField)
     {
-        $entities = $this->getConnection()->fetchAll(
-            $this->getConnection()->select()->from($this->resourceConnection->getTableName($table))
-        );
         $data = [];
-        foreach ($entities as $entity) {
-            $data[$entity[$keyField]] = $entity;
+        $tableName = $this->resourceConnection->getTableName($table);
+        // Check if db table exists before fetch data
+        if ($this->resourceConnection->getConnection()->isTableExists($tableName)) {
+            $entities = $this->getConnection()->fetchAll(
+                $this->getConnection()->select()->from($tableName)
+            );
+
+            foreach ($entities as $entity) {
+                $data[$entity[$keyField]] = $entity;
+            }
         }
 
         return $data;
diff --git a/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php b/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
index 5df50581792ce..de2da54423822 100644
--- a/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
+++ b/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Store\App\FrontController\Plugin;
 
+/**
+ * Class RequestPreprocessor
+ */
 class RequestPreprocessor
 {
     /**
@@ -52,6 +55,7 @@ public function __construct(
 
     /**
      * Auto-redirect to base url (without SID) if the requested url doesn't match it.
+     *
      * By default this feature is enabled in configuration.
      *
      * @param \Magento\Framework\App\FrontController $subject
@@ -72,10 +76,11 @@ public function aroundDispatch(
                 $this->_storeManager->getStore()->isCurrentlySecure()
             );
             if ($baseUrl) {
+                // phpcs:disable Magento2.Functions.DiscouragedFunction
                 $uri = parse_url($baseUrl);
                 if (!$this->getBaseUrlChecker()->execute($uri, $request)) {
                     $redirectUrl = $this->_url->getRedirectUrl(
-                        $this->_url->getUrl(ltrim($request->getPathInfo(), '/'), ['_nosid' => true])
+                        $this->_url->getDirectUrl(ltrim($request->getPathInfo(), '/'), ['_nosid' => true])
                     );
                     $redirectCode = (int)$this->_scopeConfig->getValue(
                         'web/url/redirect_to_base',
diff --git a/app/code/Magento/Store/Controller/Store/SwitchRequest.php b/app/code/Magento/Store/Controller/Store/SwitchRequest.php
new file mode 100644
index 0000000000000..9ce151bdab094
--- /dev/null
+++ b/app/code/Magento/Store/Controller/Store/SwitchRequest.php
@@ -0,0 +1,111 @@
+<?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\Action\HttpGetActionInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Store\Model\StoreSwitcher\HashGenerator;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use \Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Url\DecoderInterface;
+use \Magento\Framework\App\ActionInterface;
+use Magento\Store\Model\StoreSwitcher\HashGenerator\HashData;
+
+/**
+ * Builds correct url to target store and performs redirect.
+ */
+class SwitchRequest extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
+{
+
+    /**
+     * @var customerSession
+     */
+    private $customerSession;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var HashGenerator
+     */
+    private $hashGenerator;
+
+    /**
+     * @var DecoderInterface
+     */
+    private $urlDecoder;
+
+    /**
+     * @param Context $context
+     * @param CustomerSession $session
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param HashGenerator $hashGenerator
+     * @param DecoderInterface $urlDecoder
+     */
+    public function __construct(
+        Context $context,
+        CustomerSession $session,
+        CustomerRepositoryInterface $customerRepository,
+        HashGenerator $hashGenerator,
+        DecoderInterface $urlDecoder
+    ) {
+        parent::__construct($context);
+        $this->customerSession = $session;
+        $this->customerRepository = $customerRepository;
+        $this->hashGenerator = $hashGenerator;
+        $this->urlDecoder = $urlDecoder;
+    }
+
+    /**
+     * Execute action
+     *
+     * @return void
+     */
+    public function execute()
+    {
+        $fromStoreCode = (string)$this->_request->getParam('___from_store');
+        $customerId = (int)$this->_request->getParam('customer_id');
+        $timeStamp = (string)$this->_request->getParam('time_stamp');
+        $signature = (string)$this->_request->getParam('signature');
+        $error = null;
+        $encodedUrl = (string)$this->_request->getParam(ActionInterface::PARAM_NAME_URL_ENCODED);
+        $targetUrl = $this->urlDecoder->decode($encodedUrl);
+
+        $data = new HashData(
+            [
+                "customer_id" => $customerId,
+                "time_stamp" => $timeStamp,
+                "___from_store" => $fromStoreCode
+            ]
+        );
+
+        if ($targetUrl && $this->hashGenerator->validateHash($signature, $data)) {
+            try {
+                $customer = $this->customerRepository->getById($customerId);
+                if (!$this->customerSession->isLoggedIn()) {
+                    $this->customerSession->setCustomerDataAsLoggedIn($customer);
+                }
+                $this->getResponse()->setRedirect($targetUrl);
+            } catch (NoSuchEntityException $e) {
+                $error = __('The requested customer does not exist.');
+            } catch (LocalizedException $e) {
+                $error = __('There was an error retrieving the customer record.');
+            }
+        } else {
+            $error = __('The requested store cannot be found. Please check the request and try again.');
+        }
+
+        if ($error !== null) {
+            $this->messageManager->addErrorMessage($error);
+        }
+    }
+}
diff --git a/app/code/Magento/Store/Model/Config/Placeholder.php b/app/code/Magento/Store/Model/Config/Placeholder.php
index ca5d869d347a4..be84c7f444c44 100644
--- a/app/code/Magento/Store/Model/Config/Placeholder.php
+++ b/app/code/Magento/Store/Model/Config/Placeholder.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Store\Model\Config;
 
 /**
@@ -32,8 +33,8 @@ class Placeholder
      */
     public function __construct(\Magento\Framework\App\RequestInterface $request, $urlPaths, $urlPlaceholder)
     {
-        $this->request = $request;
-        $this->urlPaths = $urlPaths;
+        $this->request        = $request;
+        $this->urlPaths       = $urlPaths;
         $this->urlPlaceholder = $urlPlaceholder;
     }
 
@@ -45,15 +46,46 @@ public function __construct(\Magento\Framework\App\RequestInterface $request, $u
      */
     public function process(array $data = [])
     {
-        foreach (array_keys($data) as $key) {
-            $this->_processData($data, $key);
+        // check provided arguments
+        if (empty($data)) {
+            return [];
+        }
+
+        // initialize $pointer, $parents and $level variable
+        reset($data);
+        $pointer = &$data;
+        $parents = [];
+        $level   = 0;
+
+        while ($level >= 0) {
+            $current = &$pointer[key($pointer)];
+            if (is_array($current)) {
+                reset($current);
+                $parents[$level] = &$pointer;
+                $pointer         = &$current;
+                $level++;
+            } else {
+                $current = $this->_processPlaceholders($current, $data);
+
+                // move pointer of last queue layer to next element
+                // or remove layer if all path elements were processed
+                while ($level >= 0 && next($pointer) === false) {
+                    $level--;
+                    // removal of last element of $parents is skipped here for better performance
+                    // on next iteration that element will be overridden
+                    $pointer = &$parents[$level];
+                }
+            }
         }
+
         return $data;
     }
 
     /**
      * Process array data recursively
      *
+     * @deprecated This method isn't used in process() implementation anymore
+     *
      * @param array &$data
      * @param string $path
      * @return void
@@ -90,7 +122,7 @@ protected function _processPlaceholders($value, $data)
 
             if ($url) {
                 $value = str_replace('{{' . $placeholder . '}}', $url, $value);
-            } elseif (strpos($value, (string) $this->urlPlaceholder) !== false) {
+            } elseif (strpos($value, (string)$this->urlPlaceholder) !== false) {
                 $distroBaseUrl = $this->request->getDistroBaseUrl();
 
                 $value = str_replace($this->urlPlaceholder, $distroBaseUrl, $value);
@@ -113,10 +145,9 @@ protected function _getPlaceholder($value)
     {
         if (is_string($value) && preg_match('/{{(.*)}}.*/', $value, $matches)) {
             $placeholder = $matches[1];
-            if ($placeholder == 'unsecure_base_url' || $placeholder == 'secure_base_url' || strpos(
-                $value,
-                (string) $this->urlPlaceholder
-            ) !== false
+            if ($placeholder == 'unsecure_base_url' ||
+                $placeholder == 'secure_base_url' ||
+                strpos($value, (string)$this->urlPlaceholder) !== false
             ) {
                 return $placeholder;
             }
@@ -147,6 +178,8 @@ protected function _getValue($path, array $data)
     /**
      * Set array value by path
      *
+     * @deprecated This method isn't used in process() implementation anymore
+     *
      * @param array &$container
      * @param string $path
      * @param string $value
@@ -154,13 +187,13 @@ protected function _getValue($path, array $data)
      */
     protected function _setValue(array &$container, $path, $value)
     {
-        $segments = explode('/', $path);
-        $currentPointer = & $container;
+        $segments       = explode('/', $path);
+        $currentPointer = &$container;
         foreach ($segments as $segment) {
             if (!isset($currentPointer[$segment])) {
                 $currentPointer[$segment] = [];
             }
-            $currentPointer = & $currentPointer[$segment];
+            $currentPointer = &$currentPointer[$segment];
         }
         $currentPointer = $value;
     }
diff --git a/app/code/Magento/Store/Model/ResourceModel/Store.php b/app/code/Magento/Store/Model/ResourceModel/Store.php
index 88d7b5d8216fe..7a2821987f9bf 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Store.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Store.php
@@ -166,11 +166,16 @@ protected function _changeGroup(\Magento\Framework\Model\AbstractModel $model)
      */
     public function readAllStores()
     {
-        $select = $this->getConnection()
-            ->select()
-            ->from($this->getTable('store'));
+        $stores = [];
+        if ($this->getConnection()->isTableExists($this->getMainTable())) {
+            $select = $this->getConnection()
+                ->select()
+                ->from($this->getTable($this->getMainTable()));
 
-        return $this->getConnection()->fetchAll($select);
+            $stores = $this->getConnection()->fetchAll($select);
+        }
+
+        return $stores;
     }
 
     /**
diff --git a/app/code/Magento/Store/Model/ResourceModel/Website.php b/app/code/Magento/Store/Model/ResourceModel/Website.php
index d6fefd60ae54a..431a9d62e7c39 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Website.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Website.php
@@ -47,12 +47,15 @@ protected function _initUniqueFields()
     public function readAllWebsites()
     {
         $websites = [];
-        $select = $this->getConnection()
-            ->select()
-            ->from($this->getTable('store_website'));
+        $tableName = $this->getMainTable();
+        if ($this->getConnection()->isTableExists($tableName)) {
+            $select = $this->getConnection()
+                ->select()
+                ->from($tableName);
 
-        foreach ($this->getConnection()->fetchAll($select) as $websiteData) {
-            $websites[$websiteData['code']] = $websiteData;
+            foreach ($this->getConnection()->fetchAll($select) as $websiteData) {
+                $websites[$websiteData['code']] = $websiteData;
+            }
         }
 
         return $websites;
@@ -115,6 +118,7 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $model)
 
     /**
      * Retrieve default stores select object
+     *
      * Select fields website_id, store_id
      *
      * @param bool $includeDefault include/exclude default admin website
diff --git a/app/code/Magento/Store/Model/ScopeTreeProvider.php b/app/code/Magento/Store/Model/ScopeTreeProvider.php
index da772ec0410e0..d15030fe88ac6 100644
--- a/app/code/Magento/Store/Model/ScopeTreeProvider.php
+++ b/app/code/Magento/Store/Model/ScopeTreeProvider.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Store\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -78,25 +80,30 @@ public function get()
                 'scopes' => [],
             ];
 
-            /** @var Group $group */
-            foreach ($groups[$website->getId()] as $group) {
-                $groupScope = [
-                    'scope' => ScopeInterface::SCOPE_GROUP,
-                    'scope_id' => $group->getId(),
-                    'scopes' => [],
-                ];
-
-                /** @var Store $store */
-                foreach ($stores[$group->getId()] as $store) {
-                    $storeScope = [
-                        'scope' => ScopeInterface::SCOPE_STORES,
-                        'scope_id' => $store->getId(),
+            if (!empty($groups[$website->getId()])) {
+                /** @var Group $group */
+                foreach ($groups[$website->getId()] as $group) {
+                    $groupScope = [
+                        'scope' => ScopeInterface::SCOPE_GROUP,
+                        'scope_id' => $group->getId(),
                         'scopes' => [],
                     ];
-                    $groupScope['scopes'][] = $storeScope;
+
+                    if (!empty($stores[$group->getId()])) {
+                        /** @var Store $store */
+                        foreach ($stores[$group->getId()] as $store) {
+                            $storeScope = [
+                                'scope' => ScopeInterface::SCOPE_STORES,
+                                'scope_id' => $store->getId(),
+                                'scopes' => [],
+                            ];
+                            $groupScope['scopes'][] = $storeScope;
+                        }
+                    }
+                    $websiteScope['scopes'][] = $groupScope;
                 }
-                $websiteScope['scopes'][] = $groupScope;
             }
+
             $defaultScope['scopes'][] = $websiteScope;
         }
 
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index faa26b24a5505..5eda6f4a9b57d 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -423,9 +423,6 @@ public function __construct(
 
     /**
      * @inheritdoc
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -438,9 +435,6 @@ public function __sleep()
      * Init not serializable fields
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/app/code/Magento/Store/Model/StoreCookieManager.php b/app/code/Magento/Store/Model/StoreCookieManager.php
index d5194379c69d8..d94357caf785c 100644
--- a/app/code/Magento/Store/Model/StoreCookieManager.php
+++ b/app/code/Magento/Store/Model/StoreCookieManager.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -11,10 +10,13 @@
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\StoreCookieManagerInterface;
 
+/**
+ * DTO class to work with cookies.
+ */
 class StoreCookieManager implements StoreCookieManagerInterface
 {
     /**
-     * Cookie name
+     * @var string
      */
     const COOKIE_NAME = 'store';
 
@@ -41,7 +43,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getStoreCodeFromCookie()
     {
@@ -49,12 +51,12 @@ public function getStoreCodeFromCookie()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStoreCookie(StoreInterface $store)
     {
         $cookieMetadata = $this->cookieMetadataFactory->createPublicCookieMetadata()
-            ->setHttpOnly(true)
+            ->setHttpOnly(false)
             ->setDurationOneYear()
             ->setPath($store->getStorePath());
 
@@ -62,7 +64,7 @@ public function setStoreCookie(StoreInterface $store)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteStoreCookie(StoreInterface $store)
     {
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/HashGenerator.php b/app/code/Magento/Store/Model/StoreSwitcher/HashGenerator.php
new file mode 100644
index 0000000000000..456941bd41c25
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher/HashGenerator.php
@@ -0,0 +1,121 @@
+<?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\Model\StoreSwitcher\HashGenerator\HashData;
+use Magento\Store\Model\StoreSwitcherInterface;
+use \Magento\Framework\App\DeploymentConfig as DeploymentConfig;
+use Magento\Framework\Url\Helper\Data as UrlHelper;
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Authorization\Model\UserContextInterface;
+use \Magento\Framework\App\ActionInterface;
+
+/**
+ * Generate one time token and build redirect url
+ */
+class HashGenerator implements StoreSwitcherInterface
+{
+    /**
+     * @var \Magento\Framework\App\DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var UrlHelper
+     */
+    private $urlHelper;
+
+    /**
+     * @var UserContextInterface
+     */
+    private $currentUser;
+
+    /**
+     * @param DeploymentConfig $deploymentConfig
+     * @param UrlHelper $urlHelper
+     * @param UserContextInterface $currentUser
+     */
+    public function __construct(
+        DeploymentConfig $deploymentConfig,
+        UrlHelper $urlHelper,
+        UserContextInterface $currentUser
+    ) {
+        $this->deploymentConfig = $deploymentConfig;
+        $this->urlHelper = $urlHelper;
+        $this->currentUser = $currentUser;
+    }
+
+    /**
+     * Builds redirect url with token
+     *
+     * @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
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function switch(StoreInterface $fromStore, StoreInterface $targetStore, string $redirectUrl): string
+    {
+        $targetUrl = $redirectUrl;
+        $customerId = null;
+        $encodedUrl = $this->urlHelper->getEncodedUrl($redirectUrl);
+
+        if ($this->currentUser->getUserType() == UserContextInterface::USER_TYPE_CUSTOMER) {
+            $customerId = $this->currentUser->getUserId();
+        }
+
+        if ($customerId) {
+            // phpcs:ignore
+            $urlParts = parse_url($targetUrl);
+            $host = $urlParts['host'];
+            $scheme = $urlParts['scheme'];
+            $key = (string)$this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY);
+            $timeStamp = time();
+            $fromStoreCode = $fromStore->getCode();
+            $data = implode(',', [$customerId, $timeStamp, $fromStoreCode]);
+            $signature = hash_hmac('sha256', $data, $key);
+            $targetUrl = $scheme . "://" . $host . '/stores/store/switchrequest';
+            $targetUrl = $this->urlHelper->addRequestParam(
+                $targetUrl,
+                ['customer_id' => $customerId]
+            );
+            $targetUrl = $this->urlHelper->addRequestParam($targetUrl, ['time_stamp' => $timeStamp]);
+            $targetUrl = $this->urlHelper->addRequestParam($targetUrl, ['signature' => $signature]);
+            $targetUrl = $this->urlHelper->addRequestParam($targetUrl, ['___from_store' => $fromStoreCode]);
+            $targetUrl = $this->urlHelper->addRequestParam(
+                $targetUrl,
+                [ActionInterface::PARAM_NAME_URL_ENCODED => $encodedUrl]
+            );
+        }
+        return $targetUrl;
+    }
+
+    /**
+     * Validates one time token
+     *
+     * @param string $signature
+     * @param HashData $hashData
+     * @return bool
+     */
+    public function validateHash(string $signature, HashData $hashData): bool
+    {
+        if (!empty($signature) && !empty($hashData)) {
+            $timeStamp = $hashData->getTimestamp();
+            $fromStoreCode = $hashData->getFromStoreCode();
+            $customerId = $hashData->getCustomerId();
+            $value = implode(",", [$customerId, $timeStamp, $fromStoreCode]);
+            $key = (string)$this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY);
+
+            if (time() - $timeStamp <= 5 && hash_equals($signature, hash_hmac('sha256', $value, $key))) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/HashGenerator/HashData.php b/app/code/Magento/Store/Model/StoreSwitcher/HashGenerator/HashData.php
new file mode 100644
index 0000000000000..2d0068efbdd92
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher/HashGenerator/HashData.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Model\StoreSwitcher\HashGenerator;
+
+use Magento\Framework\DataObject;
+
+/**
+ * HashData object for one time token
+ */
+class HashData extends DataObject
+{
+    /**
+     * Get CustomerId
+     *
+     * @return int
+     */
+    public function getCustomerId(): int
+    {
+        return (int)$this->getData('customer_id');
+    }
+
+    /**
+     * Get Timestamp
+     *
+     * @return int
+     */
+    public function getTimestamp(): int
+    {
+        return (int)$this->getData('time_stamp');
+    }
+
+    /**
+     * Get Fromstore
+     *
+     * @return string
+     */
+    public function getFromStoreCode(): string
+    {
+        return (string)$this->getData('___from_store');
+    }
+}
diff --git a/app/code/Magento/Store/Model/System/Store.php b/app/code/Magento/Store/Model/System/Store.php
index cf75f26aed9b7..d13781b8c146b 100644
--- a/app/code/Magento/Store/Model/System/Store.php
+++ b/app/code/Magento/Store/Model/System/Store.php
@@ -52,6 +52,11 @@ class Store extends \Magento\Framework\DataObject implements OptionSourceInterfa
      */
     protected $_storeManager;
 
+    /**
+     * @var string
+     */
+    private $nonEscapableNbspChar;
+
     /**
      * Init model
      * Load Website, Group and Store collections
@@ -61,6 +66,9 @@ class Store extends \Magento\Framework\DataObject implements OptionSourceInterfa
     public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
         $this->_storeManager = $storeManager;
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $this->nonEscapableNbspChar = html_entity_decode('&#160;', ENT_NOQUOTES, 'UTF-8');
+
         return $this->reload();
     }
 
@@ -121,9 +129,6 @@ public function getStoreValuesForForm($empty = false, $all = false)
             $options[] = ['label' => __('All Store Views'), 'value' => 0];
         }
 
-        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-        $nonEscapableNbspChar = html_entity_decode('&#160;', ENT_NOQUOTES, 'UTF-8');
-
         foreach ($this->_websiteCollection as $website) {
             $websiteShow = false;
             foreach ($this->_groupCollection as $group) {
@@ -140,18 +145,24 @@ public function getStoreValuesForForm($empty = false, $all = false)
                         $websiteShow = true;
                     }
                     $values[] = [
-                        'label' => str_repeat($nonEscapableNbspChar, 4) . $store->getName(),
+                        'label' => str_repeat($this->nonEscapableNbspChar, 4) . $store->getName(),
                         'value' => $store->getId(),
                     ];
                 }
                 if (!empty($values)) {
                     $options[] = [
-                        'label' => str_repeat($nonEscapableNbspChar, 4) . $group->getName(),
+                        'label' => str_repeat($this->nonEscapableNbspChar, 4) . $group->getName(),
                         'value' => $values,
                     ];
                 }
             }
         }
+        array_walk(
+            $options,
+            function (&$item) {
+                $item['__disableTmpl'] = true;
+            }
+        );
         return $options;
     }
 
@@ -210,6 +221,22 @@ public function getStoresStructure($isAll = false, $storeIds = [], $groupIds = [
         return $out;
     }
 
+    /**
+     * Get store options in tree view
+     *
+     * @param bool $isAll
+     * @param array $storeIds
+     * @param array $groupIds
+     * @param array $websiteIds
+     * @return array Format: array(array('value' => '<value>', 'label' => '<label>'), ...)
+     */
+    public function getStoreOptionsTree($isAll = false, $storeIds = [], $groupIds = [], $websiteIds = []): array
+    {
+        $storeStructure = $this->getStoresStructure($isAll, $storeIds, $groupIds, $websiteIds);
+
+        return $this->retrieveOptionValues($storeStructure);
+    }
+
     /**
      * Website label/value array getter, compatible with form dropdown options
      *
@@ -474,4 +501,35 @@ public function toOptionArray()
     {
         return $this->getStoreValuesForForm();
     }
+
+    /**
+     * Retrieve option values
+     *
+     * Return array of options as value-label pairs in tree view
+     *
+     * @param array $structure
+     * @param bool $needSpacePrefix
+     * @return array
+     */
+    private function retrieveOptionValues(array $structure, bool $needSpacePrefix = false): array
+    {
+        $prefix = '';
+        if ($needSpacePrefix) {
+            $prefix = str_repeat($this->nonEscapableNbspChar, 4);
+        }
+
+        $values = [];
+        foreach ($structure as $item) {
+            $value = !empty($item['children'])
+                ? $this->retrieveOptionValues($item['children'], true)
+                : $item['value'];
+
+            $values[] = [
+                'label' => $prefix . $item['label'],
+                'value' => $value,
+            ];
+        }
+
+        return $values;
+    }
 }
diff --git a/app/code/Magento/Store/Setup/Patch/Data/DisableSid.php b/app/code/Magento/Store/Setup/Patch/Data/DisableSid.php
new file mode 100644
index 0000000000000..95df83043f15f
--- /dev/null
+++ b/app/code/Magento/Store/Setup/Patch/Data/DisableSid.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Setup\Patch\Data;
+
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use \Magento\Framework\App\Config\MutableScopeConfigInterface;
+
+/**
+ * Disable default frontend SID
+ */
+class DisableSid implements DataPatchInterface, PatchVersionInterface
+{
+
+    /**
+     * Config path for flag whether use SID on frontend
+     */
+    const XML_PATH_USE_FRONTEND_SID = 'web/session/use_frontend_sid';
+
+    /**
+     * @var \Magento\Framework\App\Config\MutableScopeConfigInterface
+     */
+    private $mutableScopeConfig;
+
+    /**
+     * scope type
+     */
+    const SCOPE_STORE = 'store';
+
+    /**
+     * Disable Sid constructor.
+     *
+     * @param MutableScopeConfigInterface $mutableScopeConfig
+     */
+    public function __construct(
+        MutableScopeConfigInterface $mutableScopeConfig
+    ) {
+        $this->mutableScopeConfig = $mutableScopeConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        $this->mutableScopeConfig->setValue(self::XML_PATH_USE_FRONTEND_SID, 0, self::SCOPE_STORE);
+    }
+
+    /**
+     * @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/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
index 63dc4b0ded4f9..7ac300e3ab804 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
@@ -29,7 +29,8 @@
         <waitForElementVisible selector="{{AdminConfirmationModalSection.title}}" stepKey="waitingForWarningModal"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreDelete"/>
         <waitForPageLoad stepKey="waitForSuccessMessage"/>
-        <see userInput="You deleted the store view." stepKey="seeDeleteMessage"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitSuccessMessageAppears"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the store view." stepKey="seeDeleteMessage"/>
     </actionGroup>
 
     <actionGroup name="DeleteCustomStoreViewBackupEnabledYesActionGroup">
@@ -72,4 +73,42 @@
         <waitForPageLoad stepKey="waitForStoreToLoad"/>
         <see selector="{{AdminStoresGridSection.emptyText}}" userInput="We couldn't find any records." stepKey="seeAssertStoreViewNotInGridMessage"/>
     </actionGroup>
+
+    <actionGroup name="AdminSearchStoreViewByNameActionGroup">
+        <annotations>
+            <description>Goes to the Admin Stores grid page. Clears filters and search by store view name.</description>
+        </annotations>
+        <arguments>
+            <argument name="storeViewName" type="string"/>
+        </arguments>
+
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="resetSearchFilter"/>
+        <fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{storeViewName}}" stepKey="fillSearchStoreViewField"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton"/>
+    </actionGroup>
+
+    <actionGroup name="AdminDeleteStoreViewIfExistsActionGroup" extends="AdminSearchStoreViewByNameActionGroup">
+        <annotations>
+            <description>EXTENDS: AdminSearchStoreViewByNameActionGroup. Goes to the Admin Stores grid page. Deletes the provided Store (if exists) without creating a Backup. Validates that the Success Message is present and correct.</description>
+        </annotations>
+
+        <executeInSelenium function="function($webdriver) use ($I) {
+                $items = $webdriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('.col-store_title>a'));
+                if(!empty($items)) {
+                    $I->click('.col-store_title>a');
+                    $I->waitForPageLoad(10);
+                    $I->click('#delete');
+                    $I->waitForPageLoad(30);
+                    $I->selectOption('select#store_create_backup', 'No');
+                    $I->click('#delete');
+                    $I->waitForPageLoad(30);
+                    $I->waitForElementVisible('aside.confirm .modal-title', 10);
+                    $I->click('aside.confirm .modal-footer button.action-accept');
+                    $I->waitForPageLoad(60);
+                    $I->waitForElementVisible('#messages div.message-success', 10);
+                    $I->see('You deleted the store view.', '#messages div.message-success');
+                }
+            }" after="clickSearchButton" stepKey="deleteStoreViewIfExists"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminWebsitePageActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminWebsitePageActionGroup.xml
new file mode 100644
index 0000000000000..1a43ae1d2bbd1
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminWebsitePageActionGroup.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="AdminGoCreatedWebsitePageActionGroup">
+        <annotations>
+            <description>Filter website name in grid and go first found website page</description>
+        </annotations>
+        <arguments>
+            <argument name="websiteName" type="string" defaultValue="SecondWebsite"/>
+        </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"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
index f93b0a22f7558..a4d4374704291 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml
@@ -26,8 +26,8 @@
         <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteStoreGroupButtonOnEditStorePage"/>
         <selectOption userInput="No" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
         <click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteStoreGroupButtonOnDeleteStorePage"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the store." stepKey="seeSuccessMessage"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the store." stepKey="seeSuccessMessage"/>
     </actionGroup>
 
     <actionGroup name="DeleteCustomStoreBackupEnabledYesActionGroup">
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
index 90dc74e3a3fee..77d148eedb99f 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml
@@ -15,7 +15,7 @@
         <arguments>
             <argument name="websiteName" defaultValue="customWebsite.name"/>
         </arguments>
-        
+
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnTheStorePage"/>
         <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
         <fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
@@ -26,6 +26,6 @@
         <click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditStorePage"/>
         <selectOption userInput="No" selector="{{AdminStoresDeleteWebsiteSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
         <click selector="{{AdminStoresDeleteWebsiteSection.deleteButton}}" stepKey="clickDeleteButtonOnDeleteWebsitePage"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the website." stepKey="checkSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the website." stepKey="checkSuccessMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
index 982d829b57153..bdb1842cf2959 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
@@ -197,4 +197,13 @@
         <data key="name">third_store_view</data>
         <data key="code">third_store_view</data>
     </entity>
+    <entity name="storeViewChinese" type="store">
+        <data key="group_id">1</data>
+        <data key="name">Chinese</data>
+        <data key="code">chinese</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_type">store</data>
+        <data key="store_action">add</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml
deleted file mode 100644
index e93fd62a74999..0000000000000
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreGroupTest.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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>
-            <actionGroup ref="logout" stepKey="adminLogout"/>
-        </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/AdminCreateWebsiteTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml
index 1608d0b7b5a25..29d96c3cb94c2 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateWebsiteTest.xml
@@ -19,7 +19,7 @@
         </annotations>
 
         <before>
-            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
diff --git a/app/code/Magento/Store/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php b/app/code/Magento/Store/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
index ba06d191c9f71..a8f76d0a28fee 100644
--- a/app/code/Magento/Store/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
+++ b/app/code/Magento/Store/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
@@ -53,11 +53,11 @@ public function setUp()
 
     public function testGet()
     {
-        $this->deploymentConfig->expects($this->once())
+        $this->deploymentConfig->expects($this->any())
             ->method('get')
             ->with('db')
             ->willReturn(true);
-        $this->resourceConnection->expects($this->once())->method('getConnection')->willReturn($this->connection);
+        $this->resourceConnection->expects($this->any())->method('getConnection')->willReturn($this->connection);
 
         $selectMock = $this->getMockBuilder(Select::class)->disableOriginalConstructor()->getMock();
         $selectMock->expects($this->any())->method('from')->willReturnSelf();
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 e44eacc79b82f..6e003e2e56275 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->once()
+            $this->any()
         )->method(
             'getDistroBaseUrl'
         )->will(
@@ -54,11 +54,27 @@ public function testProcess()
             ],
             'path' => 'value',
             'some_url' => '{{base_url}}some',
+            'level1' => [
+                'level2' => [
+                    'level3' => [
+                        // test that all levels are processed (i.e. implementation is not hardcoded to 3 levels)
+                        'level4' => '{{secure_base_url}}level4'
+                    ]
+                ]
+            ]
         ];
         $expectedResult = $data;
         $expectedResult['web']['unsecure']['base_link_url'] = 'http://localhost/website/de';
         $expectedResult['web']['secure']['base_link_url'] = 'https://localhost/website/de';
+        $expectedResult['level1']['level2']['level3']['level4'] = 'https://localhost/level4';
         $expectedResult['some_url'] = 'http://localhost/some';
         $this->assertEquals($expectedResult, $this->_model->process($data));
     }
+
+    public function testProcessEmptyArray()
+    {
+        $data = [];
+        $expectedResult = [];
+        $this->assertEquals($expectedResult, $this->_model->process($data));
+    }
 }
diff --git a/app/code/Magento/Store/Test/Unit/Model/ResourceModel/StoreTest.php b/app/code/Magento/Store/Test/Unit/Model/ResourceModel/StoreTest.php
new file mode 100644
index 0000000000000..926764b989686
--- /dev/null
+++ b/app/code/Magento/Store/Test/Unit/Model/ResourceModel/StoreTest.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Test\Unit\Model\ResourceModel;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\ResourceModel\Store;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+
+class StoreTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var Store */
+    protected $model;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resourceMock;
+
+    /** @var  Select | \PHPUnit_Framework_MockObject_MockObject */
+    protected $select;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $connectionMock;
+
+    public function setUp()
+    {
+        $objectManagerHelper = new ObjectManager($this);
+        $this->select =  $this->createMock(Select::class);
+        $this->resourceMock = $this->createPartialMock(
+            ResourceConnection::class,
+            [
+                'getConnection',
+                'getTableName'
+            ]
+        );
+        $this->connectionMock = $this->createPartialMock(
+            \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
+            [
+                'isTableExists',
+                'select',
+                'fetchAll',
+                'fetchOne',
+                'from',
+                'getCheckSql',
+                'where',
+                'quoteIdentifier',
+                'quote'
+            ]
+        );
+
+        $contextMock = $this->createMock(\Magento\Framework\Model\ResourceModel\Db\Context::class);
+        $contextMock->expects($this->once())->method('getResources')->willReturn($this->resourceMock);
+        $configCacheTypeMock = $this->createMock('\Magento\Framework\App\Cache\Type\Config');
+        $this->model = $objectManagerHelper->getObject(
+            Store::class,
+            [
+                'context' => $contextMock,
+                'configCacheType' => $configCacheTypeMock
+            ]
+        );
+    }
+
+    public function testCountAll($countAdmin = false)
+    {
+        $mainTable = 'store';
+        $tableIdentifier = 'code';
+        $tableIdentifierValue = 'admin';
+        $count = 1;
+
+        $this->resourceMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->select);
+
+        $this->resourceMock->expects($this->once())
+            ->method('getTableName')
+            ->willReturn($mainTable);
+
+        $this->select->expects($this->once())
+            ->method('from')
+            ->with($mainTable, 'COUNT(*)')
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->any())
+            ->method('quoteIdentifier')
+            ->with($tableIdentifier)
+            ->willReturn($tableIdentifier);
+
+        $this->connectionMock->expects($this->once())
+            ->method('quote')
+            ->with($tableIdentifierValue)
+            ->willReturn($tableIdentifierValue);
+
+        $this->select->expects($this->any())
+            ->method('where')
+            ->with(sprintf('%s <> %s', $tableIdentifier, $tableIdentifierValue))
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->once())
+            ->method('fetchOne')
+            ->with($this->select)
+            ->willReturn($count);
+
+        $this->assertEquals($count, $this->model->countAll($countAdmin));
+    }
+
+    public function testReadAllStores()
+    {
+        $mainTable = 'store';
+        $data = [
+            ["store_id" => "0", "code" => "admin", "website_id" => 0, "name" => "Admin"],
+            ["store_id" => "1", "code" => "default", "website_id" => 1, "name" => "Default Store View"]
+        ];
+
+        $this->resourceMock->expects($this->atLeastOnce())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->resourceMock->expects($this->atLeastOnce())
+            ->method('getTableName')
+            ->willReturn($mainTable);
+
+        $this->connectionMock->expects($this->once())
+            ->method('isTableExists')
+            ->with($mainTable)
+            ->willReturn(true);
+
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->select);
+
+        $this->select->expects($this->once())
+            ->method('from')
+            ->with($mainTable)
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->once())
+            ->method('fetchAll')
+            ->with($this->select)
+            ->willReturn($data);
+
+        $this->assertEquals($data, $this->model->readAllStores());
+    }
+
+    public function testReadAllStoresNoDbTable()
+    {
+        $mainTable = 'no_store_table';
+        $data = [];
+
+        $this->resourceMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->resourceMock->expects($this->once())
+            ->method('getTableName')
+            ->willReturn($mainTable);
+
+        $this->connectionMock->expects($this->once())
+            ->method('isTableExists')
+            ->with($mainTable)
+            ->willReturn(false);
+
+        $this->connectionMock->expects($this->never())
+            ->method('select')
+            ->willReturn($this->select);
+
+        $this->select->expects($this->never())
+            ->method('from')
+            ->with($mainTable)
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->never())
+            ->method('fetchAll')
+            ->with($this->select)
+            ->willReturn($data);
+
+        $this->assertEquals($data, $this->model->readAllStores());
+    }
+}
diff --git a/app/code/Magento/Store/Test/Unit/Model/ResourceModel/WebsiteTest.php b/app/code/Magento/Store/Test/Unit/Model/ResourceModel/WebsiteTest.php
new file mode 100644
index 0000000000000..5fd5aa09a46be
--- /dev/null
+++ b/app/code/Magento/Store/Test/Unit/Model/ResourceModel/WebsiteTest.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Store\Test\Unit\Model\ResourceModel;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\ResourceModel\Website;
+
+class WebsiteTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var  Website */
+    protected $model;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resourceMock;
+
+    /** @var  Select | \PHPUnit_Framework_MockObject_MockObject */
+    protected $select;
+
+    /**
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $connectionMock;
+
+    public function setUp()
+    {
+        $objectManagerHelper = new ObjectManager($this);
+        $this->select =  $this->createMock(\Magento\Framework\DB\Select::class);
+        $this->resourceMock = $this->createPartialMock(
+            ResourceConnection::class,
+            [
+                'getConnection',
+                'getTableName'
+            ]
+        );
+        $this->connectionMock = $this->createPartialMock(
+            \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
+            [
+                'isTableExists',
+                'select',
+                'fetchAll',
+                'fetchOne',
+                'from',
+                'getCheckSql',
+                'joinLeft',
+                'where'
+            ]
+        );
+        $contextMock = $this->createMock(\Magento\Framework\Model\ResourceModel\Db\Context::class);
+        $contextMock->expects($this->once())->method('getResources')->willReturn($this->resourceMock);
+        $this->model = $objectManagerHelper->getObject(
+            Website::class,
+            [
+            'context' => $contextMock
+            ]
+        );
+    }
+
+    public function testReadAllWebsites()
+    {
+        $data = [
+            "admin" => ["website_id" => "0", "code" => "admin", "name" => "Admin"],
+            "base" => ["website_id" => "1", "code" => "base", "name" => "Main Website"]
+        ];
+        $mainTable = 'store_website';
+
+        $this->resourceMock->expects($this->once())
+            ->method('getTableName')
+            ->willReturn($mainTable);
+
+        $this->resourceMock->expects($this->atLeastOnce())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->connectionMock->expects($this->once())
+            ->method('isTableExists')
+            ->with($mainTable)
+            ->willReturn(true);
+
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->select);
+
+        $this->select->expects($this->once())
+            ->method('from')
+            ->with($mainTable)
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->once())
+            ->method('fetchAll')
+            ->with($this->select)
+            ->willReturn($data);
+
+        $this->assertEquals($data, $this->model->readAllWebsites());
+    }
+
+    public function testReadAllWebsitesNoDbTable()
+    {
+        $data = [];
+        $mainTable = 'no_store_website_table';
+
+        $this->resourceMock->expects($this->once())
+            ->method('getTableName')
+            ->willReturn($mainTable);
+
+        $this->resourceMock->expects($this->atLeastOnce())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->connectionMock->expects($this->once())
+            ->method('isTableExists')
+            ->with($mainTable)
+            ->willReturn(false);
+
+        $this->connectionMock->expects($this->never())
+            ->method('select')
+            ->willReturn($this->select);
+
+        $this->select->expects($this->never())
+            ->method('from')
+            ->with($mainTable)
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->never())
+            ->method('fetchAll')
+            ->with($this->select)
+            ->willReturn($data);
+
+        $this->assertEquals($data, $this->model->readAllWebsites());
+    }
+
+    public function testGetDefaultStoresSelect($includeDefault = false)
+    {
+        $storeId = 1;
+        $storeWebsiteTable = 'store_website';
+        $storeGroupTable = 'store_group';
+
+        $this->resourceMock->expects($this->atLeastOnce())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->connectionMock->expects($this->once())
+            ->method('getCheckSql')
+            ->with(
+                'store_group_table.default_store_id IS NULL',
+                '0',
+                'store_group_table.default_store_id'
+            )
+            ->willReturn($storeId);
+
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->select);
+
+        $this->resourceMock->expects($this->atLeastOnce())
+            ->method('getTableName')
+            ->withConsecutive([$storeWebsiteTable], [$storeGroupTable])
+            ->willReturnOnConsecutiveCalls($storeWebsiteTable, $storeGroupTable);
+
+        $this->select->expects($this->once())
+            ->method('from')
+            ->with(
+                ['website_table' => $storeWebsiteTable],
+                ['website_id']
+            )
+            ->willReturnSelf();
+
+        $this->select->expects($this->once())
+            ->method('joinLeft')
+            ->with(
+                ['store_group_table' => $storeGroupTable],
+                'website_table.website_id=store_group_table.website_id' .
+                ' AND website_table.default_group_id = store_group_table.group_id',
+                ['store_id' => $storeId]
+            )
+            ->willReturnSelf();
+
+        $this->assertInstanceOf('\Magento\Framework\DB\Select', $this->model->getDefaultStoresSelect($includeDefault));
+    }
+
+    public function testCountAll($includeDefault = false)
+    {
+        $count = 2;
+        $mainTable = 'store_website';
+
+        $this->resourceMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $this->connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($this->select);
+
+        $this->resourceMock->expects($this->once())
+            ->method('getTableName')
+            ->willReturn($mainTable);
+
+        $this->select->expects($this->once())
+            ->method('from')
+            ->with($mainTable, 'COUNT(*)')
+            ->willReturnSelf();
+
+        $this->connectionMock->expects($this->once())
+            ->method('fetchOne')
+            ->with($this->select)
+            ->willReturn($count);
+
+        $this->assertEquals($count, $this->model->countAll($includeDefault));
+    }
+}
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 9cc4bb6ac8e5b..6befb28e35383 100644
--- a/app/code/Magento/Store/Test/Unit/Model/System/StoreTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/System/StoreTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Store\Test\Unit\Model\System;
 
+/**
+ * Class StoreTest covers Magento\Store\Model\System\Store.
+ */
 class StoreTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -262,14 +265,15 @@ public function getStoreValuesForFormDataProvider()
                 'storeGroupId' => $groupId,
                 'groupWebsiteId' => $websiteId,
                 'expectedResult' => [
-                    ['label' => '', 'value' => ''],
-                    ['label' => __('All Store Views'), 'value' => 0],
-                    ['label' => $websiteName, 'value' => []],
+                    ['label' => '', 'value' => '','__disableTmpl' => true],
+                    ['label' => __('All Store Views'), 'value' => 0,'__disableTmpl' => true],
+                    ['label' => $websiteName, 'value' => [],'__disableTmpl' => true],
                     [
                         'label' => str_repeat($nonEscapableNbspChar, 4) . $groupName,
                         'value' => [
                             ['label' => str_repeat($nonEscapableNbspChar, 4) . $storeName, 'value' => $storeId]
-                        ]
+                        ],
+                        '__disableTmpl' => true
                     ],
                 ]
             ],
diff --git a/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php b/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php
index 1fc13390e30b5..907eb74e20fa2 100644
--- a/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php
+++ b/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php
@@ -68,6 +68,26 @@ public function toOptionArray()
         return $this->options;
     }
 
+    /**
+     * Sanitize website/store option name
+     *
+     * @param string $name
+     *
+     * @return string
+     */
+    protected function sanitizeName($name)
+    {
+        $matches = [];
+        preg_match('/\$[:]*{(.)*}/', $name, $matches);
+        if (count($matches) > 0) {
+            $name = $this->escaper->escapeHtml($this->escaper->escapeJs($name));
+        } else {
+            $name = $this->escaper->escapeHtml($name);
+        }
+
+        return $name;
+    }
+
     /**
      * Generate current options
      *
@@ -88,20 +108,20 @@ protected function generateCurrentOptions()
                     /** @var  \Magento\Store\Model\Store $store */
                     foreach ($storeCollection as $store) {
                         if ($store->getGroupId() == $group->getId()) {
-                            $name = $this->escaper->escapeHtml($store->getName());
+                            $name = $this->sanitizeName($store->getName());
                             $stores[$name]['label'] = str_repeat(' ', 8) . $name;
                             $stores[$name]['value'] = $store->getId();
                         }
                     }
                     if (!empty($stores)) {
-                        $name = $this->escaper->escapeHtml($group->getName());
+                        $name = $this->sanitizeName($group->getName());
                         $groups[$name]['label'] = str_repeat(' ', 4) . $name;
                         $groups[$name]['value'] = array_values($stores);
                     }
                 }
             }
             if (!empty($groups)) {
-                $name = $this->escaper->escapeHtml($website->getName());
+                $name = $this->sanitizeName($website->getName());
                 $this->currentOptions[$name]['label'] = $name;
                 $this->currentOptions[$name]['value'] = array_values($groups);
             }
diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
index bb7c33be70562..1ca87ec068d47 100644
--- a/app/code/Magento/Store/composer.json
+++ b/app/code/Magento/Store/composer.json
@@ -12,6 +12,8 @@
         "magento/module-directory": "*",
         "magento/module-media-storage": "*",
         "magento/module-ui": "*",
+        "magento/module-customer": "*",
+        "magento/module-authorization": "*",
         "magento/module-backend": "*"
     },
     "suggest": {
diff --git a/app/code/Magento/Store/etc/config.xml b/app/code/Magento/Store/etc/config.xml
index b9e7ac1c6aca0..07e4c8b0b6529 100644
--- a/app/code/Magento/Store/etc/config.xml
+++ b/app/code/Magento/Store/etc/config.xml
@@ -83,7 +83,7 @@
                 <use_http_via>0</use_http_via>
                 <use_http_x_forwarded_for>0</use_http_x_forwarded_for>
                 <use_http_user_agent>0</use_http_user_agent>
-                <use_frontend_sid>1</use_frontend_sid>
+                <use_frontend_sid>0</use_frontend_sid>
             </session>
             <browser_capabilities>
                 <cookies>1</cookies>
@@ -135,14 +135,14 @@
                 </protected_extensions>
                 <public_files_valid_paths>
                     <protected>
-                        <app>/app/*/*</app>
-                        <bin>/bin/*/*</bin>
-                        <dev>/dev/*/*</dev>
-                        <generated>/generated/*/*</generated>
-                        <lib>/lib/*/*</lib>
-                        <setup>/setup/*/*</setup>
-                        <update>/update/*/*</update>
-                        <vendor>/vendor/*/*</vendor>
+                        <app>*/app/*/*</app>
+                        <bin>*/bin/*/*</bin>
+                        <dev>*/dev/*/*</dev>
+                        <generated>*/generated/*/*</generated>
+                        <lib>*/lib/*/*</lib>
+                        <setup>*/setup/*/*</setup>
+                        <update>*/update/*/*</update>
+                        <vendor>*/vendor/*/*</vendor>
                     </protected>
                 </public_files_valid_paths>
             </file>
diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml
index defe0694d018d..3fa9c8314fdd1 100644
--- a/app/code/Magento/Store/etc/di.xml
+++ b/app/code/Magento/Store/etc/di.xml
@@ -436,6 +436,7 @@
                 <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>
+                <item name="hashGenerator" xsi:type="object" sortOrder="1000">Magento\Store\Model\StoreSwitcher\HashGenerator</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Store/etc/frontend/sections.xml b/app/code/Magento/Store/etc/frontend/sections.xml
index b1a9fc3cb1d71..b7dbfe405263b 100644
--- a/app/code/Magento/Store/etc/frontend/sections.xml
+++ b/app/code/Magento/Store/etc/frontend/sections.xml
@@ -8,4 +8,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Customer:etc/sections.xsd">
     <action name="stores/store/switch"/>
+    <action name="stores/store/switchrequest"/>
 </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 5a592b9b7c987..059b9ad445806 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
@@ -30,6 +30,7 @@
         <!--Remove Magento page content-->
         <referenceContainer name="page.wrapper" remove="true"/>
         <referenceBlock name="translate" remove="true"/>
+        <referenceBlock name="theme.active.editor" 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" />
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 2e4980c2fbfd0..6e0a1e8d01360 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
@@ -9,7 +9,6 @@
 use Magento\Catalog\Helper\Product as CatalogProduct;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Layer\Resolver;
-use Magento\Catalog\Model\Layer\Category as CategoryLayer;
 use Magento\ConfigurableProduct\Helper\Data;
 use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
 use Magento\Customer\Helper\Session\CurrentCustomer;
@@ -154,7 +153,7 @@ public function getJsonConfig()
         $this->unsetData('allow_products');
         return parent::getJsonConfig();
     }
-    
+
     /**
      * Composes configuration for js price format
      *
@@ -242,9 +241,12 @@ private function getLayeredAttributesIfExists(Product $configurableProduct, arra
 
         $layeredAttributes = [];
 
-        $configurableAttributes = array_map(function ($attribute) {
-            return $attribute->getAttributeCode();
-        }, $configurableAttributes);
+        $configurableAttributes = array_map(
+            function ($attribute) {
+                return $attribute->getAttributeCode();
+            },
+            $configurableAttributes
+        );
 
         $commonAttributeCodes = array_intersect(
             $configurableAttributes,
@@ -257,16 +259,4 @@ private function getLayeredAttributesIfExists(Product $configurableProduct, arra
 
         return $layeredAttributes;
     }
-
-    /**
-     * @inheritdoc
-     */
-    public function getCacheKeyInfo()
-    {
-        $cacheKeyInfo = parent::getCacheKeyInfo();
-        /** @var CategoryLayer $catalogLayer */
-        $catalogLayer = $this->layerResolver->get();
-        $cacheKeyInfo[] = $catalogLayer->getStateKey();
-        return $cacheKeyInfo;
-    }
 }
diff --git a/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php b/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php
index 3ef202af95a1a..303f1eda2e40a 100644
--- a/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php
+++ b/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php
@@ -6,7 +6,7 @@
 namespace Magento\Swatches\Observer;
 
 use Magento\Config\Model\Config\Source;
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\Framework\Event\Observer as EventObserver;
 use Magento\Framework\Event\ObserverInterface;
 
@@ -21,15 +21,15 @@ class AddFieldsToAttributeObserver implements ObserverInterface
     protected $yesNo;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
     /**
-     * @param ModuleManagerInterface $moduleManager
+     * @param Manager $moduleManager
      * @param Source\Yesno $yesNo
      */
-    public function __construct(ModuleManagerInterface $moduleManager, Source\Yesno $yesNo)
+    public function __construct(Manager $moduleManager, Source\Yesno $yesNo)
     {
         $this->moduleManager = $moduleManager;
         $this->yesNo = $yesNo;
diff --git a/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php b/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php
index ca75da3321698..fb8c185cc545b 100644
--- a/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php
+++ b/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php
@@ -6,7 +6,7 @@
 namespace Magento\Swatches\Observer;
 
 use Magento\Config\Model\Config\Source;
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\Framework\Event\Observer as EventObserver;
 use Magento\Framework\Event\ObserverInterface;
 
@@ -16,14 +16,14 @@
 class AddSwatchAttributeTypeObserver implements ObserverInterface
 {
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
     /**
-     * @param ModuleManagerInterface $moduleManager
+     * @param Manager $moduleManager
      */
-    public function __construct(ModuleManagerInterface $moduleManager)
+    public function __construct(Manager $moduleManager)
     {
         $this->moduleManager = $moduleManager;
     }
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
index 3d69895b0c895..2ffc61614bd1d 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
@@ -11,6 +11,7 @@
     <test name="AdminDisablingSwatchTooltipsTest">
         <annotations>
             <features value="Swatches"/>
+            <stories value="Swatch Tooltip Status Change"/>
             <title value="Admin disabling swatch tooltips test."/>
             <description value="Verify possibility to disable/enable swatch tooltips."/>
             <severity value="AVERAGE"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml
new file mode 100644
index 0000000000000..569952019b29b
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.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="AdminSetUpWatermarkForSwatchImageTest">
+        <annotations>
+            <features value="Swatches"/>
+            <title value="Possibility to set up watermark for a swatch image type"/>
+            <description value="Possibility to set up watermark for a swatch image type"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-17607"/>
+            <useCaseId value="MC-15523"/>
+            <group value="swatches"/>
+        </annotations>
+        <before>
+            <!-- Login as Admin -->
+            <comment userInput="Login as Admin" stepKey="commentLoginAsAdmin"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!-- Log out -->
+            <comment userInput="Log out" stepKey="commentLogOut"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Go to Admin > Content > Configuration	page -->
+        <comment userInput="Go to Configuration Page" stepKey="commentOpenConfigurationPage"/>
+        <amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPage"/>
+        <actionGroup ref="AdminFilterStoreViewActionGroup" stepKey="filterDefaultStoreView">
+            <argument name="customStore" value="'Default'" />
+        </actionGroup>
+        <!-- Select Edit next to the Default Store View -->
+        <comment userInput="Select Edit next to the Default Store View" stepKey="commentEditDefaultView"/>
+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickToEditDefaultStoreView"/>
+        <waitForPageLoad stepKey="waitForDefaultStorePage"/>
+        <!-- Expand the Product Image Watermarks section-->
+        <comment userInput="Expand the Product Image Watermarks section" stepKey="commentOpenWatermarksSection"/>
+        <click selector="{{AdminDesignConfigSection.watermarkSectionHeader}}" stepKey="clickToProductImageWatermarks"/>
+        <waitForPageLoad stepKey="waitForWatermarksPage"/>
+        <!-- See Base, Thumbnail, Small image types are displayed -->
+        <comment userInput="See Base, Thumbnail, Small image types are displayed" stepKey="commentSeeImageTypes"/>
+        <seeElement selector="{{AdminDesignConfigSection.imageWatermarkType('Base')}}" stepKey="seeElementBaseWatermark"/>
+        <waitForElementVisible selector="{{AdminDesignConfigSection.imageWatermarkType('Thumbnail')}}" stepKey="waitForThumbnailVisible" />
+        <seeElement selector="{{AdminDesignConfigSection.imageWatermarkType('Thumbnail')}}" stepKey="seeElementThumbnailWatermark"/>
+        <waitForElementVisible selector="{{AdminDesignConfigSection.imageWatermarkType('Small')}}" stepKey="waitForSmallVisible" />
+        <seeElement selector="{{AdminDesignConfigSection.imageWatermarkType('Small')}}" stepKey="seeElementSmallWatermark"/>
+        <!-- See Swatch Image type is absent -->
+        <comment userInput="See Swatch Image type is absent" stepKey="commentSeeTypeAbsent"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <dontSeeElement selector="{{AdminDesignConfigSection.imageWatermarkType('Swatch')}}" stepKey="dontSeeImageWatermarkSwatchImage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminWatermarkUploadTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminWatermarkUploadTest.xml
deleted file mode 100644
index e9df186bae5e6..0000000000000
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminWatermarkUploadTest.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.
-  */
--->
-
-<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
index 470421776cf8f..1bcdd6fcf9a3a 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontDisplayAllCharactersOnTextSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontDisplayAllCharactersOnTextSwatchTest.xml
@@ -29,6 +29,9 @@
         <fillField selector="{{AdminManageSwatchSection.swatchTextByIndex('3')}}" userInput="123456789012345678901" stepKey="fillSwatch3" after="clickAddSwatch3"/>
         <fillField selector="{{AdminManageSwatchSection.swatchAdminDescriptionByIndex('3')}}" userInput="123456789012345678901BrownD" stepKey="fillDescription3" after="fillSwatch3"/>
 
+        <!--Run re-index task-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <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"/>
 
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
index 824817a322137..c9602ddcd127c 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
@@ -103,6 +103,9 @@
             <argument name="image" value="TestImageAdobe"/>
         </actionGroup>
 
+        <!-- Run re-index task-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <!-- Go to the category page -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
         <waitForPageLoad stepKey="waitForCategoryPage"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
index f150c6697bb96..7bf63d25417e3 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
@@ -82,6 +82,9 @@
             <argument name="attributeCode" value="{{ProductAttributeFrontendLabel.label}}"/>
         </actionGroup>
 
+        <!--Run re-index task-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <!-- Go to the category page -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
         <waitForPageLoad stepKey="waitForCategoryPage"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
index 623fd7456830c..fd38c48919416 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
@@ -94,6 +94,9 @@
             <argument name="attributeCode" value="{{ProductAttributeFrontendLabel.label}}"/>
         </actionGroup>
 
+        <!-- Run re-index task-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+
         <!-- Go to the category page -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
         <waitForPageLoad stepKey="waitForCategoryPage"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontImageColorWhenFilterByColorFilterTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontImageColorWhenFilterByColorFilterTest.xml
index 033778635ddbd..2928011662864 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontImageColorWhenFilterByColorFilterTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontImageColorWhenFilterByColorFilterTest.xml
@@ -67,6 +67,11 @@
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}"  stepKey="clickOnNextButton"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnGenerateProductsButton"/>
         <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
+
+        <!-- Perform reindex and flush cache -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <!--Select any option in the Layered navigation and verify product image-->
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage"/>
         <actionGroup ref="SelectStorefrontSideBarAttributeOption" stepKey="selectStorefrontProductAttributeOption">
diff --git a/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/TextTest.php b/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/TextTest.php
new file mode 100644
index 0000000000000..e72ebdd4507f4
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/TextTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Swatches\Test\Unit\Block\Adminhtml\Attribute\Edit\Options;
+
+use Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\Text;
+
+/**
+ * Class \Magento\Swatches\Test\Unit\Block\Adminhtml\Attribute\Edit\Options\TextTest
+ */
+class TextTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Text
+     */
+    private $model;
+
+    /**
+     * Setup environment for test
+     */
+    protected function setUp()
+    {
+        $this->model = $this->getMockBuilder(Text::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getReadOnly', 'canManageOptionDefaultOnly', 'getOptionValues'])
+            ->getMock();
+    }
+
+    /**
+     * Test getJsonConfig with getReadOnly() is true and canManageOptionDefaultOnly() is false
+     */
+    public function testGetJsonConfigDataSet1()
+    {
+        $testCase1 = [
+            'dataSet' => [
+                'read_only' => true,
+                'can_manage_option_default_only' => false,
+                'option_values' => [
+                    new \Magento\Framework\DataObject(['value' => 6, 'label' => 'red']),
+                    new \Magento\Framework\DataObject(['value' => 6, 'label' => 'blue']),
+                ]
+            ],
+            'expectedResult' => '{"attributesData":[{"value":6,"label":"red"},{"value":6,"label":"blue"}],' .
+                '"isSortable":0,"isReadOnly":1}'
+
+        ];
+
+        $this->executeTest($testCase1);
+    }
+
+    /**
+     * Test getJsonConfig with getReadOnly() is false and canManageOptionDefaultOnly() is false
+     */
+    public function testGetJsonConfigDataSet2()
+    {
+        $testCase2 = [
+            'dataSet' => [
+                'read_only' => false,
+                'can_manage_option_default_only' => false,
+                'option_values' => [
+                    new \Magento\Framework\DataObject(['value' => 6, 'label' => 'red']),
+                    new \Magento\Framework\DataObject(['value' => 6, 'label' => 'blue']),
+                ]
+            ],
+            'expectedResult' => '{"attributesData":[{"value":6,"label":"red"},{"value":6,"label":"blue"}],' .
+                '"isSortable":1,"isReadOnly":0}'
+
+        ];
+
+        $this->executeTest($testCase2);
+    }
+
+    /**
+     * Execute test for getJsonConfig() function
+     */
+    public function executeTest($testCase)
+    {
+        $this->model->expects($this->any())->method('getReadOnly')
+            ->willReturn($testCase['dataSet']['read_only']);
+        $this->model->expects($this->any())->method('canManageOptionDefaultOnly')
+            ->willReturn($testCase['dataSet']['can_manage_option_default_only']);
+        $this->model->expects($this->any())->method('getOptionValues')->willReturn(
+            $testCase['dataSet']['option_values']
+        );
+
+        $this->assertEquals($testCase['expectedResult'], $this->model->getJsonConfig());
+    }
+}
diff --git a/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/VisualTest.php b/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/VisualTest.php
new file mode 100644
index 0000000000000..f78fedea6afb7
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/VisualTest.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Swatches\Test\Unit\Block\Adminhtml\Attribute\Edit\Options;
+
+use Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\Visual;
+
+/**
+ * Class \Magento\Swatches\Test\Unit\Block\Adminhtml\Attribute\Edit\Options\VisualTest
+ */
+class VisualTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Visual
+     */
+    private $model;
+
+    /**
+     * Setup environment for test
+     */
+    protected function setUp()
+    {
+        $this->model = $this->getMockBuilder(Visual::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getReadOnly', 'canManageOptionDefaultOnly', 'getOptionValues', 'getUrl'])
+            ->getMock();
+    }
+
+    /**
+     * Test getJsonConfig with getReadOnly() is true and canManageOptionDefaultOnly() is false
+     */
+    public function testGetJsonConfigDataSet1()
+    {
+        $testCase1 = [
+            'dataSet' => [
+                'read_only' => true,
+                'can_manage_option_default_only' => false,
+                'upload_action_url' => 'http://magento.com/admin/swatches/iframe/show',
+                'option_values' => [
+                    new \Magento\Framework\DataObject(['value' => 6, 'label' => 'red']),
+                    new \Magento\Framework\DataObject(['value' => 6, 'label' => 'blue']),
+                ]
+            ],
+            'expectedResult' => '{"attributesData":[{"value":6,"label":"red"},{"value":6,"label":"blue"}],' .
+                '"uploadActionUrl":"http:\/\/magento.com\/admin\/swatches\/iframe\/show","isSortable":0,"isReadOnly":1}'
+
+        ];
+
+        $this->executeTest($testCase1);
+    }
+
+    /**
+     * Test getJsonConfig with getReadOnly() is false and canManageOptionDefaultOnly() is false
+     */
+    public function testGetJsonConfigDataSet2()
+    {
+        $testCase1 = [
+            'dataSet' => [
+                'read_only' => false,
+                'can_manage_option_default_only' => false,
+                'upload_action_url' => 'http://magento.com/admin/swatches/iframe/show',
+                'option_values' => [
+                    new \Magento\Framework\DataObject(['value' => 6, 'label' => 'red']),
+                    new \Magento\Framework\DataObject(['value' => 6, 'label' => 'blue']),
+                ]
+            ],
+            'expectedResult' => '{"attributesData":[{"value":6,"label":"red"},{"value":6,"label":"blue"}],' .
+                '"uploadActionUrl":"http:\/\/magento.com\/admin\/swatches\/iframe\/show","isSortable":1,"isReadOnly":0}'
+        ];
+
+        $this->executeTest($testCase1);
+    }
+
+    /**
+     * Execute test for getJsonConfig() function
+     */
+    public function executeTest($testCase)
+    {
+        $this->model->expects($this->any())->method('getReadOnly')
+            ->willReturn($testCase['dataSet']['read_only']);
+        $this->model->expects($this->any())->method('canManageOptionDefaultOnly')
+            ->willReturn($testCase['dataSet']['can_manage_option_default_only']);
+        $this->model->expects($this->any())->method('getOptionValues')->willReturn(
+            $testCase['dataSet']['option_values']
+        );
+        $this->model->expects($this->any())->method('getUrl')
+            ->willReturn($testCase['dataSet']['upload_action_url']);
+
+        $this->assertEquals($testCase['expectedResult'], $this->model->getJsonConfig());
+    }
+}
diff --git a/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php b/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php
index f8ba5c20250ad..45c680366264b 100644
--- a/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php
@@ -10,7 +10,7 @@
  */
 class AddFieldsToAttributeObserverTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject */
     protected $moduleManagerMock;
 
     /** @var \Magento\Config\Model\Config\Source\Yesno|\PHPUnit_Framework_MockObject_MockObject */
diff --git a/app/code/Magento/Swatches/Test/Unit/Observer/AddSwatchAttributeTypeObserverTest.php b/app/code/Magento/Swatches/Test/Unit/Observer/AddSwatchAttributeTypeObserverTest.php
index 24afa1045e5cb..f78797d93cb0d 100644
--- a/app/code/Magento/Swatches/Test/Unit/Observer/AddSwatchAttributeTypeObserverTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Observer/AddSwatchAttributeTypeObserverTest.php
@@ -10,7 +10,7 @@
  */
 class AddSwatchAttributeTypeObserverTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject */
     protected $moduleManagerMock;
 
     /** @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject */
diff --git a/app/code/Magento/Swatches/etc/config.xml b/app/code/Magento/Swatches/etc/config.xml
index 4140acc4974d6..9d36d9692b295 100644
--- a/app/code/Magento/Swatches/etc/config.xml
+++ b/app/code/Magento/Swatches/etc/config.xml
@@ -22,10 +22,5 @@
                 </input_types>
             </validator_data>
         </general>
-        <design>
-            <watermark>
-                <swatch_image_position>stretch</swatch_image_position>
-            </watermark>
-        </design>
     </default>
 </config>
diff --git a/app/code/Magento/Swatches/etc/di.xml b/app/code/Magento/Swatches/etc/di.xml
index 585cef924e928..593786b993560 100644
--- a/app/code/Magento/Swatches/etc/di.xml
+++ b/app/code/Magento/Swatches/etc/di.xml
@@ -40,39 +40,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Theme\Model\Design\Config\MetadataProvider">
-        <arguments>
-            <argument name="metadata" xsi:type="array">
-                <item name="watermark_swatch_image_size" xsi:type="array">
-                    <item name="path" xsi:type="string">design/watermark/swatch_image_size</item>
-                    <item name="fieldset" xsi:type="string">other_settings/watermark/swatch_image</item>
-                </item>
-                <item name="watermark_swatch_image_imageOpacity" xsi:type="array">
-                    <item name="path" xsi:type="string">design/watermark/swatch_image_imageOpacity</item>
-                    <item name="fieldset" xsi:type="string">other_settings/watermark/swatch_image</item>
-                </item>
-                <item name="watermark_swatch_image_image" xsi:type="array">
-                    <item name="path" xsi:type="string">design/watermark/swatch_image_image</item>
-                    <item name="fieldset" xsi:type="string">other_settings/watermark/swatch_image</item>
-                    <item name="backend_model" xsi:type="string">Magento\Theme\Model\Design\Backend\Image</item>
-                    <item name="upload_dir" xsi:type="array">
-                        <item name="config" xsi:type="string">system/filesystem/media</item>
-                        <item name="scope_info" xsi:type="string">1</item>
-                        <item name="value" xsi:type="string">catalog/product/watermark</item>
-                    </item>
-                    <item name="base_url" xsi:type="array">
-                        <item name="type" xsi:type="string">media</item>
-                        <item name="scope_info" xsi:type="string">1</item>
-                        <item name="value" xsi:type="string">catalog/product/watermark</item>
-                    </item>
-                </item>
-                <item name="watermark_swatch_image_position" xsi:type="array">
-                    <item name="path" xsi:type="string">design/watermark/swatch_image_position</item>
-                    <item name="fieldset" xsi:type="string">other_settings/watermark/swatch_image</item>
-                </item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Swatches\Model\SwatchAttributeCodes">
         <arguments>
             <argument name="cacheKey" xsi:type="string">swatch-attribute-list</argument>
@@ -84,4 +51,13 @@
     <type name="Magento\Catalog\Model\Product\Attribute\OptionManagement">
         <plugin name="swatches_product_attribute_optionmanagement_plugin" type="Magento\Swatches\Plugin\Eav\Model\Entity\Attribute\OptionManagement"/>
     </type>
+    <type name="Magento\Eav\Model\Config">
+        <arguments>
+            <argument name="attributesForPreload" xsi:type="array">
+                <item name="catalog_product" xsi:type="array">
+                    <item name="swatch_image" xsi:type="string">catalog_product</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
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
deleted file mode 100644
index b38e8ecc6e201..0000000000000
--- a/app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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">
-    <fieldset name="other_settings">
-        <fieldset name="watermark">
-            <fieldset name="swatch_image" sortOrder="40">
-                <settings>
-                    <level>2</level>
-                    <label translate="true">Swatch Image</label>
-                </settings>
-                <field name="watermark_swatch_image_image" formElement="imageUploader">
-                    <settings>
-                        <label translate="true">Image</label>
-                        <componentType>imageUploader</componentType>
-                    </settings>
-                    <formElements>
-                        <imageUploader>
-                            <settings>
-                                <allowedExtensions>jpg jpeg gif png</allowedExtensions>
-                                <maxFileSize>2097152</maxFileSize>
-                                <uploaderConfig>
-                                    <param xsi:type="string" name="url">theme/design_config_fileUploader/save</param>
-                                </uploaderConfig>
-                            </settings>
-                        </imageUploader>
-                    </formElements>
-                </field>
-                <field name="watermark_swatch_image_imageOpacity" formElement="input">
-                    <settings>
-                        <validation>
-                            <rule name="validate-number" xsi:type="boolean">true</rule>
-                        </validation>
-                        <dataType>text</dataType>
-                        <addAfter>%</addAfter>
-                        <label translate="true">Image Opacity</label>
-                        <dataScope>watermark_swatch_image_imageOpacity</dataScope>
-                    </settings>
-                </field>
-                <field name="watermark_swatch_image_size" component="Magento_Catalog/component/image-size-field" formElement="input">
-                    <settings>
-                        <notice translate="true">Example format: 200x300.</notice>
-                        <validation>
-                            <rule name="validate-image-size-range" xsi:type="boolean">true</rule>
-                        </validation>
-                        <dataType>text</dataType>
-                        <label translate="true">Image Size</label>
-                        <dataScope>watermark_swatch_image_size</dataScope>
-                    </settings>
-                </field>
-                <field name="watermark_swatch_image_position" formElement="select">
-                    <settings>
-                        <dataType>text</dataType>
-                        <label translate="true">Image Position</label>
-                        <dataScope>watermark_swatch_image_position</dataScope>
-                    </settings>
-                    <formElements>
-                        <select>
-                            <settings>
-                                <options class="Magento\Catalog\Model\Config\Source\Watermark\Position"/>
-                            </settings>
-                        </select>
-                    </formElements>
-                </field>
-            </fieldset>
-        </fieldset>
-    </fieldset>
-</form>
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 f795f99e8112d..9e48af20ee945 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
@@ -31,6 +31,7 @@ define([
                 defaultValueText: $('#default_value_text'),
                 defaultValueTextarea: $('#default_value_textarea'),
                 defaultValueDate: $('#default_value_date'),
+                defaultValueDatetime: $('#default_value_datetime'),
                 defaultValueYesno: $('#default_value_yesno'),
                 isGlobal: $('#is_global'),
                 useProductImageForSwatch: $('#use_product_image_for_swatch'),
@@ -178,6 +179,7 @@ define([
                         defaultValueTextVisibility = false,
                         defaultValueTextareaVisibility = false,
                         defaultValueDateVisibility = false,
+                        defaultValueDatetimeVisibility = false,
                         defaultValueYesnoVisibility = false,
                         scopeVisibility = true,
                         useProductImageForSwatch = false,
@@ -203,6 +205,10 @@ define([
                             defaultValueDateVisibility = true;
                             break;
 
+                        case 'datetime':
+                            defaultValueDatetimeVisibility = true;
+                            break;
+
                         case 'boolean':
                             defaultValueYesnoVisibility = true;
                             break;
@@ -256,6 +262,7 @@ define([
                                     defaultValueTextVisibility = false;
                                     defaultValueTextareaVisibility = false;
                                     defaultValueDateVisibility = false;
+                                    defaultValueDatetimeVisibility = false;
                                     defaultValueYesnoVisibility = false;
                                     break;
 
@@ -279,6 +286,7 @@ define([
                     this.setRowVisibility(this.defaultValueText, defaultValueTextVisibility);
                     this.setRowVisibility(this.defaultValueTextarea, defaultValueTextareaVisibility);
                     this.setRowVisibility(this.defaultValueDate, defaultValueDateVisibility);
+                    this.setRowVisibility(this.defaultValueDatetime, defaultValueDatetimeVisibility);
                     this.setRowVisibility(this.defaultValueYesno, defaultValueYesnoVisibility);
                     this.setRowVisibility(this.isGlobal, scopeVisibility);
 
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js
similarity index 99%
rename from app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
rename to app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js
index bd8994743976c..894a4518f4de8 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js
@@ -296,6 +296,12 @@ define([
          * @private
          */
         _init: function () {
+            // Don't render the same set of swatches twice
+            if ($(this.element).attr('data-rendered')) {
+                return;
+            }
+            $(this.element).attr('data-rendered', true);
+
             if (_.isEmpty(this.options.jsonConfig.images)) {
                 this.options.useAjax = true;
                 // creates debounced variant of _LoadProductMedia()
@@ -840,7 +846,10 @@ define([
          */
         _Rewind: function (controls) {
             controls.find('div[option-id], option[option-id]').removeClass('disabled').removeAttr('disabled');
-            controls.find('div[option-empty], option[option-empty]').attr('disabled', true).addClass('disabled');
+            controls.find('div[option-empty], option[option-empty]')
+                .attr('disabled', true)
+                .addClass('disabled')
+                .attr('tabindex', '-1');
         },
 
         /**
diff --git a/app/code/Magento/SwatchesGraphQl/Plugin/Filters/DataProviderPlugin.php b/app/code/Magento/SwatchesGraphQl/Plugin/Filters/DataProviderPlugin.php
index 14c4ba62c8a47..c14ec68b9ab38 100644
--- a/app/code/Magento/SwatchesGraphQl/Plugin/Filters/DataProviderPlugin.php
+++ b/app/code/Magento/SwatchesGraphQl/Plugin/Filters/DataProviderPlugin.php
@@ -36,6 +36,7 @@ class DataProviderPlugin
      *
      * @param FiltersProvider $filtersProvider
      * @param \Magento\Swatches\Helper\Data $swatchHelper
+     * @param \Magento\Swatches\Block\LayeredNavigation\RenderLayered $renderLayered
      */
     public function __construct(
         FiltersProvider $filtersProvider,
@@ -53,12 +54,19 @@ public function __construct(
      * @param Filters $subject
      * @param \Closure $proceed
      * @param string $layerType
+     * @param array|null $attributesToFilter
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * phpcs:disable Generic.Metrics.NestingLevel
      */
-    public function aroundGetData(Filters $subject, \Closure $proceed, string $layerType) : array
-    {
+    public function aroundGetData(
+        Filters $subject,
+        \Closure $proceed,
+        string $layerType,
+        $attributesToFilter = null
+    ) : array {
         $swatchFilters = [];
         /** @var AbstractFilter $filter */
         foreach ($this->filtersProvider->getFilters($layerType) as $filter) {
@@ -69,7 +77,7 @@ public function aroundGetData(Filters $subject, \Closure $proceed, string $layer
             }
         }
 
-        $filtersData = $proceed($layerType);
+        $filtersData = $proceed($layerType, $attributesToFilter);
 
         foreach ($filtersData as $groupKey => $filterGroup) {
             /** @var AbstractFilter $swatchFilter */
@@ -92,4 +100,5 @@ public function aroundGetData(Filters $subject, \Closure $proceed, string $layer
 
         return $filtersData;
     }
+    //phpcs:enable
 }
diff --git a/app/code/Magento/Tax/Block/Sales/Order/Tax.php b/app/code/Magento/Tax/Block/Sales/Order/Tax.php
index 0adaec9311ee6..9c992185b4e1d 100644
--- a/app/code/Magento/Tax/Block/Sales/Order/Tax.php
+++ b/app/code/Magento/Tax/Block/Sales/Order/Tax.php
@@ -106,8 +106,8 @@ protected function _addTax($after = 'discount')
     {
         $taxTotal = new \Magento\Framework\DataObject(['code' => 'tax', 'block_name' => $this->getNameInLayout()]);
         $totals = $this->getParentBlock()->getTotals();
-        if ($totals['grand_total']) {
-            $this->getParentBlock()->addTotalBefore($taxTotal, 'grand_total');
+        if (isset($totals['grand_total_incl'])) {
+            $this->getParentBlock()->addTotal($taxTotal, 'grand_total');
         }
         $this->getParentBlock()->addTotal($taxTotal, $after);
         return $this;
@@ -214,6 +214,7 @@ protected function _initSubtotal()
     protected function _initShipping()
     {
         $store = $this->getStore();
+        /** @var \Magento\Sales\Block\Order\Totals $parent */
         $parent = $this->getParentBlock();
         $shipping = $parent->getTotal('shipping');
         if (!$shipping) {
@@ -232,12 +233,14 @@ protected function _initShipping()
                 $baseShippingIncl = $baseShipping + (double)$this->_source->getBaseShippingTaxAmount();
             }
 
+            $couponDescription = $this->getCouponDescription();
+
             $totalExcl = new \Magento\Framework\DataObject(
                 [
                     'code' => 'shipping',
                     'value' => $shipping,
                     'base_value' => $baseShipping,
-                    'label' => __('Shipping & Handling (Excl.Tax)'),
+                    'label' => __('Shipping & Handling (Excl.Tax)') . $couponDescription,
                 ]
             );
             $totalIncl = new \Magento\Framework\DataObject(
@@ -245,7 +248,7 @@ protected function _initShipping()
                     'code' => 'shipping_incl',
                     'value' => $shippingIncl,
                     'base_value' => $baseShippingIncl,
-                    'label' => __('Shipping & Handling (Incl.Tax)'),
+                    'label' => __('Shipping & Handling (Incl.Tax)') . $couponDescription,
                 ]
             );
             $parent->addTotal($totalExcl, 'shipping');
@@ -319,8 +322,8 @@ protected function _initGrandTotal()
                     'label' => __('Grand Total (Incl.Tax)'),
                 ]
             );
-            $parent->addTotal($totalExcl, 'grand_total');
-            $parent->addTotal($totalIncl, 'tax');
+            $parent->addTotal($totalIncl, 'grand_total');
+            $parent->addTotal($totalExcl, 'tax');
             $this->_addTax('grand_total');
         }
         return $this;
@@ -355,4 +358,25 @@ public function getValueProperties()
     {
         return $this->getParentBlock()->getValueProperties();
     }
+
+    /**
+     * Returns additional information about coupon code if it is not displayed in totals.
+     *
+     * @return string
+     */
+    private function getCouponDescription(): string
+    {
+        $couponDescription = "";
+
+        /** @var \Magento\Sales\Block\Order\Totals $parent */
+        $parent = $this->getParentBlock();
+        $couponCode = $parent->getSource()
+            ->getCouponCode();
+
+        if ($couponCode && !$parent->getTotal('discount')) {
+            $couponDescription = " ({$couponCode})";
+        }
+
+        return $couponDescription;
+    }
 }
diff --git a/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php b/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php
index bba9bc3f3ebe7..913fa4c46f0ae 100644
--- a/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php
+++ b/app/code/Magento/Tax/Model/App/Action/ContextPlugin.php
@@ -34,7 +34,7 @@ class ContextPlugin
     /**
      * Module manager
      *
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     private $moduleManager;
 
@@ -50,15 +50,15 @@ class ContextPlugin
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param \Magento\Tax\Model\Calculation\Proxy $calculation
      * @param \Magento\Tax\Helper\Data $taxHelper
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\PageCache\Model\Config $cacheConfig
      */
     public function __construct(
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Framework\App\Http\Context $httpContext,
-        \Magento\Tax\Model\Calculation\Proxy $calculation,
+        \Magento\Tax\Model\Calculation\Proxy $calculation, //phpcs:ignore Magento2.Classes.DiscouragedDependencies
         \Magento\Tax\Helper\Data $taxHelper,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\PageCache\Model\Config $cacheConfig
     ) {
         $this->customerSession = $customerSession;
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
index 09212ce90bf58..201158eae25dd 100644
--- a/app/code/Magento/Tax/Model/Config.php
+++ b/app/code/Magento/Tax/Model/Config.php
@@ -14,11 +14,15 @@
 use Magento\Store\Model\Store;
 
 /**
+ * Class to set flags for tax display setting
+ *
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  */
 class Config
 {
-    // tax notifications
+    /**
+     * Tax notifications
+     */
     const XML_PATH_TAX_NOTIFICATION_IGNORE_DISCOUNT = 'tax/notification/ignore_discount';
 
     const XML_PATH_TAX_NOTIFICATION_IGNORE_PRICE_DISPLAY = 'tax/notification/ignore_price_display';
@@ -70,7 +74,11 @@ class Config
 
     const XML_PATH_DISPLAY_CART_SHIPPING = 'tax/cart_display/shipping';
 
-    /** @deprecated */
+    /**
+     * Tax cart display discount
+     *
+     * @deprecated
+     */
     const XML_PATH_DISPLAY_CART_DISCOUNT = 'tax/cart_display/discount';
 
     const XML_PATH_DISPLAY_CART_GRANDTOTAL = 'tax/cart_display/grandtotal';
@@ -88,7 +96,11 @@ class Config
 
     const XML_PATH_DISPLAY_SALES_SHIPPING = 'tax/sales_display/shipping';
 
-    /** @deprecated */
+    /**
+     * Tax sales display discount
+     *
+     * @deprecated
+     */
     const XML_PATH_DISPLAY_SALES_DISCOUNT = 'tax/sales_display/discount';
 
     const XML_PATH_DISPLAY_SALES_GRANDTOTAL = 'tax/sales_display/grandtotal';
@@ -231,6 +243,7 @@ public function discountTax($store = null)
 
     /**
      * Get taxes/discounts calculation sequence.
+     *
      * This sequence depends on "Apply Customer Tax" and "Apply Discount On Prices" configuration options.
      *
      * @param   null|int|string|Store $store
@@ -353,6 +366,8 @@ public function setShippingPriceIncludeTax($flag)
     }
 
     /**
+     * Return the flag for display sales for cart prices including tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -366,6 +381,8 @@ public function displayCartPricesInclTax($store = null)
     }
 
     /**
+     * Return the flag for display sales for cart prices excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -379,6 +396,8 @@ public function displayCartPricesExclTax($store = null)
     }
 
     /**
+     * Return the flag for display sales for cart prices both including and excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -392,6 +411,8 @@ public function displayCartPricesBoth($store = null)
     }
 
     /**
+     * Return the flag for display sales for cart subtotal including tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -405,6 +426,8 @@ public function displayCartSubtotalInclTax($store = null)
     }
 
     /**
+     * Return the flag for display sales for cart subtotal excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -418,6 +441,8 @@ public function displayCartSubtotalExclTax($store = null)
     }
 
     /**
+     * Return the flag for display sales for cart subtotal both including and excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -431,6 +456,8 @@ public function displayCartSubtotalBoth($store = null)
     }
 
     /**
+     * Return the flag for display sales for cart shipping including tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -444,6 +471,8 @@ public function displayCartShippingInclTax($store = null)
     }
 
     /**
+     * Return the flag for display sales for cart shipping excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -457,6 +486,8 @@ public function displayCartShippingExclTax($store = null)
     }
 
     /**
+     * Return the flag for display sales for shipping both including and excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -470,6 +501,8 @@ public function displayCartShippingBoth($store = null)
     }
 
     /**
+     * Return the flag for display cart discount for including tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      * @deprecated 100.1.3
@@ -484,6 +517,8 @@ public function displayCartDiscountInclTax($store = null)
     }
 
     /**
+     * Return the flag for display cart discount for excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      * @deprecated 100.1.3
@@ -498,6 +533,8 @@ public function displayCartDiscountExclTax($store = null)
     }
 
     /**
+     * Return the flag for display cart discount for both including and excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      * @deprecated 100.1.3
@@ -512,6 +549,8 @@ public function displayCartDiscountBoth($store = null)
     }
 
     /**
+     * Return the flag for display cart tax with grand total for both including and excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -525,6 +564,8 @@ public function displayCartTaxWithGrandTotal($store = null)
     }
 
     /**
+     * Return the flag for display cart full summary
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -538,6 +579,8 @@ public function displayCartFullSummary($store = null)
     }
 
     /**
+     * Return the flag for display cart zero tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -551,6 +594,8 @@ public function displayCartZeroTax($store = null)
     }
 
     /**
+     * Return the flag for display sales prices for including tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -564,6 +609,8 @@ public function displaySalesPricesInclTax($store = null)
     }
 
     /**
+     * Return the flag for display sales prices for excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -577,6 +624,8 @@ public function displaySalesPricesExclTax($store = null)
     }
 
     /**
+     * Return the flag for display sales prices for both including and excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -590,6 +639,8 @@ public function displaySalesPricesBoth($store = null)
     }
 
     /**
+     * Return the flag for display sales subtotal for including tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -603,6 +654,8 @@ public function displaySalesSubtotalInclTax($store = null)
     }
 
     /**
+     * Return the flag for display sales subtotal for excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -616,6 +669,8 @@ public function displaySalesSubtotalExclTax($store = null)
     }
 
     /**
+     * Return the flag for display sales subtotal for both including and excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -629,6 +684,8 @@ public function displaySalesSubtotalBoth($store = null)
     }
 
     /**
+     * Return the flag for display sales for shipping including tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -642,6 +699,8 @@ public function displaySalesShippingInclTax($store = null)
     }
 
     /**
+     * Return the flag for display sales for shipping excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -655,6 +714,8 @@ public function displaySalesShippingExclTax($store = null)
     }
 
     /**
+     * Return the flag for display sales for shipping both including and excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -668,6 +729,8 @@ public function displaySalesShippingBoth($store = null)
     }
 
     /**
+     * Return the flag for display sales discount for including tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      * @deprecated 100.1.3
@@ -682,6 +745,8 @@ public function displaySalesDiscountInclTax($store = null)
     }
 
     /**
+     * Return the flag for display sales discount for excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      * @deprecated 100.1.3
@@ -696,6 +761,8 @@ public function displaySalesDiscountExclTax($store = null)
     }
 
     /**
+     * Return the flag for display sales discount for both including and excluding tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      * @deprecated 100.1.3
@@ -710,6 +777,8 @@ public function displaySalesDiscountBoth($store = null)
     }
 
     /**
+     * Return the flag for display sales tax with grand total
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -723,6 +792,8 @@ public function displaySalesTaxWithGrandTotal($store = null)
     }
 
     /**
+     * Return the flag for display sales full summary
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -736,6 +807,8 @@ public function displaySalesFullSummary($store = null)
     }
 
     /**
+     * Return the flag for display sales zero tax
+     *
      * @param null|string|bool|int|Store $store
      * @return bool
      */
@@ -829,15 +902,16 @@ public function getInfoUrl($store = null)
 
     /**
      * Check if necessary do product price conversion
+     *
      * If it necessary will be returned conversion type (minus or plus)
      *
      * @param null|int|string|Store $store
-     * @return bool|int
+     * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function needPriceConversion($store = null)
     {
-        $res = 0;
+        $res = false;
         $priceIncludesTax = $this->priceIncludesTax($store) || $this->getNeedUseShippingExcludeTax();
         if ($priceIncludesTax) {
             switch ($this->getPriceDisplayType($store)) {
@@ -845,7 +919,7 @@ public function needPriceConversion($store = null)
                 case self::DISPLAY_TYPE_BOTH:
                     return self::PRICE_CONVERSION_MINUS;
                 case self::DISPLAY_TYPE_INCLUDING_TAX:
-                    $res = false;
+                    $res = $this->displayCartPricesInclTax($store);
                     break;
                 default:
                     break;
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
index 77b3cfa3a08bb..c70c715d32c1b 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -383,6 +383,7 @@ public function mapItems(
                         $priceIncludesTax,
                         $useBaseCurrency
                     );
+                    //phpcs:ignore Magento2.Performance.ForeachArrayMerge
                     $itemDataObjects = array_merge($itemDataObjects, $extraTaxableItems);
                 }
             } else {
@@ -394,6 +395,7 @@ public function mapItems(
                     $priceIncludesTax,
                     $useBaseCurrency
                 );
+                //phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $itemDataObjects = array_merge($itemDataObjects, $extraTaxableItems);
             }
         }
@@ -592,6 +594,7 @@ protected function processProductItems(
         $total->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);
         $total->setBaseSubtotalInclTax($baseSubtotalInclTax);
         $shippingAssignment->getShipping()->getAddress()->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);
+        $shippingAssignment->getShipping()->getAddress()->setBaseTaxAmount($baseTax);
 
         return $this;
     }
@@ -799,6 +802,7 @@ public function convertAppliedTaxes($appliedTaxes, $baseAppliedTaxes, $extraInfo
                 'rates' => $rates,
             ];
             if (!empty($extraInfo)) {
+                //phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $appliedTaxArray = array_merge($appliedTaxArray, $extraInfo);
             }
 
diff --git a/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php b/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php
index ef84eac32e95a..cf5d939b35c01 100644
--- a/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php
+++ b/app/code/Magento/Tax/Observer/AfterAddressSaveObserver.php
@@ -8,7 +8,7 @@
 use Magento\Customer\Model\Address;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\PageCache\Model\Config;
 use Magento\Tax\Api\TaxAddressManagerInterface;
 use Magento\Tax\Helper\Data;
@@ -26,7 +26,7 @@ class AfterAddressSaveObserver implements ObserverInterface
     /**
      * Module manager
      *
-     * @var ModuleManagerInterface
+     * @var Manager
      */
     private $moduleManager;
 
@@ -46,13 +46,13 @@ class AfterAddressSaveObserver implements ObserverInterface
 
     /**
      * @param Data $taxHelper
-     * @param ModuleManagerInterface $moduleManager
+     * @param Manager $moduleManager
      * @param Config $cacheConfig
      * @param TaxAddressManagerInterface $addressManager
      */
     public function __construct(
         Data $taxHelper,
-        ModuleManagerInterface $moduleManager,
+        Manager $moduleManager,
         Config $cacheConfig,
         TaxAddressManagerInterface $addressManager
     ) {
diff --git a/app/code/Magento/Tax/Observer/CustomerLoggedInObserver.php b/app/code/Magento/Tax/Observer/CustomerLoggedInObserver.php
index 00b3a9f9e09ad..c1e4ad66d75d7 100644
--- a/app/code/Magento/Tax/Observer/CustomerLoggedInObserver.php
+++ b/app/code/Magento/Tax/Observer/CustomerLoggedInObserver.php
@@ -9,7 +9,7 @@
 use Magento\Customer\Model\Session;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\PageCache\Model\Config;
 use Magento\Tax\Api\TaxAddressManagerInterface;
 use Magento\Tax\Helper\Data;
@@ -33,7 +33,7 @@ class CustomerLoggedInObserver implements ObserverInterface
     /**
      * Module manager
      *
-     * @var ModuleManagerInterface
+     * @var Manager
      */
     private $moduleManager;
 
@@ -60,7 +60,7 @@ class CustomerLoggedInObserver implements ObserverInterface
      * @param GroupRepositoryInterface $groupRepository
      * @param Session $customerSession
      * @param Data $taxHelper
-     * @param ModuleManagerInterface $moduleManager
+     * @param Manager $moduleManager
      * @param Config $cacheConfig
      * @param TaxAddressManagerInterface $addressManager
      */
@@ -68,7 +68,7 @@ public function __construct(
         GroupRepositoryInterface $groupRepository,
         Session $customerSession,
         Data $taxHelper,
-        ModuleManagerInterface $moduleManager,
+        Manager $moduleManager,
         Config $cacheConfig,
         TaxAddressManagerInterface $addressManager
     ) {
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml
index 27c89162b5cea..4b8d79117eb24 100644
--- a/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxCodeData.xml
@@ -26,6 +26,12 @@
         <data key="zip">*</data>
         <data key="rate">8.375</data>
     </entity>
+    <entity name="SimpleTaxNYRate" type="tax">
+        <data key="state">New York</data>
+        <data key="country">United States</data>
+        <data key="zip">*</data>
+        <data key="rate">20.00</data>
+    </entity>
     <entity name="SimpleTaxCA" type="tax">
         <data key="state">California</data>
         <data key="country">United States</data>
diff --git a/app/code/Magento/Tax/Test/Unit/App/Action/ContextPluginTest.php b/app/code/Magento/Tax/Test/Unit/App/Action/ContextPluginTest.php
index 020baa0c30ec5..a6c7e9bb8685a 100644
--- a/app/code/Magento/Tax/Test/Unit/App/Action/ContextPluginTest.php
+++ b/app/code/Magento/Tax/Test/Unit/App/Action/ContextPluginTest.php
@@ -38,7 +38,7 @@ class ContextPluginTest extends \PHPUnit\Framework\TestCase
     /**
      * Module manager
      *
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     private $moduleManagerMock;
 
@@ -89,7 +89,7 @@ protected function setUp()
             )
             ->getMock();
 
-        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
+        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Tax/Test/Unit/CustomerData/CheckoutTotalsJsLayoutDataProviderTest.php b/app/code/Magento/Tax/Test/Unit/CustomerData/CheckoutTotalsJsLayoutDataProviderTest.php
new file mode 100644
index 0000000000000..d624a42c1e134
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Unit/CustomerData/CheckoutTotalsJsLayoutDataProviderTest.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Tax\Test\Unit\CustomerData;
+
+use PHPUnit\Framework\TestCase;
+use Magento\Tax\CustomerData\CheckoutTotalsJsLayoutDataProvider;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Tax\Model\Config as TaxConfig;
+
+/**
+ * Test class to cover CheckoutTotalsJsLayoutDataProvider
+ *
+ * Class \Magento\Tax\Test\Unit\CustomerData\CheckoutTotalsJsLayoutDataProviderTest
+ */
+class CheckoutTotalsJsLayoutDataProviderTest extends TestCase
+{
+    /**
+     * @var CheckoutTotalsJsLayoutDataProvider
+     */
+    private $dataProvider;
+
+    /**
+     * @var TaxConfig|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $taxConfigMock;
+
+    /**
+     * Setup environment for test
+     */
+    protected function setUp()
+    {
+        $this->taxConfigMock = $this->createMock(TaxConfig::class);
+        $objectManager = new ObjectManagerHelper($this);
+
+        $this->dataProvider = $objectManager->getObject(
+            CheckoutTotalsJsLayoutDataProvider::class,
+            [
+                'taxConfig' => $this->taxConfigMock
+            ]
+        );
+    }
+
+    /**
+     * Test getData() with dataset getDataDataProvider
+     *
+     * @param int $displayCartSubtotalInclTax
+     * @param int $displayCartSubtotalExclTax
+     * @param array $expected
+     * @return void
+     * @dataProvider getDataDataProvider
+     */
+    public function testGetData($displayCartSubtotalInclTax, $displayCartSubtotalExclTax, $expected)
+    {
+        $this->taxConfigMock->expects($this->any())->method('displayCartSubtotalInclTax')
+            ->willReturn($displayCartSubtotalInclTax);
+        $this->taxConfigMock->expects($this->any())->method('displayCartSubtotalExclTax')
+            ->willReturn($displayCartSubtotalExclTax);
+
+        $this->assertEquals($expected, $this->dataProvider->getData());
+    }
+
+    /**
+     * Dataset for test getData()
+     *
+     * @return array
+     */
+    public function getDataDataProvider()
+    {
+        return [
+            'Test with settings display cart incl and excl is Yes' => [
+                '1' ,
+                '1',
+                [
+                    'components' => [
+                        'minicart_content' => [
+                            'children' => [
+                                'subtotal.container' => [
+                                    'children' => [
+                                        'subtotal' => [
+                                            'children' => [
+                                                'subtotal.totals' => [
+                                                    'config' => [
+                                                        'display_cart_subtotal_incl_tax' => 1,
+                                                        'display_cart_subtotal_excl_tax' => 1
+                                                    ]
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ]
+                ]
+            ],
+            'Test with settings display cart incl and excl is No' => [
+                '0' ,
+                '0',
+                [
+                    'components' => [
+                        'minicart_content' => [
+                            'children' => [
+                                'subtotal.container' => [
+                                    'children' => [
+                                        'subtotal' => [
+                                            'children' => [
+                                                'subtotal.totals' => [
+                                                    'config' => [
+                                                        'display_cart_subtotal_incl_tax' => 0,
+                                                        'display_cart_subtotal_excl_tax' => 0
+                                                    ]
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php b/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
index 2e957e528e294..571cc7173bc92 100644
--- a/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Tax\Test\Unit\Observer;
 
 use Magento\Framework\Event\Observer;
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\PageCache\Model\Config;
 use Magento\Tax\Api\TaxAddressManagerInterface;
@@ -31,7 +31,7 @@ class AfterAddressSaveObserverTest extends \PHPUnit\Framework\TestCase
     /**
      * Module manager
      *
-     * @var ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var Manager|\PHPUnit_Framework_MockObject_MockObject
      */
     private $moduleManagerMock;
 
@@ -65,7 +65,7 @@ protected function setUp()
             ->setMethods(['getCustomerAddress'])
             ->getMock();
 
-        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
+        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -77,7 +77,7 @@ protected function setUp()
             ->setMethods(['isCatalogPriceDisplayAffectedByTax'])
             ->disableOriginalConstructor()
             ->getMock();
-        
+
         $this->addressManagerMock = $this->getMockBuilder(TaxAddressManagerInterface::class)
             ->setMethods(['setDefaultAddressAfterSave', 'setDefaultAddressAfterLogIn'])
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Tax/Test/Unit/Observer/CustomerLoggedInObserverTest.php b/app/code/Magento/Tax/Test/Unit/Observer/CustomerLoggedInObserverTest.php
index facbb6733b5c8..c577f1727552f 100644
--- a/app/code/Magento/Tax/Test/Unit/Observer/CustomerLoggedInObserverTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Observer/CustomerLoggedInObserverTest.php
@@ -31,7 +31,7 @@ class CustomerLoggedInObserverTest extends \PHPUnit\Framework\TestCase
     /**
      * Module manager
      *
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     private $moduleManagerMock;
 
@@ -82,7 +82,7 @@ protected function setUp()
             )
             ->getMock();
 
-        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
+        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Tax/etc/di.xml b/app/code/Magento/Tax/etc/di.xml
index a0b43df226f22..50683b1b879e6 100644
--- a/app/code/Magento/Tax/etc/di.xml
+++ b/app/code/Magento/Tax/etc/di.xml
@@ -183,4 +183,13 @@
     <type name="Magento\Catalog\Ui\DataProvider\Product\Listing\DataProvider">
         <plugin name="taxSettingsProvider" type="Magento\Tax\Plugin\Ui\DataProvider\TaxSettings"/>
     </type>
+    <type name="Magento\Eav\Model\Config">
+        <arguments>
+            <argument name="attributesForPreload" xsi:type="array">
+                <item name="catalog_product" xsi:type="array">
+                    <item name="tax_class_id" xsi:type="string">catalog_product</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Tax/view/frontend/layout/sales_email_item_price.xml b/app/code/Magento/Tax/view/frontend/layout/sales_email_item_price.xml
index 5dc1e5c72313d..35bcfc265eafc 100644
--- a/app/code/Magento/Tax/view/frontend/layout/sales_email_item_price.xml
+++ b/app/code/Magento/Tax/view/frontend/layout/sales_email_item_price.xml
@@ -5,8 +5,7 @@
  * 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">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="items">
             <block class="Magento\Tax\Block\Item\Price\Renderer" name="item_price" template="Magento_Tax::email/items/price/row.phtml">
@@ -16,11 +15,4 @@
             </block>
         </referenceBlock>
     </body>
-</page>
-
-
-
-
-
-
-
+</page>
\ No newline at end of file
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/shipping.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/shipping.html
index 9f8574a9438d1..269b447cfe66e 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/shipping.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/shipping.html
@@ -9,6 +9,9 @@
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
             <span class="label" data-bind="text: title + ' ' + excludingTaxMessage"></span>
+            <!-- ko if: haveToShowCoupon() -->
+                <span class="label description" data-bind="text: getCouponDescription()"></span>
+            <!-- /ko -->
             <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
@@ -19,6 +22,9 @@
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
             <span class="label" data-bind="text: title + ' ' + includingTaxMessage"></span>
+            <!-- ko if: haveToShowCoupon() -->
+                <span class="label description" data-bind="text: getCouponDescription()"></span>
+            <!-- /ko -->
             <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
@@ -31,6 +37,9 @@
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
             <span class="label" data-bind="i18n: title"></span>
+            <!-- ko if: haveToShowCoupon() -->
+                <span class="label description" data-bind="text: getCouponDescription()"></span>
+            <!-- /ko -->
             <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
@@ -43,6 +52,9 @@
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
             <span class="label" data-bind="i18n: title"></span>
+            <!-- ko if: haveToShowCoupon() -->
+                <span class="label description" data-bind="text: getCouponDescription()"></span>
+            <!-- /ko -->
             <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
index 007e7ded68210..82ab993bb63eb 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
@@ -9,6 +9,9 @@
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
             <span class="label" data-bind="text: title+ ' ' + excludingTaxMessage"></span>
+            <!-- ko if: haveToShowCoupon() -->
+                <span class="label description" data-bind="text: getCouponDescription()"></span>
+            <!-- /ko -->
             <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
@@ -25,6 +28,9 @@
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
             <span class="label" data-bind="text: title + ' ' + includingTaxMessage"></span>
+            <!-- ko if: haveToShowCoupon() -->
+                <span class="label description" data-bind="text: getCouponDescription()"></span>
+            <!-- /ko -->
             <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
@@ -43,6 +49,9 @@
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
             <span class="label" data-bind="i18n: title"></span>
+            <!-- ko if: haveToShowCoupon() -->
+                <span class="label description" data-bind="text: getCouponDescription()"></span>
+            <!-- /ko -->
             <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
@@ -61,6 +70,9 @@
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
             <span class="label" data-bind="i18n: title"></span>
+            <!-- ko if: haveToShowCoupon() -->
+                <span class="label description" data-bind="text: getCouponDescription()"></span>
+            <!-- /ko -->
             <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
diff --git a/app/code/Magento/Theme/Block/Html/Header/Logo.php b/app/code/Magento/Theme/Block/Html/Header/Logo.php
index b51f624c20339..626a771b4e309 100644
--- a/app/code/Magento/Theme/Block/Html/Header/Logo.php
+++ b/app/code/Magento/Theme/Block/Html/Header/Logo.php
@@ -98,7 +98,7 @@ public function getLogoWidth()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
-        return (int)$this->_data['logo_width'] ? : (int)$this->getLogoImgWidth();
+        return (int)$this->_data['logo_width'];
     }
 
     /**
@@ -114,7 +114,7 @@ public function getLogoHeight()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
-        return (int)$this->_data['logo_height'] ? : (int)$this->getLogoImgHeight();
+        return (int)$this->_data['logo_height'];
     }
 
     /**
diff --git a/app/code/Magento/Theme/Block/Html/Pager.php b/app/code/Magento/Theme/Block/Html/Pager.php
index ad3f4aad676eb..d26c383241f66 100644
--- a/app/code/Magento/Theme/Block/Html/Pager.php
+++ b/app/code/Magento/Theme/Block/Html/Pager.php
@@ -236,7 +236,7 @@ public function setShowPerPage($varName)
      */
     public function isShowPerPage()
     {
-        if (sizeof($this->getAvailableLimit()) <= 1) {
+        if (count($this->getAvailableLimit()) <= 1) {
             return false;
         }
         return $this->_showPerPage;
diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php
index 77b9144069502..fd8aaa7708cf3 100644
--- a/app/code/Magento/Theme/Block/Html/Topmenu.php
+++ b/app/code/Magento/Theme/Block/Html/Topmenu.php
@@ -133,7 +133,7 @@ protected function _countItems($items)
      *
      * @param Menu $items
      * @param int $limit
-     * @return array
+     * @return array|void
      *
      * @todo: Add Depth Level limit, and better logic for columns
      */
@@ -141,7 +141,7 @@ protected function _columnBrake($items, $limit)
     {
         $total = $this->_countItems($items);
         if ($total <= $limit) {
-            return [];
+            return;
         }
 
         $result[] = ['total' => $total, 'max' => (int)ceil($total / ceil($total / $limit))];
diff --git a/app/code/Magento/Theme/Model/Design/BackendModelFactory.php b/app/code/Magento/Theme/Model/Design/BackendModelFactory.php
index 155afa89c4173..df4ad381ca0d8 100644
--- a/app/code/Magento/Theme/Model/Design/BackendModelFactory.php
+++ b/app/code/Magento/Theme/Model/Design/BackendModelFactory.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Theme\Model\Design;
 
 use Magento\Framework\App\Config\Value;
@@ -11,6 +14,9 @@
 use Magento\Theme\Model\Design\Config\MetadataProvider;
 use Magento\Theme\Model\ResourceModel\Design\Config\CollectionFactory;
 
+/**
+ * Class BackendModelFactory
+ */
 class BackendModelFactory extends ValueFactory
 {
     /**
@@ -58,13 +64,15 @@ public function __construct(
      */
     public function create(array $data = [])
     {
+        $storedData = $this->getStoredData($data['scope'], $data['scopeId'], $data['config']['path']);
+
         $backendModelData = array_replace_recursive(
-            $this->getStoredData($data['scope'], $data['scopeId'], $data['config']['path']),
+            $storedData,
             [
                 'path' => $data['config']['path'],
                 'scope' => $data['scope'],
                 'scope_id' => $data['scopeId'],
-                'field_config' => $data['config'],
+                'field_config' => $data['config']
             ]
         );
 
@@ -76,6 +84,13 @@ public function create(array $data = [])
         $backendModel = $this->getNewBackendModel($backendType, $backendModelData);
         $backendModel->setValue($data['value']);
 
+        if ($storedData) {
+            foreach ($storedData as $key => $value) {
+                $backendModel->setOrigData($key, $value);
+            }
+            $backendModel->setOrigData('field_config', $data['config']);
+        }
+
         return $backendModel;
     }
 
@@ -166,9 +181,12 @@ protected function getMetadata()
     {
         if (!$this->metadata) {
             $this->metadata = $this->metadataProvider->get();
-            array_walk($this->metadata, function (&$value) {
-                $value = $value['path'];
-            });
+            array_walk(
+                $this->metadata,
+                function (&$value) {
+                    $value = $value['path'];
+                }
+            );
         }
         return $this->metadata;
     }
diff --git a/app/code/Magento/Theme/Model/Design/Config/ValueChecker.php b/app/code/Magento/Theme/Model/Design/Config/ValueChecker.php
index 42801f57c8822..11d45616e387d 100644
--- a/app/code/Magento/Theme/Model/Design/Config/ValueChecker.php
+++ b/app/code/Magento/Theme/Model/Design/Config/ValueChecker.php
@@ -8,6 +8,9 @@
 use Magento\Framework\App\Config as AppConfig;
 use Magento\Framework\App\ScopeFallbackResolverInterface;
 
+/**
+ * Class ValueChecker
+ */
 class ValueChecker
 {
     /**
@@ -61,7 +64,7 @@ public function isDifferentFromDefault($value, $scope, $scopeId, array $fieldCon
                     $fieldConfig
                 ),
                 $this->valueProcessor->process(
-                    $this->appConfig->getValue($fieldConfig['path'], $scope, $scopeId),
+                    ($this->appConfig->getValue($fieldConfig['path'], $scope, $scopeId) ?? ""),
                     $scope,
                     $scopeId,
                     $fieldConfig
@@ -80,12 +83,11 @@ public function isDifferentFromDefault($value, $scope, $scopeId, array $fieldCon
      */
     protected function isEqual($value, $defaultValue)
     {
-        switch (gettype($value)) {
-            case 'array':
-                return $this->isEqualArrays($value, $defaultValue);
-            default:
-                return $value === $defaultValue;
+        if (is_array($value)) {
+            return $this->isEqualArrays($value, $defaultValue);
         }
+
+        return $value === $defaultValue;
     }
 
     /**
diff --git a/app/code/Magento/Theme/Model/Theme/ThemeProvider.php b/app/code/Magento/Theme/Model/Theme/ThemeProvider.php
index cd3f7f8a2dc0e..04e4c131dbcd3 100644
--- a/app/code/Magento/Theme/Model/Theme/ThemeProvider.php
+++ b/app/code/Magento/Theme/Model/Theme/ThemeProvider.php
@@ -93,8 +93,8 @@ public function getThemeByFullPath($fullPath)
         if ($theme->getId()) {
             $this->saveThemeToCache($theme, 'theme' . $fullPath);
             $this->saveThemeToCache($theme, 'theme-by-id-' . $theme->getId());
-            $this->themes[$fullPath] = $theme;
         }
+        $this->themes[$fullPath] = $theme;
 
         return $theme;
     }
@@ -167,6 +167,8 @@ private function saveThemeToCache(\Magento\Theme\Model\Theme $theme, $cacheId)
     }
 
     /**
+     * Get theme list
+     *
      * @deprecated 100.1.3
      * @return ListInterface
      */
@@ -179,6 +181,8 @@ private function getThemeList()
     }
 
     /**
+     * Get deployment config
+     *
      * @deprecated 100.1.3
      * @return DeploymentConfig
      */
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
index 069068163ccaf..762537ba426f2 100644
--- a/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml
@@ -31,6 +31,7 @@
         <element name="storesArrow" type="button" selector="#ZmF2aWNvbi9zdG9yZXM- > .jstree-icon" />
         <element name="checkIfStoresArrowExpand" type="button" selector="//li[@id='ZmF2aWNvbi9zdG9yZXM-' and contains(@class,'jstree-closed')]" />
         <element name="storeLink" type="button" selector="#ZmF2aWNvbi9zdG9yZXMvMQ-- > a"/>
+        <element name="imageWatermarkType" type="text" selector="//div[contains(@class, 'fieldset-wrapper-title')]//span[contains(text(), '{{watermarkType}}')]" parameterized="true"/>
         <element name="appliedTheme" type="select" selector="select[name='theme_theme_id']"/>
         <element name="scopeEditLinkByName" type="button" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[normalize-space(.)= '{{scope}}']/preceding-sibling::th)+1][contains(.,'{{scopeName}}')]/..//a[contains(@class, 'action-menu-item')]" timeout="30" parameterized="true"/>
     </section>
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml
index 219ca7420361c..1a0bb738bc9ca 100644
--- a/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml
@@ -15,7 +15,8 @@
         <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="gridCell" type="text" selector="//table//div[contains(text(), '{{gridCellText}}')]" parameterized="true"/>
+        <element name="gridCellUpdated" type="text" selector="//tbody//tr//div[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
+</sections>
diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemeSortTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemeSortTest.xml
new file mode 100644
index 0000000000000..9facab57e9a09
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemeSortTest.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="AdminContentThemesSortTest">
+        <annotations>
+            <features value="Theme"/>
+            <stories value="Menu Navigation"/>
+            <title value="Admin content themes sort themes test"/>
+            <description value="Admin should be able to sort Themes"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="https://github.com/magento/magento2/pull/25926"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentThemesPage">
+            <argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuContentDesignThemes.dataUiId}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
+            <argument name="title" value="{{AdminMenuContentDesignThemes.pageTitle}}"/>
+        </actionGroup>
+        <click selector="{{AdminThemeSection.columnHeader('Theme Title')}}" stepKey="clickSortByTitle"/>
+        <click selector="{{AdminThemeSection.columnHeader('Theme Title')}}" stepKey="clickSortByTitleSecondTime"/>
+        <seeNumberOfElements selector="{{AdminThemeSection.rowsInColumn('theme_path')}}" userInput="2" stepKey="see2RowsOnTheGrid"/>
+        <seeNumberOfElements selector="{{AdminThemeSection.gridCellUpdated('Magento Luma')}}" userInput="1" stepKey="seeLumaThemeInTitleColumn"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Theme/Test/Mftf/Test/AdminWatermarkUploadTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/AdminWatermarkUploadTest.xml
index a667f40ad327f..afe70243f602c 100644
--- a/app/code/Magento/Theme/Test/Mftf/Test/AdminWatermarkUploadTest.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Test/AdminWatermarkUploadTest.xml
@@ -16,6 +16,9 @@
             <description value="Watermark images should be able to be uploaded in the admin"/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-5796"/>
+            <skip>
+                <issueId value="MC-18496"/>
+            </skip>
             <group value="Watermark"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/Theme/Test/Unit/Block/Html/Header/LogoTest.php b/app/code/Magento/Theme/Test/Unit/Block/Html/Header/LogoTest.php
index 91af1a9bf6078..077f12e578dca 100644
--- a/app/code/Magento/Theme/Test/Unit/Block/Html/Header/LogoTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Block/Html/Header/LogoTest.php
@@ -44,4 +44,38 @@ public function testGetLogoSrc()
 
         $this->assertEquals('http://localhost/pub/media/logo/default/image.gif', $block->getLogoSrc());
     }
+
+    /**
+     * cover \Magento\Theme\Block\Html\Header\Logo::getLogoHeight
+     */
+    public function testGetLogoHeight()
+    {
+        $scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $scopeConfig->expects($this->once())->method('getValue')->willReturn(null);
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $arguments = [
+            'scopeConfig' => $scopeConfig,
+        ];
+        $block = $objectManager->getObject(\Magento\Theme\Block\Html\Header\Logo::class, $arguments);
+
+        $this->assertEquals(null, $block->getLogoHeight());
+    }
+
+    /**
+     * @covers \Magento\Theme\Block\Html\Header\Logo::getLogoWidth
+     */
+    public function testGetLogoWidth()
+    {
+        $scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $scopeConfig->expects($this->once())->method('getValue')->willReturn('170');
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $arguments = [
+            'scopeConfig' => $scopeConfig,
+        ];
+        $block = $objectManager->getObject(\Magento\Theme\Block\Html\Header\Logo::class, $arguments);
+
+        $this->assertEquals('170', $block->getLogoHeight());
+    }
 }
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 2ac959d0a9881..22cc1c9e89fbe 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
@@ -9,6 +9,9 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Theme\Ui\Component\Listing\Column\EditAction;
 
+/**
+ * Class EditActionTest
+ */
 class EditActionTest extends \PHPUnit\Framework\TestCase
 {
     /** @var EditAction */
@@ -64,6 +67,7 @@ public function testPrepareDataSource($dataSourceItem, $scope, $scopeId)
                 'edit' => [
                     'href' => 'http://magento.com/theme/design_config/edit',
                     'label' => new \Magento\Framework\Phrase('Edit'),
+                    '__disableTmpl' => true,
                 ]
             ],
         ];
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
index 03d1fe70f2f07..5e2fe51043885 100644
--- 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
@@ -99,20 +99,52 @@ public function getPrepareDataSourceDataProvider()
     {
         return [
             [
-                ['name' => 'itemName', 'config' => []],
-                [['itemName' => '', 'entity_id' => 1]],
-                [['itemName' => ['view' => ['href' => 'url', 'label' => __('View')]], 'entity_id' => 1]],
+                [
+                    'name' => 'itemName',
+                    'config' => []
+                ],
+                [
+                    ['itemName' => '', 'entity_id' => 1]
+                ],
+                [
+                    [
+                        'itemName' => [
+                            'view' => [
+                                'href' => 'url',
+                                'label' => __('View'),
+                                '__disableTmpl' => true,
+                            ]
+                        ],
+                        'entity_id' => 1
+                    ]
+                ],
                 '#',
                 ['id' => 1]
             ],
             [
-                ['name' => 'itemName', 'config' => [
-                    'viewUrlPath' => 'url_path',
-                    'urlEntityParamName' => 'theme_id',
-                    'indexField' => 'theme_id']
+                [
+                    'name' => 'itemName',
+                    'config' => [
+                        'viewUrlPath' => 'url_path',
+                        'urlEntityParamName' => 'theme_id',
+                        'indexField' => 'theme_id'
+                    ]
+                ],
+                [
+                    ['itemName' => '', 'theme_id' => 2]
+                ],
+                [
+                    [
+                        'itemName' => [
+                            'view' => [
+                                'href' => 'url',
+                                'label' => __('View'),
+                                '__disableTmpl' => true,
+                            ]
+                        ],
+                        'theme_id' => 2
+                    ]
                 ],
-                [['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/EditAction.php b/app/code/Magento/Theme/Ui/Component/Listing/Column/EditAction.php
index 801f30ce30b0a..1eeeaccff88ce 100644
--- a/app/code/Magento/Theme/Ui/Component/Listing/Column/EditAction.php
+++ b/app/code/Magento/Theme/Ui/Component/Listing/Column/EditAction.php
@@ -73,7 +73,8 @@ public function prepareDataSource(array $dataSource)
                                     'scope_id' => $scopeId,
                                 ]
                             ),
-                            'label' => __('Edit')
+                            'label' => __('Edit'),
+                            '__disableTmpl' => true,
                         ]
                     ];
                 }
diff --git a/app/code/Magento/Theme/Ui/Component/Listing/Column/ViewAction.php b/app/code/Magento/Theme/Ui/Component/Listing/Column/ViewAction.php
index 774d5bab660af..9e47e2c52bddf 100644
--- a/app/code/Magento/Theme/Ui/Component/Listing/Column/ViewAction.php
+++ b/app/code/Magento/Theme/Ui/Component/Listing/Column/ViewAction.php
@@ -65,7 +65,8 @@ public function prepareDataSource(array $dataSource) : array
                                     $urlEntityParamName => $item[$indexField]
                                 ]
                             ),
-                            'label' => __('View')
+                            'label' => __('View'),
+                            '__disableTmpl' => true,
                         ]
                     ];
                 }
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
index 14aea72d87357..d2e5fa7ae1ca9 100644
--- 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
@@ -20,6 +20,9 @@
     <dataSource name="design_theme_listing_data_source" component="Magento_Ui/js/grid/provider">
         <settings>
             <updateUrl path="mui/index/render"/>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">theme_id</param>
+            </storageConfig>
         </settings>
         <aclResource>Magento_Theme::theme</aclResource>
         <dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="design_theme_listing_data_source">
diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml
index 81cffe8c040b3..8eaac4aa3e794 100644
--- a/app/code/Magento/Theme/view/frontend/layout/default.xml
+++ b/app/code/Magento/Theme/view/frontend/layout/default.xml
@@ -50,12 +50,7 @@
                 </container>
             </container>
             <container name="header-wrapper" label="Page Header" as="header-wrapper" htmlTag="div" htmlClass="header content">
-                <block class="Magento\Theme\Block\Html\Header\Logo" name="logo">
-                    <arguments>
-                        <argument name="logo_img_width" xsi:type="number">189</argument>
-                        <argument name="logo_img_height" xsi:type="number">64</argument>
-                    </arguments>
-                </block>
+                <block class="Magento\Theme\Block\Html\Header\Logo" name="logo"/>
             </container>
         </referenceContainer>
         <referenceContainer name="page.top">
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Node.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Node.js
index 41cc0d9813bfa..58074216458ee 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Node.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/classes/html/Node.js
@@ -197,7 +197,7 @@
 		},
 
 		/**
-		 * Wraps the node in in another node.
+		 * Wraps the node in another node.
 		 *
 		 * @example
 		 * node.wrap(wrapperNode);
diff --git a/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js b/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
index bb3300baf988a..15bc5465e5d04 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
@@ -78,6 +78,8 @@ define([
             }
 
             tinyMCE3.init(this.getSettings(mode));
+            varienGlobalEvents.clearEventHandlers('open_browser_callback');
+            varienGlobalEvents.attachEventHandler('open_browser_callback', tinyMceEditors.get(this.id).openFileBrowser);
         },
 
         /**
diff --git a/app/code/Magento/Translation/Console/Command/UninstallLanguageCommand.php b/app/code/Magento/Translation/Console/Command/UninstallLanguageCommand.php
index a1092b231479e..4f7a1133ab208 100644
--- a/app/code/Magento/Translation/Console/Command/UninstallLanguageCommand.php
+++ b/app/code/Magento/Translation/Console/Command/UninstallLanguageCommand.php
@@ -85,31 +85,33 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
         $this->setName('i18n:uninstall')
             ->setDescription('Uninstalls language packages')
-            ->setDefinition([
-                new InputArgument(
-                    self::PACKAGE_ARGUMENT,
-                    InputArgument::IS_ARRAY | InputArgument::REQUIRED,
-                    'Language package name'
-                ),
-                new InputOption(
-                    self::BACKUP_CODE_OPTION,
-                    '-b',
-                    InputOption::VALUE_NONE,
-                    'Take code and configuration files backup (excluding temporary files)'
-                ),
-            ]);
+            ->setDefinition(
+                [
+                    new InputArgument(
+                        self::PACKAGE_ARGUMENT,
+                        InputArgument::IS_ARRAY | InputArgument::REQUIRED,
+                        'Language package name'
+                    ),
+                    new InputOption(
+                        self::BACKUP_CODE_OPTION,
+                        '-b',
+                        InputOption::VALUE_NONE,
+                        'Take code and configuration files backup (excluding temporary files)'
+                    )
+                ]
+            );
 
         parent::configure();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -121,7 +123,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if (!$this->validate($package)) {
                 $output->writeln("<info>Package $package is not a Magento language and will be skipped.</info>");
             } else {
-                if (sizeof($dependencies[$package]) > 0) {
+                if (count($dependencies[$package]) > 0) {
                     $output->writeln("<info>Package $package has dependencies and will be skipped.</info>");
                 } else {
                     $packagesToRemove[] = $package;
diff --git a/app/code/Magento/Translation/Model/Inline/Parser.php b/app/code/Magento/Translation/Model/Inline/Parser.php
index 52124aee869af..ca66d288d6f60 100644
--- a/app/code/Magento/Translation/Model/Inline/Parser.php
+++ b/app/code/Magento/Translation/Model/Inline/Parser.php
@@ -16,7 +16,7 @@
 use Magento\Translation\Model\Inline\CacheManager;
 
 /**
- * Parse content, applying necessary html element wrapping and client scripts for inline translation.
+ * Parses content and applies necessary html element wrapping and client scripts for inline translation.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -229,7 +229,12 @@ public function processAjaxPost(array $translateParams)
                     $storeId = $validStoreId;
                 }
             }
-            $resource->saveTranslate($param['original'], $param['custom'], null, $storeId);
+            $resource->saveTranslate(
+                $param['original'],
+                $param['custom'],
+                null,
+                $storeId
+            );
         }
 
         return $this->getCacheManger()->updateAndGetTranslations();
@@ -257,7 +262,7 @@ protected function _validateTranslationParams(array $translateParams)
      * Apply input filter to values of translation parameters
      *
      * @param array $translateParams
-     * @param array $fieldNames
+     * @param array $fieldNames Names of fields values of which are to be filtered
      * @return void
      */
     protected function _filterTranslationParams(array &$translateParams, array $fieldNames)
diff --git a/app/code/Magento/Ui/Component/Control/SplitButton.php b/app/code/Magento/Ui/Component/Control/SplitButton.php
index ef57268566ba8..5c9d09565fc66 100644
--- a/app/code/Magento/Ui/Component/Control/SplitButton.php
+++ b/app/code/Magento/Ui/Component/Control/SplitButton.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\Component\Control;
 
 /**
@@ -22,7 +23,7 @@
 class SplitButton extends Button
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getTemplatePath()
     {
@@ -83,12 +84,12 @@ public function getButtonAttributesHtml()
             'style' => $this->getStyle(),
         ];
 
-        if (($idHard = $this->getIdHard())) {
+        if ($idHard = $this->getIdHard()) {
             $attributes['id'] = $idHard;
         }
 
         //TODO perhaps we need to skip data-mage-init when disabled="disabled"
-        if (($dataAttribute = $this->getDataAttribute())) {
+        if ($dataAttribute = $this->getDataAttribute()) {
             $this->getDataAttributes($dataAttribute, $attributes);
         }
 
@@ -112,7 +113,7 @@ public function getToggleAttributesHtml()
             $title = $this->getLabel();
         }
 
-        if (($currentClass = $this->getClass())) {
+        if ($currentClass = $this->getClass()) {
             $classes[] = $currentClass;
         }
 
@@ -201,12 +202,11 @@ public function hasSplit()
     {
         return $this->hasData('has_split') ? (bool)$this->getData('has_split') : true;
     }
-
     /**
      * Add data attributes to $attributes array
      *
      * @param array $data
-     * @param array &$attributes
+     * @param array $attributes
      * @return void
      */
     protected function getDataAttributes($data, &$attributes)
diff --git a/app/code/Magento/Ui/Component/Filters.php b/app/code/Magento/Ui/Component/Filters.php
index fe02c23af9c8a..5bf89ae7936e9 100644
--- a/app/code/Magento/Ui/Component/Filters.php
+++ b/app/code/Magento/Ui/Component/Filters.php
@@ -12,6 +12,8 @@
 use Magento\Ui\Component\Listing\Columns\ColumnInterface;
 
 /**
+ * Grid filters UI component
+ *
  * @api
  * @since 100.0.2
  */
@@ -36,6 +38,7 @@ class Filters extends AbstractComponent implements ObserverInterface
         'textRange' => 'filterRange',
         'select' => 'filterSelect',
         'dateRange' => 'filterDate',
+        'datetimeRange' => 'filterDate',
     ];
 
     /**
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Date.php b/app/code/Magento/Ui/Component/Filters/Type/Date.php
index e854b888c45e6..28ad8568ebe31 100644
--- a/app/code/Magento/Ui/Component/Filters/Type/Date.php
+++ b/app/code/Magento/Ui/Component/Filters/Type/Date.php
@@ -9,6 +9,8 @@
 use Magento\Ui\Component\Form\Element\DataType\Date as DataTypeDate;
 
 /**
+ * Date grid filter UI Component
+ *
  * @api
  * @since 100.0.2
  */
@@ -84,30 +86,18 @@ protected function applyFilter()
                 if (isset($value['from'])) {
                     $this->applyFilterByType(
                         'gteq',
-                        $this->wrappedComponent->convertDate(
-                            $value['from'],
-                            0,
-                            0,
-                            0,
-                            !$this->getData('config/skipTimeZoneConversion')
-                        )
+                        $this->convertDatetime((string)$value['from'])
                     );
                 }
 
                 if (isset($value['to'])) {
                     $this->applyFilterByType(
                         'lteq',
-                        $this->wrappedComponent->convertDate(
-                            $value['to'],
-                            23,
-                            59,
-                            59,
-                            !$this->getData('config/skipTimeZoneConversion')
-                        )
+                        $this->convertDatetime((string)$value['to'], 23, 59, 59)
                     );
                 }
             } else {
-                $this->applyFilterByType('eq', $this->wrappedComponent->convertDate($value));
+                $this->applyFilterByType('eq', $this->convertDatetime((string)$value));
             }
         }
     }
@@ -130,4 +120,31 @@ protected function applyFilterByType($type, $value)
             $this->getContext()->getDataProvider()->addFilter($filter);
         }
     }
+
+    /**
+     * Convert given date to default (UTC) timezone
+     *
+     * @param string $value
+     * @param int $hour
+     * @param int $minute
+     * @param int $second
+     * @return \DateTime
+     */
+    private function convertDatetime(string $value, int $hour = 0, int $minute = 0, int $second = 0): ?\DateTime
+    {
+        $value = $this->getData('config/options/showsTime')
+            ? $this->wrappedComponent->convertDatetime(
+                $value,
+                !$this->getData('config/skipTimeZoneConversion')
+            )
+            : $this->wrappedComponent->convertDate(
+                $value,
+                $hour,
+                $minute,
+                $second,
+                !$this->getData('config/skipTimeZoneConversion')
+            );
+
+        return $value;
+    }
 }
diff --git a/app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php b/app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php
index b01b2937151ce..586d76828ba3a 100644
--- a/app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php
+++ b/app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php
@@ -62,6 +62,14 @@ public function prepare()
             if (empty($config['rawOptions'])) {
                 $options = $this->convertOptionsValueToString($options);
             }
+
+            array_walk(
+                $options,
+                function (&$item) {
+                    $item['__disableTmpl'] = true;
+                }
+            );
+
             $config['options'] = array_values(array_replace_recursive($config['options'], $options));
         }
         $this->setData('config', (array)$config);
@@ -89,7 +97,7 @@ protected function convertOptionsValueToString(array $options)
     {
         array_walk(
             $options,
-            static function (&$value) {
+            function (&$value) {
                 if (isset($value['value']) && is_scalar($value['value'])) {
                     $value['value'] = (string)$value['value'];
                 }
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
index 31d2fe786cfd8..ef2df77e7daff 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
@@ -11,7 +11,7 @@
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
 /**
- * Class Date
+ * UI component date type
  */
 class Date extends AbstractDataType
 {
@@ -111,7 +111,7 @@ public function getComponentName()
     public function convertDate($date, $hour = 0, $minute = 0, $second = 0, $setUtcTimeZone = true)
     {
         try {
-            $dateObj = $this->localeDate->date($date, $this->getLocale(), true);
+            $dateObj = $this->localeDate->date($date, $this->getLocale(), false);
             $dateObj->setTime($hour, $minute, $second);
             //convert store date to default date in UTC timezone without DST
             if ($setUtcTimeZone) {
@@ -122,4 +122,26 @@ public function convertDate($date, $hour = 0, $minute = 0, $second = 0, $setUtcT
             return null;
         }
     }
+
+    /**
+     * Convert given date to default (UTC) timezone
+     *
+     * @param string $date
+     * @param bool $setUtcTimezone
+     * @return \DateTime|null
+     */
+    public function convertDatetime(string $date, bool $setUtcTimezone = true): ?\DateTime
+    {
+        try {
+            $date = rtrim($date, 'Z');
+            $dateObj = new \DateTime($date, new \DateTimeZone($this->localeDate->getConfigTimezone()));
+            //convert store date to default date in UTC timezone without DST
+            if ($setUtcTimezone) {
+                $dateObj->setTimezone(new \DateTimeZone('UTC'));
+            }
+            return $dateObj;
+        } catch (\Throwable $e) {
+            return null;
+        }
+    }
 }
diff --git a/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php b/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php
index d39d2dc3cd930..040c27d4939ef 100644
--- a/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php
+++ b/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php
@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Ui\Component\Form\Element;
 
 use Magento\Framework\Data\Form\Element\Editor;
 use Magento\Framework\Data\Form;
 use Magento\Framework\Data\FormFactory;
-use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Ui\Component\Wysiwyg\ConfigInterface;
 
@@ -51,6 +51,7 @@ public function __construct(
         array $config = []
     ) {
         $wysiwygConfigData = isset($config['wysiwygConfigData']) ? $config['wysiwygConfigData'] : [];
+
         $this->form = $formFactory->create();
         $wysiwygId = $context->getNamespace() . '_' . $data['name'];
         $this->editor = $this->form->addField(
diff --git a/app/code/Magento/Ui/Component/MassAction.php b/app/code/Magento/Ui/Component/MassAction.php
index 4cca8d4c012bb..5af263dd861ce 100644
--- a/app/code/Magento/Ui/Component/MassAction.php
+++ b/app/code/Magento/Ui/Component/MassAction.php
@@ -28,7 +28,7 @@ public function prepare()
             if ($disabledAction) {
                 continue;
             }
-            $config['actions'][] = $componentConfig;
+            $config['actions'][] = array_merge($componentConfig, ['__disableTmpl' => true]);
         }
 
         $origConfig = $this->getConfiguration();
diff --git a/app/code/Magento/Ui/Model/Export/MetadataProvider.php b/app/code/Magento/Ui/Model/Export/MetadataProvider.php
old mode 100644
new mode 100755
index 603e102fa30e0..3f6685e37fcc4
--- a/app/code/Magento/Ui/Model/Export/MetadataProvider.php
+++ b/app/code/Magento/Ui/Model/Export/MetadataProvider.php
@@ -15,6 +15,7 @@
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
+ * Metadata Provider
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class MetadataProvider
@@ -84,7 +85,7 @@ protected function getColumnsComponent(UiComponentInterface $component)
                 return $childComponent;
             }
         }
-        throw new \Exception('No columns found');
+        throw new \Exception('No columns found'); // @codingStandardsIgnoreLine
     }
 
     /**
@@ -119,12 +120,6 @@ public function getHeaders(UiComponentInterface $component)
             $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/Test/Mftf/Section/AdminMessagesSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml
deleted file mode 100644
index 8dc20142add3f..0000000000000
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminMessagesSection.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="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"/>
-        <element name="noticeMessage" type="text" selector=".message-notice"/>
-        <element name="accessDenied" type="text" selector=".access-denied-page"/>
-    </section>
-</sections>
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/DateTest.php b/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/DateTest.php
index 78456968cbef1..20af2627fbb04 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/DateTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/DateTest.php
@@ -13,34 +13,35 @@
 use Magento\Ui\Component\Filters\Type\Date;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Ui\Component\Form\Element\DataType\Date as FormDate;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
- * Class DateTest
+ * Test for Date grid filter functionality
  */
 class DateTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var ContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ContextInterface|MockObject
      */
     private $contextMock;
 
     /**
-     * @var UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var UiComponentFactory|MockObject
      */
     private $uiComponentFactory;
 
     /**
-     * @var FilterBuilder|\PHPUnit_Framework_MockObject_MockObject
+     * @var FilterBuilder|MockObject
      */
     private $filterBuilderMock;
 
     /**
-     * @var FilterModifier|\PHPUnit_Framework_MockObject_MockObject
+     * @var FilterModifier|MockObject
      */
     private $filterModifierMock;
 
     /**
-     * @var DataProviderInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var DataProviderInterface|MockObject
      */
     private $dataProviderMock;
 
@@ -89,18 +90,19 @@ public function testGetComponentName()
      * Run test prepare method
      *
      * @param string $name
+     * @param bool $showsTime
      * @param array $filterData
      * @param array|null $expectedCondition
      * @dataProvider getPrepareDataProvider
      * @return void
      */
-    public function testPrepare($name, $filterData, $expectedCondition)
+    public function testPrepare(string $name, bool $showsTime, array $filterData, ?array $expectedCondition)
     {
         $processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->contextMock->expects(static::atLeastOnce())->method('getProcessor')->willReturn($processor);
-        /** @var FormDate $uiComponent */
+        /** @var FormDate|MockObject $uiComponent */
         $uiComponent = $this->getMockBuilder(FormDate::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -125,7 +127,7 @@ public function testPrepare($name, $filterData, $expectedCondition)
             ->willReturn($this->dataProviderMock);
 
         if ($expectedCondition !== null) {
-            $this->processFilters($name, $filterData, $expectedCondition, $uiComponent);
+            $this->processFilters($name, $showsTime, $filterData, $expectedCondition, $uiComponent);
         }
 
         $this->uiComponentFactory->expects($this->any())
@@ -139,7 +141,10 @@ public function testPrepare($name, $filterData, $expectedCondition)
             $this->filterBuilderMock,
             $this->filterModifierMock,
             [],
-            ['name' => $name]
+            [
+                'name' => $name,
+                'config' => ['options' => ['showsTime' => $showsTime]],
+            ]
         );
         $date->prepare();
     }
@@ -152,7 +157,7 @@ public function testPrepare($name, $filterData, $expectedCondition)
      * @param string $expectedDate
      * @param int $i
      *
-     * @return Filter|\PHPUnit_Framework_MockObject_MockObject
+     * @return Filter|MockObject
      */
     private function getFilterMock($name, $expectedType, $expectedDate, &$i)
     {
@@ -184,57 +189,92 @@ public function getPrepareDataProvider()
     {
         return [
             [
-                'test_date',
-                ['test_date' => ['from' => '11-05-2015', 'to' => null]],
-                ['date' => '2015-05-11 00:00:00', 'type' => 'gteq'],
+                'name' => 'test_date',
+                'showsTime' => false,
+                'filterData' => ['test_date' => ['from' => '11-05-2015', 'to' => null]],
+                'expectedCondition' => ['date' => '2015-05-11 00:00:00', 'type' => 'gteq'],
             ],
             [
-                'test_date',
-                ['test_date' => ['from' => null, 'to' => '11-05-2015']],
-                ['date' => '2015-05-11 23:59:59', 'type' => 'lteq'],
+                'name' => 'test_date',
+                'showsTime' => false,
+                'filterData' => ['test_date' => ['from' => null, 'to' => '11-05-2015']],
+                'expectedCondition' => ['date' => '2015-05-11 23:59:59', 'type' => 'lteq'],
             ],
             [
-                'test_date',
-                ['test_date' => ['from' => '11-05-2015', 'to' => '11-05-2015']],
-                [
+                'name' => 'test_date',
+                'showsTime' => false,
+                'filterData' => ['test_date' => ['from' => '11-05-2015', 'to' => '11-05-2015']],
+                'expectedCondition' => [
                     'date_from' => '2015-05-11 00:00:00', 'type_from' => 'gteq',
                     'date_to' => '2015-05-11 23:59:59', 'type_to' => 'lteq'
                 ],
             ],
             [
-                'test_date',
-                ['test_date' => '11-05-2015'],
-                ['date' => '2015-05-11 00:00:00', 'type' => 'eq'],
+                'name' => 'test_date',
+                'showsTime' => false,
+                'filterData' => ['test_date' => '11-05-2015'],
+                'expectedCondition' => ['date' => '2015-05-11 00:00:00', 'type' => 'eq'],
+            ],
+            [
+                'name' => 'test_date',
+                'showsTime' => false,
+                'filterData' => ['test_date' => ['from' => '', 'to' => '']],
+                'expectedCondition' => null,
             ],
             [
-                'test_date',
-                ['test_date' => ['from' => '', 'to' => '']],
-                null,
+                'name' => 'test_date',
+                'showsTime' => true,
+                'filterData' => ['test_date' => ['from' => '11-05-2015 10:20:00', 'to' => '11-05-2015 18:25:00']],
+                'expectedCondition' => [
+                    'date_from' => '2015-05-11 10:20:00', 'type_from' => 'gteq',
+                    'date_to' => '2015-05-11 18:25:00', 'type_to' => 'lteq'
+                ],
             ],
         ];
     }
 
     /**
-     * @param $name
-     * @param $filterData
-     * @param $expectedCondition
-     * @param $uiComponent
+     * @param string $name
+     * @param bool $showsTime
+     * @param array $filterData
+     * @param array $expectedCondition
+     * @param MockObject $uiComponent
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    private function processFilters($name, $filterData, $expectedCondition, $uiComponent)
-    {
+    private function processFilters(
+        string $name,
+        bool $showsTime,
+        array $filterData,
+        array $expectedCondition,
+        FormDate $uiComponent
+    ) {
         if (is_string($filterData[$name])) {
             $uiComponent->expects(static::once())
-                ->method('convertDate')
+                ->method($showsTime ? 'convertDatetime' : 'convertDate')
                 ->with($filterData[$name])
                 ->willReturn(new \DateTime($filterData[$name]));
         } else {
-            $from = new \DateTime($filterData[$name]['from']);
-            $to = new \DateTime($filterData[$name]['to'] . ' 23:59:59');
-            $uiComponent->method('convertDate')
-                ->willReturnMap([
-                    [$filterData[$name]['from'], 0, 0, 0, true, $from],
-                    [$filterData[$name]['to'], 23, 59, 59, true, $to],
-                ]);
+            if ($showsTime) {
+                $from = new \DateTime($filterData[$name]['from']);
+                $to = new \DateTime($filterData[$name]['to']);
+                $uiComponent->method('convertDatetime')
+                    ->willReturnMap(
+                        [
+                            [$filterData[$name]['from'], true, $from],
+                            [$filterData[$name]['to'], true, $to],
+                        ]
+                    );
+            } else {
+                $from = new \DateTime($filterData[$name]['from']);
+                $to = new \DateTime($filterData[$name]['to'] . ' 23:59:59');
+                $uiComponent->method('convertDate')
+                    ->willReturnMap(
+                        [
+                            [$filterData[$name]['from'], 0, 0, 0, true, $from],
+                            [$filterData[$name]['to'], 23, 59, 59, true, $to],
+                        ]
+                    );
+            }
         }
 
         $i = 0;
diff --git a/app/code/Magento/Ui/Test/Unit/Component/FiltersTest.php b/app/code/Magento/Ui/Test/Unit/Component/FiltersTest.php
index 402fd30bf4d5b..d4cf7f1af8d62 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/FiltersTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/FiltersTest.php
@@ -8,23 +8,27 @@
 namespace Magento\Ui\Test\Unit\Component;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use \Magento\Ui\Component\Filters;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Ui\Component\Filters;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Unit tests for \Magento\Ui\Component\Filters class
  */
 class FiltersTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var Filters|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var Filters|MockObject */
     private $filters;
 
-    /** @var \Magento\Framework\View\Element\UiComponentInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var UiComponentInterface|MockObject */
     private $uiComponentInterface;
 
-    /** @var \Magento\Framework\View\Element\UiComponentFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var UiComponentFactory|MockObject */
     private $uiComponentFactory;
 
-    /** @var \Magento\Framework\View\Element\UiComponent\ContextInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var ContextInterface|MockObject */
     private $context;
 
     /**
@@ -33,13 +37,13 @@ class FiltersTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
-        $this->uiComponentInterface = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentInterface::class)
+        $this->uiComponentInterface = $this->getMockBuilder(UiComponentInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->uiComponentFactory = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentFactory::class)
+        $this->uiComponentFactory = $this->getMockBuilder(UiComponentFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->context = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class)
+        $this->context = $this->getMockBuilder(ContextInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->filters = $objectManager->getObject(
@@ -52,7 +56,14 @@ protected function setUp()
         );
     }
 
-    public function testUpdate()
+    /**
+     * Test to Update filter component according to $component
+     *
+     * @param string $filterType
+     * @param string $filterName
+     * @dataProvider updateDataProvider
+     */
+    public function testUpdate(string $filterType, string $filterName)
     {
         $componentName = 'component_name';
         $componentConfig = [0, 1, 2];
@@ -60,7 +71,10 @@ public function testUpdate()
             ->disableOriginalConstructor()
             ->setMethods(['getData', 'getName', 'getConfiguration'])
             ->getMockForAbstractClass();
-        $columnInterface->expects($this->atLeastOnce())->method('getData')->with('config/filter')->willReturn('text');
+        $columnInterface->expects($this->atLeastOnce())
+            ->method('getData')
+            ->with('config/filter')
+            ->willReturn($filterType);
         $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)
@@ -71,11 +85,22 @@ public function testUpdate()
             ->willReturnSelf();
         $filterComponent->expects($this->once())->method('prepare')->willReturnSelf();
         $this->uiComponentFactory->expects($this->once())->method('create')
-            ->with($componentName, 'filterInput', ['context' => $this->context])
+            ->with($componentName, $filterName, ['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);
     }
+
+    /**
+     * @return array
+     */
+    public function updateDataProvider(): array
+    {
+        return [
+            ['text', 'filterInput'],
+            ['datetimeRange', 'filterDate'],
+        ];
+    }
 }
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php
index cdb11f05daa8c..015c025e7c102 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php
@@ -11,27 +11,35 @@
 use Magento\Framework\View\Element\UiComponent\Context;
 use Magento\Framework\View\Element\UiComponent\Processor;
 use Magento\Ui\Component\Form\Element\DataType\Date;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-class DateTest extends \PHPUnit\Framework\TestCase
+/**
+ * Class to test Date form element
+ */
+class DateTest extends TestCase
 {
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    /** @var Context|MockObject */
     private $contextMock;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    /** @var TimezoneInterface|MockObject */
     private $localeDateMock;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    /** @var ResolverInterface|MockObject */
     private $localeResolverMock;
 
-    /** @var \Magento\Ui\Component\Form\Element\DataType\Date  */
+    /** @var Date  */
     private $date;
 
-    /** @var  \PHPUnit_Framework_MockObject_MockObject */
+    /** @var Processor|MockObject */
     private $processorMock;
 
-    /** @var  \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
+    /** @var  ObjectManager */
     private $objectManagerHelper;
 
+    /**
+     * @inheritdoc
+     */
     public function setUp()
     {
         $this->contextMock = $this->createMock(Context::class);
@@ -39,9 +47,12 @@ public function setUp()
         $this->localeResolverMock = $this->createMock(ResolverInterface::class);
         $this->objectManagerHelper = new ObjectManager($this);
         $this->processorMock = $this->createMock(Processor::class);
-        $this->contextMock->expects($this->atLeastOnce())->method('getProcessor')->willReturn($this->processorMock);
+        $this->contextMock->method('getProcessor')->willReturn($this->processorMock);
     }
 
+    /**
+     * Test to Prepare component configuration with Time offset
+     */
     public function testPrepareWithTimeOffset()
     {
         $this->date = new Date(
@@ -72,6 +83,9 @@ public function testPrepareWithTimeOffset()
         $this->assertEquals($localeDateFormat, $config['options']['dateFormat']);
     }
 
+    /**
+     * Test to Prepare component configuration without Time offset
+     */
     public function testPrepareWithoutTimeOffset()
     {
         $defaultDateFormat = 'MM/dd/y';
@@ -130,4 +144,43 @@ public function testPrepare()
         $this->assertEquals('America/Chicago', $configArray['storeTimeZone']);
         $this->assertEquals('de-DE', $configArray['options']['storeLocale']);
     }
+
+    /**
+     * Test to Convert given date to default (UTC) timezone
+     *
+     * @param string $dateStr
+     * @param bool $setUtcTimeZone
+     * @param string $convertedDate
+     * @dataProvider convertDatetimeDataProvider
+     */
+    public function testConvertDatetime(string $dateStr, bool $setUtcTimeZone, string $convertedDate)
+    {
+        $this->localeDateMock->method('getConfigTimezone')
+            ->willReturn('America/Los_Angeles');
+
+        $this->date = $this->objectManagerHelper->getObject(
+            Date::class,
+            [
+                'localeDate' => $this->localeDateMock,
+            ]
+        );
+
+        $this->assertEquals(
+            $convertedDate,
+            $this->date->convertDatetime($dateStr, $setUtcTimeZone)->format('Y-m-d H:i:s'),
+            "The date value wasn't converted"
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function convertDatetimeDataProvider(): array
+    {
+        return [
+            ['2019-09-30T12:32:00.000Z', false, '2019-09-30 12:32:00'],
+            ['2019-09-30T12:32:00.000', false, '2019-09-30 12:32:00'],
+            ['2019-09-30T12:32:00.000Z', true, '2019-09-30 19:32:00'],
+        ];
+    }
 }
diff --git a/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php b/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php
index b2f494351597f..c2e064bb3b069 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php
@@ -104,7 +104,8 @@ public function getPrepareDataProvider()
                 [
                     'type' => 'first_action',
                     'label' => 'First Action',
-                    'url' => '/module/controller/firstAction'
+                    'url' => '/module/controller/firstAction',
+                    '__disableTmpl' => true
                 ],
             ],
             [
@@ -123,7 +124,8 @@ public function getPrepareDataProvider()
                             'label' => 'Second Sub Action 2',
                             'url' => '/module/controller/secondSubAction2'
                         ],
-                    ]
+                    ],
+                    '__disableTmpl' => true
                 ],
             ],
         ];
diff --git a/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php b/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php
old mode 100644
new mode 100755
index 80cf7666eeedd..50bce70e08feb
--- a/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php
@@ -97,12 +97,12 @@ public function testGetHeaders(array $columnLabels, array $expected): void
     public function getColumnsDataProvider(): array
     {
         return [
-            [['ID'],['"ID"']],
+            [['ID'],['ID']],
             [['Name'],['Name']],
             [['Id'],['Id']],
             [['id'],['id']],
-            [['IDTEST'],['"IDTEST"']],
-            [['ID TEST'],['"ID TEST"']],
+            [['IDTEST'],['IDTEST']],
+            [['ID TEST'],['ID TEST']],
         ];
     }
 
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/insert-listing.js b/app/code/Magento/Ui/view/base/web/js/form/components/insert-listing.js
index b33f0b5c72395..53580fc069c47 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/insert-listing.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/insert-listing.js
@@ -155,7 +155,7 @@ define([
         updateExternalValueByEditableData: function () {
             var updatedExtValue;
 
-            if (!this.behaviourType === 'edit' || _.isEmpty(this.editableData) || _.isEmpty(this.externalValue())) {
+            if (!(this.behaviourType === 'edit') || _.isEmpty(this.editableData) || _.isEmpty(this.externalValue())) {
                 return;
             }
 
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
index ac28271e90a3b..1432372dd75a9 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/date.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
@@ -107,6 +107,13 @@ define([
             return this._super().observe(['shiftedValue']);
         },
 
+        /**
+         * @inheritdoc
+         */
+        getPreview: function () {
+            return this.shiftedValue();
+        },
+
         /**
          * Prepares and sets date/time value that will be displayed
          * in the input field.
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 f28569caa0053..73bef62910644 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
@@ -435,9 +435,10 @@ define([
                          * @param {String} constructedMessage
                          */
                         insertMethod: function (constructedMessage) {
-                            var errorMsgBodyHtml = '<strong>%s</strong> %s.<br>'
-                                .replace('%s', error.filename)
-                                .replace('%s', $t('was not uploaded'));
+                            var escapedFileName = $('<div>').text(error.filename).html(),
+                                errorMsgBodyHtml = '<strong>%s</strong> %s.<br>'
+                                    .replace('%s', escapedFileName)
+                                    .replace('%s', $t('was not uploaded'));
 
                             // html is escaped in message body for notification widget; prepend unescaped html here
                             constructedMessage = constructedMessage.replace('%s', errorMsgBodyHtml);
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
index 0eaacdc32567b..72c352f353239 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
@@ -8,14 +8,14 @@
  */
 define([
     'underscore',
-    'uiRegistry',
     './abstract'
-], function (_, registry, Abstract) {
+], function (_, Abstract) {
     'use strict';
 
     return Abstract.extend({
         defaults: {
             imports: {
+                countryOptions: '${ $.parentName }.country_id:indexedOptions',
                 update: '${ $.parentName }.country_id:value'
             }
         },
@@ -41,31 +41,32 @@ define([
         },
 
         /**
-         * @param {String} value
+         * Method called every time country selector's value gets changed.
+         * Updates all validations and requirements for certain country.
+         * @param {String} value - Selected country ID.
          */
         update: function (value) {
-            var country = registry.get(this.parentName + '.' + 'country_id'),
-                options = country.indexedOptions,
-                option = null;
+            var isZipCodeOptional,
+                option;
 
             if (!value) {
                 return;
             }
 
-            option = options[value];
+            option = _.isObject(this.countryOptions) && this.countryOptions[value];
 
             if (!option) {
                 return;
             }
 
-            if (option['is_zipcode_optional']) {
+            isZipCodeOptional = !!option['is_zipcode_optional'];
+
+            if (isZipCodeOptional) {
                 this.error(false);
-                this.validation = _.omit(this.validation, 'required-entry');
-            } else {
-                this.validation['required-entry'] = true;
             }
 
-            this.required(!option['is_zipcode_optional']);
+            this.validation['required-entry'] = !isZipCodeOptional;
+            this.required(!isZipCodeOptional);
         }
     });
 });
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 f6eafcf49284d..cd9c2aee85dc6 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
@@ -18,81 +18,54 @@ define([
         defaults: {
             skipValidation: false,
             imports: {
+                countryOptions: '${ $.parentName }.country_id:indexedOptions',
                 update: '${ $.parentName }.country_id:value'
             }
         },
 
         /**
-         * @param {String} value
+         * Method called every time country selector's value gets changed.
+         * Updates all validations and requirements for certain country.
+         * @param {String} value - Selected country ID.
          */
         update: function (value) {
-            var country = registry.get(this.parentName + '.' + 'country_id'),
-                options = country.indexedOptions,
-                isRegionRequired,
+            var isRegionRequired,
                 option;
 
             if (!value) {
                 return;
             }
-            option = options[value];
 
-            if (typeof option === 'undefined') {
+            option = _.isObject(this.countryOptions) && this.countryOptions[value];
+
+            if (!option) {
                 return;
             }
 
             defaultPostCodeResolver.setUseDefaultPostCode(!option['is_zipcode_optional']);
 
-            if (this.skipValidation) {
-                this.validation['required-entry'] = false;
-                this.required(false);
-            } else {
-                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;
-                }
+            if (option['is_region_visible'] === false) {
+                // Hide select and corresponding text input field if region must not be shown for selected country.
+                this.setVisible(false);
 
-                if (option && !this.options().length) {
-                    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);
-                    });
+                if (this.customEntry) { // eslint-disable-line max-depth
+                    this.toggleInput(false);
                 }
-
-                this.required(!!option['is_region_required']);
             }
-        },
 
-        /**
-         * Filters 'initialOptions' property by 'field' and 'value' passed,
-         * calls 'setOptions' passing the result to it
-         *
-         * @param {*} value
-         * @param {String} field
-         */
-        filter: function (value, field) {
-            var superFn = this._super;
-
-            registry.get(this.parentName + '.' + 'country_id', function (country) {
-                var option = country.indexedOptions[value];
+            isRegionRequired = !this.skipValidation && !!option['is_region_required'];
 
-                superFn.call(this, value, field);
+            if (!isRegionRequired) {
+                this.error(false);
+            }
 
-                if (option && option['is_region_visible'] === false) {
-                    // hide select and corresponding text input field if region must not be shown for selected country
-                    this.setVisible(false);
+            this.required(isRegionRequired);
+            this.validation['required-entry'] = isRegionRequired;
 
-                    if (this.customEntry) {// eslint-disable-line max-depth
-                        this.toggleInput(false);
-                    }
-                }
+            registry.get(this.customName, function (input) {
+                input.required(isRegionRequired);
+                input.validation['required-entry'] = isRegionRequired;
+                input.validation['validate-not-number-first'] = !this.options().length;
             }.bind(this));
         }
     });
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/date.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/date.js
index 3f9c5b20d6215..88959cda7499d 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/columns/date.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/date.js
@@ -9,8 +9,10 @@
 define([
     'mageUtils',
     'moment',
-    './column'
-], function (utils, moment, Column) {
+    './column',
+    'underscore',
+    'moment-timezone-with-data'
+], function (utils, moment, Column, _) {
     'use strict';
 
     return Column.extend({
@@ -20,9 +22,9 @@ define([
         },
 
         /**
-         * Overrides base method to normalize date format.
+         * Overrides base method to normalize date format
          *
-         * @returns {DateColumn} Chainable.
+         * @returns {DateColumn} Chainable
          */
         initConfig: function () {
             this._super();
@@ -43,7 +45,12 @@ define([
             if (this.storeLocale !== undefined) {
                 moment.locale(this.storeLocale, utils.extend({}, this.calendarConfig));
             }
-            date = moment(this._super());
+
+            date = moment.utc(this._super());
+
+            if (!_.isUndefined(this.timezone)) {
+                date = date.tz(this.timezone);
+            }
 
             date = date.isValid() && value[this.index] ?
                 date.format(format || this.dateFormat) :
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
new file mode 100644
index 0000000000000..2549fa93a834f
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
@@ -0,0 +1,251 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'Magento_Ui/js/grid/columns/column',
+    'Magento_Ui/js/lib/key-codes'
+], function ($, Column, keyCodes) {
+    'use strict';
+
+    return Column.extend({
+        defaults: {
+            bodyTmpl: 'ui/grid/columns/image-preview',
+            previewImageSelector: '[data-image-preview]',
+            visibleRecord: null,
+            height: 0,
+            displayedRecord: {},
+            lastOpenedImage: null,
+            fields: {
+                previewUrl: 'preview_url',
+                title: 'title'
+            },
+            modules: {
+                masonry: '${ $.parentName }',
+                thumbnailComponent: '${ $.parentName }.thumbnail_url'
+            },
+            statefull: {
+                sorting: true,
+                lastOpenedImage: true
+            },
+            listens: {
+                '${ $.provider }:params.filters': 'hide',
+                '${ $.provider }:params.search': 'hide',
+                '${ $.provider }:params.paging': 'hide'
+            },
+            exports: {
+                height: '${ $.parentName }.thumbnail_url:previewHeight'
+            }
+        },
+
+        /**
+         * Initialize image preview component
+         *
+         * @returns {Object}
+         */
+        initialize: function () {
+            this._super();
+            $(document).on('keydown', this.handleKeyDown.bind(this));
+
+            return this;
+        },
+
+        /**
+         * Init observable variables
+         * @return {Object}
+         */
+        initObservable: function () {
+            this._super()
+                .observe([
+                    'visibleRecord',
+                    'height',
+                    'displayedRecord',
+                    'lastOpenedImage'
+                ]);
+
+            return this;
+        },
+
+        /**
+         * Next image preview
+         *
+         * @param {Object} record
+         */
+        next: function (record) {
+            var recordToShow;
+
+            if (record._rowIndex + 1 === this.masonry().rows().length) {
+                return;
+            }
+
+            recordToShow = this.getRecord(record._rowIndex + 1);
+            recordToShow.rowNumber = record.lastInRow ? record.rowNumber + 1 : record.rowNumber;
+            this.show(recordToShow);
+        },
+
+        /**
+         * Previous image preview
+         *
+         * @param {Object} record
+         */
+        prev: function (record) {
+            var recordToShow;
+
+            if (record._rowIndex === 0) {
+                return;
+            }
+            recordToShow = this.getRecord(record._rowIndex - 1);
+
+            recordToShow.rowNumber = record.firstInRow ? record.rowNumber - 1 : record.rowNumber;
+            this.show(recordToShow);
+        },
+
+        /**
+         * Get record
+         *
+         * @param {Integer} recordIndex
+         *
+         * @return {Object}
+         */
+        getRecord: function (recordIndex) {
+            return this.masonry().rows()[recordIndex];
+        },
+
+        /**
+         * Set selected row id
+         *
+         * @param {Number} rowId
+         * @private
+         */
+        _selectRow: function (rowId) {
+            this.thumbnailComponent().previewRowId(rowId);
+        },
+
+        /**
+         * Show image preview
+         *
+         * @param {Object} record
+         */
+        show: function (record) {
+            var img;
+
+            if (record._rowIndex === this.visibleRecord()) {
+                this.hide();
+
+                return;
+            }
+
+            this.hide();
+            this.displayedRecord(record);
+            this._selectRow(record.rowNumber || null);
+            this.visibleRecord(record._rowIndex);
+
+            img = $(this.previewImageSelector + ' img');
+
+            if (img.get(0).complete) {
+                this.updateHeight();
+                this.scrollToPreview();
+            } else {
+                img.load(function () {
+                    this.updateHeight();
+                    this.scrollToPreview();
+                }.bind(this));
+            }
+
+            this.lastOpenedImage(record._rowIndex);
+        },
+
+        /**
+         * Update image preview section height
+         */
+        updateHeight: function () {
+            this.height($(this.previewImageSelector).height() + 'px');
+        },
+
+        /**
+         * Close image preview
+         */
+        hide: function () {
+            this.lastOpenedImage(null);
+            this.visibleRecord(null);
+            this.height(0);
+            this._selectRow(null);
+        },
+
+        /**
+         * Returns visibility for given record.
+         *
+         * @param {Object} record
+         * @return {*|bool}
+         */
+        isVisible: function (record) {
+            if (this.lastOpenedImage() === record._rowIndex &&
+                this.visibleRecord() === null
+            ) {
+                this.show(record);
+            }
+
+            return this.visibleRecord() === record._rowIndex || false;
+        },
+
+        /**
+         * Returns preview image url for a given record.
+         *
+         * @param {Object} record
+         * @return {String}
+         */
+        getUrl: function (record) {
+            return record[this.fields.previewUrl];
+        },
+
+        /**
+         * Returns image title for a given record.
+         *
+         * @param {Object} record
+         * @return {String}
+         */
+        getTitle: function (record) {
+            return record[this.fields.title];
+        },
+
+        /**
+         * Get styles for preview
+         *
+         * @returns {Object}
+         */
+        getStyles: function () {
+            return {
+                'margin-top': '-' + this.height()
+            };
+        },
+
+        /**
+         * Scroll to preview window
+         */
+        scrollToPreview: function () {
+            $(this.previewImageSelector).get(0).scrollIntoView({
+                behavior: 'smooth',
+                block: 'center',
+                inline: 'nearest'
+            });
+        },
+
+        /**
+         * Handle keyboard navigation for image preview
+         *
+         * @param {Object} e
+         */
+        handleKeyDown: function (e) {
+            var key = keyCodes[e.keyCode];
+
+            if (this.visibleRecord() !== null) {
+                if (key === 'pageLeftKey') {
+                    this.prev(this.displayedRecord());
+                } else if (key === 'pageRightKey') {
+                    this.next(this.displayedRecord());
+                }
+            }
+        }
+    });
+});
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/image.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/image.js
new file mode 100644
index 0000000000000..cec0955b835e0
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/image.js
@@ -0,0 +1,90 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'Magento_Ui/js/grid/columns/column'
+], function (Column) {
+    'use strict';
+
+    return Column.extend({
+        defaults: {
+            bodyTmpl: 'ui/grid/columns/image',
+            modules: {
+                previewComponent: '${ $.parentName }.preview'
+            },
+            previewRowId: null,
+            previewHeight: 0,
+            fields: {
+                id: 'id',
+                url: 'url'
+            }
+        },
+
+        /**
+         * Init observable variables
+         * @return {Object}
+         */
+        initObservable: function () {
+            this._super()
+                .observe([
+                    'previewRowId',
+                    'previewHeight'
+                ]);
+
+            return this;
+        },
+
+        /**
+         * Returns url to given record.
+         *
+         * @param {Object} record - Data to be preprocessed.
+         * @returns {String}
+         */
+        getUrl: function (record) {
+            return record[this.fields.url];
+        },
+
+        /**
+         * Returns id to given record.
+         *
+         * @param {Object} record - Data to be preprocessed.
+         * @returns {Number}
+         */
+        getId: function (record) {
+            return record[this.fields.id];
+        },
+
+        /**
+         * Returns container styles to given record.
+         *
+         * @param {Object} record - Data to be preprocessed.
+         * @returns {Object}
+         */
+        getStyles: function (record) {
+            var styles = record.styles();
+
+            styles['margin-bottom'] = this.previewRowId() === record.rowNumber ? this.previewHeight : 0;
+            record.styles(styles);
+
+            return record.styles;
+        },
+
+        /**
+         * Returns class list to given record.
+         *
+         * @param {Object} record - Data to be preprocessed.
+         * @returns {Object}
+         */
+        getClasses: function (record) {
+            return record.css || {};
+        },
+
+        /**
+         * Expand image preview
+         */
+        expandPreview: function (record) {
+            this.previewComponent().show(record);
+        }
+    });
+});
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/overlay.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/overlay.js
new file mode 100644
index 0000000000000..420b318e0b440
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/overlay.js
@@ -0,0 +1,35 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'Magento_Ui/js/grid/columns/column'
+], function (Column) {
+    'use strict';
+
+    return Column.extend({
+        defaults: {
+            bodyTmpl: 'ui/grid/columns/overlay'
+        },
+
+        /**
+         * If overlay should be visible
+         *
+         * @param {Object} row
+         * @returns {Boolean}
+         */
+        isVisible: function (row) {
+            return !!row[this.index];
+        },
+
+        /**
+         * Get overlay label
+         *
+         * @param {Object} row
+         * @returns {String}
+         */
+        getLabel: function (row) {
+            return row[this.index];
+        }
+    });
+});
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 ece49cc8fe27c..ad70b200e4420 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
@@ -337,7 +337,18 @@ define([
          * @returns {Object} Collection of records data.
          */
         getData: function () {
-            var data = this.activeRecords.map('getData');
+            var data = this.activeRecords.map(function (record) {
+                var elemKey,
+                    recordData = record.getData();
+
+                for (elemKey in recordData) {
+                    if (_.isUndefined(recordData[elemKey])) {
+                        recordData[elemKey] = null;
+                    }
+                }
+
+                return recordData;
+            });
 
             return _.indexBy(data, this.indexField);
         },
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 98c3eb1c6f882..fe33389eabad4 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
@@ -83,6 +83,10 @@ define([
                         component: 'Magento_Ui/js/grid/filters/range',
                         rangeType: 'date'
                     },
+                    datetimeRange: {
+                        component: 'Magento_Ui/js/grid/filters/range',
+                        rangeType: 'datetime'
+                    },
                     textRange: {
                         component: 'Magento_Ui/js/grid/filters/range',
                         rangeType: 'text'
@@ -272,11 +276,22 @@ define([
             }
 
             filter = utils.extend({}, filters.base, filter);
+            //Accepting labels as is.
+            filter.__disableTmpl = {
+                label: 1,
+                options: 1
+            };
 
-            return utils.template(filter, {
+            filter = utils.template(filter, {
                 filters: this,
                 column: column
             }, true, true);
+
+            filter.__disableTmpl = {
+                label: true
+            };
+
+            return filter;
         },
 
         /**
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 ccfba8e98b6f4..1949234c89324 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
@@ -30,6 +30,14 @@ define([
                     dateFormat: 'MM/dd/YYYY',
                     shiftedValue: 'filter'
                 },
+                datetime: {
+                    component: 'Magento_Ui/js/form/element/date',
+                    dateFormat: 'MM/dd/YYYY',
+                    shiftedValue: 'filter',
+                    options: {
+                        showsTime: true
+                    }
+                },
                 text: {
                     component: 'Magento_Ui/js/form/element/abstract'
                 },
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/masonry.js b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
new file mode 100644
index 0000000000000..e4c72ee950c26
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
@@ -0,0 +1,276 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'Magento_Ui/js/grid/listing',
+    'Magento_Ui/js/lib/view/utils/raf',
+    'jquery',
+    'ko',
+    'underscore'
+], function (Listing, raf, $, ko, _) {
+    'use strict';
+
+    return Listing.extend({
+        defaults: {
+            template: 'ui/grid/masonry',
+            imports: {
+                rows: '${ $.provider }:data.items',
+                errorMessage: '${ $.provider }:data.errorMessage'
+            },
+            listens: {
+                rows: 'initComponent'
+            },
+
+            /**
+             * Images container id
+             * @param string
+             */
+            containerId: null,
+
+            /**
+             * Minimum aspect ratio for each image
+             * @param int
+             */
+            minRatio: null,
+
+            /**
+             * Container width
+             * @param int
+             */
+            containerWidth: window.innerWidth,
+
+            /**
+             * Margin between images
+             * @param int
+             */
+            imageMargin: 20,
+
+            /**
+             * Maximum image height value
+             * @param int
+             */
+            maxImageHeight: 240,
+
+            /**
+             * The value is minimum image width to height ratio when container width is less than the key
+             * @param {Object}
+             */
+            containerWidthToMinRatio: {
+                640: 3,
+                1280: 5,
+                1920: 8
+            },
+
+            /**
+             * Default minimal image width to height ratio.
+             * Applied when container width is greater than max width in the containerWidthToMinRatio matrix.
+             * @param int
+             */
+            defaultMinRatio: 10,
+
+            /**
+             * Layout update FPS during window resizing
+             */
+            refreshFPS: 60
+        },
+
+        /**
+         * Init observable variables
+         * @return {Object}
+         */
+        initObservable: function () {
+            this._super()
+                .observe([
+                    'rows',
+                    'errorMessage'
+                ]);
+
+            return this;
+        },
+
+        /**
+         * Init component handler
+         * @param {Object} rows
+         * @return {Object}
+         */
+        initComponent: function (rows) {
+            if (!rows.length) {
+                return;
+            }
+            this.imageMargin = parseInt(this.imageMargin, 10);
+            this.container = $('[data-id="' + this.containerId + '"]')[0];
+
+            this.setLayoutStyles();
+            this.setEventListener();
+
+            return this;
+        },
+
+        /**
+         * Set event listener to track resize event
+         */
+        setEventListener: function () {
+            window.addEventListener('resize', function () {
+                raf(function () {
+                    this.containerWidth = window.innerWidth;
+                    this.setLayoutStyles();
+                }.bind(this), this.refreshFPS);
+            }.bind(this));
+        },
+
+        /**
+         * Set layout styles inside the container
+         */
+        setLayoutStyles: function () {
+            var containerWidth = parseInt(this.container.clientWidth, 10),
+                rowImages = [],
+                ratio = 0,
+                rowHeight = 0,
+                calcHeight = 0,
+                isLastRow = false,
+                rowNumber = 1;
+
+            this.setMinRatio();
+
+            this.rows().forEach(function (image, index) {
+                ratio += parseFloat((image.width / image.height).toFixed(2));
+                rowImages.push(image);
+
+                if (ratio < this.minRatio && index + 1 !== this.rows().length) {
+                    // Row has more space for images and the image is not the last one - proceed to the next iteration
+                    return;
+                }
+
+                ratio = Math.max(ratio, this.minRatio);
+                calcHeight = (containerWidth - this.imageMargin * rowImages.length) / ratio;
+                rowHeight = calcHeight < this.maxImageHeight ? calcHeight : this.maxImageHeight;
+                isLastRow = index + 1 === this.rows().length;
+
+                this.assignImagesToRow(rowImages, rowNumber, rowHeight, isLastRow);
+
+                rowImages = [];
+                ratio = 0;
+                rowNumber++;
+
+            }.bind(this));
+        },
+
+        /**
+         * Apply styles, css classes and add properties for images in the row
+         *
+         * @param {Object[]} images
+         * @param {Number} rowNumber
+         * @param {Number} rowHeight
+         * @param {Boolean} isLastRow
+         */
+        assignImagesToRow: function (images, rowNumber, rowHeight, isLastRow) {
+            var imageWidth;
+
+            images.forEach(function (img) {
+                imageWidth = rowHeight * (img.width / img.height).toFixed(2);
+                this.setImageStyles(img, imageWidth, rowHeight);
+                this.setImageClass(img, {
+                    bottom: isLastRow
+                });
+                img.rowNumber = rowNumber;
+            }.bind(this));
+
+            images[0].firstInRow = true;
+            images[images.length - 1].lastInRow = true;
+        },
+
+        /**
+         * Wait for container to initialize
+         */
+        waitForContainer: function (callback) {
+            if (typeof this.container === 'undefined') {
+                setTimeout(function () {
+                    this.waitForContainer(callback);
+                }.bind(this), 500);
+            } else {
+                setTimeout(callback, 0);
+            }
+        },
+
+        /**
+         * Set layout styles when container element is loaded.
+         */
+        setLayoutStylesWhenLoaded: function () {
+            this.waitForContainer(function () {
+                this.setLayoutStyles();
+            }.bind(this));
+        },
+
+        /**
+         * Set styles for every image in layout
+         *
+         * @param {Object} img
+         * @param {Number} width
+         * @param {Number} height
+         */
+        setImageStyles: function (img, width, height) {
+            if (!img.styles) {
+                img.styles = ko.observable();
+            }
+            img.styles({
+                width: parseInt(width, 10) + 'px',
+                height: parseInt(height, 10) + 'px'
+            });
+        },
+
+        /**
+         * Set css classes to and an image
+         *
+         * @param {Object} image
+         * @param {Object} classes
+         */
+        setImageClass: function (image, classes) {
+            if (!image.css) {
+                image.css = ko.observable(classes);
+            }
+            image.css(classes);
+        },
+
+        /**
+         * Set min ratio for images in layout
+         */
+        setMinRatio: function () {
+            var minRatio = _.find(
+                this.containerWidthToMinRatio,
+
+                /**
+                 * Find the minimal ratio for container width in the matrix
+                 *
+                 * @param {Number} ratio
+                 * @param {Number} width
+                 * @returns {Boolean}
+                 */
+                function (ratio, width) {
+                    return this.containerWidth <= width;
+                },
+                this
+            );
+
+            this.minRatio = minRatio ? minRatio : this.defaultMinRatio;
+        },
+
+        /**
+         * Checks if grid has data.
+         *
+         * @returns {Boolean}
+         */
+        hasData: function () {
+            return !!this.rows() && !!this.rows().length;
+        },
+
+        /**
+         * Returns error message returned by the data provider
+         *
+         * @returns {String|null}
+         */
+        getErrorMessageUnsanitizedHtml: function () {
+            return this.errorMessage();
+        }
+    });
+});
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
index c678b85276093..1e8e89894d22f 100644
--- 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
@@ -71,6 +71,11 @@ define([
         update: function (element, valueAccessor, allBindings, viewModel) {
             var config = valueAccessor();
 
+            /** Initialise value as empty if it is undefined when color picker input is reset **/
+            if (config.value() === undefined) {
+                config.value('');
+            }
+
             if (tinycolor(config.value()).isValid() || config.value() === '') {
                 $(element).spectrum('set', config.value());
 
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/optgroup.js b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/optgroup.js
index 2925c5859eddd..6ff7c1f673213 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/optgroup.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/optgroup.js
@@ -222,10 +222,14 @@ define([
                     ko.utils.setTextContent(option, allBindings.get('optionsCaption'));
                     ko.selectExtensions.writeValue(option, undefined);
                 } else if (typeof arrayEntry[optionsValue] === 'undefined') { // empty value === optgroup
-                    option = utils.template(optgroupTmpl, {
-                        label: arrayEntry[optionsText],
-                        title: arrayEntry[optionsText + 'title']
-                    });
+                    if (arrayEntry.__disableTmpl) {
+                        option = '<optgroup label="' + arrayEntry[optionsText] + '"></optgroup>';
+                    } else {
+                        option = utils.template(optgroupTmpl, {
+                            label: arrayEntry[optionsText],
+                            title: arrayEntry[optionsText + 'title']
+                        });
+                    }
                     option = ko.utils.parseHtmlFragment(option)[0];
 
                 } else {
@@ -307,6 +311,10 @@ define([
                         obj.disabled = disabled;
                     }
 
+                    if (option.hasOwnProperty('__disableTmpl')) {
+                        obj.__disableTmpl = option.__disableTmpl;
+                    }
+
                     label = label.replace(nbspRe, '').trim();
 
                     if (Array.isArray(value)) {
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 3402d1d1df03b..08f67955976c4 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
@@ -1067,6 +1067,16 @@ define([
                 return new RegExp(param).test(value);
             },
             $.mage.__('This link is not allowed.')
+        ],
+        'validate-dob': [
+            function (value) {
+                if (value === '') {
+                    return true;
+                }
+
+                return moment(value).isBefore(moment());
+            },
+            $.mage.__('The Date of Birth should not be greater than today.')
         ]
     }, function (data) {
         return {
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 a8a76206bcd2b..bcbb2f3c31dbd 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
@@ -15,6 +15,7 @@ define([
     'text!ui/template/modal/modal-custom.html',
     'Magento_Ui/js/lib/key-codes',
     'jquery-ui-modules/widget',
+    'jquery-ui-modules/core',
     'mage/translate'
 ], function ($, _, template, popupTpl, slideTpl, customTpl, keyCodes) {
     'use strict';
@@ -131,7 +132,10 @@ define([
             this._createWrapper();
             this._renderModal();
             this._createButtons();
-            $(this.options.trigger).on('click', _.bind(this.toggleModal, this));
+
+            if (this.options.trigger) {
+                $(document).on('click', this.options.trigger, _.bind(this.toggleModal, this));
+            }
             this._on(this.modal.find(this.options.modalCloseBtn), {
                 'click': this.options.modalCloseBtnHandler ? this.options.modalCloseBtnHandler : this.closeModal
             });
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/columns/image-preview.html b/app/code/Magento/Ui/view/base/web/templates/grid/columns/image-preview.html
new file mode 100644
index 0000000000000..3b430cf2dcbdc
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/columns/image-preview.html
@@ -0,0 +1,22 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="masonry-image-preview" if="$col.isVisible($row())" data-image-preview ko-style="$col.getStyles($row())">
+    <div class="container">
+        <div class="action-buttons">
+            <button class="action-previous" type="button" click="$col.prev.bind($col, $row())">
+                <span translate="'Previous'"/>
+            </button>
+            <button class="action-next" type="button" click="$col.next.bind($col, $row())">
+                <span translate="'Next'"/>
+            </button>
+            <button class="action-close" type="button" click="$col.hide.bind($col)">
+                <span translate="'Close'"/>
+            </button>
+        </div>
+        <img class="preview" attr="src: $col.getUrl($row()), alt: $col.getTitle($row())">
+    </div>
+</div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/columns/image.html b/app/code/Magento/Ui/view/base/web/templates/grid/columns/image.html
new file mode 100644
index 0000000000000..c513ddeff9895
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/columns/image.html
@@ -0,0 +1,9 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="masonry-image-block" ko-style="$col.getStyles($row())" attr="'data-id': $col.getId($row())">
+    <img attr="src: $col.getUrl($row())" css="$col.getClasses($row())" click="function(){ expandPreview($row()) }" data-role="thumbnail"/>
+</div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/columns/overlay.html b/app/code/Magento/Ui/view/base/web/templates/grid/columns/overlay.html
new file mode 100644
index 0000000000000..3cdc78c0683cb
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/columns/overlay.html
@@ -0,0 +1,9 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div if="$col.isVisible($row())" class="masonry-image-overlay">
+    <span text="$col.getLabel($row())"/>
+</div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/masonry.html b/app/code/Magento/Ui/view/base/web/templates/grid/masonry.html
new file mode 100644
index 0000000000000..089ee21bec15c
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/masonry.html
@@ -0,0 +1,17 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div data-role="grid-wrapper" class="masonry-image-grid" attr="'data-id': containerId">
+    <div class="masonry-image-column" repeat="foreach: rows, item: '$row'">
+        <div outerfasteach="data: getVisible(), as: '$col'" template="getBody()"/>
+    </div>
+    <div if="!hasData() && !getErrorMessageUnsanitizedHtml()" class="no-data-message-container">
+        <span translate="'We couldn\'t find any records.'"/>
+    </div>
+    <div if="getErrorMessageUnsanitizedHtml()" class="error-message-container">
+        <span html="getErrorMessageUnsanitizedHtml()"/>
+    </div>
+</div>
diff --git a/app/code/Magento/Ui/view/frontend/web/js/view/messages.js b/app/code/Magento/Ui/view/frontend/web/js/view/messages.js
index 57a590c87179a..b34eea5aa226d 100644
--- a/app/code/Magento/Ui/view/frontend/web/js/view/messages.js
+++ b/app/code/Magento/Ui/view/frontend/web/js/view/messages.js
@@ -10,7 +10,8 @@ define([
     'ko',
     'jquery',
     'uiComponent',
-    '../model/messageList'
+    '../model/messageList',
+    'jquery-ui-modules/effect-blind'
 ], function (ko, $, Component, globalMessages) {
     'use strict';
 
@@ -19,6 +20,8 @@ define([
             template: 'Magento_Ui/messages',
             selector: '[data-role=checkout-messages]',
             isHidden: false,
+            hideTimeout: 5000,
+            hideSpeed: 500,
             listens: {
                 isHidden: 'onHiddenChange'
             }
@@ -62,13 +65,11 @@ define([
          * @param {Boolean} isHidden
          */
         onHiddenChange: function (isHidden) {
-            var self = this;
-
             // Hide message block if needed
             if (isHidden) {
                 setTimeout(function () {
-                    $(self.selector).hide('blind', {}, 500);
-                }, 5000);
+                    $(this.selector).hide('blind', {}, this.hideSpeed);
+                }.bind(this), this.hideTimeout);
             }
         }
     });
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 5320aeb5bcc8a..9e33b86ea8215 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -9,7 +9,6 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Async\CallbackDeferred;
-use Magento\Framework\Async\ProxyDeferredFactory;
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\HTTP\AsyncClient\HttpResponseDeferredInterface;
@@ -22,6 +21,7 @@
 use Magento\Shipping\Model\Carrier\AbstractCarrierOnline;
 use Magento\Shipping\Model\Carrier\CarrierInterface;
 use Magento\Shipping\Model\Rate\Result;
+use Magento\Shipping\Model\Rate\Result\ProxyDeferredFactory;
 use Magento\Shipping\Model\Simplexml\Element;
 use Magento\Ups\Helper\Config;
 use Magento\Shipping\Model\Shipment\Request as Shipment;
@@ -239,15 +239,16 @@ public function collectRates(RateRequest $request)
         //To use the correct result in the callback.
         $this->_result = $result = $this->_getQuotes();
 
-        return $this->deferredProxyFactory->createFor(
-            Result::class,
-            new CallbackDeferred(
-                function () use ($request, $result) {
-                    $this->_result = $result;
-                    $this->_updateFreeMethodQuote($request);
-                    return $this->getResult();
-                }
-            )
+        return $this->deferredProxyFactory->create(
+            [
+                'deferred' => new CallbackDeferred(
+                    function () use ($request, $result) {
+                        $this->_result = $result;
+                        $this->_updateFreeMethodQuote($request);
+                        return $this->getResult();
+                    }
+                )
+            ]
         );
     }
 
@@ -782,19 +783,20 @@ protected function _getXmlQuotes()
             new Request($url, Request::METHOD_POST, ['Content-Type' => 'application/xml'], $xmlRequest)
         );
 
-        return $this->deferredProxyFactory->createFor(
-            Result::class,
-            new CallbackDeferred(
-                function () use ($httpResponse) {
-                    if ($httpResponse->get()->getStatusCode() >= 400) {
-                        $xmlResponse = '';
-                    } else {
-                        $xmlResponse = $httpResponse->get()->getBody();
-                    }
+        return $this->deferredProxyFactory->create(
+            [
+                'deferred' => new CallbackDeferred(
+                    function () use ($httpResponse) {
+                        if ($httpResponse->get()->getStatusCode() >= 400) {
+                            $xmlResponse = '';
+                        } else {
+                            $xmlResponse = $httpResponse->get()->getBody();
+                        }
 
-                    return $this->_parseXmlResponse($xmlResponse);
-                }
-            )
+                        return $this->_parseXmlResponse($xmlResponse);
+                    }
+                )
+            ]
         );
     }
 
@@ -1099,6 +1101,7 @@ protected function _getXmlTracking($trackings)
             $xmlRequest = <<<XMLAuth
 <?xml version="1.0" ?>
 <TrackRequest xml:lang="en-US">
+    <IncludeMailInnovationIndicator/>
     <Request>
         <RequestAction>Track</RequestAction>
         <RequestOption>1</RequestOption>
diff --git a/app/code/Magento/Ups/Model/Config/Backend/UpsUrl.php b/app/code/Magento/Ups/Model/Config/Backend/UpsUrl.php
new file mode 100644
index 0000000000000..9db35b6a42dcc
--- /dev/null
+++ b/app/code/Magento/Ups/Model/Config/Backend/UpsUrl.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ups\Model\Config\Backend;
+
+use Magento\Framework\App\Config\Value;
+use Magento\Framework\Exception\ValidatorException;
+
+/**
+ * Represents a config URL that may point to a UPS endpoint
+ */
+class UpsUrl extends Value
+{
+    /**
+     * @inheritdoc
+     */
+    public function beforeSave()
+    {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $host = parse_url((string)$this->getValue(), \PHP_URL_HOST);
+
+        if (!empty($host) && !preg_match('/(?:.+\.|^)ups\.com$/i', $host)) {
+            throw new ValidatorException(__('UPS API endpoint URL\'s must use ups.com'));
+        }
+
+        return parent::beforeSave();
+    }
+}
diff --git a/app/code/Magento/Ups/Test/Unit/Model/Config/Backend/UpsUrlTest.php b/app/code/Magento/Ups/Test/Unit/Model/Config/Backend/UpsUrlTest.php
new file mode 100644
index 0000000000000..149f9378889f8
--- /dev/null
+++ b/app/code/Magento/Ups/Test/Unit/Model/Config/Backend/UpsUrlTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ups\Test\Unit\Model\Config\Backend;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Ups\Model\Config\Backend\UpsUrl;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Verify behavior of UpsUrl backend type
+ */
+class UpsUrlTest extends TestCase
+{
+
+    /**
+     * @var UpsUrl
+     */
+    private $config;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        /** @var UpsUrl $upsUrl */
+        $this->config = $objectManager->getObject(UpsUrl::class);
+    }
+
+    /**
+     * @dataProvider validDataProvider
+     * @param string $data The valid data
+     */
+    public function testBeforeSave($data = null)
+    {
+        $this->config->setValue($data);
+        $this->config->beforeSave();
+    }
+
+    /**
+     * @dataProvider invalidDataProvider
+     * @param string $data The invalid data
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @expectedExceptionMessage UPS API endpoint URL's must use ups.com
+     */
+    public function testBeforeSaveErrors($data)
+    {
+        $this->config->setValue($data);
+        $this->config->beforeSave();
+    }
+
+    public function validDataProvider()
+    {
+        return [
+            [],
+            [null],
+            [''],
+            ['http://ups.com'],
+            ['https://foo.ups.com'],
+            ['http://foo.ups.com/foo/bar?baz=bash&fizz=buzz'],
+        ];
+    }
+
+    public function invalidDataProvider()
+    {
+        return [
+            ['http://upsfoo.com'],
+            ['https://fooups.com'],
+            ['https://ups.com.fake.com'],
+            ['https://ups.info'],
+            ['http://ups.com.foo.com/foo/bar?baz=bash&fizz=buzz'],
+            ['http://fooups.com/foo/bar?baz=bash&fizz=buzz'],
+        ];
+    }
+}
diff --git a/app/code/Magento/Ups/etc/adminhtml/system.xml b/app/code/Magento/Ups/etc/adminhtml/system.xml
index f1b8b22820cba..c6a2516e96170 100644
--- a/app/code/Magento/Ups/etc/adminhtml/system.xml
+++ b/app/code/Magento/Ups/etc/adminhtml/system.xml
@@ -56,9 +56,11 @@
                 </field>
                 <field id="gateway_url" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Gateway URL</label>
+                    <backend_model>Magento\Ups\Model\Config\Backend\UpsUrl</backend_model>
                 </field>
                 <field id="gateway_xml_url" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Gateway XML URL</label>
+                    <backend_model>Magento\Ups\Model\Config\Backend\UpsUrl</backend_model>
                 </field>
                 <field id="handling_type" translate="label" type="select" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Calculate Handling Fee</label>
@@ -104,6 +106,7 @@
                 </field>
                 <field id="tracking_xml_url" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Tracking XML URL</label>
+                    <backend_model>Magento\Ups\Model\Config\Backend\UpsUrl</backend_model>
                 </field>
                 <field id="type" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>UPS Type</label>
@@ -131,7 +134,7 @@
                 <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>
+                    <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>
diff --git a/app/code/Magento/Ups/i18n/en_US.csv b/app/code/Magento/Ups/i18n/en_US.csv
index baf8ecc855440..68dd34a313bd9 100644
--- a/app/code/Magento/Ups/i18n/en_US.csv
+++ b/app/code/Magento/Ups/i18n/en_US.csv
@@ -114,3 +114,4 @@ Title,Title
 Mode,Mode
 "This enables or disables SSL verification of the Magento server by UPS.","This enables or disables SSL verification of the Magento server by UPS."
 Debug,Debug
+"UPS API endpoint URL's must use ups.com","UPS API endpoint URL's must use ups.com"
diff --git a/app/code/Magento/UrlRewrite/Controller/Router.php b/app/code/Magento/UrlRewrite/Controller/Router.php
index 47718ba36316b..dd26f49b8efa4 100644
--- a/app/code/Magento/UrlRewrite/Controller/Router.php
+++ b/app/code/Magento/UrlRewrite/Controller/Router.php
@@ -5,15 +5,16 @@
  */
 namespace Magento\UrlRewrite\Controller;
 
+use Magento\Framework\App\Action\Redirect;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\Response\Http as HttpResponse;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\UrlInterface;
 use Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 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
@@ -73,11 +74,12 @@ public function __construct(
      *
      * @param RequestInterface|HttpRequest $request
      * @return ActionInterface|null
+     * @throws NoSuchEntityException
      */
     public function match(RequestInterface $request)
     {
         $rewrite = $this->getRewrite(
-            $this->getNormalizedPathInfo($request),
+            $request->getPathInfo(),
             $this->storeManager->getStore()->getId()
         );
 
@@ -153,30 +155,4 @@ protected function getRewrite($requestPath, $storeId)
             ]
         );
     }
-
-    /**
-     * Get normalized request path
-     *
-     * @param RequestInterface|HttpRequest $request
-     * @return string
-     */
-    private function getNormalizedPathInfo(RequestInterface $request): string
-    {
-        $path = $request->getPathInfo();
-        /**
-         * If request contains query params then we need to trim a slash in end of the path.
-         * For example:
-         * the original request is: http://my-host.com/category-url-key.html/?color=black
-         * where the original path is: category-url-key.html/
-         * and the result path will be: category-url-key.html
-         *
-         * It need to except a redirect like this:
-         * http://my-host.com/category-url-key.html/?color=black => http://my-host.com/category-url-key.html
-         */
-        if (!empty($path) && $request->getQuery()->count()) {
-            $path = rtrim($path, '/');
-        }
-
-        return (string)$path;
-    }
 }
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminCreateNewUrlRewriteForCmsPageActionGroup.xml b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminCreateNewUrlRewriteForCmsPageActionGroup.xml
new file mode 100644
index 0000000000000..143198e4a1faa
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminCreateNewUrlRewriteForCmsPageActionGroup.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="AdminCreateNewUrlRewriteForCmsPageActionGroup">
+        <annotations>
+            <description>Select "For Csm Page" URL Rewrite type</description>
+        </annotations>
+        <arguments>
+            <argument name="customUrlRewriteValue" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminUrlRewriteEditSection.createCustomUrlRewrite}}" stepKey="clickOnCustomUrlRewrite"/>
+        <click selector="{{AdminUrlRewriteEditSection.createCustomUrlRewriteValue('customUrlRewriteValue')}}" stepKey="selectForCsmPage"/>
+        <waitForPageLoad stepKey="waitForCategoryEditSectionToLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminFillNewCmsPageUrlRewriteFormActionGroup.xml b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminFillNewCmsPageUrlRewriteFormActionGroup.xml
new file mode 100644
index 0000000000000..0c540d0698dd8
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminFillNewCmsPageUrlRewriteFormActionGroup.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="AdminFillNewCmsPageUrlRewriteFormActionGroup">
+        <annotations>
+            <description>Fills in the provided URL details. Clicks on Save.</description>
+        </annotations>
+        <arguments>
+            <argument name="storeValue" type="string"/>
+            <argument name="requestPath" type="string"/>
+            <argument name="redirectTypeValue" type="string"/>
+            <argument name="description" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminUrlRewriteEditSection.store}}" stepKey="clickOnStore"/>
+        <click selector="{{AdminUrlRewriteEditSection.storeValue('storeValue')}}" stepKey="clickOnStoreValue"/>
+        <fillField selector="{{AdminUrlRewriteEditSection.requestPath}}" userInput="{{requestPath}}" stepKey="fillRequestPath"/>
+        <click selector="{{AdminUrlRewriteEditSection.redirectType}}" stepKey="selectRedirectType"/>
+        <click selector="{{AdminUrlRewriteEditSection.redirectTypeValue('redirectTypeValue')}}" stepKey="clickOnRedirectTypeValue"/>
+        <fillField selector="{{AdminUrlRewriteEditSection.description}}" userInput="{{description}}" stepKey="fillDescription"/>
+        <click selector="{{AdminUrlRewriteEditSection.saveButton}}" stepKey="clickOnSaveButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminGoToAddNewUrlRewritePageActionGroup.xml b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminGoToAddNewUrlRewritePageActionGroup.xml
new file mode 100644
index 0000000000000..e0e8df47852d6
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminGoToAddNewUrlRewritePageActionGroup.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="AdminGoToAddNewUrlRewritePageActionGroup">
+        <annotations>
+            <description>Goes to the Admin Add URL Rewrite edit page</description>
+        </annotations>
+
+        <amOnPage url="{{AdminUrlRewriteEditPage.url}}" stepKey="openUrlRewriteEditPage"/>
+        <waitForPageLoad stepKey="waitForUrlRewriteEditPageToLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminSelectCmsPageFromGridForNewUrlRewriteActionGroup.xml b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminSelectCmsPageFromGridForNewUrlRewriteActionGroup.xml
new file mode 100644
index 0000000000000..2713e3937469b
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminSelectCmsPageFromGridForNewUrlRewriteActionGroup.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="AdminSelectCmsPageFromGridForNewUrlRewriteActionGroup">
+        <annotations>
+            <description>Select Cms Page for URL Rewrite from the grid</description>
+        </annotations>
+        <arguments>
+            <argument name="cmsPageUrlKey" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminUrlRewriteEditSection.cmsPage('cmsPageUrlKey')}}"  stepKey="selectCmsPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml
index d3e9509f1ef00..4f89c9389c32b 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminUrlRewriteActionGroup.xml
@@ -22,20 +22,18 @@
         </arguments>
 
         <amOnPage url="{{AdminUrlRewriteEditPage.url}}" stepKey="openUrlRewriteEditPage"/>
-        <waitForPageLoad stepKey="waitForUrlRewriteEditPageToLoad"/>
-        <click selector="{{AdminUrlRewriteEditSection.createCustomUrlRewrite}}" stepKey="clickOnCustonUrlRewrite"/>
-        <click selector="{{AdminUrlRewriteEditSection.createCustomUrlRewriteValue('customUrlRewriteValue')}}" stepKey="selectForCategory"/>
-        <waitForPageLoad stepKey="waitForCategoryEditSectionToLoad"/>
-        <click selector="{{AdminUrlRewriteEditSection.categoryInTree($$category.name$$)}}"  stepKey="selectCategoryInTree"/>
-        <waitForPageLoad stepKey="waitForPageToLoad"/>
-        <click selector="{{AdminUrlRewriteEditSection.store}}" stepKey="clickOnStore"/>
-        <click selector="{{AdminUrlRewriteEditSection.storeValue('storeValue')}}" stepKey="clickOnStoreValue"/>
-        <fillField selector="{{AdminUrlRewriteEditSection.requestPath}}" userInput="{{requestPath}}" stepKey="fillRequestPath"/>
-        <click selector="{{AdminUrlRewriteEditSection.redirectType}}" stepKey="selectRedirectType"/>
-        <click selector="{{AdminUrlRewriteEditSection.redirectTypeValue('redirectTypeValue')}}" stepKey="clickOnRedirectTypeValue"/>
-        <fillField selector="{{AdminUrlRewriteEditSection.description}}" userInput="{{description}}" stepKey="fillDescription"/>
-        <click selector="{{AdminUrlRewriteEditSection.saveButton}}" stepKey="clickOnSaveButton"/>
-        <seeElement selector="{{AdminUrlRewriteIndexSection.successMessage}}" stepKey="seeSuccessSaveMessage"/>
+        <waitForElementVisible selector="{{AdminUrlRewriteEditSection.createCustomUrlRewrite}}" stepKey="waitForCreateUrlRewriteVisible"/>
+        <selectOption selector="{{AdminUrlRewriteEditSection.createCustomUrlRewrite}}" userInput="{{customUrlRewriteValue}}" stepKey="selectUrlRewriteTypeOption"/>
+        <waitForElementVisible selector="{{AdminUrlRewriteEditSection.categoryInTree(category)}}" stepKey="waitForCategoryInTreeVisible"/>
+        <click selector="{{AdminUrlRewriteEditSection.categoryInTree(category)}}" stepKey="clickOnCategoryInTree"/>
+        <waitForElementVisible selector="{{AdminUrlRewriteEditSection.store}}" stepKey="waitForStoreSelectVisible"/>
+        <selectOption selector="{{AdminUrlRewriteEditSection.store}}" userInput="{{storeValue}}" stepKey="selectStoreOption"/>
+        <fillField selector="{{AdminUrlRewriteEditSection.requestPath}}" userInput="{{requestPath}}" stepKey="fillRequestPathField"/>
+        <selectOption selector="{{AdminUrlRewriteEditSection.redirectType}}" userInput="{{redirectTypeValue}}" stepKey="selectRedirectType"/>
+        <fillField selector="{{AdminUrlRewriteEditSection.description}}" userInput="{{description}}" stepKey="fillDescriptionField"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveButton"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The URL Rewrite has been saved." stepKey="seeSuccessMessage"/>
     </actionGroup>
 
     <actionGroup name="AdminAddUrlRewriteForProduct">
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteEditSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteEditSection.xml
index 52939607f5377..5a55562e99334 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteEditSection.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteEditSection.xml
@@ -19,6 +19,7 @@
         <element name="redirectTypeValue" type="select" selector="//select[@id='redirect_type']//option[contains(., '{{Var}}')]" parameterized="true"/>
         <element name="description" type="input" selector="#description"/>
         <element name="categoryInTree" type="text" selector="//li[contains(@class,'active-category jstree-open')]/a[contains(., '{{categoryName}}')]" parameterized="true"/>
+        <element name="cmsPage" selector="//td[contains(text(), '{{cmsPageUrlKey}}')]" type="button" parameterized="true"/>
         <element name="saveButton" type="button" selector="#save" timeout="30"/>
         <element name="deleteButton" type="button" selector="#delete" timeout="30"/>
         <element name="okButton" type="button" selector="//button[@class='action-primary action-accept']" timeout="30"/>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
index 44fad061d7656..121fd7c736dcc 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
@@ -18,7 +18,16 @@
             <group value="urlRewrite"/>
         </annotations>
         <before>
+            <createData entity="ApiCategory" stepKey="createCategory">
+                <field key="name">category-admin</field>
+            </createData>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminDeleteStoreViewIfExistsActionGroup" stepKey="deleteENStoreViewIfExists">
+                <argument name="storeViewName" value="{{customStoreENNotUnique.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewIfExistsActionGroup" stepKey="deleteNLStoreViewIfExists">
+                <argument name="storeViewName" value="{{customStoreNLNotUnique.name}}"/>
+            </actionGroup>
             <!-- Create Store View EN -->
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewEn">
                 <argument name="customStore" value="customStoreENNotUnique"/>
@@ -27,23 +36,21 @@
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewNl">
                 <argument name="customStore" value="customStoreNLNotUnique"/>
             </actionGroup>
-            <createData entity="ApiCategory" stepKey="createCategory">
-                <field key="name">category-admin</field>
-            </createData>
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminDeleteStoreViewIfExistsActionGroup" stepKey="deleteStoreViewEn">
+                <argument name="storeViewName" value="{{customStoreENNotUnique.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewIfExistsActionGroup" stepKey="deleteStoreViewNl">
+                <argument name="storeViewName" value="{{customStoreNLNotUnique.name}}"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearStoreFilters"/>
             <actionGroup ref="deleteProductByName" stepKey="deleteImportedProduct">
                 <argument name="sku" value="productformagetwo68980"/>
                 <argument name="name" value="productformagetwo68980"/>
             </actionGroup>
             <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFiltersIfSet"/>
-            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
-                <argument name="customStore" value="customStoreENNotUnique"/>
-            </actionGroup>
-            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewNl">
-                <argument name="customStore" value="customStoreNLNotUnique"/>
-            </actionGroup>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="switchCategoryStoreView" stepKey="switchToStoreViewEn">
@@ -72,11 +79,11 @@
         <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Add/Update" stepKey="selectAddUpdateOption"/>
         <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="import_updated.csv" stepKey="attachFileForImport"/>
         <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
-        <see selector="{{AdminMessagesSection.notice}}" userInput="Checked rows: 3, checked entities: 1, invalid rows: 0, total errors: 0" stepKey="assertNotice"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="File is valid! To start import process press &quot;Import&quot; button" stepKey="assertSuccessMessage"/>
+        <see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="Checked rows: 3, checked entities: 1, invalid rows: 0, total errors: 0" stepKey="assertNotice"/>
+        <see selector="{{AdminImportValidationMessagesSection.success}}" userInput="File is valid! To start import process press &quot;Import&quot; button" stepKey="assertSuccessMessage"/>
         <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage1"/>
-        <see selector="{{AdminMessagesSection.notice}}" userInput="Created: 1, Updated: 0, Deleted: 0" stepKey="assertNotice1"/>
+        <see selector="{{AdminImportValidationMessagesSection.success}}" userInput="Import successfully done" stepKey="assertSuccessMessage1"/>
+        <see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="Created: 1, Updated: 0, Deleted: 0" stepKey="assertNotice1"/>
         <actionGroup ref="SearchForProductOnBackendByNameActionGroup" stepKey="searchForProductOnBackend">
             <argument name="productName" value="productformagetwo68980"/>
         </actionGroup>
@@ -130,8 +137,16 @@
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="enableGenerateUrlRewrite"/>
             <!--Flush cache-->
             <magentoCLI command="cache:flush" stepKey="cleanCache1"/>
-
+            <createData entity="ApiCategory" stepKey="createCategory">
+                <field key="name">category-admin</field>
+            </createData>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminDeleteStoreViewIfExistsActionGroup" stepKey="deleteENStoreViewIfExists">
+                <argument name="storeViewName" value="{{customStoreENNotUnique.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewIfExistsActionGroup" stepKey="deleteNLStoreViewIfExists">
+                <argument name="storeViewName" value="{{customStoreNLNotUnique.name}}"/>
+            </actionGroup>
             <!-- Create Store View EN -->
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewEn">
                 <argument name="customStore" value="customStoreENNotUnique"/>
@@ -140,10 +155,6 @@
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewNl">
                 <argument name="customStore" value="customStoreNLNotUnique"/>
             </actionGroup>
-            <createData entity="ApiCategory" stepKey="createCategory">
-                <field key="name">category-admin</field>
-            </createData>
-
             <!-- Set the configuration for Generate "category/product" URL Rewrites to No-->
             <comment userInput="Disable SEO configuration setting to generate category/product URL Rewrites" stepKey="commentDisableUrlRewriteConfig" />
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 0" stepKey="disableGenerateUrlRewrite"/>
@@ -152,17 +163,18 @@
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminDeleteStoreViewIfExistsActionGroup" stepKey="deleteStoreViewEn">
+                <argument name="storeViewName" value="{{customStoreENNotUnique.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewIfExistsActionGroup" stepKey="deleteStoreViewNl">
+                <argument name="storeViewName" value="{{customStoreNLNotUnique.name}}"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearStoreGridFilters"/>
             <actionGroup ref="deleteProductByName" stepKey="deleteImportedProduct">
                 <argument name="sku" value="productformagetwo68980"/>
                 <argument name="name" value="productformagetwo68980"/>
             </actionGroup>
             <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFiltersIfSet"/>
-            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
-                <argument name="customStore" value="customStoreENNotUnique"/>
-            </actionGroup>
-            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewNl">
-                <argument name="customStore" value="customStoreNLNotUnique"/>
-            </actionGroup>
             <actionGroup ref="logout" stepKey="logout"/>
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="resetConfigurationSetting"/>
             <!--Flush cache-->
@@ -194,11 +206,11 @@
         <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Add/Update" stepKey="selectAddUpdateOption"/>
         <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="import_updated.csv" stepKey="attachFileForImport"/>
         <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
-        <see selector="{{AdminMessagesSection.notice}}" userInput="Checked rows: 3, checked entities: 1, invalid rows: 0, total errors: 0" stepKey="assertNotice"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="File is valid! To start import process press &quot;Import&quot; button" stepKey="assertSuccessMessage"/>
+        <see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="Checked rows: 3, checked entities: 1, invalid rows: 0, total errors: 0" stepKey="assertNotice"/>
+        <see selector="{{AdminImportValidationMessagesSection.success}}" userInput="File is valid! To start import process press &quot;Import&quot; button" stepKey="assertSuccessMessage"/>
         <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage1"/>
-        <see selector="{{AdminMessagesSection.notice}}" userInput="Created: 1, Updated: 0, Deleted: 0" stepKey="assertNotice1"/>
+        <see selector="{{AdminImportValidationMessagesSection.success}}" userInput="Import successfully done" stepKey="assertSuccessMessage1"/>
+        <see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="Created: 1, Updated: 0, Deleted: 0" stepKey="assertNotice1"/>
         <actionGroup ref="SearchForProductOnBackendByNameActionGroup" stepKey="searchForProductOnBackend">
             <argument name="productName" value="productformagetwo68980"/>
         </actionGroup>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategoryTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategoryTest.xml
index 52dce4d67f698..7b901658faa4a 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategoryTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategoryTest.xml
@@ -34,6 +34,10 @@
 
             <!--Create additional Store View in Main Website Store -->
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView"/>
+
+            <!-- Reindex and flush the cache -->
+            <magentoCLI command="indexer:reindex" stepKey="runReindex"/>
+            <magentoCLI command="cache:flush" stepKey="cleanCache"/>
         </before>
         <after>
             <deleteData createDataKey="createFirstCategory" stepKey="deleteFirstCategory"/>
@@ -76,7 +80,6 @@
         <!-- Assert category url with custom store view -->
         <amOnPage url="{{StorefrontHomePage.url}}$$createSecondCategory.name$$/{{SimpleRootSubCategory.url_key}}.html" stepKey="amOnCategoryPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-        <dontSee userInput="$$createSecondSimpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
-        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
+        <see userInput="$$createFirstSimpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="seeProductInCategory"/>
     </test>
 </tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddNoRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddNoRedirectTest.xml
index a7a7c0c73d826..85e9d7847d5ea 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddNoRedirectTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddNoRedirectTest.xml
@@ -29,7 +29,7 @@
         <!--Open Url Rewrite Index Page and update the Custom Url Rewrite, Store, Request Path, Redirect Type and Description -->
         <actionGroup ref="AdminAddUrlRewrite" stepKey="addUrlRewrite">
             <argument name="category" value="$$category.name$$"/>
-            <argument name="customUrlRewriteValue" value="For Category'"/>
+            <argument name="customUrlRewriteValue" value="For Category"/>
             <argument name="storeValue" value="Default Store View"/>
             <argument name="requestPath" value="newrequestpath.html"/>
             <argument name="redirectTypeValue" value="No"/>
@@ -49,4 +49,4 @@
             <argument name="targetPath" value="catalog/category/view/id/{$categoryId}"/>
         </actionGroup>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddPermanentRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddPermanentRedirectTest.xml
index 974550bb92214..477742e7e3618 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddPermanentRedirectTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddPermanentRedirectTest.xml
@@ -29,7 +29,7 @@
         <!--Open Url Rewrite Index Page and update the Custom Url Rewrite, Store, Request Path, Redirect Type and Description -->
         <actionGroup ref="AdminAddUrlRewrite" stepKey="addUrlRewrite">
             <argument name="category" value="$$category.name$$"/>
-            <argument name="customUrlRewriteValue" value="For Category'"/>
+            <argument name="customUrlRewriteValue" value="For Category"/>
             <argument name="storeValue" value="Default Store View"/>
             <argument name="requestPath" value="newrequestpath.html"/>
             <argument name="redirectTypeValue" value="Permanent (301)"/>
@@ -49,4 +49,4 @@
             <argument name="newRequestPath" value="newrequestpath.html"/>
         </actionGroup>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml
index c64019ea38acc..2367c3d982d15 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateCategoryUrlRewriteAndAddTemporaryRedirectTest.xml
@@ -29,7 +29,7 @@
         <!--Open Url Rewrite Index Page and update the Custom Url Rewrite, Store, Request Path, Redirect Type and Description -->
         <actionGroup ref="AdminAddUrlRewrite" stepKey="addUrlRewrite">
             <argument name="category" value="$$category.name$$"/>
-            <argument name="customUrlRewriteValue" value="For Category'"/>
+            <argument name="customUrlRewriteValue" value="For Category"/>
             <argument name="storeValue" value="Default Store View"/>
             <argument name="requestPath" value="newrequestpath.html"/>
             <argument name="redirectTypeValue" value="Temporary (302)"/>
@@ -49,4 +49,4 @@
             <argument name="newRequestPath" value="newrequestpath.html"/>
         </actionGroup>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCategoryUrlRewriteHypenAsRequestPathTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCategoryUrlRewriteHypenAsRequestPathTest.xml
new file mode 100644
index 0000000000000..5a05dab7aa707
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCategoryUrlRewriteHypenAsRequestPathTest.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="AdminDeleteCategoryUrlRewriteHypenAsRequestPathTest">
+        <annotations>
+            <features value="UrlRewrite" />
+            <stories value="Delete custom URL rewrite"/>
+            <title value="Delete category URL rewrite, hyphen as request path"/>
+            <description value="Delete category URL rewrite, hyphen as request path"/>
+            <testCaseId value="MC-5348" />
+            <group value="urlRewrite"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="_defaultCategory" stepKey="category"/>
+        </before>
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create the Category Url Rewrite-->
+        <actionGroup ref="AdminAddUrlRewrite" stepKey="addUrlRewrite">
+            <argument name="category" value="$$category.name$$"/>
+            <argument name="customUrlRewriteValue" value="For Category"/>
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="-"/>
+            <argument name="redirectTypeValue" value="No"/>
+            <argument name="description" value="End To End Test"/>
+        </actionGroup>
+
+        <!--Delete the Category Url Rewrite-->
+        <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
+            <argument name="requestPath" value="-"/>
+        </actionGroup>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
+            <argument name="message" value="You deleted the URL rewrite."/>
+        </actionGroup>
+
+        <!--Verify AssertPageByUrlRewriteIsNotFound-->
+        <actionGroup ref="AssertPageByUrlRewriteIsNotFound" stepKey="checkUrlOnFrontend">
+            <argument name="requestPath" value="-"/>
+        </actionGroup>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCategoryUrlRewriteWithRequestPathTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCategoryUrlRewriteWithRequestPathTest.xml
new file mode 100644
index 0000000000000..e94e10767c632
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCategoryUrlRewriteWithRequestPathTest.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="AdminDeleteCategoryUrlRewriteWithRequestPathTest">
+        <annotations>
+            <features value="UrlRewrite" />
+            <stories value="Delete custom URL rewrite"/>
+            <title value="Delete category URL rewrite, with request path"/>
+            <description value="Delete category URL rewrite, with request path"/>
+            <testCaseId value="MC-5349" />
+            <group value="urlRewrite"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="_defaultCategory" stepKey="category"/>
+        </before>
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create the Category Url Rewrite-->
+        <actionGroup ref="AdminAddUrlRewrite" stepKey="addUrlRewriteSecondTime">
+            <argument name="category" value="$$category.name$$"/>
+            <argument name="customUrlRewriteValue" value="For Category"/>
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="newrequestpath.html"/>
+            <argument name="redirectTypeValue" value="No"/>
+            <argument name="description" value="End To End Test"/>
+        </actionGroup>
+
+        <!--Delete the Category Url Rewrite-->
+        <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewriteSecondTime">
+            <argument name="requestPath" value="newrequestpath.html"/>
+        </actionGroup>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessageSecondTime">
+            <argument name="message" value="You deleted the URL rewrite."/>
+        </actionGroup>
+
+        <!--Verify AssertPageByUrlRewriteIsNotFound-->
+        <actionGroup ref="AssertPageByUrlRewriteIsNotFound" stepKey="checkUrlOnFrontendSecondTime">
+            <argument name="requestPath" value="newrequestpath.html"/>
+        </actionGroup>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCmsPageUrlRewriteWithNoRedirectsTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCmsPageUrlRewriteWithNoRedirectsTest.xml
new file mode 100644
index 0000000000000..b6cd116956812
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCmsPageUrlRewriteWithNoRedirectsTest.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="AdminDeleteCmsPageUrlRewriteWithNoRedirectsTest">
+        <annotations>
+            <stories value="Delete CMS Page URL rewrite with No Redirects"/>
+            <title value="Delete CMS Page URL rewrite with No Redirects"/>
+            <description value="Log in to admin and delete CMS Page URL rewrite with No Redirects"/>
+            <testCaseId value="MC-14648"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="simpleCmsPage" stepKey="createCMSPage"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <actionGroup ref="AdminGoToAddNewUrlRewritePageActionGroup" stepKey="openUrlRewriteEditPage"/>
+        <actionGroup ref="AdminCreateNewUrlRewriteForCmsPageActionGroup" stepKey="selectForCsmPageType">
+            <argument name="customUrlRewriteValue" value="For CMS page'"/>
+        </actionGroup>
+        <actionGroup ref="AdminSelectCmsPageFromGridForNewUrlRewriteActionGroup" stepKey="selectCmsPge">
+            <argument name="cmsPageUrlKey" value="$$createCMSPage.identifier$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminFillNewCmsPageUrlRewriteFormActionGroup" stepKey="fillTheForm">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="newrequestpath"/>
+            <argument name="redirectTypeValue" value="No"/>
+            <argument name="description" value="cms_default_no_redirect"/>
+        </actionGroup>
+
+        <!--Delete the URL Rewrite for CMS Page with No redirects-->
+        <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
+            <argument name="requestPath" value="newrequestpath"/>
+        </actionGroup>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
+            <argument name="message" value="You deleted the URL rewrite."/>
+        </actionGroup>
+
+        <!--Search and verify AssertUrlRewriteNotInGrid-->
+        <actionGroup ref="AdminSearchDeletedUrlRewrite" stepKey="searchDeletedUrlRewriteInGrid">
+            <argument name="requestPath" value="newrequestpath"/>
+        </actionGroup>
+
+        <!--Verify AssertPageByUrlRewriteIsNotFound-->
+        <actionGroup ref="AssertPageByUrlRewriteIsNotFound" stepKey="assertPageByUrlRewriteIsNotFound">
+            <argument name="requestPath" value="newrequestpath"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCmsPageUrlRewriteWithPermanentRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCmsPageUrlRewriteWithPermanentRedirectTest.xml
new file mode 100644
index 0000000000000..1f76493bac89c
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCmsPageUrlRewriteWithPermanentRedirectTest.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="AdminDeleteCmsPageUrlRewriteWithPermanentRedirectTest">
+        <annotations>
+            <stories value="Delete CMS Page URL rewrite with Permanent Redirect"/>
+            <title value="Delete CMS Page URL rewrite with Permanent Redirect"/>
+            <description value="Log in to admin and delete CMS Page URL rewrite with Permanent Redirect"/>
+            <testCaseId value="MC-14649"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="simpleCmsPage" stepKey="createCMSPage"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <actionGroup ref="AdminGoToAddNewUrlRewritePageActionGroup" stepKey="openUrlRewriteEditPage"/>
+        <actionGroup ref="AdminCreateNewUrlRewriteForCmsPageActionGroup" stepKey="selectForCsmPageType">
+            <argument name="customUrlRewriteValue" value="For CMS page'"/>
+        </actionGroup>
+        <actionGroup ref="AdminSelectCmsPageFromGridForNewUrlRewriteActionGroup" stepKey="selectCmsPge">
+            <argument name="cmsPageUrlKey" value="$$createCMSPage.identifier$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminFillNewCmsPageUrlRewriteFormActionGroup" stepKey="fillTheForm">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="permanentrequestpath.html"/>
+            <argument name="redirectTypeValue" value="Permanent (301)"/>
+            <argument name="description" value="cms_default_permanent_redirect"/>
+        </actionGroup>
+
+        <!-- Delete the URL Rewrite for CMS Page with permanent redirect-->
+        <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deletePermanentUrlRewrite">
+            <argument name="requestPath" value="permanentrequestpath.html"/>
+        </actionGroup>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
+            <argument name="message" value="You deleted the URL rewrite."/>
+        </actionGroup>
+
+        <!-- Verify AssertPageByUrlRewriteIsNotFound -->
+        <actionGroup ref="AssertPageByUrlRewriteIsNotFound" stepKey="assertPageByUrlRewriteIsNotFound">
+            <argument name="requestPath" value="permanentrequestpath.html"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCmsPageUrlRewriteWithTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCmsPageUrlRewriteWithTemporaryRedirectTest.xml
new file mode 100644
index 0000000000000..c62f0ece7e780
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminDeleteCmsPageUrlRewriteWithTemporaryRedirectTest.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="AdminDeleteCmsPageUrlRewriteWithTemporaryRedirectTest">
+        <annotations>
+            <stories value="Delete CMS Page URL rewrite with Temporary Redirect"/>
+            <title value="Delete CMS Page URL rewrite with Temporary Redirect"/>
+            <description value="Log in to admin and delete CMS Page URL rewrite with Temporary Redirect"/>
+            <testCaseId value="MC-14650"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="simpleCmsPage" stepKey="createCMSPage"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <actionGroup ref="AdminGoToAddNewUrlRewritePageActionGroup" stepKey="openUrlRewriteEditPage"/>
+        <actionGroup ref="AdminCreateNewUrlRewriteForCmsPageActionGroup" stepKey="selectForCsmPageType">
+            <argument name="customUrlRewriteValue" value="For CMS page'"/>
+        </actionGroup>
+        <actionGroup ref="AdminSelectCmsPageFromGridForNewUrlRewriteActionGroup" stepKey="selectCmsPge">
+            <argument name="cmsPageUrlKey" value="$$createCMSPage.identifier$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminFillNewCmsPageUrlRewriteFormActionGroup" stepKey="fillTheForm">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="temporaryrequestpath.html"/>
+            <argument name="redirectTypeValue" value="Temporary (302)"/>
+            <argument name="description" value="cms_default_temporary_redirect"/>
+        </actionGroup>
+
+        <!-- Delete the URL Rewrite for CMS Page with with temporary redirect-->
+        <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteTemporaryUrlRewrite">
+            <argument name="requestPath" value="temporaryrequestpath.html"/>
+        </actionGroup>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
+            <argument name="message" value="You deleted the URL rewrite."/>
+        </actionGroup>
+
+        <!--Verify AssertPageByUrlRewriteIsNotFound-->
+        <actionGroup ref="AssertPageByUrlRewriteIsNotFound" stepKey="assertPageByUrlRewriteIsNotFound">
+            <argument name="requestPath" value="temporaryrequestpath.html"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCmsPageRewriteEntityWithNoRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCmsPageRewriteEntityWithNoRedirectTest.xml
new file mode 100644
index 0000000000000..81dedfea7a35e
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCmsPageRewriteEntityWithNoRedirectTest.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="AdminUpdateCmsPageRewriteEntityWithNoRedirectTest">
+        <annotations>
+            <stories value="Update CMS Page URL Redirect With No Redirect"/>
+            <title value="Update CMS Page URL Redirect With No Redirect"/>
+            <description value="Login as Admin and tried to update the created URL Rewrite for CMS page"/>
+            <group value="cMSContent"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="simpleCmsPage" stepKey="createCMSPage"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create Custom Store View-->
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView"/>
+
+        <!-- Open CMS Edit Page, Get the CMS ID and Modify Store View Option to All Store Views -->
+        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="cmsId" regex="#\/([0-9]*)?\/$#"/>
+        <actionGroup ref="AddStoreViewToCmsPage" stepKey="updateStoreViewForCmsPage">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+            <argument name="storeViewName" value="All Store Views"/>
+        </actionGroup>
+
+        <!--Create CMS Page URL Redirect-->
+        <actionGroup ref="AdminAddCustomUrlRewrite" stepKey="addCustomUrlRewrite">
+            <argument name="customUrlRewriteValue" value="Custom"/>
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="created-new-cms-page"/>
+            <argument name="redirectTypeValue" value="Permanent (301)"/>
+            <argument name="targetPath" value="cms/page/view/page_id/{$cmsId}"/>
+            <argument name="description" value="Created New CMS Page"/>
+        </actionGroup>
+
+         <!--Search created CMS page url rewrite in grid-->
+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="searchUrlRewrite">
+            <argument name="requestPath" value="created-new-cms-page"/>
+        </actionGroup>
+
+        <!-- Update URL Rewrite for CMS Page -->
+        <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateUrlRewriteFirstAttempt">
+            <argument name="storeValue" value="{{customStore.name}}"/>
+            <argument name="requestPath" value="newrequestpath"/>
+            <argument name="redirectTypeValue" value="No"/>
+            <argument name="description" value="test_description_custom_store"/>
+        </actionGroup>
+
+        <!-- Assert Url Rewrite Save Message -->
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
+            <argument name="message" value="The URL Rewrite has been saved."/>
+        </actionGroup>
+
+        <!-- Assert Url Rewrite Cms Page Redirect -->
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomepage"/>
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="storefrontSwitchToCustomStoreView">
+            <argument name="storeView" value="customStore"/>
+        </actionGroup>
+        <actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToTheStoreFront">
+            <argument name="page" value="newrequestpath"/>
+        </actionGroup>
+        <actionGroup ref="AssertStoreFrontCMSPage" stepKey="assertCMSPage">
+            <argument name="cmsTitle"  value="$$createCMSPage.title$$"/>
+            <argument name="cmsContent" value="$$createCMSPage.content$$"/>
+            <argument name="cmsContentHeading" value="$$createCMSPage.content_heading$$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
+            <argument name="requestPath" value="newrequestpath"/>
+        </actionGroup>
+        <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteCustomStoreView"/>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCmsPageRewriteEntityWithPermanentReirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCmsPageRewriteEntityWithPermanentReirectTest.xml
new file mode 100644
index 0000000000000..f073794896c2c
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCmsPageRewriteEntityWithPermanentReirectTest.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="AdminUpdateCmsPageRewriteEntityWithPermanentRedirectTest">
+        <annotations>
+            <stories value="Update CMS Page URL Redirect With Permanent Redirect"/>
+            <title value="Update CMS Page URL Redirect With Permanent Redirect"/>
+            <description value="Login as Admin and tried to update the created URL Rewrite for CMS page"/>
+            <group value="cMSContent"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="simpleCmsPage" stepKey="createCMSPage"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create Custom Store View-->
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView"/>
+
+        <!-- Open CMS Edit Page, Get the CMS ID and Modify Store View Option to All Store Views -->
+        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="cmsId" regex="#\/([0-9]*)?\/$#"/>
+        <actionGroup ref="AddStoreViewToCmsPage" stepKey="updateStoreViewForCmsPage">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+            <argument name="storeViewName" value="All Store Views"/>
+        </actionGroup>
+
+        <!--Create CMS Page URL Redirect-->
+        <actionGroup ref="AdminAddCustomUrlRewrite" stepKey="addCustomUrlRewrite">
+            <argument name="customUrlRewriteValue" value="Custom"/>
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="created-new-cms-page"/>
+            <argument name="redirectTypeValue" value="No"/>
+            <argument name="targetPath" value="cms/page/view/page_id/{$cmsId}"/>
+            <argument name="description" value="Created New CMS Page"/>
+        </actionGroup>
+
+        <!--Search created CMS page url rewrite in grid-->
+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="searchUrlRewrite">
+            <argument name="requestPath" value="created-new-cms-page"/>
+        </actionGroup>
+
+        <!-- Update URL Rewrite for CMS Page -->
+        <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateUrlRewrite">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="permanentrequestpath.htm"/>
+            <argument name="redirectTypeValue" value="Permanent (301)"/>
+            <argument name="description" value="test_description_301"/>
+        </actionGroup>
+
+        <!-- Assert Url Rewrite Save Message -->
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
+            <argument name="message" value="The URL Rewrite has been saved."/>
+        </actionGroup>
+
+        <!-- Assert Url Rewrite Cms Page Redirect -->
+        <actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToTheStoreFront">
+            <argument name="page" value="permanentrequestpath.htm"/>
+        </actionGroup>
+        <actionGroup ref="AssertStoreFrontCMSPage" stepKey="assertCMSPage">
+            <argument name="cmsTitle"  value="$$createCMSPage.title$$"/>
+            <argument name="cmsContent" value="$$createCMSPage.content$$"/>
+            <argument name="cmsContentHeading" value="$$createCMSPage.content_heading$$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
+            <argument name="requestPath" value="permanentrequestpath.htm"/>
+        </actionGroup>
+        <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteCustomStoreView"/>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCmsPageRewriteEntityWithTemporaryRedirectTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCmsPageRewriteEntityWithTemporaryRedirectTest.xml
new file mode 100644
index 0000000000000..8f04fe7cf9ab9
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCmsPageRewriteEntityWithTemporaryRedirectTest.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="AdminUpdateCmsPageRewriteEntityWithTemporaryRedirectTest">
+        <annotations>
+            <stories value="Update CMS Page URL Redirect With Temporary Redirect"/>
+            <title value="Update CMS Page URL Redirect With Temporary Redirect"/>
+            <description value="Login as Admin and tried to update the created URL Rewrite for CMS page"/>
+            <group value="cMSContent"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <createData entity="simpleCmsPage" stepKey="createCMSPage"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Create Custom Store View-->
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView"/>
+
+        <!-- Open CMS Edit Page, Get the CMS ID and Modify Store View Option to All Store Views -->
+        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+        <grabFromCurrentUrl stepKey="cmsId" regex="#\/([0-9]*)?\/$#"/>
+        <actionGroup ref="AddStoreViewToCmsPage" stepKey="updateStoreViewForCmsPage">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+            <argument name="storeViewName" value="All Store Views"/>
+        </actionGroup>
+
+        <!--Create CMS Page URL Redirect-->
+        <actionGroup ref="AdminAddCustomUrlRewrite" stepKey="addCustomUrlRewrite">
+            <argument name="customUrlRewriteValue" value="Custom"/>
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="created-new-cms-page"/>
+            <argument name="redirectTypeValue" value="Permanent (301)"/>
+            <argument name="targetPath" value="cms/page/view/page_id/{$cmsId}"/>
+            <argument name="description" value="Created New CMS Page"/>
+        </actionGroup>
+
+        <!--Search created CMS page url rewrite in grid-->
+        <actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="searchUrlRewrite">
+            <argument name="requestPath" value="created-new-cms-page"/>
+        </actionGroup>
+
+        <!-- Update URL Rewrite for CMS Page -->
+        <actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateUrlRewrite">
+            <argument name="storeValue" value="Default Store View"/>
+            <argument name="requestPath" value="temporaryrequestpath.html"/>
+            <argument name="redirectTypeValue" value="Temporary (302)"/>
+            <argument name="description" value="test description_302"/>
+        </actionGroup>
+
+        <!-- Assert Url Rewrite Save Message -->
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
+            <argument name="message" value="The URL Rewrite has been saved."/>
+        </actionGroup>
+
+        <!-- Assert Url Rewrite Cms Page Redirect -->
+        <actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToTheStoreFront">
+            <argument name="page" value="temporaryrequestpath.html"/>
+        </actionGroup>
+        <actionGroup ref="AssertStoreFrontCMSPage" stepKey="assertCMSPage">
+            <argument name="cmsTitle"  value="$$createCMSPage.title$$"/>
+            <argument name="cmsContent" value="$$createCMSPage.content$$"/>
+            <argument name="cmsContentHeading" value="$$createCMSPage.content_heading$$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
+            <argument name="requestPath" value="temporaryrequestpath.html"/>
+        </actionGroup>
+        <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteCustomStoreView"/>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
index 6eea8b962bf9f..c935b3c7ec4cb 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
@@ -351,54 +351,4 @@ public function testMatch()
 
         $this->router->match($this->request);
     }
-
-    /**
-     * Test to match corresponding URL Rewrite on request with query params
-     *
-     * @param string $originalRequestPath
-     * @param string $requestPath
-     * @param int $countOfQueryParams
-     * @dataProvider matchWithQueryParamsDataProvider
-     */
-    public function testMatchWithQueryParams(string $originalRequestPath, string $requestPath, int $countOfQueryParams)
-    {
-        $targetPath = 'target-path';
-
-        $this->storeManager->method('getStore')->willReturn($this->store);
-        $urlRewrite = $this->createMock(UrlRewrite::class);
-        $urlRewrite->method('getRedirectType')->willReturn(0);
-        $urlRewrite->method('getTargetPath')->willReturn($targetPath);
-        $urlRewrite->method('getRequestPath')->willReturn($requestPath);
-        $this->urlFinder->method('findOneByData')
-            ->with([UrlRewrite::REQUEST_PATH => $requestPath, UrlRewrite::STORE_ID => $this->store->getId()])
-            ->willReturn($urlRewrite);
-
-        $this->requestQuery->method('count')->willReturn($countOfQueryParams);
-        $this->request->method('getPathInfo')
-            ->willReturn($originalRequestPath);
-        $this->request->expects($this->once())
-            ->method('setPathInfo')
-            ->with('/' . $targetPath);
-        $this->request->expects($this->once())
-            ->method('setAlias')
-            ->with(UrlInterface::REWRITE_REQUEST_PATH_ALIAS, $requestPath);
-        $this->actionFactory->expects($this->once())
-            ->method('create')
-            ->with(Forward::class);
-
-        $this->router->match($this->request);
-    }
-
-    /**
-     * Data provider for Test to match corresponding URL Rewrite on request with query params
-     *
-     * @return array
-     */
-    public function matchWithQueryParamsDataProvider(): array
-    {
-        return [
-            ['/category.html/', 'category.html/', 0],
-            ['/category.html/', 'category.html', 1],
-        ];
-    }
 }
diff --git a/app/code/Magento/UrlRewrite/etc/db_schema.xml b/app/code/Magento/UrlRewrite/etc/db_schema.xml
index 06d4949e63d9a..93e84d8e02a0f 100644
--- a/app/code/Magento/UrlRewrite/etc/db_schema.xml
+++ b/app/code/Magento/UrlRewrite/etc/db_schema.xml
@@ -37,5 +37,8 @@
             <column name="store_id"/>
             <column name="entity_id"/>
         </index>
+        <index referenceId="URL_REWRITE_ENTITY_ID" indexType="btree">
+            <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
index bdaed647587a6..658673959a734 100644
--- a/app/code/Magento/UrlRewrite/etc/db_schema_whitelist.json
+++ b/app/code/Magento/UrlRewrite/etc/db_schema_whitelist.json
@@ -14,11 +14,12 @@
         },
         "index": {
             "URL_REWRITE_TARGET_PATH": true,
-            "URL_REWRITE_STORE_ID_ENTITY_ID": true
+            "URL_REWRITE_STORE_ID_ENTITY_ID": true,
+            "URL_REWRITE_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/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php
index 0acece9271f7c..e6b03755bea47 100644
--- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php
+++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php
@@ -31,6 +31,11 @@ class EntityUrl implements ResolverInterface
      */
     private $customUrlLocator;
 
+    /**
+     * @var int
+     */
+    private $redirectType;
+
     /**
      * @param UrlFinderInterface $urlFinder
      * @param CustomUrlLocatorInterface $customUrlLocator
@@ -57,49 +62,83 @@ public function resolve(
             throw new GraphQlInputException(__('"url" argument should be specified and not empty'));
         }
 
+        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         $result = null;
         $url = $args['url'];
         if (substr($url, 0, 1) === '/' && $url !== '/') {
             $url = ltrim($url, '/');
         }
+        $this->redirectType = 0;
         $customUrl = $this->customUrlLocator->locateUrl($url);
         $url = $customUrl ?: $url;
-        $urlRewrite = $this->findCanonicalUrl($url, (int)$context->getExtensionAttributes()->getStore()->getId());
-        if ($urlRewrite) {
-            if (!$urlRewrite->getEntityId()) {
+        $finalUrlRewrite = $this->findFinalUrl($url, $storeId);
+        if ($finalUrlRewrite) {
+            $relativeUrl = $finalUrlRewrite->getRequestPath();
+            $resultArray = $this->rewriteCustomUrls($finalUrlRewrite, $storeId) ?? [
+                'id' => $finalUrlRewrite->getEntityId(),
+                'canonical_url' => $relativeUrl,
+                'relative_url' => $relativeUrl,
+                'redirectCode' => $this->redirectType,
+                'type' => $this->sanitizeType($finalUrlRewrite->getEntityType())
+            ];
+
+            if (empty($resultArray['id'])) {
                 throw new GraphQlNoSuchEntityException(
                     __('No such entity found with matching URL key: %url', ['url' => $url])
                 );
             }
-            $result = [
-                'id' => $urlRewrite->getEntityId(),
-                'canonical_url' => $urlRewrite->getTargetPath(),
-                'relative_url' => $urlRewrite->getTargetPath(),
-                'type' => $this->sanitizeType($urlRewrite->getEntityType())
-            ];
+
+            $result = $resultArray;
         }
         return $result;
     }
 
     /**
-     * Find the canonical url passing through all redirects if any
+     * Handle custom urls with and without redirects
+     *
+     * @param UrlRewrite $finalUrlRewrite
+     * @param int $storeId
+     * @return array|null
+     */
+    private function rewriteCustomUrls(UrlRewrite $finalUrlRewrite, int $storeId): ?array
+    {
+        if ($finalUrlRewrite->getEntityType() === 'custom' || !($finalUrlRewrite->getEntityId() > 0)) {
+            $finalCustomUrlRewrite = clone $finalUrlRewrite;
+            $finalUrlRewrite = $this->findFinalUrl($finalCustomUrlRewrite->getTargetPath(), $storeId, true);
+            $relativeUrl =
+                $finalCustomUrlRewrite->getRedirectType() == 0
+                    ? $finalCustomUrlRewrite->getRequestPath() : $finalUrlRewrite->getRequestPath();
+            return [
+                'id' => $finalUrlRewrite->getEntityId(),
+                'canonical_url' => $relativeUrl,
+                'relative_url' => $relativeUrl,
+                'redirectCode' => $finalCustomUrlRewrite->getRedirectType(),
+                'type' => $this->sanitizeType($finalUrlRewrite->getEntityType())
+            ];
+        }
+        return null;
+    }
+
+    /**
+     * Find the final url passing through all redirects if any
      *
      * @param string $requestPath
      * @param int $storeId
+     * @param bool $findCustom
      * @return UrlRewrite|null
      */
-    private function findCanonicalUrl(string $requestPath, int $storeId) : ?UrlRewrite
+    private function findFinalUrl(string $requestPath, int $storeId, bool $findCustom = false): ?UrlRewrite
     {
         $urlRewrite = $this->findUrlFromRequestPath($requestPath, $storeId);
-        if ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
+        if ($urlRewrite) {
+            $this->redirectType = $urlRewrite->getRedirectType();
             while ($urlRewrite && $urlRewrite->getRedirectType() > 0) {
                 $urlRewrite = $this->findUrlFromRequestPath($urlRewrite->getTargetPath(), $storeId);
             }
-        }
-        if (!$urlRewrite) {
+        } else {
             $urlRewrite = $this->findUrlFromTargetPath($requestPath, $storeId);
         }
-        if ($urlRewrite && !$urlRewrite->getEntityId() && !$urlRewrite->getIsAutogenerated()) {
+        if ($urlRewrite && ($findCustom && !$urlRewrite->getEntityId() && !$urlRewrite->getIsAutogenerated())) {
             $urlRewrite = $this->findUrlFromTargetPath($urlRewrite->getTargetPath(), $storeId);
         }
 
@@ -113,7 +152,7 @@ private function findCanonicalUrl(string $requestPath, int $storeId) : ?UrlRewri
      * @param int $storeId
      * @return UrlRewrite|null
      */
-    private function findUrlFromRequestPath(string $requestPath, int $storeId) : ?UrlRewrite
+    private function findUrlFromRequestPath(string $requestPath, int $storeId): ?UrlRewrite
     {
         return $this->urlFinder->findOneByData(
             [
@@ -130,7 +169,7 @@ private function findUrlFromRequestPath(string $requestPath, int $storeId) : ?Ur
      * @param int $storeId
      * @return UrlRewrite|null
      */
-    private function findUrlFromTargetPath(string $targetPath, int $storeId) : ?UrlRewrite
+    private function findUrlFromTargetPath(string $targetPath, int $storeId): ?UrlRewrite
     {
         return $this->urlFinder->findOneByData(
             [
diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php
index fb7bbd634d11f..55cd505928f42 100644
--- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php
+++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/UrlRewrite.php
@@ -11,9 +11,11 @@
 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;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\EntityManager\TypeResolver;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * Returns URL rewrites list for the specified product
@@ -25,13 +27,37 @@ class UrlRewrite implements ResolverInterface
      */
     private $urlFinder;
 
+    /**
+     * @var array
+     */
+    private $entityTypeMapping;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var TypeResolver
+     */
+    private $typeResolver;
+
     /**
      * @param UrlFinderInterface $urlFinder
+     * @param TypeResolver $typeResolver
+     * @param MetadataPool $metadataPool
+     * @param array $entityTypeMapping
      */
     public function __construct(
-        UrlFinderInterface $urlFinder
+        UrlFinderInterface $urlFinder,
+        TypeResolver $typeResolver,
+        MetadataPool $metadataPool,
+        array $entityTypeMapping = []
     ) {
         $this->urlFinder = $urlFinder;
+        $this->typeResolver = $typeResolver;
+        $this->metadataPool = $metadataPool;
+        $this->entityTypeMapping = $entityTypeMapping;
     }
 
     /**
@@ -48,11 +74,24 @@ public function resolve(
             throw new LocalizedException(__('"model" value should be specified'));
         }
 
-        /** @var AbstractModel $entity */
+        /** @var  AbstractModel $entity */
         $entity = $value['model'];
         $entityId = $entity->getEntityId();
 
-        $urlRewriteCollection = $this->urlFinder->findAllByData([UrlRewriteDTO::ENTITY_ID => $entityId]);
+        $resolveEntityType = $this->typeResolver->resolve($entity);
+        $metadata = $this->metadataPool->getMetadata($resolveEntityType);
+        $entityType = $this->getEntityType($metadata->getEavEntityType());
+
+        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
+
+        $data = [
+            UrlRewriteDTO::ENTITY_TYPE => $entityType,
+            UrlRewriteDTO::ENTITY_ID => $entityId,
+            UrlRewriteDTO::STORE_ID => $storeId
+        ];
+
+        $urlRewriteCollection = $this->urlFinder->findAllByData($data);
+
         $urlRewrites = [];
 
         /** @var UrlRewriteDTO $urlRewrite */
@@ -80,14 +119,32 @@ private function getUrlParameters(string $targetPath): array
     {
         $urlParameters = [];
         $targetPathParts = explode('/', trim($targetPath, '/'));
+        $count = count($targetPathParts) - 1;
 
-        for ($i = 3; ($i < sizeof($targetPathParts) - 1); $i += 2) {
+        /** $index starts from 3 to eliminate catalog/product/view/ part and fetch only name,
+         value data from from target path */
+        //phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
+        for ($index = 3; $index < $count; $index += 2) {
             $urlParameters[] = [
-                'name' => $targetPathParts[$i],
-                'value' => $targetPathParts[$i + 1]
+                'name' => $targetPathParts[$index],
+                'value' => $targetPathParts[$index + 1]
             ];
         }
-
         return $urlParameters;
     }
+
+    /**
+     * Get the entity type
+     *
+     * @param string $entityTypeMetadata
+     * @return string
+     */
+    private function getEntityType(string $entityTypeMetadata) : string
+    {
+        $entityType = '';
+        if ($entityTypeMetadata) {
+            $entityType = $this->entityTypeMapping[$entityTypeMetadata];
+        }
+        return $entityType;
+    }
 }
diff --git a/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls b/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls
index ace3e0eae831e..7f7ebb627b4dc 100644
--- a/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/UrlRewriteGraphQl/etc/schema.graphqls
@@ -9,6 +9,7 @@ type EntityUrl @doc(description: "EntityUrl is an output object containing the `
     id: Int @doc(description: "The ID assigned to the object associated with the specified url. This could be a product ID, category ID, or page ID.")
     canonical_url: String @deprecated(reason: "The canonical_url field is deprecated, use relative_url instead.")
     relative_url: String @doc(description: "The internal relative URL. If the specified  url is a redirect, the query returns the redirected URL, not the original.")
+    redirectCode: Int @doc(description: "301 or 302 HTTP code for url permanent or temporary redirect or 0 for the 200 no redirect")
     type: UrlRewriteEntityTypeEnum @doc(description: "One of PRODUCT, CATEGORY, or CMS_PAGE.")
 }
 
diff --git a/app/code/Magento/User/Block/Role/Tab/Info.php b/app/code/Magento/User/Block/Role/Tab/Info.php
index 8a656efa97443..1b8b528aff774 100644
--- a/app/code/Magento/User/Block/Role/Tab/Info.php
+++ b/app/code/Magento/User/Block/Role/Tab/Info.php
@@ -6,7 +6,9 @@
 namespace Magento\User\Block\Role\Tab;
 
 /**
- * implementing now
+ * Info
+ *
+ * User role tab info
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  */
@@ -18,6 +20,8 @@ class Info extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
     const IDENTITY_VERIFICATION_PASSWORD_FIELD = 'current_password';
 
     /**
+     * Get tab label
+     *
      * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
@@ -26,6 +30,8 @@ public function getTabLabel()
     }
 
     /**
+     * Get tab title
+     *
      * @return string
      */
     public function getTabTitle()
@@ -34,6 +40,8 @@ public function getTabTitle()
     }
 
     /**
+     * Can show tab
+     *
      * @return bool
      */
     public function canShowTab()
@@ -42,6 +50,8 @@ public function canShowTab()
     }
 
     /**
+     * Is tab hidden
+     *
      * @return bool
      */
     public function isHidden()
@@ -50,6 +60,8 @@ public function isHidden()
     }
 
     /**
+     * Before html rendering
+     *
      * @return $this
      */
     public function _beforeToHtml()
@@ -60,6 +72,8 @@ public function _beforeToHtml()
     }
 
     /**
+     * Form initializatiion
+     *
      * @return void
      */
     protected function _initForm()
@@ -99,7 +113,7 @@ protected function _initForm()
                 'label' => __('Your Password'),
                 'id' => self::IDENTITY_VERIFICATION_PASSWORD_FIELD,
                 'title' => __('Your Password'),
-                'class' => 'input-text validate-current-password required-entry',
+                'class' => 'validate-current-password required-entry',
                 'required' => true
             ]
         );
diff --git a/app/code/Magento/User/Block/User/Edit/Tab/Main.php b/app/code/Magento/User/Block/User/Edit/Tab/Main.php
index 27e00483733d0..3182393db8eaf 100644
--- a/app/code/Magento/User/Block/User/Edit/Tab/Main.php
+++ b/app/code/Magento/User/Block/User/Edit/Tab/Main.php
@@ -184,7 +184,7 @@ protected function _prepareForm()
                 'label' => __('Your Password'),
                 'id' => self::CURRENT_USER_PASSWORD_FIELD,
                 'title' => __('Your Password'),
-                'class' => 'input-text validate-current-password required-entry',
+                'class' => 'validate-current-password required-entry',
                 'required' => true
             ]
         );
diff --git a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
index 6d921dfdcdd65..93b5389bc3608 100644
--- a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
+++ b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
@@ -4,13 +4,37 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\User\Model\Backend\Config;
 
 /**
  * User backend observer helper class
+ *
+ * Class \Magento\User\Model\Backend\Config\ObserverConfig
  */
 class ObserverConfig
 {
+    /**
+     * Config path for lockout threshold
+     */
+    private const XML_ADMIN_SECURITY_LOCKOUT_THRESHOLD = 'admin/security/lockout_threshold';
+
+    /**
+     * Config path for password change is forced or not
+     */
+    private const XML_ADMIN_SECURITY_PASSWORD_IS_FORCED = 'admin/security/password_is_forced';
+
+    /**
+     * Config path for password lifetime
+     */
+    private const XML_ADMIN_SECURITY_PASSWORD_LIFETIME = 'admin/security/password_lifetime';
+
+    /**
+     * Config path for maximum lockout failures
+     */
+    private const XML_ADMIN_SECURITY_LOCKOUT_FAILURES = 'admin/security/lockout_failures';
+
     /**
      * Backend configuration interface
      *
@@ -19,6 +43,8 @@ class ObserverConfig
     protected $backendConfig;
 
     /**
+     * Constructor
+     *
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
      */
     public function __construct(
@@ -44,11 +70,12 @@ public function _isLatestPasswordExpired($latestPassword)
 
     /**
      * Get admin lock threshold from configuration
+     *
      * @return int
      */
     public function getAdminLockThreshold()
     {
-        return 60 * (int)$this->backendConfig->getValue('admin/security/lockout_threshold');
+        return 60 * (int)$this->backendConfig->getValue(self::XML_ADMIN_SECURITY_LOCKOUT_THRESHOLD);
     }
 
     /**
@@ -58,7 +85,7 @@ public function getAdminLockThreshold()
      */
     public function isPasswordChangeForced()
     {
-        return (bool)(int)$this->backendConfig->getValue('admin/security/password_is_forced');
+        return (bool)(int)$this->backendConfig->getValue(self::XML_ADMIN_SECURITY_PASSWORD_IS_FORCED);
     }
 
     /**
@@ -68,7 +95,7 @@ public function isPasswordChangeForced()
      */
     public function getAdminPasswordLifetime()
     {
-        return 86400 * (int)$this->backendConfig->getValue('admin/security/password_lifetime');
+        return 86400 * (int)$this->backendConfig->getValue(self::XML_ADMIN_SECURITY_PASSWORD_LIFETIME);
     }
 
     /**
@@ -78,6 +105,6 @@ public function getAdminPasswordLifetime()
      */
     public function getMaxFailures()
     {
-        return (int)$this->backendConfig->getValue('admin/security/lockout_failures');
+        return (int)$this->backendConfig->getValue(self::XML_ADMIN_SECURITY_LOCKOUT_FAILURES);
     }
 }
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index 0c59f165f11f0..3b41d529b542b 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -216,9 +216,6 @@ protected function _construct()
      * Removing dependencies and leaving only entity's properties.
      *
      * @return string[]
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -247,9 +244,6 @@ public function __sleep()
      * Restoring required objects after serialization.
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
@@ -419,10 +413,6 @@ public function getRoles()
      */
     public function getRole()
     {
-        if ($this->getData('extracted_role')) {
-            $this->_role = $this->getData('extracted_role');
-            $this->unsetData('extracted_role');
-        }
         if (null === $this->_role) {
             $this->_role = $this->_roleFactory->create();
             $roles = $this->getRoles();
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminAddNewUserRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminAddNewUserRoleActionGroup.xml
index 76a83f5d5a5aa..175f6203350c7 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminAddNewUserRoleActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminAddNewUserRoleActionGroup.xml
@@ -36,7 +36,7 @@
         <selectOption userInput="{{role.resourceAccess}}" selector="{{AdminCreateRoleSection.roleResourceNew}}" stepKey="selectResourceAccess"/>
         <click selector="{{AdminCreateRoleSection.save}}" stepKey="saveUserRole"/>
         <waitForPageLoad stepKey="waitForSaving"/>
-        <see userInput="You saved the role." selector="{{AdminMessagesSection.successMessage}}" stepKey="seeMessage"/>
+        <see userInput="You saved the role." selector="{{AdminMessagesSection.success}}" stepKey="seeMessage"/>
     </actionGroup>
 
     <actionGroup name="AdminAddNewUserRoleWithCustomRoleScopes" extends="AdminAddNewUserRoleActionGroup">
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserWithRoleAndIsActiveActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserWithRoleAndIsActiveActionGroup.xml
new file mode 100644
index 0000000000000..779dcbc512fd2
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserWithRoleAndIsActiveActionGroup.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">
+    <!--Create new user with role and active setting-->
+    <actionGroup name="AdminCreateUserWithRoleAndIsActiveActionGroup" extends="AdminCreateUserWithRoleActionGroup">
+        <checkOption selector="{{AdminNewUserFormSection.userIsActive(user.is_active)}}" stepKey="checkIsActive" after="confirmPassword"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserRoleActionGroup.xml
index d2c881b771973..84c9e26eed54c 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserRoleActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserRoleActionGroup.xml
@@ -21,7 +21,7 @@
         <click selector="{{AdminEditRoleInfoSection.deleteButton}}" stepKey="deleteUserRole"/>
         <waitForElementVisible selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForConfirmModal"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitSuccessMessage"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the role." stepKey="seeUserRoleDeleteMessage"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the role." stepKey="seeUserRoleDeleteMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillUserRoleFormActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillUserRoleFormActionGroup.xml
index 480695aa7a931..7b913382651ae 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillUserRoleFormActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillUserRoleFormActionGroup.xml
@@ -17,13 +17,13 @@
             <argument name="currentAdminPassword" type="string" defaultValue="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" />
         </arguments>
 
-        <fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.name}}" stepKey="fillRoleName"/>
+        <fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.rolename}}" stepKey="fillRoleName"/>
         <fillField selector="{{AdminCreateRoleSection.password}}" userInput="{{currentAdminPassword}}" stepKey="fillCurrentUserPassword"/>
 
         <click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
         <waitForPageLoad stepKey="waitForRoleResourceTab" />
         
         <selectOption userInput="{{role.resourceAccess}}" selector="{{AdminCreateRoleSection.resourceAccess}}" stepKey="selectResourceAccess" />
-        <performOn stepKey="checkNeededResources" selector="{{AdminCreateRoleSection.resourceTree}}" function="function($I,$userRoles={{role.resources}}){foreach($userRoles as $userRole){$I->conditionalClick('//li[@data-id=\'' . $userRole . '\']//*[@class=\'jstree-checkbox\']','//li[@data-id=\'' . $userRole . '\' and contains(@class, \'jstree-checked\')]',false);}}" />
+        <performOn stepKey="checkNeededResources" selector="{{AdminCreateRoleSection.resourceTree}}" function="function($I,$userRoles={{role.resource}}){foreach($userRoles as $userRole){$I->conditionalClick('//li[@data-id=\'' . $userRole . '\']//*[@class=\'jstree-checkbox\']','//li[@data-id=\'' . $userRole . '\' and contains(@class, \'jstree-checked\')]',false);}}" />
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenAdminUsersPageActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenAdminUsersPageActionGroup.xml
new file mode 100644
index 0000000000000..1c4a35eeff6cb
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenAdminUsersPageActionGroup.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="AdminOpenAdminUsersPageActionGroup">
+        <amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToAdminUsersGrid"/>
+        <waitForPageLoad stepKey="waitForAdminUsersPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUpdateUserRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUpdateUserRoleActionGroup.xml
new file mode 100644
index 0000000000000..9c632e70db55d
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUpdateUserRoleActionGroup.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="AdminUpdateUserRoleActionGroup">
+        <arguments>
+            <argument name="role" type="entity"/>
+        </arguments>
+        <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterThePassword"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <waitForPageLoad stepKey="waitForPageScrollToTop" time="15"/>
+        <click selector="{{AdminNewUserFormSection.userRoleTab}}" stepKey="openUserRoleTab"/>
+        <waitForPageLoad stepKey="waitForUserRoleTabOpened" />
+        <click selector="{{AdminNewUserFormSection.resetFilter}}" stepKey="resetGridFilter"/>
+        <waitForPageLoad stepKey="waitForFiltersReset"/>
+        <fillField selector="{{AdminNewUserFormSection.roleFilterField}}" userInput="{{role.name}}" stepKey="fillRoleFilterField"/>
+        <click selector="{{AdminNewUserFormSection.search}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForFiltersApplied"/>
+        <checkOption selector="{{AdminNewUserFormSection.roleRadiobutton(role.name)}}" stepKey="assignRole"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AssertAdminUserIsInGridActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AssertAdminUserIsInGridActionGroup.xml
new file mode 100644
index 0000000000000..3499f4e0d951c
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AssertAdminUserIsInGridActionGroup.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="AssertAdminUserIsInGridActionGroup">
+        <arguments>
+            <argument name="user" type="entity"/>
+        </arguments>
+        <click selector="{{AdminUserGridSection.resetButton}}" stepKey="resetGridFilter"/>
+        <waitForPageLoad stepKey="waitForFiltersReset" time="15"/>
+        <fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{user.username}}" stepKey="enterUserName"/>
+        <click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearch"/>
+        <waitForPageLoad stepKey="waitForGridToLoad" time="15"/>
+        <see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{user.username}}" stepKey="seeUser"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AssertUserRoleRestrictedAccessActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AssertUserRoleRestrictedAccessActionGroup.xml
new file mode 100644
index 0000000000000..0747eab31588e
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AssertUserRoleRestrictedAccessActionGroup.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="AssertUserRoleRestrictedAccessActionGroup">
+        <see selector="{{AdminHeaderSection.pageHeading}}" userInput="Sorry, you need permissions to view this content." stepKey="seeErrorMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/Data/UserData.xml b/app/code/Magento/User/Test/Mftf/Data/UserData.xml
index d465851c62373..7947c8ee3c161 100644
--- a/app/code/Magento/User/Test/Mftf/Data/UserData.xml
+++ b/app/code/Magento/User/Test/Mftf/Data/UserData.xml
@@ -33,6 +33,12 @@
             <item>1</item>
         </array>
     </entity>
+    <entity name="AdminUserWithUpdatedUserRoleToSales" extends="NewAdminUser">
+        <data key="password">123123qA</data>
+        <data key="password_confirmation">123123qA</data>
+        <data key="role">{{roleSales.rolename}}</data>
+    </entity>
+
     <entity name="EditAdminUser" type="user">
         <data key="username" unique="suffix">admin</data>
         <data key="firstname">John</data>
@@ -109,6 +115,36 @@
         </array>
     </entity>
 
+    <entity name="activeAdmin" type="user" extends="NewAdminUser">
+        <data key="name" unique="suffix">admin</data>
+        <data key="is_active">1</data>
+    </entity>
+    <entity name="inactiveAdmin" type="user" extends="NewAdminUser">
+        <data key="name" unique="suffix">admin</data>
+        <data key="is_active">0</data>
+    </entity>
+
+    <entity name="adminUserCorrectPassword" type="user">
+        <data key="username">admin_user_with_correct_password</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="email" unique="prefix">admin@example.com</data>
+        <data key="password">123123q</data>
+        <data key="password_confirmation">123123q</data>
+        <data key="interface_local">en_US</data>
+        <data key="interface_local_label">English (United States)</data>
+        <data key="is_active">true</data>
+        <data key="is_active_label">Active</data>
+        <data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
+        <data key="role">Administrators</data>
+        <array key="roles">
+            <item>1</item>
+        </array>
+    </entity>
+    <entity name="adminUserIncorrectPassword" type="user">
+        <data key="username">admin_user_with_correct_password</data>
+        <data key="password">123123123q</data>
+    </entity>
 <!--
     Since User delete action is performed via POST request we created this entity to be able to delete it.
     Please use "AdminDeleteUserViaCurlActionGroup".
diff --git a/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml b/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml
index a0d89bbf3fb9d..a39e6cf47c295 100644
--- a/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml
+++ b/app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml
@@ -10,38 +10,49 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="adminRole" type="role">
         <data key="name" unique="suffix">adminRole</data>
+        <data key="rolename" unique="suffix">adminRole</data>
         <data key="scope">1</data>
         <data key="access">1</data>
     </entity>
 
-    <entity name="roleAdministrator" type="role">
+    <entity name="roleAdministrator" type="user_role">
         <data key="name" unique="suffix">Administrator </data>
+        <data key="rolename" unique="suffix">Administrator </data>
         <data key="resourceAccess">All</data>
-        <data key="resources">[]</data>
+        <data key="all">1</data>
+        <data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
+        <data key="resource">[]</data>
     </entity>
 
-    <entity name="roleSales" type="role">
+    <entity name="roleSales">
         <data key="name" unique="suffix">Role Sales </data>
+        <data key="rolename" unique="suffix">Role Sales </data>
         <data key="resourceAccess">Custom</data>
-        <data key="resources">['Magento_Sales::sales','Magento_Sales::sales_operation','Magento_Sales::actions','Magento_Sales::sales_order','Magento_Sales::create','Magento_Sales::actions_view','Magento_Sales::email','Magento_Sales::reorder','Magento_Sales::actions_edit','Magento_Sales::cancel','Magento_Sales::review_payment','Magento_Sales::capture','Magento_Sales::invoice','Magento_Sales::creditmemo','Magento_Sales::hold','Magento_Sales::unhold','Magento_Sales::ship','Magento_Sales::comment','Magento_Sales::emails','Magento_Backend::system','Magento_Backend::system_other_settings','Magento_AdminNotification::adminnotification','Magento_AdminNotification::show_list']</data>
+        <data key="all">0</data>
+        <data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
+        <data key="resource">['Magento_Sales::sales','Magento_Sales::sales_operation','Magento_Sales::actions','Magento_Sales::sales_order','Magento_Sales::create','Magento_Sales::actions_view','Magento_Sales::email','Magento_Sales::reorder','Magento_Sales::actions_edit','Magento_Sales::cancel','Magento_Sales::review_payment','Magento_Sales::capture','Magento_Sales::invoice','Magento_Sales::creditmemo','Magento_Sales::hold','Magento_Sales::unhold','Magento_Sales::ship','Magento_Sales::comment','Magento_Sales::emails','Magento_Backend::system_other_settings','Magento_AdminNotification::adminnotification','Magento_AdminNotification::show_list']</data>
     </entity>
 
     <entity name="limitedRole" type="role">
         <data key="name" unique="suffix">Limited</data>
+        <data key="rolename" unique="suffix">Limited</data>
         <data key="roleScopes">Custom</data>
         <data key="resourceAccess">All</data>
     </entity>
 
     <entity name="restrictedRole" type="role">
         <data key="name" unique="suffix">Restricted</data>
+        <data key="rolename" unique="suffix">Restricted</data>
         <data key="roleScopes">Custom</data>
         <data key="resourceAccess">All</data>
     </entity>
 
     <!-- This admin created for checking turn off "Bulk Actions" -->
     <entity name="adminWithoutBulkActionRole" type="user_role">
+        <data key="name">restrictedWebsiteRole</data>
         <data key="rolename">restrictedWebsiteRole</data>
-        <data key="current_password">123123q</data>
+        <data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
+        <data key="all">0</data>
         <data key="gws_is_all">0</data>
         <array key="gws_websites">
             <item>1</item>
@@ -78,4 +89,18 @@
             <item>Magento_Backend::system</item>
         </array>
     </entity>
+    <entity name="adminProductInWebsiteRole" type="user_role">
+        <data key="rolename" unique="suffix">restrictedWebsiteRole</data>
+        <data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
+        <data key="all">0</data>
+    </entity>
+    <entity name="adminRestrictedProductRole" type="user_role">
+        <data key="rolename" unique="suffix">restrictedCatalogRole</data>
+        <data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
+        <data key="all">0</data>
+    </entity>
+
+    <entity name="genericAdminRole" type="role">
+        <data key="name">Administrators</data>
+    </entity>
 </entities>
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
index 9d0132453c798..5384bd520b2c7 100644
--- a/app/code/Magento/User/Test/Mftf/Metadata/user_role-meta.xml
+++ b/app/code/Magento/User/Test/Mftf/Metadata/user_role-meta.xml
@@ -10,9 +10,10 @@
     <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">
+        <field key="rolename" required="true">string</field>
+        <field key="current_password" required="true">string</field>
+        <field key="all" required="true">integer</field>
+        <array key="resource" required="false">
             <value>string</value>
         </array>
     </operation>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
index 1b55d09d0597e..a3a82f6ce38e0 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
@@ -10,8 +10,10 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminDeleteRoleSection">
         <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
+        <element name="salesRole" selector="//td[contains(text(), 'Sales')]" 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>
+
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteUserSection.xml
new file mode 100644
index 0000000000000..21ca1cb36f988
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteUserSection.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="AdminDeleteUserSection">
+        <element name="role" parameterized="true" selector="//td[contains(text(), '{{roleName}}')]" 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=".action-primary.action-accept" type="button"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminNewUserFormSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminNewUserFormSection.xml
index 9b030b216ce2c..8774261ea739d 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminNewUserFormSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminNewUserFormSection.xml
@@ -19,6 +19,7 @@
         <element name="password" type="input" selector="#page_tabs_main_section_content input[name='password']"/>
         <element name="passwordConfirmation" type="input" selector="#page_tabs_main_section_content input[name='password_confirmation']"/>
         <element name="interfaceLocale" type="select" selector="#page_tabs_main_section_content select[name='interface_locale']"/>
+        <element name="userIsActive" type="select" selector="#page_tabs_main_section_content select[id='user_is_active'] > option[value='{{isActive}}']" parameterized="true"/>
         <element name="currentPassword" type="input" selector="#page_tabs_main_section_content input[name='current_password']"/>
 
         <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/ConfigurationMainActionsSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminStoreSection.xml
similarity index 57%
rename from app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/ConfigurationMainActionsSection.xml
rename to app/code/Magento/User/Test/Mftf/Section/AdminStoreSection.xml
index 344330c4bc052..9e47351e68701 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/Section/ConfigurationMainActionsSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminStoreSection.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
  /**
   * Copyright © Magento, Inc. All rights reserved.
   * See COPYING.txt for license details.
   */
 -->
-
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="ConfigurationMainActionsSection">
-        <element name="save" type="button" selector="#save"/>
+    <section name="AdminStoreSection">
+        <element name="createdRoleInUserPage" type="text" selector="//tr//td[contains(text(), '{{roleName}}')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminCreateActiveUserEntityTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminCreateActiveUserEntityTest.xml
new file mode 100644
index 0000000000000..753ab02f84053
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminCreateActiveUserEntityTest.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="AdminCreateActiveUserEntityTest">
+        <annotations>
+            <features value="User"/>
+            <stories value="Create Admin User"/>
+            <title value="Admin user should be able to create active admin user"/>
+            <description value="Admin user should be able to create active admin user"/>
+            <testCaseId value=""/>
+            <severity value="CRITICAL"/>
+            <group value="user"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <actionGroup ref="AdminDeleteUserActionGroup" stepKey="deleteUser">
+                <argument name="user" value="activeAdmin"/>
+            </actionGroup>
+        </after>
+
+        <actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser">
+            <argument name="role" value="genericAdminRole"/>
+            <argument name="user" value="activeAdmin"/>
+        </actionGroup>
+        <actionGroup ref="logout" stepKey="logoutMasterAdmin"/>
+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{activeAdmin.username}}" stepKey="fillUsername"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{activeAdmin.password}}" stepKey="fillPassword"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
+        <closeAdminNotification stepKey="closeAdminNotification"/>
+        <amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToAdminUsersGrid"/>
+        <fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{activeAdmin.username}}" stepKey="fillUsernameSearch"/>
+        <click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad time="10" stepKey="wait1"/>
+        <see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{activeAdmin.username}}" stepKey="seeFoundUsername"/>
+        <actionGroup ref="logout" stepKey="logoutCreatedUser"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminCreateInactiveUserEntityTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminCreateInactiveUserEntityTest.xml
new file mode 100644
index 0000000000000..d0fdd72ebbdcc
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminCreateInactiveUserEntityTest.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="AdminCreateInactiveUserEntityTest">
+        <annotations>
+            <features value="User"/>
+            <stories value="Create Admin User"/>
+            <title value="Admin user should be able to create inactive admin user"/>
+            <description value="Admin user should be able to create inactive admin user"/>
+            <testCaseId value=""/>
+            <severity value="CRITICAL"/>
+            <group value="user"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <actionGroup ref="AdminDeleteUserActionGroup" stepKey="deleteUser">
+                <argument name="user" value="inactiveAdmin"/>
+            </actionGroup>
+        </after>
+
+        <actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser">
+            <argument name="role" value="genericAdminRole"/>
+            <argument name="user" value="inactiveAdmin"/>
+        </actionGroup>
+        <amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToAdminUsersGrid"/>
+        <fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{inactiveAdmin.username}}" stepKey="fillUsernameSearch"/>
+        <click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad time="10" stepKey="wait1"/>
+        <see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{inactiveAdmin.username}}" stepKey="seeFoundUsername"/>
+        <actionGroup ref="logout" stepKey="logoutMasterAdmin"/>
+        <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
+        <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{inactiveAdmin.username}}" stepKey="fillUsername"/>
+        <fillField selector="{{AdminLoginFormSection.password}}" userInput="{{inactiveAdmin.password}}" stepKey="fillPassword"/>
+        <click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeUserErrorMessage" />
+    </test>
+</tests>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminLockAdminUserEntityTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminLockAdminUserEntityTest.xml
new file mode 100644
index 0000000000000..3bd55a454c3b0
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminLockAdminUserEntityTest.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="AdminLockAdminUserEntityTest">
+        <annotations>
+            <features value="User"/>
+            <stories value="Lock admin user during login"/>
+            <title value="Lock admin  user after entering incorrect password specified number of times"/>
+            <description value="Lock admin  user after entering incorrect password specified number of times"/>
+            <testCaseId value="MC-14267"/>
+            <severity value="CRITICAL"/>
+            <group value="user"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <magentoCLI command="config:set admin/captcha/enable 0" stepKey="disableAdminCaptcha"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="logIn"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set admin/captcha/enable 1" stepKey="enableAdminCaptcha"/>
+            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <actionGroup ref="logout" stepKey="logOut"/>
+        </after>
+
+        <!--Create New User-->
+        <actionGroup ref="AdminOpenNewUserPageActionGroup" stepKey="goToNewUserPage"/>
+        <actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="fillNewUserForm">
+            <argument name="user" value="adminUserCorrectPassword"/>
+        </actionGroup>
+        <actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="saveNewUser"/>
+
+        <!--Set 'Maximum Login Failures to Lockout Account'-->
+        <actionGroup ref="AdminOpenConfigAdminPageActionGroup" stepKey="goToConfigAdminSectionPage"/>
+        <actionGroup ref="AdminExpandSecurityTabActionGroup" stepKey="openSecurityTab"/>
+        <actionGroup ref="AdminSetMaximumLoginFailuresToLockoutAccountActionGroup" stepKey="setMaximumLoginFailures">
+            <argument name="qty" value="2"/>
+        </actionGroup>
+        <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveChanges"/>
+
+        <!-- Log in to Admin Panel with incorrect password specified number of times-->
+        <actionGroup ref="logout" stepKey="logoutAsDefaultUser"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUserFirstAttempt">
+            <argument name="adminUser" value="adminUserIncorrectPassword"/>
+        </actionGroup>
+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="checkLoginErrorFirstAttempt"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUserSecondAttempt">
+            <argument name="adminUser" value="adminUserIncorrectPassword"/>
+        </actionGroup>
+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="checkLoginErrorSecondAttempt"/>
+
+        <!-- Log in to Admin Panel with correct password-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUserThirdAttempt">
+            <argument name="adminUser" value="adminUserCorrectPassword"/>
+        </actionGroup>
+        <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="checkLoginErrorThirdAttempt"/>
+
+        <!--Login as default admin user-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUser"/>
+
+        <!--Delete new User-->
+        <actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteNewUser">
+            <argument name="user" value="adminUserCorrectPassword"/>
+        </actionGroup>
+
+    </test>
+</tests>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserTest.xml
new file mode 100644
index 0000000000000..dfadee8ee6807
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserTest.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="AdminUpdateUserTest">
+        <annotations>
+            <features value="User"/>
+            <title value="Update admin user entity by changing user role"/>
+            <stories value="Update User" />
+            <testCaseId value="MC-14264" />
+            <severity value="MAJOR" />
+            <description value="Change full access role for admin user to custom one with restricted permission (Sales)"/>
+            <group value="user"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="logIn"/>
+
+            <!--Create New User-->
+            <actionGroup ref="AdminOpenNewUserPageActionGroup" stepKey="goToNewUserPage"/>
+            <actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="fillNewUserForm">
+                <argument name="user" value="NewAdminUser"/>
+            </actionGroup>
+            <actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="saveNewUser"/>
+
+            <!--Create New Role-->
+            <actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePage"/>
+            <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleForm">
+                <argument name="role" value="roleSales"/>
+            </actionGroup>
+            <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRole"/>
+        </before>
+        <after>
+            <!--Delete new User-->
+            <actionGroup ref="logout" stepKey="logoutAsSaleRoleUser"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUser"/>
+            <actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteNewUser">
+                <argument name="user" value="AdminUserWithUpdatedUserRoleToSales"/>
+            </actionGroup>
+
+            <!--Delete new Role-->
+            <actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteCustomRole">
+                <argument name="roleName" value="{{roleSales.rolename}}"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logOut"/>
+        </after>
+
+
+        <!--Assign new role-->
+        <actionGroup ref="AdminOpenUserEditPageActionGroup" stepKey="openUserEditPage">
+            <argument name="user" value="NewAdminUser"/>
+        </actionGroup>
+        <actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="fillUserForm">
+            <argument name="user" value="AdminUserWithUpdatedUserRoleToSales"/>
+        </actionGroup>
+        <actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="saveUser"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
+            <argument name="message" value="You saved the user."/>
+        </actionGroup>
+
+        <actionGroup ref="AssertAdminUserIsInGridActionGroup" stepKey="seeUserInGrid">
+            <argument name="user" value="AdminUserWithUpdatedUserRoleToSales"/>
+        </actionGroup>
+        <actionGroup ref="logout" stepKey="logOutFromAdminPanel"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsSaleRoleUser">
+            <argument name="adminUser" value="AdminUserWithUpdatedUserRoleToSales"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminSuccessLoginActionGroup" stepKey="seeSuccessloginMessage"/>
+        <actionGroup ref="AdminOpenAdminUsersPageActionGroup" stepKey="navigateToAdminUsersPage"/>
+        <actionGroup ref="AssertUserRoleRestrictedAccessActionGroup" stepKey="seeErrorMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/User/Test/Unit/Model/Authorization/AdminSessionUserContextTest.php b/app/code/Magento/User/Test/Unit/Model/Authorization/AdminSessionUserContextTest.php
new file mode 100644
index 0000000000000..23681c4b8da26
--- /dev/null
+++ b/app/code/Magento/User/Test/Unit/Model/Authorization/AdminSessionUserContextTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\User\Test\Unit\Model\Authorization;
+
+use Magento\Authorization\Model\UserContextInterface;
+
+/**
+ * Tests Magento\User\Model\Authorization\AdminSessionUserContext
+ */
+class AdminSessionUserContextTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * @var \Magento\User\Model\Authorization\AdminSessionUserContext
+     */
+    protected $adminSessionUserContext;
+
+    /**
+     * @var \Magento\Backend\Model\Auth\Session
+     */
+    protected $adminSession;
+
+    protected function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->adminSession = $this->getMockBuilder(\Magento\Backend\Model\Auth\Session::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['hasUser', 'getUser', 'getId'])
+            ->getMock();
+
+        $this->adminSessionUserContext = $this->objectManager->getObject(
+            \Magento\User\Model\Authorization\AdminSessionUserContext::class,
+            ['adminSession' => $this->adminSession]
+        );
+    }
+
+    public function testGetUserIdExist()
+    {
+        $userId = 1;
+
+        $this->setupUserId($userId);
+
+        $this->assertEquals($userId, $this->adminSessionUserContext->getUserId());
+    }
+
+    public function testGetUserIdDoesNotExist()
+    {
+        $userId = null;
+
+        $this->setupUserId($userId);
+
+        $this->assertEquals($userId, $this->adminSessionUserContext->getUserId());
+    }
+
+    public function testGetUserType()
+    {
+        $this->assertEquals(UserContextInterface::USER_TYPE_ADMIN, $this->adminSessionUserContext->getUserType());
+    }
+
+    /**
+     * @param int|null $userId
+     * @return void
+     */
+    public function setupUserId($userId)
+    {
+        $this->adminSession->expects($this->once())
+            ->method('hasUser')
+            ->will($this->returnValue($userId));
+
+        if ($userId) {
+            $this->adminSession->expects($this->once())
+                ->method('getUser')
+                ->will($this->returnSelf());
+
+            $this->adminSession->expects($this->once())
+                ->method('getId')
+                ->will($this->returnValue($userId));
+        }
+    }
+}
diff --git a/app/code/Magento/User/Test/Unit/Model/Backend/Config/ObserverConfigTest.php b/app/code/Magento/User/Test/Unit/Model/Backend/Config/ObserverConfigTest.php
new file mode 100644
index 0000000000000..395c45bc676a8
--- /dev/null
+++ b/app/code/Magento/User/Test/Unit/Model/Backend/Config/ObserverConfigTest.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\User\Test\Unit\Model\Backend\Config;
+
+use Magento\User\Model\Backend\Config\ObserverConfig;
+use Magento\Backend\App\ConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+/**
+ * Unit Test for \Magento\User\Model\Backend\Config\ObserverConfig class
+ *
+ * Class \Magento\User\Test\Unit\Model\Backend\Config\ObserverConfigTest
+ */
+class ObserverConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Config path for lockout threshold
+     */
+    private const XML_ADMIN_SECURITY_LOCKOUT_THRESHOLD = 'admin/security/lockout_threshold';
+
+    /**
+     * Config path for password change is forced or not
+     */
+    private const XML_ADMIN_SECURITY_PASSWORD_IS_FORCED = 'admin/security/password_is_forced';
+
+    /**
+     * Config path for password lifetime
+     */
+    private const XML_ADMIN_SECURITY_PASSWORD_LIFETIME = 'admin/security/password_lifetime';
+
+    /**
+     * Config path for maximum lockout failures
+     */
+    private const XML_ADMIN_SECURITY_LOCKOUT_FAILURES = 'admin/security/lockout_failures';
+
+    /** @var ObserverConfig */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ConfigInterface
+     */
+    private $backendConfigMock;
+
+    /**
+     * Set environment for test
+     */
+    protected function setUp()
+    {
+        $this->backendConfigMock = $this->createMock(ConfigInterface::class);
+
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
+            ObserverConfig::class,
+            [
+                'backendConfig' => $this->backendConfigMock
+            ]
+        );
+    }
+
+    /**
+     * Test when admin password lifetime = 0 days
+     */
+    public function testIsLatestPasswordExpiredWhenNoAdminLifeTime()
+    {
+        $this->backendConfigMock->expects(self::any())->method('getValue')
+            ->with(self::XML_ADMIN_SECURITY_PASSWORD_LIFETIME)
+            ->willReturn('0');
+        $this->assertEquals(false, $this->model->_isLatestPasswordExpired([]));
+    }
+
+    /**
+     * Test when admin password lifetime = 2 days
+     */
+    public function testIsLatestPasswordExpiredWhenHasAdminLifeTime()
+    {
+        $this->backendConfigMock->expects(self::any())->method('getValue')
+            ->with(self::XML_ADMIN_SECURITY_PASSWORD_LIFETIME)
+            ->willReturn('2');
+        $this->assertEquals(true, $this->model->_isLatestPasswordExpired(['last_updated' => 1571428052]));
+    }
+
+    /**
+     * Test when security lockout threshold = 100 minutes
+     */
+    public function testGetAdminLockThreshold()
+    {
+        $this->backendConfigMock->expects(self::any())->method('getValue')
+            ->with(self::XML_ADMIN_SECURITY_LOCKOUT_THRESHOLD)
+            ->willReturn('100');
+        $this->assertEquals(6000, $this->model->getAdminLockThreshold());
+    }
+
+    /**
+     * Test when password change force is true
+     */
+    public function testIsPasswordChangeForcedTrue()
+    {
+        $this->backendConfigMock->expects(self::any())->method('getValue')
+            ->with(self::XML_ADMIN_SECURITY_PASSWORD_IS_FORCED)
+            ->willReturn('1');
+        $this->assertEquals(true, $this->model->isPasswordChangeForced());
+    }
+
+    /**
+     * Test when password change force is false
+     */
+    public function testIsPasswordChangeForcedFalse()
+    {
+        $this->backendConfigMock->expects(self::any())->method('getValue')
+            ->with(self::XML_ADMIN_SECURITY_PASSWORD_IS_FORCED)
+            ->willReturn('0');
+        $this->assertEquals(false, $this->model->isPasswordChangeForced());
+    }
+
+    /**
+     * Test when admin password lifetime = 2 days
+     */
+    public function testGetAdminPasswordLifetime()
+    {
+        $this->backendConfigMock->expects(self::any())->method('getValue')
+            ->with(self::XML_ADMIN_SECURITY_PASSWORD_LIFETIME)
+            ->willReturn('2');
+        $this->assertEquals(172800, $this->model->getAdminPasswordLifetime());
+    }
+
+    /**
+     * Test when max failures = 5 (times)
+     */
+    public function testGetMaxFailures()
+    {
+        $this->backendConfigMock->expects(self::any())->method('getValue')
+            ->with(self::XML_ADMIN_SECURITY_LOCKOUT_FAILURES)
+            ->willReturn('5');
+        $this->assertEquals(5, $this->model->getMaxFailures());
+    }
+}
diff --git a/app/code/Magento/User/Test/Unit/Model/UserTest.php b/app/code/Magento/User/Test/Unit/Model/UserTest.php
index ab06c8754b2f0..670316c2500fc 100644
--- a/app/code/Magento/User/Test/Unit/Model/UserTest.php
+++ b/app/code/Magento/User/Test/Unit/Model/UserTest.php
@@ -44,6 +44,31 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
+    public function testSleep()
+    {
+        $excludedProperties = [
+            '_eventManager',
+            '_cacheManager',
+            '_registry',
+            '_appState',
+            '_userData',
+            '_config',
+            '_validatorObject',
+            '_roleFactory',
+            '_encryptor',
+            '_transportBuilder',
+            '_storeManager',
+            '_validatorBeforeSave'
+        ];
+        $actualResult = $this->model->__sleep();
+        $this->assertNotEmpty($actualResult);
+        $expectedResult = array_intersect($actualResult, $excludedProperties);
+        $this->assertEmpty($expectedResult);
+    }
+
     /**
      * @return void
      */
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
index 891faf5fb8c2b..87f4e4669c4b6 100644
--- a/app/code/Magento/User/view/adminhtml/email/new_user_notification.html
+++ b/app/code/Magento/User/view/adminhtml/email/new_user_notification.html
@@ -6,7 +6,13 @@
 -->
 <!--@subject {{trans "New admin user '%user_name' created" user_name=$user.name}} @-->
 <!--@vars {
-"var store.getFrontendName()|escape":"Store Name"
+"var store.frontend_name":"Store Name",
+"var user.name":"User Name",
+"var user.first_name":"User First Name",
+"var user.last_name":"User Last Name",
+"var user.email":"User Email",
+"var store_email":"Store Email",
+"var store_phone":"Store Phone"
 } @-->
 
 {{trans "Hello,"}}
@@ -15,4 +21,4 @@
 {{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()}}
+{{var store.frontend_name}}
diff --git a/app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html b/app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html
index 62bac389e6dc4..dacfa640464a3 100644
--- a/app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html
+++ b/app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html
@@ -6,6 +6,9 @@
 -->
 <!--@subject {{trans "Password Reset Confirmation for %name" name=$user.name}} @-->
 <!--@vars {
+"var store.frontend_name":"Store Name",
+"var user.id":"Account Holder Id",
+"var user.rp_token":"Reset Password Token",
 "var user.name":"Account Holder Name",
 "store url=\"admin\/auth\/resetpassword\/\" _query_id=$user.id _query_token=$user.rp_token":"Reset Password URL"
 } @-->
@@ -21,4 +24,4 @@
 {{trans "If you did not make this request, you can ignore this email and your password will remain the same."}}
 
 {{trans "Thank you,"}}
-{{var store.getFrontendName()}}
+{{var store.frontend_name}}
diff --git a/app/code/Magento/User/view/adminhtml/email/user_notification.html b/app/code/Magento/User/view/adminhtml/email/user_notification.html
index 3b6ffb2ce14b1..82657531a10df 100644
--- a/app/code/Magento/User/view/adminhtml/email/user_notification.html
+++ b/app/code/Magento/User/view/adminhtml/email/user_notification.html
@@ -6,13 +6,18 @@
 -->
 <!--@subject {{trans "New %changes for %user_name" changes=$changes user_name=$user.name}} @-->
 <!--@vars {
-"var store.getFrontendName()|escape":"Store Name"
+"var store.frontend_name":"Store Name",
+"var store_name":"Store Name",
+"var store_email":"Store Email",
+"var store_phone":"Store Phone",
+"var changes":"Changes",
+"var user.name":"User Name"
 } @-->
 
 {{trans "Hello,"}}
 
-{{trans "We have received a request to change the following information associated with your account at %store_name: %changes." store_name=$store.getFrontendName() changes=$changes}}
+{{trans "We have received a request to change the following information associated with your account at %store_name: %changes." store_name=$store.frontend_name changes=$changes}}
 {{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()}}
+{{var store.frontend_name}}
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
index edee167dc1b8a..97308204be854 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
@@ -38,13 +38,13 @@
         <label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
 
         <div class="control">
-            <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?= /* @noEscape */
-                $block->getJsonSerializer()->serialize([
+            <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?=
+                $block->escapeHtmlAttr($block->getJsonSerializer()->serialize([
                     'rolesTree' => [
                         "treeInitData" => $block->getTree(),
                         "treeInitSelectedData" => $block->getSelectedResources(),
                     ],
-                ]); ?>'>
+                ])); ?>'>
             </div>
         </div>
     </div>
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index 7136a403003df..1c8ff0ce9efa9 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -8,7 +8,6 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Async\CallbackDeferred;
-use Magento\Framework\Async\ProxyDeferredFactory;
 use Magento\Framework\HTTP\AsyncClient\Request;
 use Magento\Framework\HTTP\AsyncClientInterface;
 use Magento\Framework\Xml\Security;
@@ -16,6 +15,7 @@
 use Magento\Shipping\Helper\Carrier as CarrierHelper;
 use Magento\Shipping\Model\Carrier\AbstractCarrierOnline;
 use Magento\Shipping\Model\Rate\Result;
+use Magento\Shipping\Model\Rate\Result\ProxyDeferredFactory;
 use Magento\Usps\Helper\Data as DataHelper;
 
 /**
@@ -239,16 +239,17 @@ public function collectRates(RateRequest $request)
         //Saving current result to use the right one in the callback.
         $this->_result = $result = $this->_getQuotes();
 
-        return $this->proxyDeferredFactory->createFor(
-            Result::class,
-            new CallbackDeferred(
-                function () use ($request, $result) {
-                    $this->_result = $result;
-                    $this->_updateFreeMethodQuote($request);
+        return $this->proxyDeferredFactory->create(
+            [
+                'deferred' => new CallbackDeferred(
+                    function () use ($request, $result) {
+                        $this->_result = $result;
+                        $this->_updateFreeMethodQuote($request);
 
-                    return $this->getResult();
-                }
-            )
+                        return $this->getResult();
+                    }
+                )
+            ]
         );
     }
 
@@ -555,18 +556,19 @@ protected function _getXmlQuotes()
                 )
             );
 
-            return $this->proxyDeferredFactory->createFor(
-                Result::class,
-                new CallbackDeferred(
-                    function () use ($deferredResponse, $request, $debugData) {
-                        $responseBody = $deferredResponse->get()->getBody();
-                        $debugData['result'] = $responseBody;
-                        $this->_setCachedQuotes($request, $responseBody);
-                        $this->_debug($debugData);
-
-                        return $this->_parseXmlResponse($responseBody);
-                    }
-                )
+            return $this->proxyDeferredFactory->create(
+                [
+                    'deferred' => new CallbackDeferred(
+                        function () use ($deferredResponse, $request, $debugData) {
+                            $responseBody = $deferredResponse->get()->getBody();
+                            $debugData['result'] = $responseBody;
+                            $this->_setCachedQuotes($request, $responseBody);
+                            $this->_debug($debugData);
+
+                            return $this->_parseXmlResponse($responseBody);
+                        }
+                    )
+                ]
             );
         }
 
diff --git a/app/code/Magento/Variable/Test/Mftf/ActionGroup/CreateCustomVariableActionGroup.xml b/app/code/Magento/Variable/Test/Mftf/ActionGroup/CreateCustomVariableActionGroup.xml
index 1aa9a3fa6c6ab..75f09b478170e 100644
--- a/app/code/Magento/Variable/Test/Mftf/ActionGroup/CreateCustomVariableActionGroup.xml
+++ b/app/code/Magento/Variable/Test/Mftf/ActionGroup/CreateCustomVariableActionGroup.xml
@@ -21,20 +21,4 @@
         <fillField selector="{{CustomVariableSection.variablePlain}}" userInput="{{customVariable.plain}}" stepKey="fillVariablePlain"/>
         <click selector="{{CustomVariableSection.saveCustomVariable}}" stepKey="clickSaveVariable"/>
     </actionGroup>
-
-    <actionGroup name="DeleteCustomVariableActionGroup">
-        <annotations>
-            <description>Goes to the Custom Variable grid page. Deletes the Custom Variable. PLEASE NOTE: The Custom Variable that is deleted is Hardcoded using 'customVariable'.</description>
-        </annotations>
-
-        <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="waitForPageLoad3"/>
-    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Variable/Test/Mftf/ActionGroup/DeleteCustomVariableActionGroup.xml b/app/code/Magento/Variable/Test/Mftf/ActionGroup/DeleteCustomVariableActionGroup.xml
new file mode 100644
index 0000000000000..df77d7d1fb9d0
--- /dev/null
+++ b/app/code/Magento/Variable/Test/Mftf/ActionGroup/DeleteCustomVariableActionGroup.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="DeleteCustomVariableActionGroup">
+        <annotations>
+            <description>Goes to the Custom Variable grid page. Deletes the Custom Variable. PLEASE NOTE: The Custom Variable that is deleted is Hardcoded using 'customVariable'.</description>
+        </annotations>
+
+        <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="waitForPageLoad3"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Variable/Test/Unit/Model/Variable/DataTest.php b/app/code/Magento/Variable/Test/Unit/Model/Variable/DataTest.php
new file mode 100644
index 0000000000000..50191de66efbf
--- /dev/null
+++ b/app/code/Magento/Variable/Test/Unit/Model/Variable/DataTest.php
@@ -0,0 +1,128 @@
+<?php
+/***
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Variable\Test\Unit\Model\Variable;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\TestCase;
+use Magento\Variable\Model\Variable\Data as VariableDataModel;
+use Magento\Variable\Model\ResourceModel\Variable\CollectionFactory as VariableCollectionFactory;
+use Magento\Variable\Model\ResourceModel\Variable\Collection as VariableCollection;
+use Magento\Variable\Model\Source\Variables as StoreVariables;
+
+class DataTest extends TestCase
+{
+    /**
+     * @var VariableDataModel
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var StoreVariables|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storesVariablesMock;
+
+    /**
+     * @var VariableCollectionFactory|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $variableCollectionFactoryMock;
+
+    /**
+     * Set up before tests
+     */
+    protected function setUp()
+    {
+        $this->storesVariablesMock = $this->createMock(StoreVariables::class);
+        $this->variableCollectionFactoryMock = $this->getMockBuilder(
+            VariableCollectionFactory::class
+        )->disableOriginalConstructor()->setMethods(['create'])->getMock();
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $this->objectManagerHelper->getObject(
+            VariableDataModel::class,
+            [
+                'collectionFactory' => $this->variableCollectionFactoryMock,
+                'storesVariables' => $this->storesVariablesMock
+            ]
+        );
+    }
+
+    /**
+     * Test getDefaultVariables() function
+     */
+    public function testGetDefaultVariables()
+    {
+        $storesVariablesData = [
+            [
+                'value' => 'test 1',
+                'label' => 'Test Label 1',
+                'group_label' => 'Group Label 1'
+            ],
+            [
+                'value' => 'test 2',
+                'label' => 'Test Label 2',
+                'group_label' => 'Group Label 2'
+            ]
+        ];
+        $expectedResult = [
+            [
+                'code' => 'test 1',
+                'variable_name' => 'Group Label 1 / Test Label 1',
+                'variable_type' => StoreVariables::DEFAULT_VARIABLE_TYPE
+            ],
+            [
+                'code' => 'test 2',
+                'variable_name' => 'Group Label 2 / Test Label 2',
+                'variable_type' => StoreVariables::DEFAULT_VARIABLE_TYPE
+            ]
+        ];
+        $this->storesVariablesMock->expects($this->any())->method('getData')->willReturn($storesVariablesData);
+
+        $this->assertEquals($expectedResult, $this->model->getDefaultVariables());
+    }
+
+    /**
+     * Test getCustomVariables() function
+     */
+    public function testGetCustomVariables()
+    {
+        $customVariables = [
+            [
+                'code' => 'test 1',
+                'name' => 'Test 1'
+            ],
+            [
+                'code' => 'test 2',
+                'name' => 'Test 2'
+            ]
+        ];
+        $expectedResult = [
+            [
+                'code' => 'test 1',
+                'variable_name' => 'Custom Variable / Test 1',
+                'variable_type' => StoreVariables::CUSTOM_VARIABLE_TYPE
+            ],
+            [
+                'code' => 'test 2',
+                'variable_name' => 'Custom Variable / Test 2',
+                'variable_type' => StoreVariables::CUSTOM_VARIABLE_TYPE
+            ]
+        ];
+        $variableCollectionMock = $this->createMock(VariableCollection::class);
+        $this->variableCollectionFactoryMock->expects($this->once())->method('create')
+            ->willReturn($variableCollectionMock);
+        $variableCollectionMock->expects($this->any())->method('getData')->willReturn($customVariables);
+
+        $this->assertEquals($expectedResult, $this->model->getCustomVariables());
+    }
+}
diff --git a/app/code/Magento/Weee/Block/Sales/Order/Totals.php b/app/code/Magento/Weee/Block/Sales/Order/Totals.php
index 8aeefecb14cc9..bc04b3a3985f3 100644
--- a/app/code/Magento/Weee/Block/Sales/Order/Totals.php
+++ b/app/code/Magento/Weee/Block/Sales/Order/Totals.php
@@ -6,6 +6,8 @@
 namespace Magento\Weee\Block\Sales\Order;
 
 /**
+ * Wee tax total column block
+ *
  * @api
  * @since 100.0.2
  */
@@ -54,6 +56,8 @@ public function initTotals()
         $weeeTotal = $this->weeeData->getTotalAmounts($items, $store);
         $weeeBaseTotal = $this->weeeData->getBaseTotalAmounts($items, $store);
         if ($weeeTotal) {
+            $totals = $this->getParentBlock()->getTotals();
+
             // Add our total information to the set of other totals
             $total = new \Magento\Framework\DataObject(
                 [
@@ -63,10 +67,10 @@ public function initTotals()
                     'base_value' => $weeeBaseTotal
                 ]
             );
-            if ($this->getBeforeCondition()) {
-                $this->getParentBlock()->addTotalBefore($total, $this->getBeforeCondition());
+            if (isset($totals['grand_total_incl'])) {
+                $this->getParentBlock()->addTotalBefore($total, 'grand_total');
             } else {
-                $this->getParentBlock()->addTotal($total, $this->getAfterCondition());
+                $this->getParentBlock()->addTotalBefore($total, $this->getBeforeCondition());
             }
         }
         return $this;
diff --git a/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php b/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php
index 5d5426660d8f1..aae6f769eb500 100644
--- a/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php
+++ b/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php
@@ -33,7 +33,7 @@ class ContextPlugin
     protected $weeeHelper;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManager;
 
@@ -63,7 +63,7 @@ class ContextPlugin
      * @param \Magento\Weee\Model\Tax $weeeTax
      * @param \Magento\Tax\Helper\Data $taxHelper
      * @param \Magento\Weee\Helper\Data $weeeHelper
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\PageCache\Model\Config $cacheConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -74,7 +74,7 @@ public function __construct(
         \Magento\Weee\Model\Tax $weeeTax,
         \Magento\Tax\Helper\Data $taxHelper,
         \Magento\Weee\Helper\Data $weeeHelper,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\PageCache\Model\Config $cacheConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
diff --git a/app/code/Magento/Weee/Observer/AfterAddressSave.php b/app/code/Magento/Weee/Observer/AfterAddressSave.php
index 9acea506adf67..ba15854b2dff4 100644
--- a/app/code/Magento/Weee/Observer/AfterAddressSave.php
+++ b/app/code/Magento/Weee/Observer/AfterAddressSave.php
@@ -8,7 +8,7 @@
 use Magento\Customer\Model\Address;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\PageCache\Model\Config;
 use Magento\Tax\Api\TaxAddressManagerInterface;
 use Magento\Weee\Helper\Data;
@@ -26,7 +26,7 @@ class AfterAddressSave implements ObserverInterface
     /**
      * Module manager
      *
-     * @var ModuleManagerInterface
+     * @var Manager
      */
     private $moduleManager;
 
@@ -46,13 +46,13 @@ class AfterAddressSave implements ObserverInterface
 
     /**
      * @param Data $weeeHelper
-     * @param ModuleManagerInterface $moduleManager
+     * @param Manager $moduleManager
      * @param Config $cacheConfig
      * @param TaxAddressManagerInterface $addressManager
      */
     public function __construct(
         Data $weeeHelper,
-        ModuleManagerInterface $moduleManager,
+        Manager $moduleManager,
         Config $cacheConfig,
         TaxAddressManagerInterface $addressManager
     ) {
diff --git a/app/code/Magento/Weee/Observer/CustomerLoggedIn.php b/app/code/Magento/Weee/Observer/CustomerLoggedIn.php
index 95299d96cabd2..0b22c24d7fa25 100644
--- a/app/code/Magento/Weee/Observer/CustomerLoggedIn.php
+++ b/app/code/Magento/Weee/Observer/CustomerLoggedIn.php
@@ -8,7 +8,7 @@
 use Magento\Customer\Model\Session;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\PageCache\Model\Config;
 use Magento\Tax\Api\TaxAddressManagerInterface;
 use Magento\Weee\Helper\Data;
@@ -52,13 +52,13 @@ class CustomerLoggedIn implements ObserverInterface
 
     /**
      * @param Data $weeeHelper
-     * @param ModuleManagerInterface $moduleManager
+     * @param Manager $moduleManager
      * @param Config $cacheConfig
      * @param TaxAddressManagerInterface $addressManager
      */
     public function __construct(
         Data $weeeHelper,
-        ModuleManagerInterface $moduleManager,
+        Manager $moduleManager,
         Config $cacheConfig,
         TaxAddressManagerInterface $addressManager
     ) {
diff --git a/app/code/Magento/Weee/README.md b/app/code/Magento/Weee/README.md
index 61f9b8d6d8970..ef433ec4c96f9 100644
--- a/app/code/Magento/Weee/README.md
+++ b/app/code/Magento/Weee/README.md
@@ -2,10 +2,10 @@
 The Magento_Weee module enables the application of fees/fixed product taxes (FPT) on certain types of products, usually related to electronic devices and recycling.
 Fixed product taxes can be used to setup a WEEE tax that is a fixed amount, rather than a percentage of the product price. FPT can be configured to be displayed at various places in Magento. Rules, amounts, and display options can be configured in the backend. This module extends the existing functionality of Magento_Tax.
 
-The Magento_Wee module includes the following:
+The Magento_Weee module includes the following:
 
 * ability to add different number of fixed product taxes to product. They are treated as a product attribute;
-* configuration of where Weee appears (on category, product, sales, invoice, or credit memo pages) and whether FPT should be taxed;
+* configuration of where WEEE appears (on category, product, sales, invoice, or credit memo pages) and whether FPT should be taxed;
 * a new line item in the totals section.
 
 # System requirements
diff --git a/app/code/Magento/Weee/Test/Mftf/Test/AdminFixedTaxValSavedForSpecificWebsiteTest.xml b/app/code/Magento/Weee/Test/Mftf/Test/AdminFixedTaxValSavedForSpecificWebsiteTest.xml
index 85ed044644d5c..aeb8537313fae 100644
--- a/app/code/Magento/Weee/Test/Mftf/Test/AdminFixedTaxValSavedForSpecificWebsiteTest.xml
+++ b/app/code/Magento/Weee/Test/Mftf/Test/AdminFixedTaxValSavedForSpecificWebsiteTest.xml
@@ -11,6 +11,7 @@
     <test name="AdminFixedTaxValSavedForSpecificWebsiteTest">
         <annotations>
             <features value="Tax"/>
+            <stories value="Website Specific Fixed Product Tax"/>
             <title value="Fixed Product Tax value is saved correctly for Specific Website"/>
             <description value="Fixed Product Tax value is saved correctly for Specific Website"/>
             <severity value="MAJOR"/>
diff --git a/app/code/Magento/Weee/Test/Unit/App/Action/ContextPluginTest.php b/app/code/Magento/Weee/Test/Unit/App/Action/ContextPluginTest.php
index b720f42378fa9..c829b524527a6 100644
--- a/app/code/Magento/Weee/Test/Unit/App/Action/ContextPluginTest.php
+++ b/app/code/Magento/Weee/Test/Unit/App/Action/ContextPluginTest.php
@@ -39,7 +39,7 @@ class ContextPluginTest extends \PHPUnit\Framework\TestCase
     protected $taxCalculationMock;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $moduleManagerMock;
 
@@ -93,7 +93,7 @@ protected function setUp()
             )
             ->getMock();
 
-        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
+        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php b/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
index a7b88f5727126..868d603f34b8c 100644
--- a/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
@@ -18,7 +18,7 @@ class AfterAddressSaveTest extends \PHPUnit\Framework\TestCase
      * @var ObjectManager
      */
     private $objectManager;
-    
+
     /**
      * @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -27,7 +27,7 @@ class AfterAddressSaveTest extends \PHPUnit\Framework\TestCase
     /**
      * Module manager
      *
-     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
      */
     private $moduleManagerMock;
 
@@ -42,7 +42,7 @@ class AfterAddressSaveTest extends \PHPUnit\Framework\TestCase
      * @var \Magento\Weee\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
      */
     private $weeeHelperMock;
-    
+
     /**
      * @var TaxAddressManagerInterface|MockObject
      */
@@ -61,7 +61,7 @@ protected function setUp()
             ->setMethods(['getCustomerAddress'])
             ->getMock();
 
-        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
+        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -129,7 +129,7 @@ public function testExecute(
         $this->addressManagerMock->expects($isNeedSetAddress ? $this->once() : $this->never())
             ->method('setDefaultAddressAfterSave')
             ->with($address);
-        
+
         $this->session->execute($this->observerMock);
     }
 
diff --git a/app/code/Magento/Weee/Test/Unit/Observer/CustomerLoggedInTest.php b/app/code/Magento/Weee/Test/Unit/Observer/CustomerLoggedInTest.php
index 06d1dbedcfd80..af8c2e70a8ff6 100644
--- a/app/code/Magento/Weee/Test/Unit/Observer/CustomerLoggedInTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Observer/CustomerLoggedInTest.php
@@ -21,7 +21,7 @@ class CustomerLoggedInTest extends \PHPUnit\Framework\TestCase
     /**
      * Module manager
      *
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     private $moduleManagerMock;
 
@@ -59,7 +59,7 @@ protected function setUp()
             )
             ->getMock();
 
-        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
+        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/WeeeGraphQl/Model/Resolver/StoreConfig.php b/app/code/Magento/WeeeGraphQl/Model/Resolver/StoreConfig.php
new file mode 100644
index 0000000000000..d2ea44fff5bcc
--- /dev/null
+++ b/app/code/Magento/WeeeGraphQl/Model/Resolver/StoreConfig.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\WeeeGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Weee\Helper\Data;
+use Magento\Tax\Helper\Data as TaxHelper;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Weee\Model\Tax as WeeeDisplayConfig;
+use Magento\Framework\Pricing\Render;
+
+/**
+ * Resolver for the FPT store config settings
+ */
+class StoreConfig implements ResolverInterface
+{
+    /**
+     * @var string
+     */
+    private static $weeeDisplaySettingsNone = 'FPT_DISABLED';
+
+    /**
+     * @var array
+     */
+    private static $weeeDisplaySettings =  [
+        WeeeDisplayConfig::DISPLAY_INCL => 'INCLUDE_FPT_WITHOUT_DETAILS',
+        WeeeDisplayConfig::DISPLAY_INCL_DESCR => 'INCLUDE_FPT_WITH_DETAILS',
+        WeeeDisplayConfig::DISPLAY_EXCL_DESCR_INCL => 'EXCLUDE_FPT_AND_INCLUDE_WITH_DETAILS',
+        WeeeDisplayConfig::DISPLAY_EXCL => 'EXCLUDE_FPT_WITHOUT_DETAILS'
+    ];
+
+    /**
+     * @var Data
+     */
+    private $weeeHelper;
+
+    /**
+     * @var TaxHelper
+     */
+    private $taxHelper;
+
+    /**
+     * @var array
+     */
+    private $computedFptSettings = [];
+
+    /**
+     * @param Data $weeeHelper
+     * @param TaxHelper $taxHelper
+     */
+    public function __construct(Data $weeeHelper, TaxHelper $taxHelper)
+    {
+        $this->weeeHelper = $weeeHelper;
+        $this->taxHelper = $taxHelper;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (empty($this->computedFptSettings)) {
+            /** @var StoreInterface $store */
+            $store = $context->getExtensionAttributes()->getStore();
+            $storeId = (int)$store->getId();
+
+            $this->computedFptSettings = [
+                'product_fixed_product_tax_display_setting' => self::$weeeDisplaySettingsNone,
+                'category_fixed_product_tax_display_setting' => self::$weeeDisplaySettingsNone,
+                'sales_fixed_product_tax_display_setting' => self::$weeeDisplaySettingsNone,
+            ];
+            if ($this->weeeHelper->isEnabled($store)) {
+                $productFptDisplay = $this->getWeeDisplaySettingsByZone(Render::ZONE_ITEM_VIEW, $storeId);
+                $categoryFptDisplay = $this->getWeeDisplaySettingsByZone(Render::ZONE_ITEM_LIST, $storeId);
+                $salesModulesFptDisplay = $this->getWeeDisplaySettingsByZone(Render::ZONE_SALES, $storeId);
+
+                $this->computedFptSettings = [
+                    'product_fixed_product_tax_display_setting' => self::$weeeDisplaySettings[$productFptDisplay] ??
+                        self::$weeeDisplaySettingsNone,
+                    'category_fixed_product_tax_display_setting' => self::$weeeDisplaySettings[$categoryFptDisplay] ??
+                        self::$weeeDisplaySettingsNone,
+                    'sales_fixed_product_tax_display_setting' => self::$weeeDisplaySettings[$salesModulesFptDisplay] ??
+                        self::$weeeDisplaySettingsNone,
+                ];
+            }
+        }
+
+        return $this->computedFptSettings[$info->fieldName] ?? null;
+    }
+
+    /**
+     * Get the weee system display setting
+     *
+     * @param string $zone
+     * @param string $storeId
+     * @return string
+     */
+    private function getWeeDisplaySettingsByZone(string $zone, int $storeId): int
+    {
+        return (int) $this->weeeHelper->typeOfDisplay(
+            null,
+            $zone,
+            $storeId
+        );
+    }
+}
diff --git a/app/code/Magento/WeeeGraphQl/etc/schema.graphqls b/app/code/Magento/WeeeGraphQl/etc/schema.graphqls
index 5c6d2f98b43fc..18b0e7c1823e8 100644
--- a/app/code/Magento/WeeeGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WeeeGraphQl/etc/schema.graphqls
@@ -14,3 +14,17 @@ type FixedProductTax @doc(description: "A single FPT that can be applied to a pr
     amount: Money @doc(description: "Amount of the FPT as a money object.")
     label: String @doc(description: "The label assigned to the FPT to be displayed on the frontend.")
 }
+
+type StoreConfig {
+    product_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices On Product View Page' field. It indicates how FPT information is displayed on product pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+    category_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices In Product Lists' field. It indicates how FPT information is displayed on category pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+    sales_fixed_product_tax_display_setting : FixedProductTaxDisplaySettings @doc(description: "Corresponds to the 'Display Prices In Sales Modules' field. It indicates how FPT information is displayed on cart, checkout, and order pages") @resolver(class: "Magento\\WeeeGraphQl\\Model\\Resolver\\StoreConfig")
+}
+
+enum FixedProductTaxDisplaySettings @doc(description: "This enumeration display settings for the fixed product tax") {
+    INCLUDE_FPT_WITHOUT_DETAILS @doc(description: "The displayed price includes the FPT amount without displaying the ProductPrice.fixed_product_taxes values. This value corresponds to 'Including FPT only'")
+    INCLUDE_FPT_WITH_DETAILS @doc(description: "The displayed price includes the FPT amount while displaying the values of ProductPrice.fixed_product_taxes separately. This value corresponds to 'Including FPT and FPT description'")
+    EXCLUDE_FPT_AND_INCLUDE_WITH_DETAILS @doc(description: "The displayed price does not include the FPT amount. The values of ProductPrice.fixed_product_taxes and the price including the FPT are displayed separately. This value corresponds to 'Excluding FPT, Including FPT description and final price'")
+    EXCLUDE_FPT_WITHOUT_DETAILS @doc(description: "The displayed price does not include the FPT amount. The values from ProductPrice.fixed_product_taxes are not displayed. This value corresponds to 'Excluding FPT'")
+    FPT_DISABLED @doc(description: "The FPT feature is not enabled. You can omit  ProductPrice.fixed_product_taxes from your query")
+}
diff --git a/app/code/Magento/Widget/Model/Template/FilterEmulate.php b/app/code/Magento/Widget/Model/Template/FilterEmulate.php
index 9e3b571587a50..4312003c7f34e 100644
--- a/app/code/Magento/Widget/Model/Template/FilterEmulate.php
+++ b/app/code/Magento/Widget/Model/Template/FilterEmulate.php
@@ -3,18 +3,44 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Widget\Model\Template;
 
+/**
+ * Class FilterEmulate
+ *
+ * @package Magento\Widget\Model\Template
+ */
 class FilterEmulate extends Filter
 {
     /**
      * Generate widget with emulation frontend area
      *
      * @param string[] $construction
-     * @return string
+     *
+     * @return mixed|string
+     * @throws \Exception
      */
     public function widgetDirective($construction)
     {
         return $this->_appState->emulateAreaCode('frontend', [$this, 'generateWidget'], [$construction]);
     }
+
+    /**
+     * Filter the string as template with frontend area emulation
+     *
+     * @param string $value
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function filterDirective($value) : string
+    {
+        return $this->_appState->emulateAreaCode(
+            \Magento\Framework\App\Area::AREA_FRONTEND,
+            [$this, 'filter'],
+            [$value]
+        );
+    }
 }
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateAndSaveWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateAndSaveWidgetActionGroup.xml
index 00f593a2d3bc8..5e564fcd799ae 100644
--- a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateAndSaveWidgetActionGroup.xml
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateAndSaveWidgetActionGroup.xml
@@ -12,8 +12,8 @@
         <annotations>
             <description>EXTENDS: AdminCreateWidgetActionGroup. Clicks on Save. Validates that the Success Message is present and correct.</description>
         </annotations>
-        
+
         <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateDynamicBlocksRotatorWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateDynamicBlocksRotatorWidgetActionGroup.xml
new file mode 100644
index 0000000000000..16efe55202bb0
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateDynamicBlocksRotatorWidgetActionGroup.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="AdminCreateDynamicBlocksRotatorWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
+        <annotations>
+            <description>EXTENDS: AdminCreateWidgetActionGroup. Creates a Dynamic Block Rotate Widget.</description>
+        </annotations>
+
+        <selectOption selector="{{AdminNewWidgetSection.displayMode}}" userInput="{{widget.display_mode}}" stepKey="selectDisplayMode"/>
+        <selectOption selector="{{AdminNewWidgetSection.restrictTypes}}" userInput="{{widget.restrict_type}}" stepKey="selectRestrictType"/>
+        <click selector="{{AdminNewWidgetSection.saveAndContinue}}" stepKey="clickSaveWidget"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateProductLinkWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateProductLinkWidgetActionGroup.xml
new file mode 100644
index 0000000000000..cb82f5ad068fd
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateProductLinkWidgetActionGroup.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="AdminCreateProductLinkWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
+        <annotations>
+            <description>EXTENDS: AdminCreateWidgetActionGroup. Creates a Product List Widget using the provided Product. Validates that the Success Message is present and correct.</description>
+        </annotations>
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+
+        <selectOption selector="{{AdminNewWidgetSection.selectTemplate}}" userInput="{{widget.template}}" after="waitForPageLoad" stepKey="setTemplate"/>
+        <waitForAjaxLoad after="setTemplate" stepKey="waitForPageLoad2"/>
+        <click selector="{{AdminNewWidgetSection.selectProduct}}" after="clickWidgetOptions" stepKey="clickSelectProduct"/>
+        <fillField selector="{{AdminNewWidgetSelectProductPopupSection.filterBySku}}" userInput="{{product.sku}}" after="clickSelectProduct" stepKey="fillProductNameInFilter"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" after="fillProductNameInFilter" stepKey="applyFilter"/>
+        <click selector="{{AdminNewWidgetSelectProductPopupSection.firstRow}}" after="applyFilter" stepKey="selectProduct"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateProductsListWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateProductsListWidgetActionGroup.xml
new file mode 100644
index 0000000000000..e3845adc9cd4a
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateProductsListWidgetActionGroup.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="AdminCreateProductsListWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
+        <annotations>
+            <description>EXTENDS: AdminCreateWidgetActionGroup. Creates a Product List Widget. Validates that the Success Message is present and correct.</description>
+        </annotations>
+
+        <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"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
index 797abdb6f56ae..e657b3eb73b53 100644
--- a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
@@ -30,73 +30,4 @@
        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
        <click selector="{{AdminNewWidgetSection.widgetOptions}}" stepKey="clickWidgetOptions"/>
    </actionGroup>
-
-   <!--Create Product List Widget-->
-   <actionGroup name="AdminCreateProductsListWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
-       <annotations>
-           <description>EXTENDS: AdminCreateWidgetActionGroup. Creates a Product List Widget. Validates that the Success Message is present and correct.</description>
-       </annotations>
-
-       <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"/>
-       <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
-   </actionGroup>
-
-   <!--Create Dynamic Block Rotate Widget-->
-   <actionGroup name="AdminCreateDynamicBlocksRotatorWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
-       <annotations>
-           <description>EXTENDS: AdminCreateWidgetActionGroup. Creates a Dynamic Block Rotate Widget.</description>
-       </annotations>
-       
-       <selectOption selector="{{AdminNewWidgetSection.displayMode}}" userInput="{{widget.display_mode}}" stepKey="selectDisplayMode"/>
-       <selectOption selector="{{AdminNewWidgetSection.restrictTypes}}" userInput="{{widget.restrict_type}}" stepKey="selectRestrictType"/>
-       <click selector="{{AdminNewWidgetSection.saveAndContinue}}" stepKey="clickSaveWidget"/>
-       <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
-   </actionGroup>
-
-   <actionGroup name="AdminDeleteWidgetActionGroup">
-       <annotations>
-           <description>Goes to the Admin Widget grid page. Deletes the provided Widget. Validates that the Success Message is present and correct.</description>
-       </annotations>
-       <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>
-
-    <actionGroup name="AdminCreateProductLinkWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
-        <annotations>
-            <description>EXTENDS: AdminCreateWidgetActionGroup. Creates a Product List Widget using the provided Product. Validates that the Success Message is present and correct.</description>
-        </annotations>
-        <arguments>
-            <argument name="product"/>
-        </arguments>
-
-        <selectOption selector="{{AdminNewWidgetSection.selectTemplate}}" userInput="{{widget.template}}" after="waitForPageLoad" stepKey="setTemplate"/>
-        <waitForAjaxLoad after="setTemplate" stepKey="waitForPageLoad2"/>
-        <click selector="{{AdminNewWidgetSection.selectProduct}}" after="clickWidgetOptions" stepKey="clickSelectProduct"/>
-        <fillField selector="{{AdminNewWidgetSelectProductPopupSection.filterBySku}}" userInput="{{product.sku}}" after="clickSelectProduct" stepKey="fillProductNameInFilter"/>
-        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" after="fillProductNameInFilter" stepKey="applyFilter"/>
-        <click selector="{{AdminNewWidgetSelectProductPopupSection.firstRow}}" after="applyFilter" stepKey="selectProduct"/>
-        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
-        <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
-    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminDeleteWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminDeleteWidgetActionGroup.xml
new file mode 100644
index 0000000000000..889c8a9477534
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminDeleteWidgetActionGroup.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="AdminDeleteWidgetActionGroup">
+        <annotations>
+            <description>Goes to the Admin Widget grid page. Deletes the provided Widget. Validates that the Success Message is present and correct.</description>
+        </annotations>
+        <arguments>
+            <argument name="widget"/>
+        </arguments>
+
+        <amOnPage url="{{AdminWidgetsPage.url}}" stepKey="amOnAdmin"/>
+        <waitForPageLoad stepKey="waitWidgetsLoad"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
+        <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.success}}" userInput="The widget instance has been deleted" stepKey="seeSuccess"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminFillSpecificPageWidgetMainFieldsActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminFillSpecificPageWidgetMainFieldsActionGroup.xml
new file mode 100644
index 0000000000000..c0fa53da7c688
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminFillSpecificPageWidgetMainFieldsActionGroup.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="AdminFillSpecificPageWidgetMainFieldsActionGroup">
+        <annotations>
+            <description>Fill widget main fields and widget layout by index for specified page DisplayOn option</description>
+        </annotations>
+        <arguments>
+            <argument name="widget" type="entity" defaultValue="ProductsListWidget"/>
+            <argument name="index" type="string" defaultValue="0"/>
+        </arguments>
+        <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}}" parameterArray="{{widget.store_ids}}" stepKey="setWidgetStoreIds"/>
+        <fillField selector="{{AdminNewWidgetSection.widgetSortOrder}}" userInput="{{widget.sort_order}}" stepKey="fillSortOrder"/>
+        <click selector="{{AdminNewWidgetSection.addLayoutUpdate}}" stepKey="clickAddLayoutUpdate"/>
+        <waitForElementVisible selector="{{AdminNewWidgetSection.selectDisplayOn}}" stepKey="waitForSelectElement"/>
+        <selectOption selector="{{AdminNewWidgetSection.displayOnByIndex(index)}}" userInput="{{widget.display_on}}" stepKey="setDisplayOn"/>
+        <waitForPageLoad stepKey="waitForDisplayOnChangesApplied"/>
+        <selectOption selector="{{AdminNewWidgetSection.layoutByIndex(index)}}" userInput="{{widget.page}}" stepKey="selectPage"/>
+        <selectOption selector="{{AdminNewWidgetSection.templateByIndex(index)}}" userInput="{{widget.template}}" stepKey="selectTemplate"/>
+        <scrollTo selector="{{AdminNewWidgetSection.containerByIndex(index)}}" stepKey="scrollToSelectContainerElement"/>
+        <waitForPageLoad stepKey="waitForScroll"/>
+        <selectOption selector="{{AdminNewWidgetSection.containerByIndex(index)}}" userInput="{{widget.container}}" stepKey="setContainer"/>
+        <waitForPageLoad stepKey="waitForContainerChangesApplied"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
index eebd6c10b5085..0777e6cbd58d9 100644
--- a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -11,12 +11,17 @@
     <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="continue" type="button" timeout="30" selector="#continue_button"/>
         <element name="widgetTitle" type="input" selector="#title"/>
         <element name="widgetStoreIds" type="select" selector="#store_ids"/>
+        <element name="widgetSortOrder" type="input" selector="#sort_order"/>
         <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="displayOnByIndex" type="select" selector="select[name='widget_instance[{{index}}][page_group]']" parameterized="true"/>
+        <element name="layoutByIndex" type="select" selector="select[name='widget_instance[{{index}}][pages][layout_handle]']" parameterized="true"/>
+        <element name="containerByIndex" type="select" selector="select[name='widget_instance[{{index}}][pages][block]']" parameterized="true"/>
+        <element name="templateByIndex" type="select" selector="select[name='widget_instance[{{index}}][pages][template]']" parameterized="true"/>
         <element name="selectTemplate" type="select" selector=".widget-layout-updates .block_template_container .select"/>
         <element name="widgetOptions" type="select" selector="#widget_instace_tabs_properties_section"/>
         <element name="addNewCondition" type="select" selector=".rule-param.rule-param-new-child"/>
diff --git a/app/code/Magento/Widget/Test/Mftf/Test/NewProductsListWidgetTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/NewProductsListWidgetTest.xml
index 9ed4e2ced99f7..c63e76d851933 100644
--- a/app/code/Magento/Widget/Test/Mftf/Test/NewProductsListWidgetTest.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Test/NewProductsListWidgetTest.xml
@@ -27,7 +27,7 @@
         </before>
 
         <after>
-            <actionGroup ref="logout" stepKey="adminLogout"/>
+            <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
         <!-- Create a CMS page containing the New Products widget -->
diff --git a/app/code/Magento/Wishlist/Controller/Index/Add.php b/app/code/Magento/Wishlist/Controller/Index/Add.php
index 5cb60905aea48..3ed152cb84125 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Add.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Add.php
@@ -7,15 +7,18 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Controller\ResultFactory;
 
 /**
+ * Wish list Add controller
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Add extends \Magento\Wishlist\Controller\AbstractIndex
+class Add extends \Magento\Wishlist\Controller\AbstractIndex implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Wishlist\Controller\WishlistProviderInterface
@@ -138,6 +141,7 @@ public function execute()
                     'referer' => $referer
                 ]
             );
+            // phpcs:disable Magento2.Exceptions.ThrowCatch
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->messageManager->addErrorMessage(
                 __('We can\'t add the item to Wish List right now: %1.', $e->getMessage())
diff --git a/app/code/Magento/Wishlist/Controller/Index/Cart.php b/app/code/Magento/Wishlist/Controller/Index/Cart.php
index da37609d688e7..870c4231f97c9 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Cart.php
@@ -186,7 +186,7 @@ public function execute()
                     'You added %1 to your shopping cart.',
                     $this->escaper->escapeHtml($item->getProduct()->getName())
                 );
-                $this->messageManager->addSuccess($message);
+                $this->messageManager->addSuccessMessage($message);
             }
 
             if ($this->cartHelper->getShouldRedirectToCart()) {
@@ -214,7 +214,7 @@ public function execute()
             $resultJson->setData(['backUrl' => $redirectUrl]);
             return $resultJson;
         }
-        
+
         $resultRedirect->setUrl($redirectUrl);
         return $resultRedirect;
     }
diff --git a/app/code/Magento/Wishlist/Controller/Index/Configure.php b/app/code/Magento/Wishlist/Controller/Index/Configure.php
index 93a05ffc0ec93..a273a37deeff3 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Configure.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Configure.php
@@ -11,9 +11,11 @@
 use Magento\Framework\Controller\ResultFactory;
 
 /**
+ * Wishlist Configure Controller
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Configure extends \Magento\Wishlist\Controller\AbstractIndex
+class Configure extends \Magento\Wishlist\Controller\AbstractIndex implements Action\HttpGetActionInterface
 {
     /**
      * Core registry
@@ -102,11 +104,11 @@ public function execute()
 
             return $resultPage;
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $resultRedirect->setPath('*');
             return $resultRedirect;
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We can\'t configure the product right now.'));
+            $this->messageManager->addErrorMessage(__('We can\'t configure the product right now.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
             $resultRedirect->setPath('*');
             return $resultRedirect;
diff --git a/app/code/Magento/Wishlist/Controller/Index/Plugin.php b/app/code/Magento/Wishlist/Controller/Index/Plugin.php
index 60d6859613d5e..150e4de72b40d 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Plugin.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Plugin.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -12,6 +11,9 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\RedirectInterface;
 
+/**
+ * Wishlist plugin before dispatch
+ */
 class Plugin
 {
     /**
@@ -75,7 +77,9 @@ public function beforeDispatch(\Magento\Framework\App\ActionInterface $subject,
             if (!$this->customerSession->getBeforeWishlistUrl()) {
                 $this->customerSession->setBeforeWishlistUrl($this->redirector->getRefererUrl());
             }
-            $this->customerSession->setBeforeWishlistRequest($request->getParams());
+            $data = $request->getParams();
+            unset($data['login']);
+            $this->customerSession->setBeforeWishlistRequest($data);
             $this->customerSession->setBeforeRequestParams($this->customerSession->getBeforeWishlistRequest());
             $this->customerSession->setBeforeModuleName('wishlist');
             $this->customerSession->setBeforeControllerName('index');
diff --git a/app/code/Magento/Wishlist/Controller/Index/Remove.php b/app/code/Magento/Wishlist/Controller/Index/Remove.php
index 84c59b5be3d1e..ea798a8b57cda 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Remove.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Remove.php
@@ -14,9 +14,11 @@
 use Magento\Wishlist\Model\Product\AttributeValueProvider;
 
 /**
+ * Wishlist Remove Controller
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Remove extends \Magento\Wishlist\Controller\AbstractIndex
+class Remove extends \Magento\Wishlist\Controller\AbstractIndex implements Action\HttpPostActionInterface
 {
     /**
      * @var WishlistProviderInterface
@@ -88,11 +90,11 @@ public function execute()
                 ]
             );
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError(
+            $this->messageManager->addErrorMessage(
                 __('We can\'t delete the item from Wish List right now because of an error: %1.', $e->getMessage())
             );
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We can\'t delete the item from the Wish List right now.'));
+            $this->messageManager->addErrorMessage(__('We can\'t delete the item from the Wish List right now.'));
         }
 
         $this->_objectManager->get(\Magento\Wishlist\Helper\Data::class)->calculate();
diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
index 5d867ac74752b..54aa53d829db5 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Send.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -219,7 +219,7 @@ public function execute()
         }
 
         if ($error) {
-            $this->messageManager->addError($error);
+            $this->messageManager->addErrorMessage($error);
             $this->wishlistSession->setSharingForm($this->getRequest()->getPostValue());
             $resultRedirect->setPath('*/*/share');
             return $resultRedirect;
@@ -285,12 +285,12 @@ public function execute()
             $this->inlineTranslation->resume();
 
             $this->_eventManager->dispatch('wishlist_share', ['wishlist' => $wishlist]);
-            $this->messageManager->addSuccess(__('Your wish list has been shared.'));
+            $this->messageManager->addSuccessMessage(__('Your wish list has been shared.'));
             $resultRedirect->setPath('*/*', ['wishlist_id' => $wishlist->getId()]);
             return $resultRedirect;
         } catch (\Exception $e) {
             $this->inlineTranslation->resume();
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $this->wishlistSession->setSharingForm($this->getRequest()->getPostValue());
             $resultRedirect->setPath('*/*/share');
             return $resultRedirect;
diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php
index b56aa4b5b3c8d..e5fbd4b93f82e 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Update.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Update.php
@@ -103,7 +103,7 @@ public function execute()
                         $item->delete();
                     } catch (\Exception $e) {
                         $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-                        $this->messageManager->addError(__('We can\'t delete item from Wish List right now.'));
+                        $this->messageManager->addErrorMessage(__('We can\'t delete item from Wish List right now.'));
                     }
                 }
 
@@ -118,7 +118,7 @@ public function execute()
                     );
                     $updatedItems++;
                 } catch (\Exception $e) {
-                    $this->messageManager->addError(
+                    $this->messageManager->addErrorMessage(
                         __(
                             'Can\'t save description %1',
                             $this->_objectManager->get(\Magento\Framework\Escaper::class)->escapeHtml($description)
@@ -133,7 +133,7 @@ public function execute()
                     $wishlist->save();
                     $this->_objectManager->get(\Magento\Wishlist\Helper\Data::class)->calculate();
                 } catch (\Exception $e) {
-                    $this->messageManager->addError(__('Can\'t update wish list'));
+                    $this->messageManager->addErrorMessage(__('Can\'t update wish list'));
                 }
             }
 
diff --git a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
index 2a98fa1b7fcd5..6fae77fd604e5 100644
--- a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
+++ b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
@@ -14,9 +14,11 @@
 use Magento\Wishlist\Controller\WishlistProviderInterface;
 
 /**
+ * Wishlist UpdateItemOptions Controller
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class UpdateItemOptions extends \Magento\Wishlist\Controller\AbstractIndex
+class UpdateItemOptions extends \Magento\Wishlist\Controller\AbstractIndex implements Action\HttpPostActionInterface
 {
     /**
      * @var WishlistProviderInterface
@@ -85,7 +87,7 @@ public function execute()
         }
 
         if (!$product || !$product->isVisibleInCatalog()) {
-            $this->messageManager->addError(__('We can\'t specify a product.'));
+            $this->messageManager->addErrorMessage(__('We can\'t specify a product.'));
             $resultRedirect->setPath('*/');
             return $resultRedirect;
         }
@@ -114,11 +116,11 @@ public function execute()
             $this->_objectManager->get(\Magento\Wishlist\Helper\Data::class)->calculate();
 
             $message = __('%1 has been updated in your Wish List.', $product->getName());
-            $this->messageManager->addSuccess($message);
+            $this->messageManager->addSuccessMessage($message);
         } 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 your Wish List right now.'));
+            $this->messageManager->addErrorMessage(__('We can\'t update your Wish List right now.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
         }
         $resultRedirect->setPath('*/*', ['wishlist_id' => $wishlist->getId()]);
diff --git a/app/code/Magento/Wishlist/Controller/Shared/Cart.php b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
index b41b51057636f..38f100602972a 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
@@ -9,6 +9,7 @@
 use Magento\Checkout\Helper\Cart as CartHelper;
 use Magento\Checkout\Model\Cart as CustomerCart;
 use Magento\Framework\App\Action\Context as ActionContext;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Escaper;
 use Magento\Framework\Exception\LocalizedException;
@@ -18,9 +19,11 @@
 use Magento\Wishlist\Model\ResourceModel\Item\Option\Collection as OptionCollection;
 
 /**
+ * Wishlist Cart Controller
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Cart extends \Magento\Framework\App\Action\Action
+class Cart extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
 {
     /**
      * @var CustomerCart
@@ -103,19 +106,19 @@ public function execute()
                     'You added %1 to your shopping cart.',
                     $this->escaper->escapeHtml($item->getProduct()->getName())
                 );
-                $this->messageManager->addSuccess($message);
+                $this->messageManager->addSuccessMessage($message);
             }
 
             if ($this->cartHelper->getShouldRedirectToCart()) {
                 $redirectUrl = $this->cartHelper->getCartUrl();
             }
         } catch (ProductException $e) {
-            $this->messageManager->addError(__('This product(s) is out of stock.'));
+            $this->messageManager->addErrorMessage(__('This product(s) is out of stock.'));
         } catch (LocalizedException $e) {
-            $this->messageManager->addNotice($e->getMessage());
+            $this->messageManager->addNoticeMessage($e->getMessage());
             $redirectUrl = $item->getProductUrl();
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t add the item to the cart right now.'));
+            $this->messageManager->addExceptionMessage($e, __('We can\'t add the item to the cart right now.'));
         }
         /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/Wishlist/Controller/WishlistProvider.php b/app/code/Magento/Wishlist/Controller/WishlistProvider.php
index 4740ea9947ef7..ae59d3a13d6eb 100644
--- a/app/code/Magento/Wishlist/Controller/WishlistProvider.php
+++ b/app/code/Magento/Wishlist/Controller/WishlistProvider.php
@@ -1,13 +1,18 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Wishlist\Controller;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\RequestInterface;
 
+/**
+ * WishlistProvider Controller
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
 class WishlistProvider implements WishlistProviderInterface
 {
     /**
@@ -54,7 +59,8 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function getWishlist($wishlistId = null)
@@ -85,10 +91,10 @@ public function getWishlist($wishlistId = null)
                 );
             }
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             return false;
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t create the Wish List right now.'));
+            $this->messageManager->addExceptionMessage($e, __('We can\'t create the Wish List right now.'));
             return false;
         }
         $this->wishlist = $wishlist;
diff --git a/app/code/Magento/Wishlist/Model/ItemCarrier.php b/app/code/Magento/Wishlist/Model/ItemCarrier.php
index 6cf295084eca8..6198eb289a0f4 100644
--- a/app/code/Magento/Wishlist/Model/ItemCarrier.php
+++ b/app/code/Magento/Wishlist/Model/ItemCarrier.php
@@ -10,6 +10,7 @@
 use Magento\Checkout\Helper\Cart as CartHelper;
 use Magento\Checkout\Model\Cart;
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\Response\RedirectInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Psr\Log\LoggerInterface as Logger;
@@ -18,7 +19,10 @@
 use Magento\Wishlist\Helper\Data as WishlistHelper;
 
 /**
+ * Wishlist ItemCarrier Controller
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class ItemCarrier
 {
@@ -182,7 +186,7 @@ public function moveAllToCart(Wishlist $wishlist, $qtys)
 
         if ($messages) {
             foreach ($messages as $message) {
-                $this->messageManager->addError($message);
+                $this->messageManager->addErrorMessage($message);
             }
             $redirectUrl = $indexUrl;
         }
@@ -192,7 +196,7 @@ public function moveAllToCart(Wishlist $wishlist, $qtys)
             try {
                 $wishlist->save();
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('We can\'t update the Wish List right now.'));
+                $this->messageManager->addErrorMessage(__('We can\'t update the Wish List right now.'));
                 $redirectUrl = $indexUrl;
             }
 
@@ -202,7 +206,7 @@ public function moveAllToCart(Wishlist $wishlist, $qtys)
                 $products[] = '"' . $product->getName() . '"';
             }
 
-            $this->messageManager->addSuccess(
+            $this->messageManager->addSuccessMessage(
                 __('%1 product(s) have been added to shopping cart: %2.', count($addedProducts), join(', ', $products))
             );
 
diff --git a/app/code/Magento/Wishlist/Setup/Patch/Schema/AddProductIdConstraint.php b/app/code/Magento/Wishlist/Setup/Patch/Schema/AddProductIdConstraint.php
deleted file mode 100644
index 5c65fce10ccd2..0000000000000
--- a/app/code/Magento/Wishlist/Setup/Patch/Schema/AddProductIdConstraint.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
index cda7f5f3267b0..5568f255304a7 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
@@ -33,7 +33,7 @@
             <argument name="productVar"/>
         </arguments>
 
-        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.productAddToWishlist}}" stepKey="WaitForWishList"/>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.productAddToWishlist}}" stepKey="WaitForWishList" time="30"/>
         <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. Click here to continue shopping." stepKey="addProductToWishlistSeeProductNameAddedToWishlist"/>
@@ -135,4 +135,47 @@
         <dontSeeElement selector="{{StorefrontCustomerWishlistProductSection.pager}}" stepKey="checkThatPagerIsAbsent"/>
         <see selector="{{StorefrontCustomerWishlistProductSection.wishlistEmpty}}" userInput="You have no items in your wish list." stepKey="checkNoItemsMessage"/>
     </actionGroup>
+
+    <actionGroup name="AssertMoveProductToWishListSuccessMessage">
+        <annotations>
+            <description>Moves a product from the cart to the wishlist.</description>
+        </annotations>
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <click selector="{{CheckoutCartProductSection.moveToWishlistByProductName(productName)}}" stepKey="moveToWishlist"/>
+        <waitForPageLoad stepKey="waitForMove"/>
+        <see userInput="{{productName}} has been moved to your wish list." selector="{{CheckoutCartMessageSection.successMessage}}" stepKey="assertSuccess"/>
+    </actionGroup>
+
+    <actionGroup name="AssertProductIsPresentInWishList">
+        <annotations>
+            <description>Go to storefront customer wishlist page and assert product name and price is present.</description>
+        </annotations>
+        <arguments>
+            <argument name="productName" type="string"/>
+            <argument name="productPrice" type="string"/>
+        </arguments>
+        <amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="goToWishList"/>
+        <waitForPageLoad stepKey="waitForWishList"/>
+        <waitForElement selector="{{StorefrontCustomerWishlistProductSection.ProductTitleByName(productName)}}" time="30" stepKey="assertProductName"/>
+        <see userInput="{{productPrice}}" selector="{{StorefrontCustomerWishlistProductSection.ProductPriceByName(productName)}}" stepKey="assertProductPrice"/>
+    </actionGroup>
+
+    <actionGroup name="AssertProductDetailsInWishlist">
+        <annotations>
+            <description>Assert product name and price in wishlist on hover.</description>
+        </annotations>
+        <arguments>
+            <argument name="productName" type="string"/>
+            <argument name="label" type="string"/>
+            <argument name="labelValue" type="string"/>
+        </arguments>
+        <moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName(productName)}}" stepKey="moveMouseOverProductInfo"/>
+        <seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductAddToCartByName(productName)}}" stepKey="seeAddToCart"/>
+        <seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductImageByName(productName)}}" stepKey="seeImage"/>
+        <moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsByName(productName)}}" stepKey="moveMouseOverProductDetails"/>
+        <see userInput="{{label}}" selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsLabelByName(productName)}}" stepKey="seeLabel"/>
+        <see userInput="{{labelValue}}" selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsValueByName(productName)}}" stepKey="seeLabelValue"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
index 0b6c2f1191c40..e75b29944117b 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml
@@ -24,5 +24,9 @@
         <element name="productSuccessShareMessage" type="text" selector="div.message-success"/>
         <element name="pager" type="block" selector=".toolbar .pager"/>
         <element name="wishlistEmpty" type="block" selector=".form-wishlist-items .message.info.empty"/>
+        <element name="removeProduct" type="button" selector=".products-grid a.btn-remove" timeout="30"/>
+        <element name="productSeeDetailsByName" type="block" selector="//a[contains(text(), '{{productName}}')]/ancestor::div/div[contains(@class, 'product-item-tooltip')]" parameterized="true"/>
+        <element name="productSeeDetailsLabelByName" type="block" selector="//a[contains(text(), '{{productName}}')]/ancestor::div/div[contains(@class, 'product-item-tooltip')]//dt[@class='label']" parameterized="true"/>
+        <element name="productSeeDetailsValueByName" type="block" selector="//a[contains(text(), '{{productName}}')]/ancestor::div/div[contains(@class, 'product-item-tooltip')]//dd[@class='values']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml
index 16a18dd27b123..82c53bc343e51 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml
@@ -26,12 +26,16 @@
                 <requiredEntity createDataKey="categorySecond"/>
             </createData>
             <createData entity="Simple_US_Customer" stepKey="customer"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
             <deleteData createDataKey="categoryFirst" stepKey="deleteCategoryFirst"/>
             <deleteData createDataKey="categorySecond" stepKey="deleteCategorySecond"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
         <!-- Sign in as customer -->
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteBundleDynamicProductFromWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteBundleDynamicProductFromWishlistTest.xml
new file mode 100644
index 0000000000000..ae65a4171d883
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteBundleDynamicProductFromWishlistTest.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="StorefrontDeleteBundleDynamicProductFromWishlistTest">
+        <annotations>
+            <stories value="Wishlist"/>
+            <title value="Delete Dynamic Bundle Product from Wishlist on Frontend"/>
+            <description value="Delete Dynamic Bundle Product from Wishlist on Frontend"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14215"/>
+            <group value="wishlist"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create Data -->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
+                <field key="price">100.00</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+                <field key="price">100.00</field>
+            </createData>
+            <!--Create Bundle product-->
+            <createData entity="BundleProductPriceViewRange" stepKey="createBundleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="DropDownBundleOption" stepKey="createBundleOption1_1">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <field key="required">True</field>
+            </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>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <actionGroup ref="goToProductPageViaID" stepKey="goToProduct">
+                <argument name="productId" value="$$createBundleProduct.id$$"/>
+            </actionGroup>
+            <scrollTo selector="{{AdminProductFormBundleSection.contentDropDown}}" stepKey="scrollToBundleSection"/>
+            <selectOption userInput="Separately" selector="{{AdminProductFormBundleSection.shipmentType}}" stepKey="selectSeparately"/>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+        </before>
+        <after>
+            <!-- Delete data -->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Login as a customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!-- Navigate to catalog page -->
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductFromCategory">
+            <argument name="productUrlKey" value="$$createBundleProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        
+        <!--  Add created product to Wishlist according to dataset and assert add product to wishlist success message -->
+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addProductToWishlist">
+            <argument name="productVar" value="$$createBundleProduct$$"/>
+        </actionGroup>
+
+        <!--  Navigate to My Account > My Wishlist -->
+        <amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="amOnWishListPage"/>
+        <waitForPageLoad stepKey="waitForWishlistPageLoad"/>
+
+        <!-- Click "Remove item" -->
+        <scrollTo selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName($$createBundleProduct.name$$)}}" stepKey="scrollToProduct"/>
+        <moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName($$createBundleProduct.name$$)}}" stepKey="mouseOverOnProduct"/>
+        <click selector="{{StorefrontCustomerWishlistProductSection.removeProduct}}" stepKey="clickRemoveButton"/>
+
+        <!-- Assert Wishlist is empty -->
+        <actionGroup ref="StorefrontAssertCustomerWishlistIsEmpty" stepKey="assertWishlistIsEmpty"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteBundleFixedProductFromWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteBundleFixedProductFromWishlistTest.xml
new file mode 100644
index 0000000000000..a0bff949f00f5
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteBundleFixedProductFromWishlistTest.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="StorefrontDeleteBundleFixedProductFromWishlistTest">
+        <annotations>
+            <stories value="Wishlist"/>
+            <title value="Delete Fixed Bundle Product from Wishlist on Frontend"/>
+            <description value="Delete Fixed Bundle Product from Wishlist on Frontend"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14216"/>
+            <group value="wishlist"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create Data -->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
+                <field key="price">100.00</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+                <field key="price">100.00</field>
+            </createData>
+            <!-- Create bundle product -->
+            <createData entity="ApiFixedBundleProduct" stepKey="createBundleProduct"/>
+            <createData entity="DropDownBundleOption" stepKey="createBundleOption1_1">
+                <requiredEntity createDataKey="createBundleProduct"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createBundleLink">
+                <field key="price_type">0</field>
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_1"/>
+                <requiredEntity createDataKey="simpleProduct1"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
+                <field key="price_type">0</field>
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_1"/>
+                <requiredEntity createDataKey="simpleProduct2"/>
+            </createData>
+            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
+            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+        </before>
+        <after>
+            <!-- Delete data -->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Login as a customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!-- Navigate to catalog page -->
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductFromCategory">
+            <argument name="productUrlKey" value="$$createBundleProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+
+        <!--  Add created product to Wishlist according to dataset and assert add product to wishlist success message -->
+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addProductToWishlist">
+            <argument name="productVar" value="$$createBundleProduct$$"/>
+        </actionGroup>
+
+        <!--  Navigate to My Account > My Wishlist -->
+        <amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="amOnWishListPage"/>
+        <waitForPageLoad stepKey="waitForWishlistPageLoad"/>
+
+        <!-- Click "Remove item" -->
+        <scrollTo selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName($$createBundleProduct.name$$)}}" stepKey="scrollToProduct"/>
+        <moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName($$createBundleProduct.name$$)}}" stepKey="mouseOverOnProduct"/>
+        <click selector="{{StorefrontCustomerWishlistProductSection.removeProduct}}" stepKey="clickRemoveButton"/>
+
+        <!-- Assert Wishlist is empty -->
+        <actionGroup ref="StorefrontAssertCustomerWishlistIsEmpty" stepKey="assertWishlistIsEmpty"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteConfigurableProductFromWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteConfigurableProductFromWishlistTest.xml
new file mode 100644
index 0000000000000..ee66825878728
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteConfigurableProductFromWishlistTest.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="StorefrontDeleteConfigurableProductFromWishlistTest">
+        <annotations>
+            <stories value="Wishlist"/>
+            <title value="Delete Configurable Product from Wishlist on Frontend"/>
+            <description value="Delete Configurable Product from Wishlist on Frontend"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-14217"/>
+            <group value="wishlist"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create Data -->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="_defaultCategory" 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="productAttributeOption3" stepKey="createConfigProductAttributeOption3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Add the attribute just created to default attribute set -->
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Get the first option of the attribute created -->
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Get the second option of the attribute created -->
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Get the third option of the attribute created -->
+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOption3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create Configurable product -->
+            <createData entity="BaseConfigurableProduct" 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"/>
+                <field key="price">10.00</field>
+            </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"/>
+                <field key="price">20.00</field>
+            </createData>
+
+            <!--Create a simple product and give it the attribute with the Third option -->
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
+                <field key="price">30.00</field>
+            </createData>
+
+            <!-- Create the configurable product -->
+            <createData entity="ConfigurableProductThreeOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
+            </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>
+
+            <!-- Add the third simple product to the configurable product -->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild3">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct3"/>
+            </createData>
+            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
+            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+        </before>
+        <after>
+            <!-- Delete data -->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="createConfigChildProduct3" stepKey="deleteSimpleProduct3"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteProductAttribute"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- 1. Login as a customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!-- 2. Navigate to catalog page -->
+        <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="openProductFromCategory">
+            <argument name="category" value="$$createCategory$$"/>
+        </actionGroup>
+
+        <!--  3. Add created product to Wishlist according to dataset and assert add product to wishlist success message -->
+        <actionGroup ref="StorefrontCustomerAddCategoryProductToWishlistActionGroup" stepKey="addProductToWishlist">
+            <argument name="productVar" value="$$createConfigProduct$$"/>
+        </actionGroup>
+
+        <!--  Navigate to My Account > My Wishlist -->
+        <amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="amOnWishListPage"/>
+        <waitForPageLoad stepKey="waitForWishlistPageLoad"/>
+
+        <!-- Click "Remove item" -->
+        <scrollTo selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName($$createConfigProduct.name$$)}}" stepKey="scrollToProduct"/>
+        <moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName($$createConfigProduct.name$$)}}" stepKey="mouseOverOnProduct"/>
+        <click selector="{{StorefrontCustomerWishlistProductSection.removeProduct}}" stepKey="clickRemoveButton"/>
+
+        <!-- Assert Wishlist is empty -->
+        <actionGroup ref="StorefrontAssertCustomerWishlistIsEmpty" stepKey="assertWishlistIsEmpty"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveConfigurableProductFromShoppingCartToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveConfigurableProductFromShoppingCartToWishlistTest.xml
new file mode 100644
index 0000000000000..70268f4e14e8f
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveConfigurableProductFromShoppingCartToWishlistTest.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="StorefrontMoveConfigurableProductFromShoppingCartToWishlistTest">
+        <annotations>
+            <stories value="Wishlist"/>
+            <title value="Move Configurable Product from Shopping Cart to Wishlist"/>
+            <description value="Move Configurable Product from Shopping Cart to Wishlist"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14211"/>
+            <group value="wishlist"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create Data -->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <!-- Create an attribute with three 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>
+            <createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOption3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Add the attribute just created to default attribute set -->
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Get the first option of the attribute created -->
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Get the second option of the attribute created -->
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Get the third option of the attribute created -->
+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOption3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create Configurable product -->
+            <createData entity="BaseConfigurableProduct" 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"/>
+                <field key="price">10.00</field>
+            </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"/>
+                <field key="price">20.00</field>
+            </createData>
+
+            <!--Create a simple product and give it the attribute with the Third option -->
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
+                <field key="price">30.00</field>
+            </createData>
+
+            <!-- Create the configurable product -->
+            <createData entity="ConfigurableProductThreeOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
+            </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>
+
+            <!-- Add the third simple product to the configurable product -->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild3">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct3"/>
+            </createData>
+
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <!-- Delete data -->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="createConfigChildProduct3" stepKey="deleteSimpleProduct3"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteProductAttribute"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- 1. Login as a customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!-- Open Product page -->
+        <actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openProductFromCategory">
+            <argument name="category" value="$$createCategory$$"/>
+            <argument name="product" value="$$createConfigProduct$$"/>
+        </actionGroup>
+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect($$createConfigProductAttribute.default_value$$)}}" userInput="$$getConfigAttributeOption2.label$$" stepKey="selectOption1"/>
+        <scrollTo selector="{{StorefrontProductInfoMainSection.productAddToWishlist}}" y="-200" stepKey="scroll"/>
+
+        <!-- Add product to the cart and Assert add product to cart success message-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartVirtualProductFromStorefrontProductPage">
+            <argument name="productName" value="$$createConfigProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
+
+        <!-- Assert move product to wishlist success message -->
+        <actionGroup ref="AssertMoveProductToWishListSuccessMessage" stepKey="moveToWishlist">
+            <argument name="productName" value="$$createConfigProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Assert product is present in wishlist -->
+        <actionGroup ref="AssertProductIsPresentInWishList" stepKey="assertProductPresent">
+            <argument name="productName" value="$$createConfigProduct.name$$"/>
+            <argument name="productPrice" value="$20.00"/>
+        </actionGroup>
+
+        <!-- Assert product details in Wishlist -->
+        <actionGroup ref="AssertProductDetailsInWishlist" stepKey="assertProductDetails">
+            <argument name="productName" value="$$createConfigProduct.name$$"/>
+            <argument name="label" value="$$createConfigProductAttribute.default_value$$"/>
+            <argument name="labelValue" value="$$getConfigAttributeOption2.label$$"/>
+        </actionGroup>
+
+        <actionGroup ref="AssertShoppingCartIsEmptyActionGroup" stepKey="assertCartIsEmpty"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
new file mode 100644
index 0000000000000..6faf4c1002c1a
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontMoveDynamicBundleProductFromShoppingCartToWishlistTest">
+        <annotations>
+            <stories value="Wishlist"/>
+            <title value="Move Dynamic Bundle Product from Shopping Cart to Wishlist"/>
+            <description value="Move Dynamic Bundle Product from Shopping Cart to Wishlist"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14212"/>
+            <group value="wishlist"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create Data -->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
+                <field key="price">100.00</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+                <field key="price">20.00</field>
+            </createData>
+            <!--Create Bundle product-->
+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createBundleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="DropDownBundleOption" stepKey="createBundleOption1_1">
+                <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>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <actionGroup ref="goToProductPageViaID" stepKey="goToProduct">
+                <argument name="productId" value="$$createBundleProduct.id$$"/>
+            </actionGroup>
+            <scrollTo selector="{{AdminProductFormBundleSection.contentDropDown}}" stepKey="scrollToBundleSection"/>
+            <selectOption userInput="Separately" selector="{{AdminProductFormBundleSection.shipmentType}}" stepKey="selectSeparately"/>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
+            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+        </before>
+        <after>
+            <!-- Delete data -->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- 1. Login as a customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!-- Open Product page -->
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductFromCategory">
+            <argument name="productUrlKey" value="$$createBundleProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickCustomizeButton"/>
+        <selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts($$createBundleOption1_1.title$$)}}" userInput="$$simpleProduct1.sku$$ +$100.00" stepKey="selectOption0Product0"/>
+        <fillField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity($$createBundleOption1_1.title$$)}}" userInput="1" stepKey="fillQuantity00"/>
+
+        <!-- Add product to the cart and Assert add product to cart success message-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartVirtualProductFromStorefrontProductPage">
+            <argument name="productName" value="$$createBundleProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
+
+        <!-- Assert move product to wishlist success message -->
+        <actionGroup ref="AssertMoveProductToWishListSuccessMessage" stepKey="moveToWishlist">
+            <argument name="productName" value="$$createBundleProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Assert product is present in wishlist -->
+        <actionGroup ref="AssertProductIsPresentInWishList" stepKey="assertProductPresent">
+            <argument name="productName" value="$$createBundleProduct.name$$"/>
+            <argument name="productPrice" value="$100.00"/>
+        </actionGroup>
+
+        <!-- Assert product details in Wishlist -->
+        <actionGroup ref="AssertProductDetailsInWishlist" stepKey="assertProductDetails">
+            <argument name="productName" value="$$createBundleProduct.name$$"/>
+            <argument name="label" value="$$createBundleOption1_1.title$$"/>
+            <argument name="labelValue" value="$$simpleProduct1.sku$$ $100.00"/>
+        </actionGroup>
+
+        <actionGroup ref="AssertShoppingCartIsEmptyActionGroup" stepKey="assertCartIsEmpty"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.xml
new file mode 100644
index 0000000000000..3906767d04cc1
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest.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="StorefrontMoveFixedBundleProductFromShoppingCartToWishlistTest">
+        <annotations>
+            <stories value="Wishlist"/>
+            <title value="Move Fixed Bundle Product from Shopping Cart to Wishlist"/>
+            <description value="Move Fixed Bundle Product from Shopping Cart to Wishlist"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14213"/>
+            <group value="wishlist"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create Data -->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+            <!-- Create bundle product -->
+            <createData entity="ApiFixedBundleProduct" stepKey="createBundleProduct"/>
+            <createData entity="DropDownBundleOption" stepKey="createBundleOption1_1">
+                <requiredEntity createDataKey="createBundleProduct"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="createBundleLink">
+                <field key="price_type">0</field>
+                <field key="price">100</field>
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_1"/>
+                <requiredEntity createDataKey="simpleProduct1"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
+                <field key="price_type">0</field>
+                <field key="price">100</field>
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_1"/>
+                <requiredEntity createDataKey="simpleProduct2"/>
+            </createData>
+            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
+            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+        </before>
+        <after>
+            <!-- Delete data -->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- 1. Login as a customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!-- Open Product page -->
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductFromCategory">
+            <argument name="productUrlKey" value="$$createBundleProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickCustomizeButton"/>
+        <selectOption selector="{{StorefrontBundledSection.dropDownOptionOneProducts($$createBundleOption1_1.title$$)}}" userInput="$$simpleProduct1.sku$$ +$100.00" stepKey="selectOption0Product0"/>
+        <fillField selector="{{StorefrontBundledSection.dropDownOptionOneQuantity($$createBundleOption1_1.title$$)}}" userInput="1" stepKey="fillQuantity00"/>
+
+        <!-- Add product to the cart and Assert add product to cart success message-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartVirtualProductFromStorefrontProductPage">
+            <argument name="productName" value="$$createBundleProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
+
+        <!-- Assert move product to wishlist success message -->
+        <actionGroup ref="AssertMoveProductToWishListSuccessMessage" stepKey="moveToWishlist">
+            <argument name="productName" value="$$createBundleProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Assert product is present in wishlist -->
+        <actionGroup ref="AssertProductIsPresentInWishList" stepKey="assertProductPresent">
+            <argument name="productName" value="$$createBundleProduct.name$$"/>
+            <argument name="productPrice" value="$101.23"/>
+        </actionGroup>
+
+        <!-- Assert product details in Wishlist -->
+        <actionGroup ref="AssertProductDetailsInWishlist" stepKey="assertProductDetails">
+            <argument name="productName" value="$$createBundleProduct.name$$"/>
+            <argument name="label" value="$$createBundleOption1_1.title$$"/>
+            <argument name="labelValue" value="$$simpleProduct1.sku$$ $100.00"/>
+        </actionGroup>
+
+        <actionGroup ref="AssertShoppingCartIsEmptyActionGroup" stepKey="assertCartIsEmpty"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveVirtualProductFromShoppingCartToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveVirtualProductFromShoppingCartToWishlistTest.xml
new file mode 100644
index 0000000000000..dc1580797e5be
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveVirtualProductFromShoppingCartToWishlistTest.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="StorefrontMoveVirtualProductFromShoppingCartToWishlistTest">
+        <annotations>
+            <stories value="Wishlist"/>
+            <title value="Move Virtual Product from Shopping Cart to Wishlist"/>
+            <description value="Move Virtual Product from Shopping Cart to Wishlist"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14210"/>
+            <group value="wishlist"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Create Data -->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="defaultVirtualProduct" stepKey="createProduct">
+                <field key="price">40</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <!-- Delete data -->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- 1. Login as a customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!-- Open Virtual Product page -->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="OpenStoreFrontProductPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+
+        <!-- Add Virtual product to the cart and Assert add product to cart success message-->
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartVirtualProductFromStorefrontProductPage">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Select Mini Cart and select 'View And Edit Cart' -->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
+
+        <!-- Assert move product to wishlist success message -->
+        <actionGroup ref="AssertMoveProductToWishListSuccessMessage" stepKey="moveToWishlist">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Assert product is present in wishlist -->
+        <actionGroup ref="AssertProductIsPresentInWishList" stepKey="assertProductPresent">
+            <argument name="productName" value="$$createProduct.name$$"/>
+            <argument name="productPrice" value="$$createProduct.price$$"/>
+        </actionGroup>
+
+        <!-- Assert cart is empty -->
+        <actionGroup ref="AssertShoppingCartIsEmptyActionGroup" stepKey="assertCartIsEmpty"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml
index e3382dc41d27e..6c73cb6708ae4 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml
@@ -34,6 +34,11 @@
             <deleteData createDataKey="categorySecond" stepKey="deleteCategorySecond"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
+
+        <!-- Perform reindex and flush cache -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <!-- Sign in as customer -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
             <argument name="Customer" value="$$customer$$"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
index e482449f623fc..b8a84a327b58f 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
@@ -26,6 +26,10 @@
             <createData entity="Simple_US_Customer" stepKey="customer"/>
         </before>
 
+        <!-- Perform reindex and flush cache -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
             <argument name="Customer" value="$$customer$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
index e9061f1f3d5f8..c1f1378c22da6 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
@@ -172,7 +172,7 @@ protected function setUp()
 
         $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods(['addSuccess'])
+            ->setMethods(['addSuccessMessage'])
             ->getMockForAbstractClass();
 
         $this->urlMock = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
@@ -566,7 +566,7 @@ protected function prepareExecuteWithQuantityArray($isAjax = false)
             ->willReturn($productName);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('You added '  . $productName . ' to your shopping cart.', null)
             ->willReturnSelf();
 
@@ -581,7 +581,7 @@ protected function prepareExecuteWithQuantityArray($isAjax = false)
         $this->helperMock->expects($this->once())
             ->method('calculate')
             ->willReturnSelf();
-        
+
         return $refererUrl;
     }
 
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 399b48073b339..2b583f9101516 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Wishlist\Test\Unit\Controller\Index;
 
+/**
+ * Test for wishlist plugin before dispatch
+ */
 class PluginTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -38,22 +41,26 @@ class PluginTest extends \PHPUnit\Framework\TestCase
      */
     protected $request;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
             ->disableOriginalConstructor()
-            ->setMethods([
-                'authenticate',
-                'getBeforeWishlistUrl',
-                'setBeforeWishlistUrl',
-                'setBeforeWishlistRequest',
-                'getBeforeWishlistRequest',
-                'setBeforeRequestParams',
-                'setBeforeModuleName',
-                'setBeforeControllerName',
-                'setBeforeAction',
-            ])
-            ->getMock();
+            ->setMethods(
+                [
+                    'authenticate',
+                    'getBeforeWishlistUrl',
+                    'setBeforeWishlistUrl',
+                    'setBeforeWishlistRequest',
+                    'getBeforeWishlistRequest',
+                    'setBeforeRequestParams',
+                    'setBeforeModuleName',
+                    'setBeforeControllerName',
+                    'setBeforeAction',
+                ]
+            )->getMock();
 
         $this->authenticationState = $this->createMock(\Magento\Wishlist\Model\AuthenticationState::class);
         $this->config = $this->createMock(\Magento\Framework\App\Config::class);
@@ -62,6 +69,9 @@ protected function setUp()
         $this->request = $this->createMock(\Magento\Framework\App\Request\Http::class);
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown()
     {
         unset(
@@ -96,6 +106,7 @@ public function testBeforeDispatch()
         $refererUrl = 'http://referer-url.com';
         $params = [
             'product' => 1,
+            'login' => [],
         ];
 
         $actionFlag = $this->createMock(\Magento\Framework\App\ActionFlag::class);
@@ -139,7 +150,7 @@ public function testBeforeDispatch()
             ->willReturnSelf();
         $this->customerSession->expects($this->once())
             ->method('setBeforeWishlistRequest')
-            ->with($params)
+            ->with(['product' => 1])
             ->willReturnSelf();
         $this->customerSession->expects($this->once())
             ->method('getBeforeWishlistRequest')
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 bb4ae44fcc31d..2f4d0e6ba48ab 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
@@ -244,7 +244,7 @@ public function testExecuteWithoutWishlist()
             ->method('create')
             ->with(\Magento\Wishlist\Model\Item::class)
             ->willReturn($item);
-        
+
         $this->wishlistProvider
             ->expects($this->once())
             ->method('getWishlist')
@@ -273,7 +273,7 @@ public function testExecuteCanNotSaveWishlist()
 
         $this->messageManager
             ->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('We can\'t delete the item from Wish List right now because of an error: Message.')
             ->willReturn(true);
 
@@ -356,7 +356,7 @@ public function testExecuteCanNotSaveWishlistAndWithRedirect()
 
         $this->messageManager
             ->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('We can\'t delete the item from the Wish List right now.')
             ->willReturn(true);
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php
index 0c2d7765b1ff2..b6fd509214897 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php
@@ -249,7 +249,7 @@ public function testExecuteWithoutProduct()
 
         $this->messageManager
             ->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('We can\'t specify a product.')
             ->willReturn(true);
         $this->resultRedirectMock->expects($this->once())
@@ -294,7 +294,7 @@ public function testExecuteWithoutWishList()
 
         $this->messageManager
             ->expects($this->never())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('We can\'t specify a product.')
             ->willReturn(true);
 
@@ -433,12 +433,12 @@ public function testExecuteAddSuccessException()
 
         $this->messageManager
             ->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('Test name has been updated in your Wish List.', null)
             ->willThrowException(new \Magento\Framework\Exception\LocalizedException(__('error-message')));
         $this->messageManager
             ->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('error-message', null)
             ->willReturn(true);
         $this->resultRedirectMock->expects($this->once())
@@ -572,12 +572,12 @@ public function testExecuteAddSuccessCriticalException()
 
         $this->messageManager
             ->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('Test name has been updated in your Wish List.', null)
             ->willThrowException($exception);
         $this->messageManager
             ->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('We can\'t update your Wish List right now.', null)
             ->willReturn(true);
         $this->resultRedirectMock->expects($this->once())
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
index 118c27ae3eee2..c65f166957c5f 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
@@ -266,7 +266,7 @@ public function testExecute(
 
         $successMessage = __('You added %1 to your shopping cart.', $productName);
         $this->messageManager->expects($this->any())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with($successMessage)
             ->willReturnSelf();
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/Helper/RssTest.php b/app/code/Magento/Wishlist/Test/Unit/Helper/RssTest.php
index b55766d77fee3..d0397be83fac7 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Helper/RssTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Helper/RssTest.php
@@ -46,7 +46,7 @@ class RssTest extends \PHPUnit\Framework\TestCase
     protected $customerRepositoryMock;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $moduleManagerMock;
 
@@ -80,7 +80,7 @@ protected function setUp()
         $this->customerRepositoryMock = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
             ->getMock();
 
-        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\ModuleManagerInterface::class)
+        $this->moduleManagerMock = $this->getMockBuilder(\Magento\Framework\Module\Manager::class)
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/ItemCarrierTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/ItemCarrierTest.php
index 43f77e00bdf98..71ae2d182d0e4 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/ItemCarrierTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/ItemCarrierTest.php
@@ -228,7 +228,7 @@ public function testMoveAllToCart()
             ->willReturn($productTwoName);
 
         $this->managerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('%1 product(s) have been added to shopping cart: %2.', 1, '"' . $productTwoName . '"'), null)
             ->willReturnSelf();
 
@@ -431,12 +431,12 @@ public function testMoveAllToCartWithNotSalableAndOptions()
             ->willReturn($productTwoName);
 
         $this->managerMock->expects($this->at(0))
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('%1 for "%2".', 'Localized Exception', $productTwoName), null)
             ->willReturnSelf();
 
         $this->managerMock->expects($this->at(1))
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(
                 __(
                     'We couldn\'t add the following product(s) to the shopping cart: %1.',
@@ -580,7 +580,7 @@ public function testMoveAllToCartWithException()
             ->with($exception, []);
 
         $this->managerMock->expects($this->at(0))
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('We can\'t add this item to your shopping cart right now.'), null)
             ->willReturnSelf();
 
@@ -603,7 +603,7 @@ public function testMoveAllToCartWithException()
             ->willThrowException(new \Exception());
 
         $this->managerMock->expects($this->at(1))
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('We can\'t update the Wish List right now.'), null)
             ->willReturnSelf();
 
@@ -615,7 +615,7 @@ public function testMoveAllToCartWithException()
             ->willReturn($productTwoName);
 
         $this->managerMock->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with(__('%1 product(s) have been added to shopping cart: %2.', 1, '"' . $productOneName . '"'), null)
             ->willReturnSelf();
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/ViewModel/AllowedQuantityTest.php b/app/code/Magento/Wishlist/Test/Unit/ViewModel/AllowedQuantityTest.php
new file mode 100644
index 0000000000000..23e28abf20959
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Unit/ViewModel/AllowedQuantityTest.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Test\Unit\ViewModel;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\CatalogInventory\Model\StockRegistry;
+use Magento\Store\Model\Store;
+use Magento\Wishlist\ViewModel\AllowedQuantity;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class AllowedQuantityTest
+ */
+class AllowedQuantityTest extends TestCase
+{
+    /**
+     * @var AllowedQuantity
+     */
+    private $sut;
+
+    /**
+     * @var StockRegistry|MockObject
+     */
+    private $stockRegistryMock;
+
+    /**
+     * @var ItemInterface|MockObject
+     */
+    private $itemMock;
+
+    /**
+     * @var Product|MockObject
+     */
+    private $productMock;
+
+    /**
+     * @var Store|MockObject
+     */
+    private $storeMock;
+
+    /**
+     * Set Up
+     */
+    protected function setUp()
+    {
+        $this->stockRegistryMock = $this->createMock(StockRegistry::class);
+        $this->itemMock = $this->getMockForAbstractClass(
+            ItemInterface::class,
+            [],
+            '',
+            false,
+            true,
+            true,
+            ['getMinSaleQty', 'getMaxSaleQty']
+        );
+        $this->productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeMock = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->sut = new AllowedQuantity(
+            $this->stockRegistryMock
+        );
+        $this->sut->setItem($this->itemMock);
+    }
+
+    /**
+     * Getting min and max qty test.
+     *
+     * @dataProvider saleQuantityDataProvider
+     *
+     * @param int $minSaleQty
+     * @param int $maxSaleQty
+     * @param array $expectedResult
+     */
+    public function testGettingMinMaxQty(int $minSaleQty, int $maxSaleQty, array $expectedResult)
+    {
+        $this->storeMock->expects($this->atLeastOnce())
+            ->method('getWebsiteId')
+            ->willReturn(1);
+        $this->productMock->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn(1);
+        $this->productMock->expects($this->atLeastOnce())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+        $this->itemMock->expects($this->any())
+            ->method('getProduct')
+            ->willReturn($this->productMock);
+        $this->itemMock->expects($this->any())
+            ->method('getMinSaleQty')
+            ->willReturn($minSaleQty);
+        $this->itemMock->expects($this->any())
+            ->method('getMaxSaleQty')
+            ->willReturn($maxSaleQty);
+        $this->stockRegistryMock->expects($this->any())
+            ->method('getStockItem')
+            ->will($this->returnValue($this->itemMock));
+
+        $result = $this->sut->getMinMaxQty();
+
+        $this->assertEquals($result, $expectedResult);
+    }
+
+    /**
+     * Sales quantity provider
+     *
+     * @return array
+     */
+    public function saleQuantityDataProvider(): array
+    {
+        return [
+            [
+                1,
+                10,
+                [
+                    'minAllowed' => 1,
+                    'maxAllowed' => 10
+                ]
+            ], [
+                1,
+                0,
+                [
+                    'minAllowed' => 1,
+                    'maxAllowed' => 99999999
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Wishlist/view/frontend/email/share_notification.html b/app/code/Magento/Wishlist/view/frontend/email/share_notification.html
index 31ea2f72346ea..d5c31ab858de8 100644
--- a/app/code/Magento/Wishlist/view/frontend/email/share_notification.html
+++ b/app/code/Magento/Wishlist/view/frontend/email/share_notification.html
@@ -6,6 +6,7 @@
 -->
 <!--@subject {{trans "Take a look at %customer_name's Wish List" customer_name=$customerName}} @-->
 <!--@vars {
+"var store.frontend_name":"Store Name",
 "var customerName":"Customer Name",
 "var viewOnSiteLink":"View Wish List URL",
 "var items|raw":"Wish List Items",
@@ -14,7 +15,7 @@
 
 {{template config_path="design/email/header_template"}}
 
-<p>{{trans "%customer_name wants to share this Wish List from %store_name with you:" customer_name=$customerName store_name=$store.getFrontendName()}}</p>
+<p>{{trans "%customer_name wants to share this Wish List from %store_name with you:" customer_name=$customerName store_name=$store.frontend_name}}</p>
 
 {{depend message}}
 <table class="message-info">
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/CustomerWishlistResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/CustomerWishlistResolver.php
new file mode 100644
index 0000000000000..e866b9cead03c
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/CustomerWishlistResolver.php
@@ -0,0 +1,56 @@
+<?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\WishlistFactory;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+
+/**
+ * Fetches customer wishlist data
+ */
+class CustomerWishlistResolver implements ResolverInterface
+{
+    /**
+     * @var WishlistFactory
+     */
+    private $wishlistFactory;
+
+    /**
+     * @param WishlistFactory $wishlistFactory
+     */
+    public function __construct(WishlistFactory $wishlistFactory)
+    {
+        $this->wishlistFactory = $wishlistFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
+        }
+        $wishlist = $this->wishlistFactory->create()->loadByCustomerId($context->getUserId(), true);
+        return [
+            'id' => (string) $wishlist->getId(),
+            'sharing_code' => $wishlist->getSharingCode(),
+            'updated_at' => $wishlist->getUpdatedAt(),
+            'items_count' => $wishlist->getItemsCount(),
+            'model' => $wishlist,
+        ];
+    }
+}
diff --git a/app/code/Magento/WishlistGraphQl/etc/module.xml b/app/code/Magento/WishlistGraphQl/etc/module.xml
index 337623cc85a92..c2f5b3165b2ab 100644
--- a/app/code/Magento/WishlistGraphQl/etc/module.xml
+++ b/app/code/Magento/WishlistGraphQl/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_WishlistGraphQl" />
+    <module name="Magento_WishlistGraphQl">
+        <sequence>
+            <module name="Magento_Customer"/>
+            <module name="Magento_CustomerGraphQl"/>
+        </sequence>
+    </module>
 </config>
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
index 2aa5f03a787d0..deaa66921ba7c 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -2,13 +2,25 @@
 # 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") @cache(cacheable: false)
+    wishlist: WishlistOutput @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistResolver") @deprecated(reason: "Moved under `Customer` `wishlist`") @doc(description: "The wishlist query returns the contents of a customer's wish list") @cache(cacheable: false)
 }
 
-type WishlistOutput {
+type Customer {
+    wishlist: Wishlist! @resolver(class:"\\Magento\\WishlistGraphQl\\Model\\Resolver\\CustomerWishlistResolver") @doc(description: "The wishlist query returns the contents of a customer's wish lists")  @cache(cacheable: false)
+}
+
+type WishlistOutput @doc(description: "Deprecated: `Wishlist` type should be used instead") {
+    items: [WishlistItem] @deprecated(reason: "Use field `items` from type `Wishlist` instead") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItemsResolver") @doc(description: "An array of items in the customer's wish list"),
+    items_count: Int @deprecated(reason: "Use field `items_count` from type `Wishlist` instead") @doc(description: "The number of items in the wish list"),
+    name: String @deprecated(reason: "This field is related to Commerce functionality and is always `null` in Open Source edition") @doc(description: "When multiple wish lists are enabled, the name the customer assigns to the wishlist"),
+    sharing_code: String @deprecated(reason: "Use field `sharing_code` from type `Wishlist` instead") @doc(description: "An encrypted code that Magento uses to link to the wish list"),
+    updated_at: String @deprecated(reason: "Use field `updated_at` from type `Wishlist` instead") @doc(description: "The time of the last modification to the wish list")
+}
+
+type Wishlist {
+    id: ID @doc(description: "Wishlist unique identifier")
     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")
 }
@@ -19,4 +31,4 @@ type WishlistItem {
     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/design/adminhtml/Magento/backend/Magento_AdminAnalytics/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_AdminAnalytics/web/css/source/_module.less
new file mode 100644
index 0000000000000..05c0653a9bac3
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_AdminAnalytics/web/css/source/_module.less
@@ -0,0 +1,43 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Magento_AdminAnalytics Modal on dashboard
+//  ---------------------------------------------
+
+.admin-usage-notification {
+    -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;
+        transition: transform 0s;
+        transform: translateX(0);
+        margin-top: 13rem;
+        max-width: 75rem;
+    }
+
+    .admin__fieldset {
+        padding: 0;
+    }
+}
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 d0b17b3439d66..29a7499ec72f4 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
@@ -17,7 +17,7 @@
 
 @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.7rem; 
+@menu-logo__padding-top: 1.7rem;
 @menu-logo-img__height: 4.1rem;
 @menu-logo-img__width: 3.5rem;
 
@@ -37,6 +37,7 @@
 @submenu__padding-horizontal: 1.5rem;
 @submenu__padding-vertical: 2rem;
 @submenu__z-index: @menu__z-index - 2;
+@submenu__height: 720px;
 @submenu-column__width: 23.8rem;
 @submenu-column__width__l: 19.8rem;
 @submenu-title__color: @color-white;
@@ -252,7 +253,6 @@
             background-color: @submenu__background-color;
             box-shadow: 0 0 3px @color-black;
             left: 100%; // align all submenus with one Y axis line
-            min-height: ~'calc(@{menu-logo__outer-size} + 2rem + 100%)';
             padding: @submenu__padding-vertical 0 0;
             position: absolute;
             top: 0;
@@ -266,6 +266,13 @@
             .ie11 & {
                 height: 100%;
             }
+
+            > ul[role='menu'] {
+                max-width: ~'calc(100vw - @{menu__width})';
+                min-height: @submenu__height;
+                overflow-x: auto;
+                overflow-y: hidden;
+            }
         }
 
         &._show {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Banner/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Banner/web/css/source/_module.less
index d9e2cfdd66bf7..dd67220db12da 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Banner/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Banner/web/css/source/_module.less
@@ -24,6 +24,7 @@ input[type='checkbox'].banner-content-checkbox {
 }
 
 .adminhtml-widget_instance-edit,
+.adminhtml-cms_page-edit,
 .adminhtml-banner-edit {
     .admin__fieldset {
         .admin__field-control {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Cms/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Cms/web/css/source/_module.less
new file mode 100644
index 0000000000000..715ad40dc475f
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Cms/web/css/source/_module.less
@@ -0,0 +1,22 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+.modal-slide {
+    .media-gallery-modal {
+        .page-main-actions {
+            margin-bottom: 3rem;
+        }
+
+        .new_folder {
+            margin-right: 10px;
+        }
+    }
+}
+
+.tree-actions {
+    a {
+        cursor: pointer;
+    }
+}
+
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 659b1fa811db1..fa158589feb96 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
@@ -22,10 +22,10 @@
     position: relative;
     display: -webkit-inline-flex;
     display: -ms-inline-flexbox;
+    display: inline-flex;
     -webkit-flex-direction: row;
     -ms-flex-direction: row;
     flex-direction: row;
-    display: inline-flex;
     flex-flow: row nowrap;
     width: 100%;
 
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 c8f2530df22e0..0c7dd7e7cb94c 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
@@ -78,3 +78,33 @@
         }
     }
 }
+
+.customer-newsletter-fieldset.admin__fieldset {
+    &.multi-website {
+        > .admin__field > .admin__field-control {
+            width: ~'calc(100% * 0.75 - 30px)';
+
+            table {
+                th.subscriber-status {
+                    text-align: center;
+                }
+
+                td {
+                    &.subscriber-status {
+                        text-align: center;
+                    }
+
+                    select.admin__control-select {
+                        width: 100%;
+                    }
+                }
+            }
+        }
+    }
+
+    > .admin__field > .admin__field-control {
+        input[type='checkbox'] {
+            margin: 8px 0 0 0;
+        }
+    }
+}
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 ffa5ee963952c..055e74c97a2f4 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
@@ -308,4 +308,62 @@
     }
 }
 
+//
+//  Create Order - Add Product Grid
+//  ---------------------------------------------
+
+#sales_order_create_search_grid {
+    .col-in_products {
+        .data-grid-checkbox-cell-inner {
+            position: relative;
+        }
+        .checkbox {
+            width: 1.6rem;
+            height: 1.6rem;
+            left: 0;
+            right: 0;
+            margin: auto;
+        }
+    }
+}
+
+//
+//  Create Order - Add Product with Custom Options Modal
+//  ----------------------------------------------------
+
+#product_composite_configure_form_fields {
+    .admin__field {
+        &.required {
+            .admin__field-label {
+                &:after {
+                    color: #e22626;
+                    content: '*';
+                    display: inline-block;
+                    font-size: 1.6rem;
+                    font-weight: 500;
+                    line-height: 1;
+                    margin-left: 10px;
+                    margin-top: .2rem;
+                    position: absolute;
+                    z-index: 1;
+                }
+            }
+            .price-container, .price-notice, .price-wrapper {
+                &:after {
+                    color: unset;
+                    content: unset;
+                    display: unset;
+                    font-size: unset;
+                    font-weight: unset;
+                    line-height: unset;
+                    margin-left: unset;
+                    margin-top: unset;
+                    position: unset;
+                    z-index: unset;
+                }
+            }
+        }
+    }
+}
+
 //  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 029594625ed1c..2c55d243ebe07 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
@@ -73,7 +73,7 @@
     }
     .order-shipping-address & {
         span {
-            top: 22px;
+            top: 0;
         }
     }
 }
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module.less
index e05e81d737f14..9255accff6950 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/_module.less
@@ -4,3 +4,4 @@
 //  */
 
 @import 'module/_data-grid.less';
+@import 'module/_masonry-grid.less';
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 946d11db2d1a2..b0c44e127a454 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
@@ -1075,7 +1075,6 @@ body._in-resize {
     }
 
     .data-grid-checkbox-cell-inner {
-        display: unset;
         margin: 0 @data-grid-checkbox-cell-inner__padding-horizontal 0;
         padding: 0;
         text-align: center;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_masonry-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_masonry-grid.less
new file mode 100644
index 0000000000000..c17c19e259478
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_masonry-grid.less
@@ -0,0 +1,108 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+@admin__masonry_grid_image__space: 20px;
+@admin__masonry_grid_background_color: #fff;
+@admin__masonry_overlay_background_color: #507dc8;
+
+& when (@media-common = true) {
+    .masonry-image {
+        &-grid {
+            margin: @admin__masonry_grid_image__space/2 -(@admin__masonry_grid_image__space/2);
+            overflow: hidden;
+            position: relative;
+
+            .no-data-message-container,
+            .error-message-container {
+                font-size: @data-grid__no-records__font-size;
+                padding: @data-grid__no-records__padding;
+                text-align: center;
+            }
+        }
+
+        &-column {
+            background-color: @admin__masonry_grid_background_color;
+            float: left;
+            margin: @admin__masonry_grid_image__space/2;
+            overflow: hidden;
+
+            img {
+                cursor: pointer;
+                height: 100%;
+                width: 100%;
+            }
+        }
+
+        &-overlay {
+            background-color: @admin__masonry_overlay_background_color;
+            color: @admin__masonry_grid_background_color;
+            opacity: 1;
+            padding: .5rem;
+            position: absolute;
+            text-align: center;
+            width: 80px;
+            z-index: 10;
+        }
+
+        &-preview {
+            background-color: @admin__masonry_grid_background_color;
+            display: table;
+            left: 0;
+            position: absolute;
+            right: 0;
+            width: 100%;
+
+            .container {
+                margin: auto;
+                max-width: 880px;
+                padding-top: 10px;
+
+                .action-buttons {
+                    text-align: right;
+
+                    .action {
+                        &-close {
+                            padding: 30px;
+                            position: static;
+                        }
+
+                        &-previous,
+                        &-next {
+                            background: transparent;
+                            border: none;
+                            margin: 0;
+                            white-space: nowrap;
+                        }
+
+                        &-close,
+                        &-previous,
+                        &-next {
+                            font-size: 2rem;
+                        }
+                    }
+                }
+
+                .preview-row-content {
+                    display: flex;
+
+                    &:after {
+                        clear: both;
+                        content: '';
+                        display: table;
+                    }
+
+                    img.preview {
+                        display: block;
+                        flex-basis: 300px;
+                        float: left;
+                        margin-bottom: 20px;
+                        max-height: 500px;
+                        max-width: 60%;
+                        width: auto;
+                    }
+                }
+            }
+        }
+    }
+}
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 886bbcc29a3b9..852c6c1f3799e 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
@@ -444,6 +444,18 @@ button {
             > .action-menu-item {
                 min-width: 100%;
             }
+
+            &::after {
+                border-color: transparent transparent transparent @color-black;
+                border-style: solid;
+                border-width: .4rem 0 .4rem .5rem;
+                content: '';
+                height: 0;
+                position: relative;
+                right: 1.2rem;
+                top: 1.4rem;
+                width: 0;
+            }
         }
     }
 
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 9a5f35e4ede90..6de25c424656d 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
@@ -280,6 +280,7 @@
     .item-role {
         background: @color-gray89;
         color: @color-brownie;
+        cursor: pointer;
         font-size: @font-size__s;
         line-height: 1;
         margin: 0 .4rem .4rem 0;
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 525c61e8267ab..bfb515c700b33 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
@@ -361,6 +361,11 @@
         cursor: inherit;
         opacity: 1;
         outline: inherit;
+        .admin__action-multiselect-wrap {
+            .admin__action-multiselect {
+                .__form-control-pattern__disabled();
+            }
+        }
     }
 
     &._hidden {
@@ -545,7 +550,6 @@
             & > .admin__field-label {
                 #mix-grid .column(@field-label-grid__column, @field-grid__columns);
                 cursor: pointer;
-                background: @color-white;
                 left: 0;
                 position: absolute;
                 top: 0;
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 44fca79c31be5..247316ab0361b 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -1827,6 +1827,10 @@
         background-image: url(../images/fam_application_form_delete.png);
     }
 
+    .x-tree-node .x-tree-node-el input[type=checkbox] {
+        margin-left: 3px;
+    }
+
     //
     //  Styles for "js" tooltip with positionings
     //  --------------------------------------
@@ -4070,6 +4074,21 @@
     }
 }
 
+.adminhtml-email_template-preview {
+    .cms-revision-preview {
+        padding-top: 56.25%;
+        position: relative;
+
+        #preview_iframe {
+            height: 100%;
+            left: 0;
+            position: absolute;
+            top: 0;
+            width: 100%;
+        }
+    }
+}
+
 .admin__scope-old {
     .buttons-set {
         margin: 0 0 15px;
diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index 39b364ea8553f..05d73ac20fcbd 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -93,6 +93,7 @@ define('globalNavigationScroll', [
 
         } else { // static menu cases
             checkRemoveClass(menu, fixedClassName);
+            menu.css('top', 'auto');
         }
 
         //  Save previous window scrollTop
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 299c138832064..44e93087399a1 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
@@ -457,9 +457,11 @@
         .action {
             &.delete {
                 &:extend(.abs-remove-button-for-blocks all);
+                line-height: unset;
                 position: absolute;
                 right: 0;
-                top: 0;
+                top: -1px;
+                width: auto;
             }
         }
 
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 d3d15019f0e87..3142d5de64be1 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
@@ -346,6 +346,10 @@
 
         .widget {
             float: left;
+            
+            &.block {
+                margin-bottom: @indent__base;
+            }
         }
     }
 
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 65f3eeef63b01..133dd0fe721bb 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
@@ -110,7 +110,7 @@
         @_dropdown-list-position-right: 0,
         @_dropdown-list-pointer-position: right,
         @_dropdown-list-pointer-position-left-right: 26px,
-        @_dropdown-list-z-index: 101,   
+        @_dropdown-list-z-index: 101,
         @_dropdown-toggle-icon-content: @icon-cart,
         @_dropdown-toggle-active-icon-content: @icon-cart,
         @_dropdown-list-item-padding: false,
@@ -263,6 +263,7 @@
                 );
                 cursor: pointer;
                 position: relative;
+                white-space: nowrap;
 
                 &:after {
                     position: static;
@@ -304,7 +305,7 @@
 
             .weee[data-label] {
                 .lib-font-size(11);
-                
+
                 .label {
                     &:extend(.abs-no-display all);
                 }
@@ -340,7 +341,6 @@
         }
 
         .item-qty {
-            margin-right: @indent__s;
             text-align: center;
             width: 45px;
         }
@@ -390,6 +390,16 @@
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
     .minicart-wrapper {
         margin-top: @indent__s;
+        .lib-clearfix();
+        .product {
+            .actions {
+                float: left;
+                margin: 10px 0 0 0;
+            }
+        }
+        .update-cart-item {
+            float: right;
+        }
     }
 }
 
@@ -400,7 +410,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/code/Magento/Contact/view/frontend/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Contact/web/css/source/_module.less
similarity index 100%
rename from app/code/Magento/Contact/view/frontend/web/css/source/_module.less
rename to app/design/frontend/Magento/blank/Magento_Contact/web/css/source/_module.less
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 213b8131815b3..0c2b1b4db83e6 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
@@ -85,6 +85,7 @@
     .box-information,
     .box-newsletter {
         .box-content {
+            .lib-wrap-words();
             line-height: 26px;
         }
     }
diff --git a/app/design/frontend/Magento/blank/Magento_Newsletter/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Newsletter/web/css/source/_module.less
index f22a325debc9c..09759d95c4b10 100644
--- a/app/design/frontend/Magento/blank/Magento_Newsletter/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Newsletter/web/css/source/_module.less
@@ -44,7 +44,8 @@
         }
 
         input {
-            padding-left: 35px;
+            margin-right: 35px;
+            padding: 0 0 0 35px; // Reset some default Safari padding values.
         }
 
         .title {
@@ -75,7 +76,8 @@
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .block.newsletter {
-        width: 32%;
+        max-width: 44%;
+        width: max-content;
 
         .field {
             margin-right: 5px;
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 678ac535d5d71..07317e1670a0b 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
@@ -120,7 +120,7 @@
                     &.selected {
                         .lib-css(background, @attr-swatch-option__selected__background);
                         .lib-css(border, @attr-swatch-option__selected__border);
-                        .lib-css(color, @attr-swatch-option__selected__color);  
+                        .lib-css(color, @attr-swatch-option__selected__color);
                     }
                 }
             }
@@ -180,7 +180,9 @@
             }
 
             &.disabled {
+                box-shadow: unset;
                 cursor: default;
+                pointer-events: none;
 
                 &:after {
                     //  ToDo: improve .lib-background-gradient() to support diagonal gradient
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 b314bcf5b3473..3faa8ca965410 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
@@ -89,6 +89,7 @@
 
         img {
             display: block;
+            height: auto;
         }
 
         .page-print & {
diff --git a/app/design/frontend/Magento/blank/media/preview.jpg b/app/design/frontend/Magento/blank/media/preview.jpg
index 61be74876a1e9..438a72e108898 100644
Binary files a/app/design/frontend/Magento/blank/media/preview.jpg and b/app/design/frontend/Magento/blank/media/preview.jpg differ
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 62195b5566f8e..287f1b45b8328 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_layout.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_layout.less
@@ -125,11 +125,14 @@
     }
 
     .page-layout-2columns-left {
+        .main {
+            padding-left: @layout-column__additional-sidebar-offset
+        }
+
         .sidebar-additional {
             clear: left;
             float: left;
             padding-left: 0;
-            padding-right: @layout-column__additional-sidebar-offset;
         }
     }
 
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 3b4da1d1ae6f5..9b6986249b009 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -397,7 +397,7 @@
 
     .box-tocart {
         &:extend(.abs-box-tocart all);
-        
+
         .field.qty {
         }
 
@@ -987,6 +987,24 @@
         }
     }
 }
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) {
+    .sidebar {
+        .product-items {
+            .action {
+                &.delete {
+                    &:extend(.abs-remove-button-for-blocks all);
+                    line-height: unset;
+                    position: absolute;
+                    right: 0;
+                    top: -1px;
+                    width: auto;
+                }
+            }
+        }
+    }
+}
+
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .compare.wrapper,
     [class*='block-compare'] {
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 92945d61e4368..7745900f1766c 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
@@ -292,7 +292,7 @@
                 margin: -10px;
                 padding: 9px;
                 position: relative;
-                z-index: 2;
+                z-index: 9;
 
                 .product-item-inner {
                     display: block;
@@ -360,13 +360,12 @@
                     position: absolute;
                     top: -2px;
                     width: 100%;
-                    z-index: 1;
+                    z-index: -1;
                 }
             }
         }
 
         .product-item-actions {
-            position: relative;
             z-index: 1;
         }
     }
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 460a961830b43..cbf1d185a5a08 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
@@ -563,6 +563,10 @@
 
         .widget {
             float: left;
+            
+            &.block {
+                margin-bottom: @indent__base;
+            }
         }
     }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
index af94dd7b97bbb..43ccee738a45e 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
@@ -120,7 +120,7 @@
             @_dropdown-list-position-right: -10px,
             @_dropdown-list-pointer-position: right,
             @_dropdown-list-pointer-position-left-right: 12px,
-            @_dropdown-list-z-index: 101,              
+            @_dropdown-list-z-index: 101,
             @_dropdown-toggle-icon-content: @icon-cart,
             @_dropdown-toggle-active-icon-content: @icon-cart,
             @_dropdown-list-item-padding: false,
@@ -136,7 +136,7 @@
 
         .block-minicart {
             .lib-css(padding, 25px @minicart__padding-horizontal);
-            
+
             .block-title {
                 display: none;
             }
@@ -233,7 +233,7 @@
 
     .minicart-items {
         .lib-list-reset-styles();
-        
+
         .product-item {
             padding: @indent__base 0;
 
@@ -315,8 +315,9 @@
             .toggle {
                 &:extend(.abs-toggling-title all);
                 border: 0;
-                padding: 0 @indent__xl @indent__xs 0;
-                
+                padding: 0 0 @indent__xs 0;
+                white-space: nowrap;
+
                 &:after {
                     .lib-css(color, @color-gray56);
                     margin: 0 0 0 @indent__xs;
@@ -349,7 +350,7 @@
                             @_icon-font-position: after
                         );
                     }
-                    
+
                     > span {
                         &:extend(.abs-visually-hidden-reset all);
                     }
@@ -369,7 +370,6 @@
         }
 
         .item-qty {
-            margin-right: @indent__s;
             text-align: center;
             width: 60px;
         }
@@ -419,6 +419,16 @@
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .minicart-wrapper {
         margin-top: @indent__s;
+        .lib-clearfix();
+        .product {
+            .actions {
+                float: left;
+                margin: 10px 0 0 0;
+            }
+        }
+        .update-cart-item {
+            float: right;
+        }
     }
 }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
index a2daf0da247d1..ce3f45c990b96 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
@@ -78,27 +78,28 @@
     }
 
     .abs-discount-code {
-        .actions-toolbar {
-            display: table-cell;
-            vertical-align: top;
-            width: 1%;
-
-            .primary { 
-                float: left;
-                .action {   
-                    &:extend(.abs-revert-to-action-secondary all);
-                    border-bottom-left-radius: 0;
-                    border-top-left-radius: 0;
-                    margin: 0 0 0 -2px; 
-                    white-space: nowrap;
-                    width: auto; 
-                }
-            }
-        }
-        .form-discount {   
+        .form-discount {
             display: table;
             width: 100%;
-            
+
+            .actions-toolbar {
+                display: table-cell;
+                vertical-align: top;
+                width: 1%;
+
+                .primary {
+                    float: left;
+                    .action {
+                        &:extend(.abs-revert-to-action-secondary all);
+                        border-bottom-left-radius: 0;
+                        border-top-left-radius: 0;
+                        margin: 0 0 0 -2px;
+                        white-space: nowrap;
+                        width: auto;
+                    }
+                }
+            }
+
             > .field {
                 > .label {
                     display: none; 
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/email/account_new.html b/app/design/frontend/Magento/luma/Magento_Customer/email/account_new.html
index c8b10aa6dffc7..4a897a62a9235 100644
--- a/app/design/frontend/Magento/luma/Magento_Customer/email/account_new.html
+++ b/app/design/frontend/Magento/luma/Magento_Customer/email/account_new.html
@@ -4,17 +4,19 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Welcome to %store_name" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Welcome to %store_name" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
+"var store.frontend_name":"Store Name",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
 "var customer.email":"Customer Email",
-"var customer.name":"Customer Name"
+"var customer.name":"Customer Name",
+"var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])":"Password Reset URL"
 } @-->
 
 {{template config_path="design/email/header_template"}}
 
 <p class="greeting">{{trans "%name," name=$customer.name}}</p>
-<p>{{trans "Welcome to %store_name." store_name=$store.getFrontendName()}}</p>
+<p>{{trans "Welcome to %store_name." store_name=$store.frontend_name}}</p>
 <p>
     {{trans
         'To sign in to our site, use these credentials during checkout or on the <a href="%customer_url">My Account</a> page:'
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
index 6adf4b5b2f86b..6354cc35d32ed 100644
--- 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
@@ -126,6 +126,7 @@
     .box-information,
     .box-newsletter {
         .box-content {
+            .lib-wrap-words();
             &:extend(.abs-account-block-line-height all);
         }
     }
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 0fc8e36a82076..9620e5c446e60 100644
--- a/app/design/frontend/Magento/luma/Magento_Email/email/footer.html
+++ b/app/design/frontend/Magento/luma/Magento_Email/email/footer.html
@@ -6,7 +6,12 @@
 -->
 <!--@subject {{trans "Footer"}} @-->
 <!--@vars {
-"var store.getFrontendName()":"Store Name"
+"var store.frontend_name":"Store Name",
+"var url_about_us":"About Us URL",
+"var url_customer_service":"Customer Service URL",
+"var store_phone":"Store Phone",
+"var store_hours":"Store Hours",
+"var store.formatted_address|raw":"Store Address"
 } @-->
 
                     <!-- End Content -->
@@ -42,7 +47,7 @@
                                 </td>
                                 <td>
                                     <p class="address">
-                                        {{var store.getFormattedAddress()|raw}}
+                                        {{var store.formatted_address|raw}}
                                     </p>
                                 </td>
                             </tr>
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 ff377a4b88acc..0f2a0db56a355 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
@@ -328,7 +328,7 @@
 
     .gift-options-cart-item {
         & + .towishlist {
-            left: 43px;
+            left: 0;
             position: absolute;
         }
     }
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 d7ee1319c9a43..5d44a32b9391b 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
@@ -46,7 +46,8 @@
         }
 
         input {
-            padding-left: 35px;
+            margin-right: 35px;
+            padding: 0 0 0 35px; // Reset some default Safari padding values.
         }
 
         .title {
@@ -78,7 +79,8 @@
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .block.newsletter {
-        width: 34%;
+        max-width: 44%;
+        width: max-content;
     }
 }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new.html
index 098a610adaddf..86e3cf01e965e 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new.html
@@ -4,28 +4,32 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var comment":"Credit Memo Comment",
+"var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
 "layout handle=\"sales_email_order_creditmemo_items\" creditmemo=$creditmemo order=$order":"Credit Memo Items Grid",
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var order.getCustomerName()":"Customer Name",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.customer_name":"Customer Name",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description",
-"var order.shipping_description":"Shipping Description"
+"var order.shipping_description":"Shipping Description",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email",
+"var creditmemo":"Credit Memo",
+"var order":"Order",
+"var order_data.is_not_virtual":"Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
             </p>
             <p>
@@ -55,7 +59,7 @@ <h1>{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_i
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -67,10 +71,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                     </td>
                     {{/depend}}
                 </tr>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html
index f116e86eeeb06..d0310a8e2c7b6 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html
@@ -4,27 +4,31 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var comment":"Credit Memo Comment",
+"var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
 "layout handle=\"sales_email_order_creditmemo_items\" creditmemo=$creditmemo order=$order":"Credit Memo Items Grid",
-"var billing.getName()":"Guest Customer Name (Billing)",
+"var billing.name":"Guest Customer Name (Billing)",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description",
-"var order.shipping_description":"Shipping Description"
+"var order.shipping_description":"Shipping Description",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email",
+"var creditmemo":"Credit Memo",
+"var order":"Order",
+"var order_data.is_not_virtual":"Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
             </p>
             <p>
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}}
@@ -53,7 +57,7 @@ <h1>{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_i
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -65,10 +69,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                     </td>
                     {{/depend}}
                 </tr>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html
index 269e46d752084..352c9ab4fddf4 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html
@@ -4,27 +4,29 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var comment":"Credit Memo Comment",
+"var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var order.getCustomerName()":"Customer Name",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.customer_name":"Customer Name",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status"
+"var order_data.frontend_status_label":"Order Status",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
             </p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
index c8bdae7b08fa5..9b09760c1fa4a 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
@@ -4,26 +4,28 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var comment":"Credit Memo Comment",
+"var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
-"var billing.getName()":"Guest Customer Name",
+"var billing.name":"Guest Customer Name",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status"
+"var order_data.frontend_status_label":"Order Status",
+"var store_email":"Store Email",
+"var store.frontend_name":"Store Frontend Name"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
             </p>
             <p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new.html
index 8d7ba99312375..636fa9ac5f425 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new.html
@@ -4,28 +4,32 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var order.getCustomerName()":"Customer Name",
-"var comment":"Invoice Comment",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.customer_name":"Customer Name",
+"var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "layout area=\"frontend\" handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
 "var order.shipping_description":"Shipping Description",
-"var order.getShippingDescription()":"Shipping Description"
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email",
+"var invoice": "Invoice",
+"var order": "Order",
+"var order_data.is_not_virtual": "Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
             </p>
             <p>
@@ -55,7 +59,7 @@ <h1>{{trans "Your Invoice #%invoice_id for Order #%order_id" invoice_id=$invoice
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -67,10 +71,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                     </td>
                     {{/depend}}
                 </tr>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html
index b8c604daf824b..7df5ffe5f4ab8 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html
@@ -4,27 +4,31 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var billing.getName()":"Guest Customer Name",
-"var comment":"Invoice Comment",
+"var billing.name":"Guest Customer Name",
+"var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "layout handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description",
-"var order.shipping_description":"Shipping Description"
+"var order.shipping_description":"Shipping Description",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email",
+"var invoice": "Invoice",
+"var order": "Order",
+"var order_data.is_not_virtual": "Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
             </p>
             <p>
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}}
@@ -53,7 +57,7 @@ <h1>{{trans "Your Invoice #%invoice_id for Order #%order_id" invoice_id=$invoice
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -65,10 +69,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                     </td>
                     {{/depend}}
                 </tr>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html
index 8ec54f1e64d9c..834b512f82fb7 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html
@@ -4,27 +4,29 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var order.getCustomerName()":"Customer Name",
-"var comment":"Invoice Comment",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.customer_name":"Customer Name",
+"var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status"
+"var order_data.frontend_status_label":"Order Status",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
             </p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
index 6028db7b97730..f9e1498763cba 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
@@ -4,26 +4,28 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.getName()":"Guest Customer Name",
-"var comment":"Invoice Comment",
+"var billing.name":"Guest Customer Name",
+"var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status"
+"var order_data.frontend_status_label":"Order Status",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
             </p>
             <p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_new.html
index b663dc92d1af8..745bf5c9c2eff 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/order_new.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/order_new.html
@@ -4,16 +4,23 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Your %store_name order confirmation" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Your %store_name order confirmation" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var order.getEmailCustomerNote()":"Email Order Note",
+"var order_data.email_customer_note|escape|nl2br":"Email Order Note",
 "var order.increment_id":"Order Id",
 "layout handle=\"sales_email_order_items\" order=$order area=\"frontend\"":"Order Items Grid",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description",
-"var shipping_msg":"Shipping message"
+"var order.shipping_description":"Shipping Description",
+"var shipping_msg":"Shipping message",
+"var created_at_formatted":"Order Created At (datetime)",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email",
+"var order":"Order",
+"var order_data.is_not_virtual":"Order Type",
+"var order_data.customer_name":"Customer Name",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL"
 } @-->
 
 {{template config_path="design/email/header_template"}}
@@ -21,9 +28,9 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%customer_name," customer_name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%customer_name," customer_name=$order_data.customer_name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans "Once your package ships we will send you a tracking number."}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
             </p>
@@ -35,16 +42,16 @@
     <tr class="email-summary">
         <td>
             <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_id=$order.increment_id |raw}}</h1>
-            <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$order.getCreatedAtFormatted(1) |raw}}</p>
+            <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$created_at_formatted |raw}}</p>
         </td>
     </tr>
     <tr class="email-information">
         <td>
-            {{depend order.getEmailCustomerNote()}}
+            {{depend order_data.email_customer_note}}
             <table class="message-info">
                 <tr>
                     <td>
-                        {{var order.getEmailCustomerNote()|escape|nl2br}}
+                        {{var order_data.email_customer_note|escape|nl2br}}
                     </td>
                 </tr>
             </table>
@@ -55,7 +62,7 @@ <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_i
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -67,10 +74,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                         {{if shipping_msg}}
                         <p>{{var shipping_msg}}</p>
                         {{/if}}
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_new_guest.html
index cc32aa4a12676..907be4d45a6c5 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/order_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/order_new_guest.html
@@ -4,27 +4,31 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Your %store_name order confirmation" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Your %store_name order confirmation" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var order.getEmailCustomerNote()":"Email Order Note",
-"var order.getBillingAddress().getName()":"Guest Customer Name",
-"var order.getCreatedAtFormatted(1)":"Order Created At (datetime)",
+"var order_data.email_customer_note|escape|nl2br":"Email Order Note",
+"var order.billing_address.name":"Guest Customer Name",
+"var created_at_formatted":"Order Created At (datetime)",
 "var order.increment_id":"Order Id",
 "layout handle=\"sales_email_order_items\" order=$order":"Order Items Grid",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
-"var order.getShippingDescription()":"Shipping Description",
-"var shipping_msg":"Shipping message"
+"var order.shipping_description":"Shipping Description",
+"var shipping_msg":"Shipping message",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email",
+"var order":"Order",
+"var order_data.is_not_virtual":"Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getBillingAddress().getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order.billing_address.name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans "Once your package ships we will send you a tracking number."}}
             </p>
             <p>
@@ -35,16 +39,16 @@
     <tr class="email-summary">
         <td>
             <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_id=$order.increment_id |raw}}</h1>
-            <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$order.getCreatedAtFormatted(1) |raw}}</p>
+            <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$created_at_formatted |raw}}</p>
         </td>
     </tr>
     <tr class="email-information">
         <td>
-            {{depend order.getEmailCustomerNote()}}
+            {{depend order_data.email_customer_note}}
             <table class="message-info">
                 <tr>
                     <td>
-                        {{var order.getEmailCustomerNote()|escape|nl2br}}
+                        {{var order_data.email_customer_note|escape|nl2br}}
                     </td>
                 </tr>
             </table>
@@ -55,7 +59,7 @@ <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_i
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -67,10 +71,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                         {{if shipping_msg}}
                         <p>{{var shipping_msg}}</p>
                         {{/if}}
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html
index fa16ac2196bf4..cec5649755b3d 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html
@@ -4,26 +4,30 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name order" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var order.getCustomerName()":"Customer Name",
-"var comment":"Order Comment",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.customer_name":"Customer Name",
+"var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status"
+"var order_data.frontend_status_label":"Order Status",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email",
+"var order":"Order",
+"var order_data.is_not_virtual":"Order Type"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
             </p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
index 8ead615fe01ca..5f23898b50018 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
@@ -4,25 +4,27 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name order" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.getName()":"Guest Customer Name",
-"var comment":"Order Comment",
+"var billing.name":"Guest Customer Name",
+"var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status"
+"var order_data.frontend_status_label":"Order Status",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
             </p>
             <p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
index e467aa843e2f4..4ff9da3a31b27 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
@@ -4,29 +4,33 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Your %store_name order has shipped" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Your %store_name order has shipped" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var order.getCustomerName()":"Customer Name",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.customer_name":"Customer Name",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
-"var comment":"Shipment Comment",
+"var comment|escape|nl2br":"Shipment Comment",
 "var shipment.increment_id":"Shipment Id",
 "layout handle=\"sales_email_order_shipment_items\" shipment=$shipment order=$order":"Shipment Items Grid",
 "block class='Magento\\\\Framework\\\\View\\\\Element\\\\Template' area='frontend' template='Magento_Sales::email\/shipment\/track.phtml' shipment=$shipment order=$order":"Shipment Track Details",
 "var formattedShippingAddress|raw":"Shipping Address",
 "var order.shipping_description":"Shipping Description",
-"var order.getShippingDescription()":"Shipping Description"
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email",
+"var order_data.is_not_virtual": "Order Type",
+"var shipment": "Shipment",
+"var order": "Order"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
             </p>
             <p>
@@ -58,7 +62,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -70,10 +74,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                     </td>
                     {{/depend}}
                 </tr>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
index 385110f8f037e..ac7eaae6b7ff7 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
@@ -4,28 +4,33 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Your %store_name order has shipped" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Your %store_name order has shipped" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var billing.getName()":"Guest Customer Name",
+"var billing.name":"Guest Customer Name",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
-"var comment":"Shipment Comment",
+"var comment|escape|nl2br":"Shipment Comment",
 "var shipment.increment_id":"Shipment Id",
 "layout handle=\"sales_email_order_shipment_items\" shipment=$shipment order=$order":"Shipment Items Grid",
 "block class='Magento\\\\Framework\\\\View\\\\Element\\\\Template' area='frontend' template='Magento_Sales::email\/shipment\/track.phtml' shipment=$shipment order=$order":"Shipment Track Details",
 "var formattedShippingAddress|raw":"Shipping Address",
 "var order.shipping_description":"Shipping Description",
-"var order.getShippingDescription()":"Shipping Description"
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email",
+"var order_data.is_not_virtual": "Order Type",
+"var shipment": "Shipment",
+"var order": "Order",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
             <p>
-                {{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
+                {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
             </p>
             <p>
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}}
@@ -56,7 +61,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
                         <h3>{{trans "Billing Info"}}</h3>
                         <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Info"}}</h3>
                         <p>{{var formattedShippingAddress|raw}}</p>
@@ -68,10 +73,10 @@ <h3>{{trans "Shipping Info"}}</h3>
                         <h3>{{trans "Payment Method"}}</h3>
                         {{var payment_html|raw}}
                     </td>
-                    {{depend order.getIsNotVirtual()}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="method-info">
                         <h3>{{trans "Shipping Method"}}</h3>
-                        <p>{{var order.getShippingDescription()}}</p>
+                        <p>{{var order.shipping_description}}</p>
                     </td>
                     {{/depend}}
                 </tr>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update.html
index 4f9b7286f3ae4..f1bd61ebec3dd 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update.html
@@ -4,27 +4,29 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name shipment" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name shipment" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var order.getCustomerName()":"Customer Name",
-"var comment":"Order Comment",
+"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
+"var order_data.customer_name":"Customer Name",
+"var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status",
-"var shipment.increment_id":"Shipment Id"
+"var order_data.frontend_status_label":"Order Status",
+"var shipment.increment_id":"Shipment Id",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
             </p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
index 3ef26463ea755..5887ff73c6398 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
@@ -4,26 +4,28 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Update to your %store_name shipment" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Update to your %store_name shipment" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.getName()":"Guest Customer Name",
-"var comment":"Order Comment",
+"var billing.name":"Guest Customer Name",
+"var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getFrontendStatusLabel()":"Order Status",
-"var shipment.increment_id":"Shipment Id"
+"var order_data.frontend_status_label":"Order Status",
+"var shipment.increment_id":"Shipment Id",
+"var store.frontend_name":"Store Frontend Name",
+"var store_email":"Store Email"
 } @-->
 {{template config_path="design/email/header_template"}}
 
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.getName()}}</p>
+            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getFrontendStatusLabel()
+                    order_status=$order_data.frontend_status_label
                 |raw}}
             </p>
             <p>
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 cc6aba6f3566e..599218f970907 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
@@ -66,6 +66,10 @@
             &:not(:last-child) {
                 margin-bottom: @indent__l;
             }
+
+            &.order-items-shipment {
+                overflow: visible;
+            }
         }
 
         .table-order-items {
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/layout/default.xml b/app/design/frontend/Magento/luma/Magento_Theme/layout/default.xml
index 5f0f3b92ab44a..ce397fad64f44 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/layout/default.xml
+++ b/app/design/frontend/Magento/luma/Magento_Theme/layout/default.xml
@@ -14,12 +14,6 @@
                 </arguments>
             </block>
         </referenceContainer>
-        <referenceBlock name="logo">
-            <arguments>
-                <argument name="logo_img_width" xsi:type="number">148</argument>
-                <argument name="logo_img_height" xsi:type="number">43</argument>
-            </arguments>
-        </referenceBlock>
         <referenceContainer name="footer">
             <block class="Magento\Store\Block\Switcher" name="store_switcher" as="store_switcher" after="footer_links" template="Magento_Store::switch/stores.phtml"/>
         </referenceContainer>
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 b841f2206e1d9..438fb55d32e5c 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
@@ -148,6 +148,7 @@
 
         img {
             display: block;
+            height: auto;
         }
 
         .page-print & {
diff --git a/app/design/frontend/Magento/luma/media/preview.jpg b/app/design/frontend/Magento/luma/media/preview.jpg
index feeda8840e562..fa6356fa02c35 100644
Binary files a/app/design/frontend/Magento/luma/media/preview.jpg and b/app/design/frontend/Magento/luma/media/preview.jpg differ
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 335743aef8eed..dfbf4f2373ac5 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -66,7 +66,6 @@
     <preference for="Magento\Framework\Config\CacheInterface" type="Magento\Framework\App\Cache\Type\Config" />
     <preference for="Magento\Framework\Config\ValidationStateInterface" type="Magento\Framework\App\Arguments\ValidationState" />
     <preference for="Magento\Framework\Module\ModuleListInterface" type="Magento\Framework\Module\ModuleList" />
-    <preference for="Magento\Framework\Module\ModuleManagerInterface" type="Magento\Framework\Module\Manager" />
     <preference for="Magento\Framework\Component\ComponentRegistrarInterface" type="Magento\Framework\Component\ComponentRegistrar"/>
     <preference for="Magento\Framework\Event\ConfigInterface" type="Magento\Framework\Event\Config" />
     <preference for="Magento\Framework\Event\InvokerInterface" type="Magento\Framework\Event\Invoker\InvokerDefault" />
@@ -664,6 +663,14 @@
             <argument name="argumentInterpreter" xsi:type="object">layoutArgumentGeneratorInterpreter</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\View\Element\UiComponent\Argument\Interpreter\ConfigurableObject">
+        <arguments>
+            <argument name="classWhitelist" xsi:type="array">
+                <item name="0" xsi:type="string">Magento\Framework\Data\OptionSourceInterface</item>
+                <item name="1" xsi:type="string">Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Mview\View">
         <arguments>
             <argument name="state" xsi:type="object" shared="false">Magento\Indexer\Model\Mview\View\State</argument>
@@ -1495,6 +1502,16 @@
             </argument>
         </arguments>
     </type>
+    <virtualType name="Magento\Framework\Config\ValidationState\Required" type="Magento\Framework\Config\ValidationState\Configurable">
+        <arguments>
+            <argument name="required" xsi:type="boolean">true</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\Framework\Config\ValidationState\NotRequired" type="Magento\Framework\Config\ValidationState\Configurable">
+        <arguments>
+            <argument name="required" xsi:type="boolean">false</argument>
+        </arguments>
+    </virtualType>
     <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>
@@ -1782,4 +1799,5 @@
         <plugin name="execute_commit_callbacks" type="Magento\Framework\Model\ExecuteCommitCallbacks" />
     </type>
     <preference for="Magento\Framework\GraphQl\Query\ErrorHandlerInterface" type="Magento\Framework\GraphQl\Query\ErrorHandler"/>
+    <preference for="Magento\Framework\Filter\VariableResolverInterface" type="Magento\Framework\Filter\VariableResolver\StrategyResolver"/>
 </config>
diff --git a/app/functions.php b/app/functions.php
index 4b00d01819f70..6b3dae71c42c6 100644
--- a/app/functions.php
+++ b/app/functions.php
@@ -13,6 +13,9 @@
  * @return \Magento\Framework\Phrase
  */
 if (!function_exists('__')) {
+    /**
+     * @return \Magento\Framework\Phrase
+     */
     function __()
     {
         $argc = func_get_args();
diff --git a/composer.json b/composer.json
index e5fabd56fbb9d..7e01980e32f58 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,6 @@
         "ext-pdo_mysql": "*",
         "ext-simplexml": "*",
         "ext-soap": "*",
-        "ext-spl": "*",
         "ext-xsl": "*",
         "ext-zip": "*",
         "lib-libxml": "*",
@@ -35,7 +34,7 @@
         "colinmollenhour/credis": "1.10.0",
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
         "composer/composer": "^1.6",
-        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1",
+        "elasticsearch/elasticsearch": "~2.0||~5.1||~6.1",
         "magento/composer": "~1.5.0",
         "magento/magento-composer-installer": ">=0.1.11",
         "magento/zendframework1": "~1.14.2",
@@ -43,13 +42,13 @@
         "wikimedia/less.php": "~1.8.0",
         "paragonie/sodium_compat": "^1.6",
         "pelago/emogrifier": "^2.0.0",
-        "php-amqplib/php-amqplib": "~2.7.0|~2.10.0",
+        "php-amqplib/php-amqplib": "~2.7.0||~2.10.0",
         "phpseclib/mcrypt_compat": "1.0.8",
         "phpseclib/phpseclib": "2.0.*",
         "ramsey/uuid": "~3.8.0",
-        "symfony/console": "~4.1.0|~4.2.0|~4.3.0",
-        "symfony/event-dispatcher": "~4.1.0|~4.2.0|~4.3.0",
-        "symfony/process": "~4.1.0|~4.2.0|~4.3.0",
+        "symfony/console": "~4.1.0||~4.2.0||~4.3.0",
+        "symfony/event-dispatcher": "~4.1.0||~4.2.0||~4.3.0",
+        "symfony/process": "~4.1.0||~4.2.0||~4.3.0",
         "tedivm/jshrink": "~1.3.0",
         "tubalmartin/cssmin": "4.1.1",
         "webonyx/graphql-php": "^0.13.8",
@@ -85,12 +84,15 @@
     },
     "require-dev": {
         "allure-framework/allure-phpunit": "~1.2.0",
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
         "friendsofphp/php-cs-fixer": "~2.14.0",
         "lusitanian/oauth": "~0.8.10",
-        "magento/magento-coding-standard": "~4.0.0",
-        "magento/magento2-functional-testing-framework": "2.5.0",
+        "magento/magento-coding-standard": "*",
+        "magento/magento2-functional-testing-framework": "2.5.3",
         "pdepend/pdepend": "2.5.2",
+        "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "@stable",
+        "phpstan/phpstan": "^0.12.3",
         "phpunit/phpunit": "~6.5.0",
         "sebastian/phpcpd": "~3.0.0",
         "squizlabs/php_codesniffer": "~3.4.0"
@@ -100,6 +102,7 @@
     },
     "replace": {
         "magento/module-marketplace": "*",
+        "magento/module-admin-analytics": "*",
         "magento/module-admin-notification": "*",
         "magento/module-advanced-pricing-import-export": "*",
         "magento/module-amqp": "*",
@@ -171,6 +174,7 @@
         "magento/module-graph-ql": "*",
         "magento/module-graph-ql-cache": "*",
         "magento/module-catalog-graph-ql": "*",
+        "magento/module-catalog-cms-graph-ql": "*",
         "magento/module-catalog-url-rewrite-graph-ql": "*",
         "magento/module-configurable-product-graph-ql": "*",
         "magento/module-customer-graph-ql": "*",
@@ -190,6 +194,8 @@
         "magento/module-instant-purchase": "*",
         "magento/module-integration": "*",
         "magento/module-layered-navigation": "*",
+        "magento/module-media-gallery": "*",
+        "magento/module-media-gallery-api": "*",
         "magento/module-media-storage": "*",
         "magento/module-message-queue": "*",
         "magento/module-msrp": "*",
@@ -284,7 +290,8 @@
         "components/jqueryui": "1.10.4",
         "twbs/bootstrap": "3.1.0",
         "tinymce/tinymce": "3.4.7",
-        "magento/module-tinymce-3": "*"
+        "magento/module-tinymce-3": "*",
+        "magento/module-csp": "*"
     },
     "conflict": {
         "gene/bluefoot": "*"
@@ -335,7 +342,8 @@
             "Magento\\Tools\\": "dev/tools/Magento/Tools/",
             "Magento\\Tools\\Sanity\\": "dev/build/publication/sanity/Magento/Tools/Sanity/",
             "Magento\\TestFramework\\Inspection\\": "dev/tests/static/framework/Magento/TestFramework/Inspection/",
-            "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/"
+            "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/",
+            "Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/"
         }
     },
     "prefer-stable": true
diff --git a/composer.lock b/composer.lock
index d665f01bd034c..a63cdcdf4a1e1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d51a6bf9aea2e8357d74864e6697727f",
+    "content-hash": "38446350ff1ac4609f77d5d74213880d",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -257,16 +257,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "1.9.0",
+            "version": "1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "314aa57fdcfc942065996f59fb73a8b3f74f3fa5"
+                "reference": "bb01f2180df87ce7992b8331a68904f80439dd2f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/314aa57fdcfc942065996f59fb73a8b3f74f3fa5",
-                "reference": "314aa57fdcfc942065996f59fb73a8b3f74f3fa5",
+                "url": "https://api.github.com/repos/composer/composer/zipball/bb01f2180df87ce7992b8331a68904f80439dd2f",
+                "reference": "bb01f2180df87ce7992b8331a68904f80439dd2f",
                 "shasum": ""
             },
             "require": {
@@ -333,7 +333,7 @@
                 "dependency",
                 "package"
             ],
-            "time": "2019-08-02T18:55:33+00:00"
+            "time": "2019-11-01T16:20:17+00:00"
         },
         {
             "name": "composer/semver",
@@ -459,24 +459,24 @@
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "1.3.3",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f"
+                "reference": "cbe23383749496fe0f373345208b79568e4bc248"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/46867cbf8ca9fb8d60c506895449eb799db1184f",
-                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/cbe23383749496fe0f373345208b79568e4bc248",
+                "reference": "cbe23383749496fe0f373345208b79568e4bc248",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0",
+                "php": "^5.3.2 || ^7.0 || ^8.0",
                 "psr/log": "^1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8"
             },
             "type": "library",
             "autoload": {
@@ -494,12 +494,12 @@
                     "email": "john-stevenson@blueyonder.co.uk"
                 }
             ],
-            "description": "Restarts a process without xdebug.",
+            "description": "Restarts a process without Xdebug.",
             "keywords": [
                 "Xdebug",
                 "performance"
             ],
-            "time": "2019-05-27T17:52:04+00:00"
+            "time": "2019-11-06T16:40:04+00:00"
         },
         {
             "name": "container-interop/container-interop",
@@ -530,6 +530,7 @@
             ],
             "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
             "homepage": "https://github.com/container-interop/container-interop",
+            "abandoned": "psr/container",
             "time": "2017-02-14T19:40:03+00:00"
         },
         {
@@ -594,27 +595,28 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.3.3",
+            "version": "6.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+                "reference": "0895c932405407fd3a7368b6910c09a24d26db11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11",
+                "reference": "0895c932405407fd3a7368b6910c09a24d26db11",
                 "shasum": ""
             },
             "require": {
+                "ext-json": "*",
                 "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.4",
+                "guzzlehttp/psr7": "^1.6.1",
                 "php": ">=5.5"
             },
             "require-dev": {
                 "ext-curl": "*",
                 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.0"
+                "psr/log": "^1.1"
             },
             "suggest": {
                 "psr/log": "Required for using the Log middleware"
@@ -626,12 +628,12 @@
                 }
             },
             "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                 "psr-4": {
                     "GuzzleHttp\\": "src/"
-                }
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -655,7 +657,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2018-04-22T15:46:56+00:00"
+            "time": "2019-10-23T15:58:00+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -882,23 +884,23 @@
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "5.2.8",
+            "version": "5.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4"
+                "reference": "44c6787311242a979fa15c704327c20e7221a0e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4",
-                "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4",
+                "reference": "44c6787311242a979fa15c704327c20e7221a0e4",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "~2.2.20",
+                "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
                 "json-schema/json-schema-test-suite": "1.2.0",
                 "phpunit/phpunit": "^4.8.35"
             },
@@ -944,7 +946,7 @@
                 "json",
                 "schema"
             ],
-            "time": "2019-01-14T23:55:14+00:00"
+            "time": "2019-09-25T14:49:45+00:00"
         },
         {
             "name": "magento/composer",
@@ -1110,16 +1112,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "1.25.1",
+            "version": "1.25.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf"
+                "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/70e65a5470a42cfec1a7da00d30edb6e617e8dcf",
-                "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d5e2fb341cb44f7e2ab639d12a1e5901091ec287",
+                "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287",
                 "shasum": ""
             },
             "require": {
@@ -1184,7 +1186,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2019-09-06T13:49:17+00:00"
+            "time": "2019-11-13T10:00:05+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -1233,16 +1235,16 @@
         },
         {
             "name": "paragonie/sodium_compat",
-            "version": "v1.11.1",
+            "version": "v1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/sodium_compat.git",
-                "reference": "a9f968bc99485f85f9303a8524c3485a7e87bc15"
+                "reference": "063cae9b3a7323579063e7037720f5b52b56c178"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/a9f968bc99485f85f9303a8524c3485a7e87bc15",
-                "reference": "a9f968bc99485f85f9303a8524c3485a7e87bc15",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/063cae9b3a7323579063e7037720f5b52b56c178",
+                "reference": "063cae9b3a7323579063e7037720f5b52b56c178",
                 "shasum": ""
             },
             "require": {
@@ -1250,7 +1252,7 @@
                 "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
             },
             "require-dev": {
-                "phpunit/phpunit": "^3|^4|^5"
+                "phpunit/phpunit": "^3|^4|^5|^6|^7"
             },
             "suggest": {
                 "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
@@ -1311,7 +1313,7 @@
                 "secret-key cryptography",
                 "side-channel resistant"
             ],
-            "time": "2019-09-12T12:05:58+00:00"
+            "time": "2019-11-07T17:07:24+00:00"
         },
         {
             "name": "pelago/emogrifier",
@@ -1389,16 +1391,16 @@
         },
         {
             "name": "php-amqplib/php-amqplib",
-            "version": "v2.10.0",
+            "version": "v2.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-amqplib/php-amqplib.git",
-                "reference": "04e5366f032906d5f716890427e425e71307d3a8"
+                "reference": "6e2b2501e021e994fb64429e5a78118f83b5c200"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/04e5366f032906d5f716890427e425e71307d3a8",
-                "reference": "04e5366f032906d5f716890427e425e71307d3a8",
+                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/6e2b2501e021e994fb64429e5a78118f83b5c200",
+                "reference": "6e2b2501e021e994fb64429e5a78118f83b5c200",
                 "shasum": ""
             },
             "require": {
@@ -1412,7 +1414,6 @@
             "require-dev": {
                 "ext-curl": "*",
                 "nategood/httpful": "^0.2.20",
-                "phpdocumentor/phpdocumentor": "dev-master",
                 "phpunit/phpunit": "^5.7|^6.5|^7.0",
                 "squizlabs/php_codesniffer": "^2.5"
             },
@@ -1459,7 +1460,7 @@
                 "queue",
                 "rabbitmq"
             ],
-            "time": "2019-08-08T18:28:18+00:00"
+            "time": "2019-10-10T13:23:40+00:00"
         },
         {
             "name": "phpseclib/mcrypt_compat",
@@ -1703,16 +1704,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.0",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
+                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
                 "shasum": ""
             },
             "require": {
@@ -1721,7 +1722,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -1746,7 +1747,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2018-11-20T15:27:04+00:00"
+            "time": "2019-11-01T11:05:21+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -1918,16 +1919,16 @@
         },
         {
             "name": "seld/jsonlint",
-            "version": "1.7.1",
+            "version": "1.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38"
+                "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38",
-                "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19",
+                "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19",
                 "shasum": ""
             },
             "require": {
@@ -1963,7 +1964,7 @@
                 "parser",
                 "validator"
             ],
-            "time": "2018-01-24T12:46:19+00:00"
+            "time": "2019-10-24T14:27:39+00:00"
         },
         {
             "name": "seld/phar-utils",
@@ -2082,16 +2083,16 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v4.3.4",
+            "version": "v4.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03"
+                "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/c6e5e2a00db768c92c3ae131532af4e1acc7bd03",
-                "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9",
+                "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9",
                 "shasum": ""
             },
             "require": {
@@ -2131,20 +2132,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-20T14:07:54+00:00"
+            "time": "2019-10-02T08:36:26+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.3.4",
+            "version": "v4.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2"
+                "reference": "0df002fd4f500392eabd243c2947061a50937287"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/429d0a1451d4c9c4abe1959b2986b88794b9b7d2",
-                "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0df002fd4f500392eabd243c2947061a50937287",
+                "reference": "0df002fd4f500392eabd243c2947061a50937287",
                 "shasum": ""
             },
             "require": {
@@ -2201,20 +2202,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-26T08:55:16+00:00"
+            "time": "2019-11-03T09:04:05+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v1.1.5",
+            "version": "v1.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "c61766f4440ca687de1084a5c00b08e167a2575c"
+                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c61766f4440ca687de1084a5c00b08e167a2575c",
-                "reference": "c61766f4440ca687de1084a5c00b08e167a2575c",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
+                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
                 "shasum": ""
             },
             "require": {
@@ -2259,11 +2260,11 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-06-20T06:46:26+00:00"
+            "time": "2019-09-17T09:54:03+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.3.4",
+            "version": "v4.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
@@ -2313,16 +2314,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v4.3.4",
+            "version": "v4.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2"
+                "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/86c1c929f0a4b24812e1eb109262fc3372c8e9f2",
-                "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/72a068f77e317ae77c0a0495236ad292cfb5ce6f",
+                "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f",
                 "shasum": ""
             },
             "require": {
@@ -2358,7 +2359,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-14T12:26:46+00:00"
+            "time": "2019-10-30T12:53:54+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -2479,16 +2480,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v4.3.4",
+            "version": "v4.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "e89969c00d762349f078db1128506f7f3dcc0d4a"
+                "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/e89969c00d762349f078db1128506f7f3dcc0d4a",
-                "reference": "e89969c00d762349f078db1128506f7f3dcc0d4a",
+                "url": "https://api.github.com/repos/symfony/process/zipball/3b2e0cb029afbb0395034509291f21191d1a4db0",
+                "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0",
                 "shasum": ""
             },
             "require": {
@@ -2524,7 +2525,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-26T08:26:39+00:00"
+            "time": "2019-10-28T17:07:32+00:00"
         },
         {
             "name": "tedivm/jshrink",
@@ -2725,23 +2726,23 @@
         },
         {
             "name": "wikimedia/less.php",
-            "version": "1.8.1",
+            "version": "1.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wikimedia/less.php.git",
-                "reference": "f0f7768f6fa8a9d2ac6a0274f6f477c72159bf9b"
+                "reference": "e238ad228d74b6ffd38209c799b34e9826909266"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wikimedia/less.php/zipball/f0f7768f6fa8a9d2ac6a0274f6f477c72159bf9b",
-                "reference": "f0f7768f6fa8a9d2ac6a0274f6f477c72159bf9b",
+                "url": "https://api.github.com/repos/wikimedia/less.php/zipball/e238ad228d74b6ffd38209c799b34e9826909266",
+                "reference": "e238ad228d74b6ffd38209c799b34e9826909266",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3"
+                "php": ">=7.2.9"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.8.24"
+                "phpunit/phpunit": "7.5.14"
             },
             "bin": [
                 "bin/lessc"
@@ -2760,6 +2761,10 @@
                 "Apache-2.0"
             ],
             "authors": [
+                {
+                    "name": "Josh Schmidt",
+                    "homepage": "https://github.com/oyejorge"
+                },
                 {
                     "name": "Matt Agar",
                     "homepage": "https://github.com/agar"
@@ -2767,10 +2772,6 @@
                 {
                     "name": "Martin Jantošovič",
                     "homepage": "https://github.com/Mordred"
-                },
-                {
-                    "name": "Josh Schmidt",
-                    "homepage": "https://github.com/oyejorge"
                 }
             ],
             "description": "PHP port of the Javascript version of LESS http://lesscss.org (Originally maintained by Josh Schmidt)",
@@ -2782,7 +2783,7 @@
                 "php",
                 "stylesheet"
             ],
-            "time": "2019-01-19T01:01:33+00:00"
+            "time": "2019-11-06T18:30:11+00:00"
         },
         {
             "name": "zendframework/zend-captcha",
@@ -3450,16 +3451,16 @@
         },
         {
             "name": "zendframework/zend-form",
-            "version": "2.14.1",
+            "version": "2.14.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-form.git",
-                "reference": "ff9385b7d0d93d9bdbc2aa4af82ab616dbc7d4be"
+                "reference": "0b1616c59b1f3df194284e26f98c81ad0c377871"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/ff9385b7d0d93d9bdbc2aa4af82ab616dbc7d4be",
-                "reference": "ff9385b7d0d93d9bdbc2aa4af82ab616dbc7d4be",
+                "url": "https://api.github.com/repos/zendframework/zend-form/zipball/0b1616c59b1f3df194284e26f98c81ad0c377871",
+                "reference": "0b1616c59b1f3df194284e26f98c81ad0c377871",
                 "shasum": ""
             },
             "require": {
@@ -3524,7 +3525,7 @@
                 "form",
                 "zf"
             ],
-            "time": "2019-02-26T18:13:31+00:00"
+            "time": "2019-10-04T10:46:36+00:00"
         },
         {
             "name": "zendframework/zend-http",
@@ -3583,16 +3584,16 @@
         },
         {
             "name": "zendframework/zend-hydrator",
-            "version": "2.4.1",
+            "version": "2.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-hydrator.git",
-                "reference": "70b02f4d8676e64af932625751750b5ca72fff3a"
+                "reference": "2bfc6845019e7b6d38b0ab5e55190244dc510285"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/70b02f4d8676e64af932625751750b5ca72fff3a",
-                "reference": "70b02f4d8676e64af932625751750b5ca72fff3a",
+                "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/2bfc6845019e7b6d38b0ab5e55190244dc510285",
+                "reference": "2bfc6845019e7b6d38b0ab5e55190244dc510285",
                 "shasum": ""
             },
             "require": {
@@ -3617,10 +3618,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-release-1.0": "1.0.x-dev",
-                    "dev-release-1.1": "1.1.x-dev",
-                    "dev-master": "2.4.x-dev",
-                    "dev-develop": "2.5.x-dev"
+                    "dev-release-2.4": "2.4.x-dev"
                 },
                 "zf": {
                     "component": "Zend\\Hydrator",
@@ -3642,7 +3640,7 @@
                 "hydrator",
                 "zf"
             ],
-            "time": "2018-11-19T19:16:10+00:00"
+            "time": "2019-10-04T11:17:36+00:00"
         },
         {
             "name": "zendframework/zend-i18n",
@@ -4053,16 +4051,16 @@
         },
         {
             "name": "zendframework/zend-mime",
-            "version": "2.7.1",
+            "version": "2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-mime.git",
-                "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2"
+                "reference": "c91e0350be53cc9d29be15563445eec3b269d7c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/52ae5fa9f12845cae749271034a2d594f0e4c6f2",
-                "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2",
+                "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/c91e0350be53cc9d29be15563445eec3b269d7c1",
+                "reference": "c91e0350be53cc9d29be15563445eec3b269d7c1",
                 "shasum": ""
             },
             "require": {
@@ -4080,8 +4078,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
                 }
             },
             "autoload": {
@@ -4094,26 +4092,25 @@
                 "BSD-3-Clause"
             ],
             "description": "Create and parse MIME messages and parts",
-            "homepage": "https://github.com/zendframework/zend-mime",
             "keywords": [
                 "ZendFramework",
                 "mime",
                 "zf"
             ],
-            "time": "2018-05-14T19:02:50+00:00"
+            "time": "2019-10-16T19:30:37+00:00"
         },
         {
             "name": "zendframework/zend-modulemanager",
-            "version": "2.8.2",
+            "version": "2.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-modulemanager.git",
-                "reference": "394df6e12248ac430a312d4693f793ee7120baa6"
+                "reference": "b2596d24b9a4e36a3cd114d35d3ad0918db9a243"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/394df6e12248ac430a312d4693f793ee7120baa6",
-                "reference": "394df6e12248ac430a312d4693f793ee7120baa6",
+                "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/b2596d24b9a4e36a3cd114d35d3ad0918db9a243",
+                "reference": "b2596d24b9a4e36a3cd114d35d3ad0918db9a243",
                 "shasum": ""
             },
             "require": {
@@ -4123,7 +4120,7 @@
                 "zendframework/zend-stdlib": "^3.1 || ^2.7"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-console": "^2.6",
                 "zendframework/zend-di": "^2.6",
@@ -4140,8 +4137,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": {
@@ -4154,13 +4151,12 @@
                 "BSD-3-Clause"
             ],
             "description": "Modular application system for zend-mvc applications",
-            "homepage": "https://github.com/zendframework/zend-modulemanager",
             "keywords": [
                 "ZendFramework",
                 "modulemanager",
                 "zf"
             ],
-            "time": "2017-12-02T06:11:18+00:00"
+            "time": "2019-10-28T13:29:38+00:00"
         },
         {
             "name": "zendframework/zend-mvc",
@@ -4308,16 +4304,16 @@
         },
         {
             "name": "zendframework/zend-serializer",
-            "version": "2.9.0",
+            "version": "2.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-serializer.git",
-                "reference": "0172690db48d8935edaf625c4cba38b79719892c"
+                "reference": "6fb7ae016cfdf0cfcdfa2b989e6a65f351170e21"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/0172690db48d8935edaf625c4cba38b79719892c",
-                "reference": "0172690db48d8935edaf625c4cba38b79719892c",
+                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/6fb7ae016cfdf0cfcdfa2b989e6a65f351170e21",
+                "reference": "6fb7ae016cfdf0cfcdfa2b989e6a65f351170e21",
                 "shasum": ""
             },
             "require": {
@@ -4326,7 +4322,7 @@
                 "zendframework/zend-stdlib": "^2.7 || ^3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.25 || ^6.4.4",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-math": "^2.6 || ^3.0",
                 "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
@@ -4355,26 +4351,26 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
+            "description": "Serialize and deserialize PHP structures to a variety of representations",
             "keywords": [
                 "ZendFramework",
                 "serializer",
                 "zf"
             ],
-            "time": "2018-05-14T18:45:18+00:00"
+            "time": "2019-10-19T08:06:30+00:00"
         },
         {
             "name": "zendframework/zend-server",
-            "version": "2.8.0",
+            "version": "2.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-server.git",
-                "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e"
+                "reference": "d80c44700ebb92191dd9a3005316a6ab6637c0d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-server/zipball/23a2e9a5599c83c05da831cb7c649e8a7809595e",
-                "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e",
+                "url": "https://api.github.com/repos/zendframework/zend-server/zipball/d80c44700ebb92191dd9a3005316a6ab6637c0d1",
+                "reference": "d80c44700ebb92191dd9a3005316a6ab6637c0d1",
                 "shasum": ""
             },
             "require": {
@@ -4408,7 +4404,7 @@
                 "server",
                 "zf"
             ],
-            "time": "2018-04-30T22:21:28+00:00"
+            "time": "2019-10-16T18:27:05+00:00"
         },
         {
             "name": "zendframework/zend-servicemanager",
@@ -4464,16 +4460,16 @@
         },
         {
             "name": "zendframework/zend-session",
-            "version": "2.9.0",
+            "version": "2.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-session.git",
-                "reference": "0a0c7ae4d8be608e30ecff714c86164ccca19ca3"
+                "reference": "c289c4d733ec23a389e25c7c451f4d062088511f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-session/zipball/0a0c7ae4d8be608e30ecff714c86164ccca19ca3",
-                "reference": "0a0c7ae4d8be608e30ecff714c86164ccca19ca3",
+                "url": "https://api.github.com/repos/zendframework/zend-session/zipball/c289c4d733ec23a389e25c7c451f4d062088511f",
+                "reference": "c289c4d733ec23a389e25c7c451f4d062088511f",
                 "shasum": ""
             },
             "require": {
@@ -4527,7 +4523,7 @@
                 "session",
                 "zf"
             ],
-            "time": "2019-09-20T12:50:51+00:00"
+            "time": "2019-10-28T19:40:43+00:00"
         },
         {
             "name": "zendframework/zend-soap",
@@ -4630,16 +4626,16 @@
         },
         {
             "name": "zendframework/zend-text",
-            "version": "2.7.0",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-text.git",
-                "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac"
+                "reference": "41e32dafa4015e160e2f95a7039554385c71624d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-text/zipball/ca987dd4594f5f9508771fccd82c89bc7fbb39ac",
-                "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac",
+                "url": "https://api.github.com/repos/zendframework/zend-text/zipball/41e32dafa4015e160e2f95a7039554385c71624d",
+                "reference": "41e32dafa4015e160e2f95a7039554385c71624d",
                 "shasum": ""
             },
             "require": {
@@ -4674,20 +4670,20 @@
                 "text",
                 "zf"
             ],
-            "time": "2018-04-30T14:55:10+00:00"
+            "time": "2019-10-16T20:36:27+00:00"
         },
         {
             "name": "zendframework/zend-uri",
-            "version": "2.7.0",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-uri.git",
-                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee"
+                "reference": "bfc4a5b9a309711e968d7c72afae4ac50c650083"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/b2785cd38fe379a784645449db86f21b7739b1ee",
-                "reference": "b2785cd38fe379a784645449db86f21b7739b1ee",
+                "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/bfc4a5b9a309711e968d7c72afae4ac50c650083",
+                "reference": "bfc4a5b9a309711e968d7c72afae4ac50c650083",
                 "shasum": ""
             },
             "require": {
@@ -4721,20 +4717,20 @@
                 "uri",
                 "zf"
             ],
-            "time": "2019-02-27T21:39:04+00:00"
+            "time": "2019-10-07T13:35:33+00:00"
         },
         {
             "name": "zendframework/zend-validator",
-            "version": "2.12.0",
+            "version": "2.12.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-validator.git",
-                "reference": "64c33668e5fa2d39c6289a878f927ea2b0850c30"
+                "reference": "fd24920c2afcf2a70d11f67c3457f8f509453a62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/64c33668e5fa2d39c6289a878f927ea2b0850c30",
-                "reference": "64c33668e5fa2d39c6289a878f927ea2b0850c30",
+                "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/fd24920c2afcf2a70d11f67c3457f8f509453a62",
+                "reference": "fd24920c2afcf2a70d11f67c3457f8f509453a62",
                 "shasum": ""
             },
             "require": {
@@ -4788,26 +4784,26 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides a set of commonly needed validators",
-            "homepage": "https://github.com/zendframework/zend-validator",
+            "description": "Validation classes for a wide range of domains, and the ability to chain validators to create complex validation criteria",
             "keywords": [
+                "ZendFramework",
                 "validator",
-                "zf2"
+                "zf"
             ],
-            "time": "2019-01-30T14:26:10+00:00"
+            "time": "2019-10-29T08:33:25+00:00"
         },
         {
             "name": "zendframework/zend-view",
-            "version": "2.11.2",
+            "version": "2.11.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-view.git",
-                "reference": "4f5cb653ed4c64bb8d9bf05b294300feb00c67f2"
+                "reference": "e766457bd6ce13c5354e443bb949511b6904d7f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/4f5cb653ed4c64bb8d9bf05b294300feb00c67f2",
-                "reference": "4f5cb653ed4c64bb8d9bf05b294300feb00c67f2",
+                "url": "https://api.github.com/repos/zendframework/zend-view/zipball/e766457bd6ce13c5354e443bb949511b6904d7f5",
+                "reference": "e766457bd6ce13c5354e443bb949511b6904d7f5",
                 "shasum": ""
             },
             "require": {
@@ -4875,13 +4871,13 @@
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides a system of helpers, output filters, and variable escaping",
-            "homepage": "https://github.com/zendframework/zend-view",
+            "description": "Flexible view layer supporting and providing multiple view layers, helpers, and more",
             "keywords": [
+                "ZendFramework",
                 "view",
-                "zf2"
+                "zf"
             ],
-            "time": "2019-02-19T17:40:15+00:00"
+            "time": "2019-10-11T21:10:04+00:00"
         }
     ],
     "packages-dev": [
@@ -5728,20 +5724,20 @@
         },
         {
             "name": "consolidation/robo",
-            "version": "1.4.10",
+            "version": "1.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/Robo.git",
-                "reference": "e5a6ca64cf1324151873672e484aceb21f365681"
+                "reference": "5fa1d901776a628167a325baa9db95d8edf13a80"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/e5a6ca64cf1324151873672e484aceb21f365681",
-                "reference": "e5a6ca64cf1324151873672e484aceb21f365681",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/5fa1d901776a628167a325baa9db95d8edf13a80",
+                "reference": "5fa1d901776a628167a325baa9db95d8edf13a80",
                 "shasum": ""
             },
             "require": {
-                "consolidation/annotated-command": "^2.10.2",
+                "consolidation/annotated-command": "^2.11.0",
                 "consolidation/config": "^1.2",
                 "consolidation/log": "~1",
                 "consolidation/output-formatters": "^3.1.13",
@@ -5771,6 +5767,7 @@
                 "pear/archive_tar": "^1.4.4",
                 "php-coveralls/php-coveralls": "^1",
                 "phpunit/php-code-coverage": "~2|~4",
+                "sebastian/comparator": "^1.2.4",
                 "squizlabs/php_codesniffer": "^2.8"
             },
             "suggest": {
@@ -5832,7 +5829,7 @@
                 }
             ],
             "description": "Modern task runner",
-            "time": "2019-07-29T15:40:50+00:00"
+            "time": "2019-10-29T15:50:02+00:00"
         },
         {
             "name": "consolidation/self-update",
@@ -5970,6 +5967,72 @@
             "description": "Guzzle6 transport for Vault PHP client",
             "time": "2019-03-10T06:17:37+00:00"
         },
+        {
+            "name": "dealerdirect/phpcodesniffer-composer-installer",
+            "version": "v0.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
+                "reference": "e749410375ff6fb7a040a68878c656c2e610b132"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e749410375ff6fb7a040a68878c656c2e610b132",
+                "reference": "e749410375ff6fb7a040a68878c656c2e610b132",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0",
+                "php": "^5.3|^7",
+                "squizlabs/php_codesniffer": "^2|^3"
+            },
+            "require-dev": {
+                "composer/composer": "*",
+                "phpcompatibility/php-compatibility": "^9.0",
+                "sensiolabs/security-checker": "^4.1.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Franck Nijhof",
+                    "email": "franck.nijhof@dealerdirect.com",
+                    "homepage": "http://www.frenck.nl",
+                    "role": "Developer / IT Manager"
+                }
+            ],
+            "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
+            "homepage": "http://www.dealerdirect.com",
+            "keywords": [
+                "PHPCodeSniffer",
+                "PHP_CodeSniffer",
+                "code quality",
+                "codesniffer",
+                "composer",
+                "installer",
+                "phpcs",
+                "plugin",
+                "qa",
+                "quality",
+                "standard",
+                "standards",
+                "style guide",
+                "stylecheck",
+                "tests"
+            ],
+            "time": "2018-10-26T13:21:45+00:00"
+        },
         {
             "name": "dflydev/dot-access-data",
             "version": "v1.1.0",
@@ -6031,16 +6094,16 @@
         },
         {
             "name": "doctrine/annotations",
-            "version": "v1.7.0",
+            "version": "v1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "fa4c4e861e809d6a1103bd620cce63ed91aedfeb"
+                "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/fa4c4e861e809d6a1103bd620cce63ed91aedfeb",
-                "reference": "fa4c4e861e809d6a1103bd620cce63ed91aedfeb",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/904dca4eb10715b92569fbcd79e201d5c349b6bc",
+                "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc",
                 "shasum": ""
             },
             "require": {
@@ -6049,7 +6112,7 @@
             },
             "require-dev": {
                 "doctrine/cache": "1.*",
-                "phpunit/phpunit": "^7.5@dev"
+                "phpunit/phpunit": "^7.5"
             },
             "type": "library",
             "extra": {
@@ -6095,20 +6158,20 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2019-08-08T18:11:40+00:00"
+            "time": "2019-10-01T18:55:10+00:00"
         },
         {
             "name": "doctrine/cache",
-            "version": "v1.8.0",
+            "version": "1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57"
+                "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57",
-                "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/89a5c76c39c292f7798f964ab3c836c3f8192a55",
+                "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55",
                 "shasum": ""
             },
             "require": {
@@ -6119,7 +6182,7 @@
             },
             "require-dev": {
                 "alcaeus/mongo-php-adapter": "^1.1",
-                "doctrine/coding-standard": "^4.0",
+                "doctrine/coding-standard": "^6.0",
                 "mongodb/mongodb": "^1.1",
                 "phpunit/phpunit": "^7.0",
                 "predis/predis": "~1.0"
@@ -6130,7 +6193,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8.x-dev"
+                    "dev-master": "1.9.x-dev"
                 }
             },
             "autoload": {
@@ -6143,6 +6206,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
@@ -6151,10 +6218,6 @@
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
                 },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
                 {
                     "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com"
@@ -6164,13 +6227,21 @@
                     "email": "schmittjoh@gmail.com"
                 }
             ],
-            "description": "Caching library offering an object-oriented API for many cache backends",
-            "homepage": "https://www.doctrine-project.org",
+            "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.",
+            "homepage": "https://www.doctrine-project.org/projects/cache.html",
             "keywords": [
+                "abstraction",
+                "apcu",
                 "cache",
-                "caching"
+                "caching",
+                "couchdb",
+                "memcached",
+                "php",
+                "redis",
+                "riak",
+                "xcache"
             ],
-            "time": "2018-08-21T18:01:43+00:00"
+            "time": "2019-11-15T14:31:57+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -6241,16 +6312,16 @@
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "a2c590166b2133a4633738648b6b064edae0814a"
+                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
-                "reference": "a2c590166b2133a4633738648b6b064edae0814a",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
+                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
                 "shasum": ""
             },
             "require": {
@@ -6293,32 +6364,34 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2019-03-17T17:37:11+00:00"
+            "time": "2019-10-21T16:45:58+00:00"
         },
         {
             "name": "doctrine/lexer",
-            "version": "1.0.2",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
+                "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
-                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
+                "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.2"
+                "php": "^7.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.5"
+                "doctrine/coding-standard": "^6.0",
+                "phpstan/phpstan": "^0.11.8",
+                "phpunit/phpunit": "^8.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
@@ -6331,14 +6404,14 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
                 {
                     "name": "Guilherme Blanco",
                     "email": "guilhermeblanco@gmail.com"
                 },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
                 {
                     "name": "Johannes Schmitt",
                     "email": "schmittjoh@gmail.com"
@@ -6353,7 +6426,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2019-06-08T11:03:04+00:00"
+            "time": "2019-10-30T14:39:59+00:00"
         },
         {
             "name": "facebook/webdriver",
@@ -6547,16 +6620,16 @@
         },
         {
             "name": "fzaninotto/faker",
-            "version": "v1.8.0",
+            "version": "v1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
+                "reference": "27a216cbe72327b2d6369fab721a5843be71e57d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
-                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/27a216cbe72327b2d6369fab721a5843be71e57d",
+                "reference": "27a216cbe72327b2d6369fab721a5843be71e57d",
                 "shasum": ""
             },
             "require": {
@@ -6565,13 +6638,11 @@
             "require-dev": {
                 "ext-intl": "*",
                 "phpunit/phpunit": "^4.8.35 || ^5.7",
-                "squizlabs/php_codesniffer": "^1.5"
+                "squizlabs/php_codesniffer": "^2.9.2"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8-dev"
-                }
+                "branch-alias": []
             },
             "autoload": {
                 "psr-4": {
@@ -6593,7 +6664,7 @@
                 "faker",
                 "fixtures"
             ],
-            "time": "2018-07-12T10:23:15+00:00"
+            "time": "2019-11-14T13:13:06+00:00"
         },
         {
             "name": "grasmash/expander",
@@ -6959,16 +7030,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.55",
+            "version": "1.0.57",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6"
+                "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/33c91155537c6dc899eacdc54a13ac6303f156e6",
-                "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
+                "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
                 "shasum": ""
             },
             "require": {
@@ -7039,7 +7110,7 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2019-08-24T11:17:19+00:00"
+            "time": "2019-10-16T21:01:05+00:00"
         },
         {
             "name": "lusitanian/oauth",
@@ -7110,51 +7181,61 @@
         },
         {
             "name": "magento/magento-coding-standard",
-            "version": "4",
+            "version": "5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento-coding-standard.git",
-                "reference": "d24e0230a532e19941ed264f57db38fad5b1008a"
+                "reference": "da46c5d57a43c950dfa364edc7f1f0436d5353a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento-coding-standard/zipball/d24e0230a532e19941ed264f57db38fad5b1008a",
-                "reference": "d24e0230a532e19941ed264f57db38fad5b1008a",
+                "url": "https://api.github.com/repos/magento/magento-coding-standard/zipball/da46c5d57a43c950dfa364edc7f1f0436d5353a5",
+                "reference": "da46c5d57a43c950dfa364edc7f1f0436d5353a5",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.6.0",
-                "squizlabs/php_codesniffer": "^3.4"
+                "squizlabs/php_codesniffer": "^3.4",
+                "webonyx/graphql-php": ">=0.12.6 <1.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
             },
             "type": "phpcodesniffer-standard",
+            "autoload": {
+                "classmap": [
+                    "PHP_CodeSniffer/Tokenizers/"
+                ],
+                "psr-4": {
+                    "Magento2\\": "Magento2/"
+                }
+            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "OSL-3.0",
                 "AFL-3.0"
             ],
             "description": "A set of Magento specific PHP CodeSniffer rules.",
-            "time": "2019-08-06T15:58:37+00:00"
+            "time": "2019-11-04T22:08:27+00:00"
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "2.5.0",
+            "version": "2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "5aa379674def88d1efc180d936dae1e4654c238a"
+                "reference": "f627085a469da79e4a628d4bf0452f12aefa4389"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/5aa379674def88d1efc180d936dae1e4654c238a",
-                "reference": "5aa379674def88d1efc180d936dae1e4654c238a",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/f627085a469da79e4a628d4bf0452f12aefa4389",
+                "reference": "f627085a469da79e4a628d4bf0452f12aefa4389",
                 "shasum": ""
             },
             "require": {
                 "allure-framework/allure-codeception": "~1.3.0",
                 "codeception/codeception": "~2.3.4 || ~2.4.0 ",
+                "composer/composer": "^1.4",
                 "consolidation/robo": "^1.0.0",
                 "csharpru/vault-php": "~3.5.3",
                 "csharpru/vault-php-guzzle6-transport": "^2.0",
@@ -7213,20 +7294,20 @@
                 "magento",
                 "testing"
             ],
-            "time": "2019-09-18T14:52:11+00:00"
+            "time": "2019-10-31T14:52:02+00:00"
         },
         {
             "name": "mikey179/vfsstream",
-            "version": "v1.6.7",
+            "version": "v1.6.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bovigo/vfsStream.git",
-                "reference": "2b544ac3a21bcc4dde5d90c4ae8d06f4319055fb"
+                "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/2b544ac3a21bcc4dde5d90c4ae8d06f4319055fb",
-                "reference": "2b544ac3a21bcc4dde5d90c4ae8d06f4319055fb",
+                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/231c73783ebb7dd9ec77916c10037eff5a2b6efe",
+                "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe",
                 "shasum": ""
             },
             "require": {
@@ -7259,7 +7340,7 @@
             ],
             "description": "Virtual file system to mock the real file system in unit tests.",
             "homepage": "http://vfs.bovigo.org/",
-            "time": "2019-08-01T01:38:37+00:00"
+            "time": "2019-10-30T15:31:00+00:00"
         },
         {
             "name": "mustache/mustache",
@@ -7355,6 +7436,58 @@
             ],
             "time": "2019-08-09T12:45:53+00:00"
         },
+        {
+            "name": "nikic/php-parser",
+            "version": "v4.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc",
+                "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "ircmaxell/php-yacc": "0.0.5",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
+            },
+            "bin": [
+                "bin/php-parse"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpParser\\": "lib/PhpParser"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "time": "2019-11-08T13:50:10+00:00"
+        },
         {
             "name": "pdepend/pdepend",
             "version": "2.5.2",
@@ -7596,6 +7729,64 @@
             ],
             "time": "2015-05-17T12:39:23+00:00"
         },
+        {
+            "name": "phpcompatibility/php-compatibility",
+            "version": "9.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
+                "reference": "1f37659196e4f3113ea506a7efba201c52303bf1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/1f37659196e4f3113ea506a7efba201c52303bf1",
+                "reference": "1f37659196e4f3113ea506a7efba201c52303bf1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "squizlabs/php_codesniffer": "^2.3 || ^3.0.2"
+            },
+            "conflict": {
+                "squizlabs/php_codesniffer": "2.6.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "suggest": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
+                "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
+            },
+            "type": "phpcodesniffer-standard",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Wim Godden",
+                    "homepage": "https://github.com/wimg",
+                    "role": "lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "homepage": "https://github.com/jrfnl",
+                    "role": "lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors"
+                }
+            ],
+            "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.",
+            "homepage": "http://techblog.wimgodden.be/tag/codesniffer/",
+            "keywords": [
+                "compatibility",
+                "phpcs",
+                "standards"
+            ],
+            "time": "2019-11-15T04:12:02+00:00"
+        },
         {
             "name": "phpdocumentor/reflection-common",
             "version": "2.0.0",
@@ -7816,28 +8007,28 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.5.0",
+            "version": "1.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed"
+                "reference": "2ba2586380f8d2b44ad1b9feb61c371020b27793"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed",
-                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/2ba2586380f8d2b44ad1b9feb61c371020b27793",
+                "reference": "2ba2586380f8d2b44ad1b9feb61c371020b27793",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.7.*"
+                "phpunit/phpunit": "^4.7|^5.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3-dev"
+                    "dev-master": "1.5-dev"
                 }
             },
             "autoload": {
@@ -7847,7 +8038,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "Apache2"
+                "Apache-2.0"
             ],
             "authors": [
                 {
@@ -7862,26 +8053,26 @@
                 "php",
                 "type"
             ],
-            "time": "2015-07-25T16:39:46+00:00"
+            "time": "2019-11-06T22:27:00+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.8.1",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76"
+                "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
-                "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203",
+                "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
                 "sebastian/comparator": "^1.1|^2.0|^3.0",
                 "sebastian/recursion-context": "^1.0|^2.0|^3.0"
             },
@@ -7925,7 +8116,47 @@
                 "spy",
                 "stub"
             ],
-            "time": "2019-06-13T12:50:23+00:00"
+            "time": "2019-10-03T11:07:50+00:00"
+        },
+        {
+            "name": "phpstan/phpstan",
+            "version": "0.12.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "c15a6ea55da71d8133399306f560cfe4d30301b7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c15a6ea55da71d8133399306f560cfe4d30301b7",
+                "reference": "c15a6ea55da71d8133399306f560cfe4d30301b7",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.3.0",
+                "php": "^7.1"
+            },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.12-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPStan - PHP Static Analysis Tool",
+            "time": "2019-12-14T13:41:17+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -9115,16 +9346,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v4.3.4",
+            "version": "v4.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "9e5dddb637b13db82e35695a8603fe6e118cc119"
+                "reference": "b14fa08508afd152257d5dcc7adb5f278654d972"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/9e5dddb637b13db82e35695a8603fe6e118cc119",
-                "reference": "9e5dddb637b13db82e35695a8603fe6e118cc119",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/b14fa08508afd152257d5dcc7adb5f278654d972",
+                "reference": "b14fa08508afd152257d5dcc7adb5f278654d972",
                 "shasum": ""
             },
             "require": {
@@ -9170,20 +9401,20 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-26T08:26:39+00:00"
+            "time": "2019-10-28T17:07:32+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v4.3.4",
+            "version": "v4.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "07d49c0f823e0bc367c6d84e35b61419188a5ece"
+                "reference": "8267214841c44d315a55242ea867684eb43c42ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/07d49c0f823e0bc367c6d84e35b61419188a5ece",
-                "reference": "07d49c0f823e0bc367c6d84e35b61419188a5ece",
+                "url": "https://api.github.com/repos/symfony/config/zipball/8267214841c44d315a55242ea867684eb43c42ce",
+                "reference": "8267214841c44d315a55242ea867684eb43c42ce",
                 "shasum": ""
             },
             "require": {
@@ -9234,20 +9465,20 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-26T08:26:39+00:00"
+            "time": "2019-11-08T08:31:27+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v4.3.4",
+            "version": "v4.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "d3ad14b66ac773ba6123622eb9b5b010165fe3d9"
+                "reference": "80c6d9e19467dfbba14f830ed478eb592ce51b64"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d3ad14b66ac773ba6123622eb9b5b010165fe3d9",
-                "reference": "d3ad14b66ac773ba6123622eb9b5b010165fe3d9",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/80c6d9e19467dfbba14f830ed478eb592ce51b64",
+                "reference": "80c6d9e19467dfbba14f830ed478eb592ce51b64",
                 "shasum": ""
             },
             "require": {
@@ -9307,20 +9538,20 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-26T16:27:33+00:00"
+            "time": "2019-11-08T16:22:27+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.3.4",
+            "version": "v4.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "cc686552948d627528c0e2e759186dff67c2610e"
+                "reference": "4b9efd5708c3a38593e19b6a33e40867f4f89d72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/cc686552948d627528c0e2e759186dff67c2610e",
-                "reference": "cc686552948d627528c0e2e759186dff67c2610e",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4b9efd5708c3a38593e19b6a33e40867f4f89d72",
+                "reference": "4b9efd5708c3a38593e19b6a33e40867f4f89d72",
                 "shasum": ""
             },
             "require": {
@@ -9368,20 +9599,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-26T08:26:39+00:00"
+            "time": "2019-10-28T17:07:32+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v2.8.50",
+            "version": "v2.8.52",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "746f8d3638bf46ee8b202e62f2b214c3d61fb06a"
+                "reference": "3929d9fe8148d17819ad0178c748b8d339420709"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/746f8d3638bf46ee8b202e62f2b214c3d61fb06a",
-                "reference": "746f8d3638bf46ee8b202e62f2b214c3d61fb06a",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3929d9fe8148d17819ad0178c748b8d339420709",
+                "reference": "3929d9fe8148d17819ad0178c748b8d339420709",
                 "shasum": ""
             },
             "require": {
@@ -9423,20 +9654,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2019-04-16T10:00:53+00:00"
+            "time": "2019-11-12T12:34:41+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v4.3.4",
+            "version": "v4.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "81c2e120522a42f623233968244baebd6b36cb6a"
+                "reference": "f46c7fc8e207bd8a2188f54f8738f232533765a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/81c2e120522a42f623233968244baebd6b36cb6a",
-                "reference": "81c2e120522a42f623233968244baebd6b36cb6a",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/f46c7fc8e207bd8a2188f54f8738f232533765a4",
+                "reference": "f46c7fc8e207bd8a2188f54f8738f232533765a4",
                 "shasum": ""
             },
             "require": {
@@ -9477,7 +9708,7 @@
                 "configuration",
                 "options"
             ],
-            "time": "2019-08-08T09:29:19+00:00"
+            "time": "2019-10-28T20:59:01+00:00"
         },
         {
             "name": "symfony/polyfill-php54",
@@ -9709,16 +9940,16 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v1.1.6",
+            "version": "v1.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3"
+                "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ea7263d6b6d5f798b56a45a5b8d686725f2719a3",
-                "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffc7f5692092df31515df2a5ecf3b7302b3ddacf",
+                "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf",
                 "shasum": ""
             },
             "require": {
@@ -9763,20 +9994,20 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-08-20T14:44:19+00:00"
+            "time": "2019-10-14T12:27:06+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v4.3.4",
+            "version": "v4.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "1e4ff456bd625be5032fac9be4294e60442e9b71"
+                "reference": "e96c259de6abcd0cead71f0bf4d730d53ee464d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/1e4ff456bd625be5032fac9be4294e60442e9b71",
-                "reference": "1e4ff456bd625be5032fac9be4294e60442e9b71",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/e96c259de6abcd0cead71f0bf4d730d53ee464d0",
+                "reference": "e96c259de6abcd0cead71f0bf4d730d53ee464d0",
                 "shasum": ""
             },
             "require": {
@@ -9813,20 +10044,20 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-07T11:52:19+00:00"
+            "time": "2019-11-05T14:48:09+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v4.3.4",
+            "version": "v4.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686"
+                "reference": "324cf4b19c345465fad14f3602050519e09e361d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686",
-                "reference": "5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/324cf4b19c345465fad14f3602050519e09e361d",
+                "reference": "324cf4b19c345465fad14f3602050519e09e361d",
                 "shasum": ""
             },
             "require": {
@@ -9872,7 +10103,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2019-08-20T14:27:59+00:00"
+            "time": "2019-10-30T12:58:49+00:00"
         },
         {
             "name": "theseer/fdomdocument",
@@ -10115,7 +10346,6 @@
         "ext-pdo_mysql": "*",
         "ext-simplexml": "*",
         "ext-soap": "*",
-        "ext-spl": "*",
         "ext-xsl": "*",
         "ext-zip": "*",
         "lib-libxml": "*"
diff --git a/dev/tests/acceptance/tests/_data/importSpecChars.csv b/dev/tests/acceptance/tests/_data/importSpecChars.csv
new file mode 100644
index 0000000000000..5d62286ccf2ee
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/importSpecChars.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,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
+Mug,,Default,simple,Default Category/C1,base,Mug,<p>this is a � � � mug</p>,,,1,Taxable Goods,"Catalog, Search",30,,,,mug,Mug,Mug,Mug ,,,,,,,,,"10/1/18, 9:21 PM","10/1/18, 11:30 PM",,,Block after Info Column,,,,Use config,,,,,,,,,gift_wrapping_available=Use config,99,0,1,0,0,1,1,1,10000,1,1,1,1,1,1,1,1,1,0,0,0,1,1,,,,,,,,,,,,,,,,,,,
diff --git a/dev/tests/acceptance/tests/_data/import_productsoftwostoresdata.csv b/dev/tests/acceptance/tests/_data/import_productsoftwostoresdata.csv
new file mode 100644
index 0000000000000..5cb120e7e2b2b
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/import_productsoftwostoresdata.csv
@@ -0,0 +1,7 @@
+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,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,msrp_price,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,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
+name4,,Default,simple,,base,name4,name4,name4,0,1,None,Catalog,39,1,7/8/2015 8:00,,name4,,,,12/16/2015 6:33,7/7/2016 13:01,,,Product Info Column,,,,,,,,Use config,,,1,0,1,0,0,0,1,1,10000,1,1,1,1,1,1,1,0,1,0,0,1
+name4,english,Default,simple,,base,, ,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+name4,chinese,Default,simple,,base,白瓷奶勺110厘米, ,白瓷奶勺110厘米,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+name5,,Default,simple,,base,name5,name5,name5,0,1,,Catalog,229,111.75,7/15/2015 0:00,,name5,,,,12/16/2015 6:33,7/7/2016 13:01,,,Product Info Column,,,,,,,,Use config,,,0,0,1,0,2,2,1,1,10000,1,1,1,1,1,1,1,0,1,0,0,1
+name5,chinese,Default,simple,,base,盐磨瓶18厘米,,盐磨瓶18厘米,,2,None,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+name5,english,Default,simple,,base,,,,,2,None,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/dev/tests/acceptance/tests/_data/import_simple_product.csv b/dev/tests/acceptance/tests/_data/import_simple_product.csv
new file mode 100644
index 0000000000000..b7eea288db4df
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/import_simple_product.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,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,use_config_is_redeemable,use_config_lifetime,use_config_allow_message,use_config_email_template,associated_skus,configurable_variations,configurable_variation_labels
+test_sku,,Default,simple,Default Category/simpleCategory5d53a993b7ccb2,base,Test_Product,,,,1,Taxable Goods,"Catalog, Search",560,,,,test-product,Test_Product,Test_Product,Test_Product ,,,,,,,,,"8/14/19, 6:27 AM","8/14/19, 6:27 AM",,,Block after Info Column,,,,Use config,,,,,,,Use config,,,25,0,1,0,0,1,1,1,10000,1,1,1,1,1,1,1,1,1,0,0,0,1,1,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/dev/tests/acceptance/tests/_data/simpleProductUpdate.csv b/dev/tests/acceptance/tests/_data/simpleProductUpdate.csv
new file mode 100644
index 0000000000000..147d6f8ade275
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/simpleProductUpdate.csv
@@ -0,0 +1,2 @@
+sku,url_key
+simpleProduct,simpleProd
diff --git a/dev/tests/acceptance/tests/_data/tablerates.csv b/dev/tests/acceptance/tests/_data/tablerates.csv
new file mode 100644
index 0000000000000..ddc591798e3cc
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/tablerates.csv
@@ -0,0 +1,21 @@
+Country,Region/State,Zip/Postal Code,Weight (and above),Shipping Price
+ASM,*,*,0,9.95
+FSM,*,*,0,9.95
+GUM,*,*,0,9.95
+MHL,*,*,0,9.95
+MNP,*,*,0,9.95
+PLW,*,*,0,9.95
+USA,AA,*,0,9.95
+USA,AE,*,0,9.95
+USA,AK,*,0,9.95
+USA,AP,*,0,9.95
+USA,AS,*,0,9.95
+USA,FM,*,0,9.95
+USA,GU,*,0,9.95
+USA,HI,*,0,9.95
+USA,MH,*,0,9.95
+USA,MP,*,0,9.95
+USA,PR,*,0,9.95
+USA,PW,*,0,9.95
+USA,VI,*,0,9.95
+VIR,*,*,0,9.95
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/_data/usa_tablerates.csv b/dev/tests/acceptance/tests/_data/usa_tablerates.csv
new file mode 100644
index 0000000000000..d5a59ae6bccf2
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/usa_tablerates.csv
@@ -0,0 +1,13 @@
+Country,Region/State,"Zip/Postal Code","Order Subtotal (and above)","Shipping Price"
+USA,*,*,0.0000,7.9900
+USA,*,*,7.0000,6.9900
+USA,*,*,13.0000,5.9900
+USA,*,*,25.9900,4.9900
+USA,AK,*,0.0000,8.9900
+USA,AK,*,7.0000,7.9900
+USA,AK,*,13.0000,6.9900
+USA,AK,*,25.9900,5.9900
+USA,HI,*,0.0000,8.9900
+USA,HI,*,7.0000,7.9900
+USA,HI,*,13.0000,6.9900
+USA,HI,*,25.9900,5.9900
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
index f0bfec543f281..cac9d0c3cb55f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
@@ -27,4 +27,23 @@
         <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="searchGrabConfigProductPageImageSrc" after="searchAssertConfigProductPage"/>
         <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$searchGrabConfigProductPageImageSrc" stepKey="searchAssertConfigProductPageImageNotDefault" after="searchGrabConfigProductPageImageSrc"/>
     </test>
+    <test name="EndToEndB2CGuestUserMysqlTest">
+        <!-- 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/api-functional/_files/Magento/TestModuleCatalogSearch/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModuleCatalogSearch/etc/module.xml
new file mode 100644
index 0000000000000..bae0739d237e1
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleCatalogSearch/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_TestModuleCatalogSearch">
+        <sequence>
+            <module name="Magento_CatalogSearch"/>
+        </sequence>
+    </module>
+</config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleCatalogSearch/registration.php b/dev/tests/api-functional/_files/Magento/TestModuleCatalogSearch/registration.php
new file mode 100644
index 0000000000000..78fb97a9e1134
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleCatalogSearch/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_TestModuleCatalogSearch') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleCatalogSearch', __DIR__);
+}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleUps/Model/Carrier.php b/dev/tests/api-functional/_files/Magento/TestModuleUps/Model/Carrier.php
index b3c3c124cfe47..9411523db0f2e 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleUps/Model/Carrier.php
+++ b/dev/tests/api-functional/_files/Magento/TestModuleUps/Model/Carrier.php
@@ -7,10 +7,10 @@
 
 namespace Magento\TestModuleUps\Model;
 
-use Magento\Framework\Async\ProxyDeferredFactory;
 use Magento\Framework\HTTP\AsyncClientInterface;
 use Magento\Framework\HTTP\ClientFactory;
 use Magento\Framework\Xml\Security;
+use Magento\Shipping\Model\Rate\Result\ProxyDeferredFactory;
 use Magento\Ups\Helper\Config;
 
 /**
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiConfigFixture.php b/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiConfigFixture.php
index a5be493032836..8061cb138660d 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiConfigFixture.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiConfigFixture.php
@@ -10,6 +10,7 @@
 use Magento\Config\Model\Config;
 use Magento\Config\Model\ResourceModel\Config as ConfigResource;
 use Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\TestCase;
@@ -156,4 +157,31 @@ private function getStoreIdByCode(string $storeCode): int
         $store = $storeManager->getStore($storeCode);
         return (int)$store->getId();
     }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _setConfigValue($configPath, $value, $storeCode = false)
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        if ($storeCode === false) {
+            $objectManager->get(
+                \Magento\TestFramework\App\ApiMutableScopeConfig::class
+            )->setValue(
+                $configPath,
+                $value,
+                ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+            );
+
+            return;
+        }
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\TestFramework\App\ApiMutableScopeConfig::class
+        )->setValue(
+            $configPath,
+            $value,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeCode
+        );
+    }
 }
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/App/MutableScopeConfig.php b/dev/tests/api-functional/framework/Magento/TestFramework/App/ApiMutableScopeConfig.php
similarity index 86%
rename from dev/tests/api-functional/framework/Magento/TestFramework/App/MutableScopeConfig.php
rename to dev/tests/api-functional/framework/Magento/TestFramework/App/ApiMutableScopeConfig.php
index efcb5be34e594..fa0cebece9a96 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/App/MutableScopeConfig.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/App/ApiMutableScopeConfig.php
@@ -17,7 +17,7 @@
 /**
  * @inheritdoc
  */
-class MutableScopeConfig implements MutableScopeConfigInterface
+class ApiMutableScopeConfig implements MutableScopeConfigInterface
 {
     /**
      * @var Config
@@ -56,7 +56,6 @@ public function setValue(
     /**
      * Clean app config cache
      *
-     * @param string|null $type
      * @return void
      */
     public function clean()
@@ -89,19 +88,13 @@ private function getTestAppConfig()
     private function persistConfig($path, $value, $scopeType, $scopeCode): void
     {
         $pathParts = explode('/', $path);
-        $store = '';
-        if ($scopeType === \Magento\Store\Model\ScopeInterface::SCOPE_STORE) {
-            if ($scopeCode !== null) {
-                $store = ObjectManager::getInstance()
+        $store = 0;
+        if ($scopeType === \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            && $scopeCode !== null) {
+            $store = ObjectManager::getInstance()
                     ->get(\Magento\Store\Api\StoreRepositoryInterface::class)
                     ->get($scopeCode)
                     ->getId();
-            } else {
-                $store = ObjectManager::getInstance()
-                    ->get(\Magento\Store\Model\StoreManagerInterface::class)
-                    ->getStore()
-                    ->getId();
-            }
         }
         $configData = [
             'section' => $pathParts[0],
diff --git a/dev/tests/api-functional/testsuite/Magento/AsynchronousOperations/Api/BulkStatusInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/AsynchronousOperations/Api/BulkStatusInterfaceTest.php
new file mode 100644
index 0000000000000..46ffb39878c0d
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/AsynchronousOperations/Api/BulkStatusInterfaceTest.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Api;
+
+use Magento\TestFramework\TestCase\WebapiAbstract;
+use Magento\Framework\Bulk\OperationInterface;
+
+class BulkStatusInterfaceTest extends WebapiAbstract
+{
+    const RESOURCE_PATH = '/V1/bulk/';
+    const SERVICE_NAME = 'asynchronousOperationsBulkStatusV1';
+    const GET_COUNT_OPERATION_NAME = "GetOperationsCountByBulkIdAndStatus";
+    const TEST_UUID = "bulk-uuid-searchable-6";
+
+    /**
+     * @magentoApiDataFixture Magento/AsynchronousOperations/_files/operation_searchable.php
+     */
+    public function testGetListByBulkStartTime()
+    {
+        $resourcePath = self::RESOURCE_PATH
+            . self::TEST_UUID
+            . "/operation-status/"
+            . OperationInterface::STATUS_TYPE_OPEN;
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => $resourcePath,
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => 'V1',
+                'operation' => self::SERVICE_NAME . self::GET_COUNT_OPERATION_NAME
+            ],
+        ];
+        $qty = $this->_webApiCall(
+            $serviceInfo,
+            ['bulkUuid' => self::TEST_UUID, 'status' => OperationInterface::STATUS_TYPE_OPEN]
+        );
+        $this->assertEquals(2, $qty);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/AsynchronousOperations/Api/OperationRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/AsynchronousOperations/Api/OperationRepositoryInterfaceTest.php
index 8eab6c9fd8676..81ed561a9803e 100644
--- a/dev/tests/api-functional/testsuite/Magento/AsynchronousOperations/Api/OperationRepositoryInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/AsynchronousOperations/Api/OperationRepositoryInterfaceTest.php
@@ -57,8 +57,8 @@ public function testGetListByBulkStartTime()
         $this->assertArrayHasKey('items', $response);
 
         $this->assertEquals($searchCriteria['searchCriteria'], $response['search_criteria']);
-        $this->assertEquals(3, $response['total_count']);
-        $this->assertEquals(3, count($response['items']));
+        $this->assertEquals(5, $response['total_count']);
+        $this->assertEquals(5, 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/ProductServiceTest.php b/dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductServiceTest.php
index 0293f44615080..6388684466d10 100644
--- a/dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductServiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductServiceTest.php
@@ -282,7 +282,6 @@ protected function getBundleProductOptions($product)
     protected function setBundleProductOptions(&$product, $bundleProductOptions)
     {
         $product["extension_attributes"]["bundle_product_options"] = $bundleProductOptions;
-        return;
     }
 
     /**
@@ -499,7 +498,8 @@ protected function deleteProductBySku($productSku)
     protected function saveProduct($product)
     {
         if (isset($product['custom_attributes'])) {
-            for ($i=0; $i<sizeof($product['custom_attributes']); $i++) {
+            $count = count($product['custom_attributes']);
+            for ($i=0; $i < $count; $i++) {
                 if ($product['custom_attributes'][$i]['attribute_code'] == 'category_ids'
                     && !is_array($product['custom_attributes'][$i]['value'])
                 ) {
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
index 332e509d550ac..d614f6e913dc5 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
@@ -6,11 +6,21 @@
  */
 namespace Magento\Catalog\Api;
 
+use Magento\Authorization\Model\Role;
+use Magento\Authorization\Model\Rules;
+use Magento\Integration\Api\AdminTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\Authorization\Model\RoleFactory;
+use Magento\Authorization\Model\RulesFactory;
 
+/**
+ * Test repository web API.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class CategoryRepositoryTest extends WebapiAbstract
 {
     const RESOURCE_PATH = '/V1/categories';
@@ -18,6 +28,33 @@ class CategoryRepositoryTest extends WebapiAbstract
 
     private $modelId = 333;
 
+    /**
+     * @var RoleFactory
+     */
+    private $roleFactory;
+
+    /**
+     * @var RulesFactory
+     */
+    private $rulesFactory;
+
+    /**
+     * @var AdminTokenServiceInterface
+     */
+    private $adminTokens;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->roleFactory = Bootstrap::getObjectManager()->get(RoleFactory::class);
+        $this->rulesFactory = Bootstrap::getObjectManager()->get(RulesFactory::class);
+        $this->adminTokens = Bootstrap::getObjectManager()->get(AdminTokenServiceInterface::class);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/category_backend.php
      */
@@ -57,8 +94,10 @@ public function testInfoNoSuchEntityException()
     }
 
     /**
+     * Load category data.
+     *
      * @param int $id
-     * @return string
+     * @return array
      */
     protected function getInfoCategory($id)
     {
@@ -209,10 +248,11 @@ protected function getSimpleCategoryData($categoryData = [])
     /**
      * Create category process
      *
-     * @param  $category
-     * @return int
+     * @param array $category
+     * @param string|null $token
+     * @return array
      */
-    protected function createCategory($category)
+    protected function createCategory(array $category, ?string $token = null)
     {
         $serviceInfo = [
             'rest' => [
@@ -225,6 +265,9 @@ protected function createCategory($category)
                 'operation' => self::SERVICE_NAME . 'Save',
             ],
         ];
+        if ($token) {
+            $serviceInfo['rest']['token'] = $serviceInfo['soap']['token'] = $token;
+        }
         $requestData = ['category' => $category];
         return $this->_webApiCall($serviceInfo, $requestData);
     }
@@ -251,7 +294,15 @@ protected function deleteCategory($id)
         return $this->_webApiCall($serviceInfo, ['categoryId' => $id]);
     }
 
-    protected function updateCategory($id, $data)
+    /**
+     * Update given category via web API.
+     *
+     * @param int $id
+     * @param array $data
+     * @param string|null $token
+     * @return array
+     */
+    protected function updateCategory($id, $data, ?string $token = null)
     {
         $serviceInfo =
             [
@@ -265,6 +316,9 @@ protected function updateCategory($id, $data)
                     'operation' => self::SERVICE_NAME . 'Save',
                 ],
             ];
+        if ($token) {
+            $serviceInfo['rest']['token'] = $serviceInfo['soap']['token'] = $token;
+        }
 
         if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
             $data['id'] = $id;
@@ -272,7 +326,125 @@ protected function updateCategory($id, $data)
         } else {
             $data['id'] = $id;
             return $this->_webApiCall($serviceInfo, ['id' => $id, 'category' => $data]);
-            return $this->_webApiCall($serviceInfo, ['category' => $data]);
         }
     }
+
+    /**
+     * Update admin role resources list.
+     *
+     * @param string $roleName
+     * @param string[] $resources
+     * @return void
+     */
+    private function updateRoleResources(string $roleName, array $resources): void
+    {
+        /** @var Role $role */
+        $role = $this->roleFactory->create();
+        $role->load($roleName, 'role_name');
+        /** @var Rules $rules */
+        $rules = $this->rulesFactory->create();
+        $rules->setRoleId($role->getId());
+        $rules->setResources($resources);
+        $rules->saveRel();
+    }
+
+    /**
+     * Extract error returned by the server.
+     *
+     * @param \Throwable $exception
+     * @return string
+     */
+    private function extractCallExceptionMessage(\Throwable $exception): string
+    {
+        if ($restResponse = json_decode($exception->getMessage(), true)) {
+            //REST
+            return $restResponse['message'];
+        } else {
+            //SOAP
+            return $exception->getMessage();
+        }
+    }
+
+    /**
+     * Test design settings authorization
+     *
+     * @magentoApiDataFixture Magento/User/_files/user_with_custom_role.php
+     * @throws \Throwable
+     * @return void
+     */
+    public function testSaveDesign(): void
+    {
+        //Updating our admin user's role to allow saving categories but not their design settings.
+        $roleName = 'test_custom_role';
+        $this->updateRoleResources($roleName, ['Magento_Catalog::categories']);
+        //Using the admin user with custom role.
+        $token = $this->adminTokens->createAdminAccessToken(
+            'customRoleUser',
+            \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD
+        );
+
+        $categoryData = $this->getSimpleCategoryData();
+        $categoryData['custom_attributes'][] = ['attribute_code' => 'custom_layout_update_file', 'value' => 'test'];
+
+        //Creating new category with design settings.
+        $exceptionMessage = null;
+        try {
+            $this->createCategory($categoryData, $token);
+        } catch (\Throwable $exception) {
+            $exceptionMessage = $this->extractCallExceptionMessage($exception);
+        }
+        //We don't have the permissions.
+        $this->assertEquals('Not allowed to edit the category\'s design attributes', $exceptionMessage);
+
+        //Updating the user role to allow access to design properties.
+        $this->updateRoleResources($roleName, ['Magento_Catalog::categories', 'Magento_Catalog::edit_category_design']);
+        //Making the same request with design settings.
+        $categoryData = $this->getSimpleCategoryData();
+        foreach ($categoryData['custom_attributes'] as &$attribute) {
+            if ($attribute['attribute_code'] === 'custom_design') {
+                $attribute['value'] = 'test';
+                break;
+            }
+        }
+        $result = $this->createCategory($categoryData, $token);
+        $this->assertArrayHasKey('id', $result);
+        //Category must be saved.
+        $categorySaved = $this->getInfoCategory($result['id']);
+        $savedCustomDesign = null;
+        foreach ($categorySaved['custom_attributes'] as $customAttribute) {
+            if ($customAttribute['attribute_code'] === 'custom_design') {
+                $savedCustomDesign = $customAttribute['value'];
+                break;
+            }
+        }
+        $this->assertEquals('test', $savedCustomDesign);
+        $categoryData = $categorySaved;
+
+        //Updating our role to remove design properties access.
+        $this->updateRoleResources($roleName, ['Magento_Catalog::categories']);
+        //Updating the category but with the same design properties values.
+        //Omitting existing design attribute and keeping it's existing value
+        $attributes = $categoryData['custom_attributes'];
+        foreach ($attributes as $index => $attrData) {
+            if ($attrData['attribute_code'] === 'custom_design') {
+                unset($categoryData['custom_attributes'][$index]);
+                break;
+            }
+        }
+        unset($attributes, $index, $attrData);
+        $result = $this->updateCategory($categoryData['id'], $categoryData, $token);
+        //We haven't changed the design so operation is successful.
+        $this->assertArrayHasKey('id', $result);
+
+        //Changing a design property.
+        $categoryData['custom_attributes'][] = ['attribute_code' => 'custom_design', 'value' => 'test2'];
+        $exceptionMessage = null;
+        try {
+            $this->updateCategory($categoryData['id'], $categoryData, $token);
+        } catch (\Throwable $exception) {
+            $exceptionMessage = $this->extractCallExceptionMessage($exception);
+        }
+        //We don't have permissions to do that.
+        $this->assertEquals('Not allowed to edit the category\'s design attributes', $exceptionMessage);
+    }
 }
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 9a6520a3ab458..a192936aeaccf 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterfaceTest.php
@@ -4,16 +4,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Api;
 
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter;
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Framework\Webapi\Rest\Request;
+use Magento\TestFramework\TestCase\WebapiAbstract;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
  * Class ProductAttributeMediaGalleryManagementInterfaceTest
  */
-class ProductAttributeMediaGalleryManagementInterfaceTest extends \Magento\TestFramework\TestCase\WebapiAbstract
+class ProductAttributeMediaGalleryManagementInterfaceTest extends WebapiAbstract
 {
     /**
      * Default create service request information (product with SKU 'simple' is used)
@@ -41,12 +48,22 @@ class ProductAttributeMediaGalleryManagementInterfaceTest extends \Magento\TestF
      */
     protected $testImagePath;
 
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
+        $this->objectManager = Bootstrap::getObjectManager();
+
         $this->createServiceInfo = [
             'rest' => [
                 'resourcePath' => '/V1/products/simple/media',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+                'httpMethod' => Request::HTTP_METHOD_POST,
             ],
             'soap' => [
                 'service' => 'catalogProductAttributeMediaGalleryManagementV1',
@@ -58,7 +75,7 @@ protected function setUp()
         $this->updateServiceInfo = [
             'rest' => [
                 'resourcePath' => '/V1/products/simple/media',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
+                'httpMethod' => Request::HTTP_METHOD_PUT,
             ],
             'soap' => [
                 'service' => 'catalogProductAttributeMediaGalleryManagementV1',
@@ -66,9 +83,10 @@ protected function setUp()
                 'operation' => 'catalogProductAttributeMediaGalleryManagementV1Update',
             ],
         ];
+
         $this->deleteServiceInfo = [
             'rest' => [
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE,
+                'httpMethod' => Request::HTTP_METHOD_DELETE,
             ],
             'soap' => [
                 'service' => 'catalogProductAttributeMediaGalleryManagementV1',
@@ -76,6 +94,7 @@ protected function setUp()
                 'operation' => 'catalogProductAttributeMediaGalleryManagementV1Remove',
             ],
         ];
+
         $this->testImagePath = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'test_image.jpg';
     }
 
@@ -86,8 +105,7 @@ protected function setUp()
      */
     protected function getTargetSimpleProduct()
     {
-        $objectManager = Bootstrap::getObjectManager();
-        return $objectManager->get(\Magento\Catalog\Model\ProductFactory::class)->create()->load(1);
+        return $this->objectManager->get(ProductFactory::class)->create()->load(1);
     }
 
     /**
@@ -101,17 +119,20 @@ protected function getTargetGalleryEntryId()
     {
         $mediaGallery = $this->getTargetSimpleProduct()->getData('media_gallery');
         $image = array_shift($mediaGallery['images']);
+
         return (int)$image['value_id'];
     }
 
     /**
+     * Test create() method
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testCreate()
     {
         $requestData = [
             'id' => null,
-            'media_type' => \Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter::MEDIA_TYPE_CODE,
+            'media_type' => ImageEntryConverter::MEDIA_TYPE_CODE,
             'label' => 'Image Text',
             'position' => 1,
             'types' => ['image'],
@@ -138,13 +159,15 @@ public function testCreate()
     }
 
     /**
+     * Test create() method without file
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testCreateWithoutFileExtension()
     {
         $requestData = [
             'id' => null,
-            'media_type' => \Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter::MEDIA_TYPE_CODE,
+            'media_type' => ImageEntryConverter::MEDIA_TYPE_CODE,
             'label' => 'Image Text',
             'position' => 1,
             'types' => ['image'],
@@ -171,13 +194,15 @@ public function testCreateWithoutFileExtension()
     }
 
     /**
+     * Test create() method with not default store id
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testCreateWithNotDefaultStoreId()
     {
         $requestData = [
             'id' => null,
-            'media_type' => \Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter::MEDIA_TYPE_CODE,
+            'media_type' => ImageEntryConverter::MEDIA_TYPE_CODE,
             'label' => 'Image Text',
             'position' => 1,
             'types' => ['image'],
@@ -215,10 +240,16 @@ public function testCreateWithNotDefaultStoreId()
     }
 
     /**
+     * Test update() method
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
      */
     public function testUpdate()
     {
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+        $product = $productRepository->get('simple');
+        $imageId = (int)$product->getMediaGalleryImages()->getFirstItem()->getValueId();
         $requestData = [
             'sku' => 'simple',
             'entry' => [
@@ -235,28 +266,64 @@ public function testUpdate()
             . '/' . $this->getTargetGalleryEntryId();
 
         $this->assertTrue($this->_webApiCall($this->updateServiceInfo, $requestData, null, 'all'));
+        $updatedImage = $this->assertMediaGalleryData($imageId, '/m/a/magento_image.jpg', 'Updated Image Text');
+        $this->assertEquals(10, $updatedImage['position_default']);
+        $this->assertEquals(1, $updatedImage['disabled_default']);
+    }
 
-        $targetProduct = $this->getTargetSimpleProduct();
-        $this->assertEquals('/m/a/magento_image.jpg', $targetProduct->getData('thumbnail'));
-        $this->assertEquals('no_selection', $targetProduct->getData('image'));
-        $this->assertEquals('no_selection', $targetProduct->getData('small_image'));
-        $mediaGallery = $targetProduct->getData('media_gallery');
-        $this->assertCount(1, $mediaGallery['images']);
-        $updatedImage = array_shift($mediaGallery['images']);
-        $this->assertEquals('Updated Image Text', $updatedImage['label']);
-        $this->assertEquals('/m/a/magento_image.jpg', $updatedImage['file']);
-        $this->assertEquals(10, $updatedImage['position']);
-        $this->assertEquals(1, $updatedImage['disabled']);
-        $this->assertEquals('Updated Image Text', $updatedImage['label_default']);
+    /**
+     * Update media gallery entity with new image.
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
+     * @return void
+     */
+    public function testUpdateWithNewImage(): void
+    {
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+        $product = $productRepository->get('simple');
+        $imageId = (int)$product->getMediaGalleryImages()->getFirstItem()->getValueId();
+
+        $requestData = [
+            'sku' => 'simple',
+            'entry' => [
+                'id' => $this->getTargetGalleryEntryId(),
+                'label' => 'Updated Image Text',
+                'position' => 10,
+                'types' => ['thumbnail'],
+                'disabled' => true,
+                'media_type' => 'image',
+                'content' => [
+                    'base64_encoded_data' => 'iVBORw0KGgoAAAANSUhEUgAAAP8AAADGCAMAAAAqo6adAAAAA1BMVEUAAP79f'
+                        . '+LBAAAASElEQVR4nO3BMQEAAADCoPVPbQwfoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+                        . 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAA+BsYAAAF7hZJ0AAAAAElFTkSuQmCC',
+                    'type' => 'image/png',
+                    'name' => 'testname_updated.png',
+                ],
+            ],
+        ];
+
+        $this->updateServiceInfo['rest']['resourcePath'] = $this->updateServiceInfo['rest']['resourcePath']
+            . '/' . $this->getTargetGalleryEntryId();
+
+        $this->assertTrue($this->_webApiCall($this->updateServiceInfo, $requestData, null, 'all'));
+        $updatedImage = $this->assertMediaGalleryData($imageId, '/t/e/testname_updated.png', 'Updated Image Text');
         $this->assertEquals(10, $updatedImage['position_default']);
         $this->assertEquals(1, $updatedImage['disabled_default']);
     }
 
     /**
+     * Test update() method with not default store id
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
      */
     public function testUpdateWithNotDefaultStoreId()
     {
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
+        $product = $productRepository->get('simple');
+        $imageId = (int)$product->getMediaGalleryImages()->getFirstItem()->getValueId();
+
         $requestData = [
             'sku' => 'simple',
             'entry' => [
@@ -273,25 +340,42 @@ public function testUpdateWithNotDefaultStoreId()
             . '/' . $this->getTargetGalleryEntryId();
 
         $this->assertTrue($this->_webApiCall($this->updateServiceInfo, $requestData, null, 'default'));
+        $updatedImage = $this->assertMediaGalleryData($imageId, '/m/a/magento_image.jpg', 'Image Alt Text');
+        $this->assertEquals(1, $updatedImage['position_default']);
+        $this->assertEquals(0, $updatedImage['disabled_default']);
+    }
 
+    /**
+     * Check that Media Gallery data is correct.
+     *
+     * @param int $imageId
+     * @param string $file
+     * @param string $label
+     * @return array
+     */
+    private function assertMediaGalleryData(int $imageId, string $file, string $label): array
+    {
         $targetProduct = $this->getTargetSimpleProduct();
-        $this->assertEquals('/m/a/magento_image.jpg', $targetProduct->getData('thumbnail'));
+        $this->assertEquals($file, $targetProduct->getData('thumbnail'));
+        $this->assertEquals('no_selection', $targetProduct->getData('image'));
+        $this->assertEquals('no_selection', $targetProduct->getData('small_image'));
         $mediaGallery = $targetProduct->getData('media_gallery');
         $this->assertCount(1, $mediaGallery['images']);
         $updatedImage = array_shift($mediaGallery['images']);
-        // Not default store view values were updated
+        $this->assertEquals($imageId, $updatedImage['value_id']);
         $this->assertEquals('Updated Image Text', $updatedImage['label']);
-        $this->assertEquals('/m/a/magento_image.jpg', $updatedImage['file']);
+        $this->assertEquals($file, $updatedImage['file']);
         $this->assertEquals(10, $updatedImage['position']);
         $this->assertEquals(1, $updatedImage['disabled']);
-        // Default store view values were not updated
-        $this->assertEquals('Image Alt Text', $updatedImage['label_default']);
-        $this->assertEquals(1, $updatedImage['position_default']);
-        $this->assertEquals(0, $updatedImage['disabled_default']);
+        $this->assertEquals($label, $updatedImage['label_default']);
+
+        return $updatedImage;
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
+     * Test delete() method
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_image_without_types.php
      */
     public function testDelete()
     {
@@ -309,6 +393,8 @@ public function testDelete()
     }
 
     /**
+     * Test create() method if provided content is not base64 encoded
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @expectedException \Exception
      * @expectedExceptionMessage The image content must be valid base64 encoded data.
@@ -334,6 +420,8 @@ public function testCreateThrowsExceptionIfProvidedContentIsNotBase64Encoded()
     }
 
     /**
+     * Test create() method if provided content is not an image
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @expectedException \Exception
      * @expectedExceptionMessage The image content must be valid base64 encoded data.
@@ -359,6 +447,8 @@ public function testCreateThrowsExceptionIfProvidedContentIsNotAnImage()
     }
 
     /**
+     * Test create() method if provided image has wrong MIME type
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @expectedException \Exception
      * @expectedExceptionMessage The image MIME type is not valid or not supported.
@@ -384,6 +474,8 @@ public function testCreateThrowsExceptionIfProvidedImageHasWrongMimeType()
     }
 
     /**
+     * Test create method if target product does not exist
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
      */
@@ -409,6 +501,8 @@ public function testCreateThrowsExceptionIfTargetProductDoesNotExist()
     }
 
     /**
+     * Test create() method if provided image name contains forbidden characters
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @expectedException \Exception
      * @expectedExceptionMessage Provided image name contains forbidden characters.
@@ -433,6 +527,8 @@ public function testCreateThrowsExceptionIfProvidedImageNameContainsForbiddenCha
     }
 
     /**
+     * Test update() method if target product does not exist
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
      */
@@ -456,6 +552,8 @@ public function testUpdateThrowsExceptionIfTargetProductDoesNotExist()
     }
 
     /**
+     * Test update() method if there is no image with given id
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
      * @expectedException \Exception
      * @expectedExceptionMessage No image with the provided ID was found. Verify the ID and try again.
@@ -481,6 +579,8 @@ public function testUpdateThrowsExceptionIfThereIsNoImageWithGivenId()
     }
 
     /**
+     * Test delete() method if target product does not exist
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage The product that was requested doesn't exist. Verify the product and try again.
      */
@@ -496,6 +596,8 @@ public function testDeleteThrowsExceptionIfTargetProductDoesNotExist()
     }
 
     /**
+     * Test delete() method if there is no image with given id
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
      * @expectedException \Exception
      * @expectedExceptionMessage No image with the provided ID was found. Verify the ID and try again.
@@ -512,15 +614,16 @@ public function testDeleteThrowsExceptionIfThereIsNoImageWithGivenId()
     }
 
     /**
+     * Test get() method
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
      */
     public function testGet()
     {
         $productSku = 'simple';
 
-        $objectManager = \Magento\TestFramework\ObjectManager::getInstance();
-        /** @var \Magento\Catalog\Model\ProductRepository $repository */
-        $repository = $objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
+        /** @var ProductRepository $repository */
+        $repository = $this->objectManager->create(ProductRepository::class);
         $product = $repository->get($productSku);
         $image = current($product->getMediaGallery('images'));
         $imageId = $image['value_id'];
@@ -537,7 +640,7 @@ public function testGet()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => '/V1/products/' . $productSku . '/media/' . $imageId,
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+                'httpMethod' => Request::HTTP_METHOD_GET,
             ],
             'soap' => [
                 'service' => 'catalogProductAttributeMediaGalleryManagementV1',
@@ -560,6 +663,8 @@ public function testGet()
     }
 
     /**
+     * Test getList() method
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_with_image.php
      */
     public function testGetList()
@@ -568,7 +673,7 @@ public function testGetList()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => '/V1/products/' . urlencode($productSku) . '/media',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+                'httpMethod' => Request::HTTP_METHOD_GET,
             ],
             'soap' => [
                 'service' => 'catalogProductAttributeMediaGalleryManagementV1',
@@ -591,13 +696,16 @@ public function testGetList()
         $this->assertContains('thumbnail', $imageTypes);
     }
 
+    /**
+     * Test getList() method for absent sku
+     */
     public function testGetListForAbsentSku()
     {
         $productSku = 'absent_sku_' . time();
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => '/V1/products/' . urlencode($productSku) . '/media',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+                'httpMethod' => Request::HTTP_METHOD_GET,
             ],
             'soap' => [
                 'service' => 'catalogProductAttributeMediaGalleryManagementV1',
@@ -622,6 +730,8 @@ public function testGetListForAbsentSku()
     }
 
     /**
+     * Test addProductVideo() method
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testAddProductVideo()
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 386bd9fc9aeeb..42aa92652a5f1 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php
@@ -4,12 +4,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Catalog\Api;
 
 use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
-use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * API tests for \Magento\Catalog\Model\Product\Attribute\Repository.
+ */
 class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 {
     const SERVICE_NAME = 'catalogProductAttributeRepositoryV1';
@@ -130,6 +131,7 @@ public function testCreateWithExceptionIfAttributeAlreadyExists()
         try {
             $this->createAttribute($attributeCode);
             $this->fail("Expected exception");
+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
         } catch (\SoapFault $e) {
             //Expects soap exception
         } catch (\Exception $e) {
@@ -320,6 +322,20 @@ public function testDeleteById()
         $this->assertTrue($this->deleteAttribute($attributeCode));
     }
 
+    /**
+     * Trying to delete system attribute.
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_system_attribute.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The system attribute can't be deleted.
+     * @return void
+     */
+    public function testDeleteSystemAttributeById(): void
+    {
+        $attributeCode = 'test_attribute_code_333';
+        $this->deleteAttribute($attributeCode);
+    }
+
     /**
      * @return void
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductLinkManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductLinkManagementInterfaceTest.php
index 011a1e40407ac..1ac61bc860759 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductLinkManagementInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductLinkManagementInterfaceTest.php
@@ -81,6 +81,7 @@ protected function assertLinkedProducts($productSku, $linkType)
 
         $actual = $this->_webApiCall($serviceInfo, ['sku' => $productSku, 'type' => $linkType]);
 
+        $this->assertArrayHasKey(0, $actual);
         $this->assertEquals('simple', $actual[0]['linked_product_type']);
         $this->assertEquals('simple', $actual[0]['linked_product_sku']);
         $this->assertEquals(1, $actual[0]['position']);
@@ -122,9 +123,13 @@ public function testAssign()
 
         $this->_webApiCall($serviceInfo, $arguments);
         $actual = $this->getLinkedProducts($productSku, 'related');
-        array_walk($actual, function (&$item) {
-            $item = $item->__toArray();
-        });
+        array_walk(
+            $actual,
+            function (&$item) {
+                /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $item */
+                $item = $item->__toArray();
+            }
+        );
         $this->assertEquals([$linkData], $actual);
     }
 
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 3e935e1d7ae9b..76107ebc6a13a 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
@@ -7,9 +7,15 @@
 
 namespace Magento\Catalog\Api;
 
+use Magento\Authorization\Model\Role;
+use Magento\Authorization\Model\Rules;
+use Magento\Authorization\Model\RoleFactory;
+use Magento\Authorization\Model\RulesFactory;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\Downloadable\Api\DomainManagerInterface;
 use Magento\Downloadable\Model\Link;
+use Magento\Integration\Api\AdminTokenServiceInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\Website;
 use Magento\Store\Model\WebsiteRepository;
@@ -24,6 +30,8 @@
 use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
 
 /**
+ * Test for \Magento\Catalog\Api\ProductRepositoryInterface
+ *
  * @magentoAppIsolation enabled
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -56,6 +64,51 @@ class ProductRepositoryInterfaceTest extends WebapiAbstract
     ];
 
     /**
+     * @var RoleFactory
+     */
+    private $roleFactory;
+
+    /**
+     * @var RulesFactory
+     */
+    private $rulesFactory;
+
+    /**
+     * @var AdminTokenServiceInterface
+     */
+    private $adminTokens;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->roleFactory = Bootstrap::getObjectManager()->get(RoleFactory::class);
+        $this->rulesFactory = Bootstrap::getObjectManager()->get(RulesFactory::class);
+        $this->adminTokens = Bootstrap::getObjectManager()->get(AdminTokenServiceInterface::class);
+        /** @var DomainManagerInterface $domainManager */
+        $domainManager = Bootstrap::getObjectManager()->get(DomainManagerInterface::class);
+        $domainManager->addDomains(['example.com']);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var DomainManagerInterface $domainManager */
+        $domainManager = $objectManager->get(DomainManagerInterface::class);
+        $domainManager->removeDomains(['example.com']);
+    }
+
+    /**
+     * Test get() method
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/products_related.php
      */
     public function testGet()
@@ -69,6 +122,8 @@ public function testGet()
     }
 
     /**
+     * Get product
+     *
      * @param string $sku
      * @param string|null $storeCode
      * @return array|bool|float|int|string
@@ -86,11 +141,14 @@ protected function getProduct($sku, $storeCode = null)
                 'operation' => self::SERVICE_NAME . 'Get',
             ],
         ];
-
         $response = $this->_webApiCall($serviceInfo, ['sku' => $sku], null, $storeCode);
+
         return $response;
     }
 
+    /**
+     * Test get() method with invalid sku
+     */
     public function testGetNoSuchEntityException()
     {
         $invalidSku = '(nonExistingSku)';
@@ -125,6 +183,8 @@ public function testGetNoSuchEntityException()
     }
 
     /**
+     * Product creation provider
+     *
      * @return array
      */
     public function productCreationProvider()
@@ -135,6 +195,7 @@ public function productCreationProvider()
                 $data
             );
         };
+
         return [
             [$productBuilder([ProductInterface::TYPE_ID => 'simple', ProductInterface::SKU => 'psku-test-1'])],
             [$productBuilder([ProductInterface::TYPE_ID => 'virtual', ProductInterface::SKU => 'psku-test-2'])],
@@ -161,6 +222,7 @@ private function loadWebsiteByCode($websiteCode)
 
     /**
      * Test removing association between product and website 1
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_with_two_websites.php
      */
     public function testUpdateWithDeleteWebsites()
@@ -184,6 +246,7 @@ public function testUpdateWithDeleteWebsites()
 
     /**
      * Test removing all website associations
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_with_two_websites.php
      */
     public function testDeleteAllWebsiteAssociations()
@@ -202,6 +265,8 @@ public function testDeleteAllWebsiteAssociations()
     }
 
     /**
+     * Test create() method with multiple websites
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/second_website.php
      */
     public function testCreateWithMultipleWebsites()
@@ -305,6 +370,8 @@ public function testUpdateWithoutWebsiteIds()
     }
 
     /**
+     * Test create() method
+     *
      * @dataProvider productCreationProvider
      */
     public function testCreate($product)
@@ -372,6 +439,9 @@ public function testCreateAllStoreCodeForSingleWebsite($fixtureProduct)
         $this->deleteProduct($fixtureProduct[ProductInterface::SKU]);
     }
 
+    /**
+     * Test create() method with invalid price format
+     */
     public function testCreateInvalidPriceFormat()
     {
         $this->_markTestAsRestOnly("In case of SOAP type casting is handled by PHP SoapServer, no need to test it");
@@ -408,6 +478,9 @@ public function testDeleteAllStoreCode($fixtureProduct)
         $this->getProduct($sku);
     }
 
+    /**
+     * Test product links
+     */
     public function testProductLinks()
     {
         // Create simple product
@@ -441,7 +514,6 @@ public function testProductLinks()
             ProductInterface::TYPE_ID => 'simple',
             ProductInterface::PRICE => 100,
             ProductInterface::STATUS => 1,
-            ProductInterface::TYPE_ID => 'simple',
             ProductInterface::ATTRIBUTE_SET_ID => 4,
             "product_links" => [$productLinkData]
         ];
@@ -504,6 +576,8 @@ public function testProductLinks()
     }
 
     /**
+     * Get options data
+     *
      * @param string $productSku
      * @return array
      */
@@ -543,6 +617,9 @@ protected function getOptionsData($productSku)
         ];
     }
 
+    /**
+     * Test product options
+     */
     public function testProductOptions()
     {
         //Create product with options
@@ -604,9 +681,13 @@ public function testProductOptions()
         $this->deleteProduct($productData[ProductInterface::SKU]);
     }
 
+    /**
+     * Test product with media gallery
+     */
     public function testProductWithMediaGallery()
     {
         $testImagePath = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'test_image.jpg';
+        // @codingStandardsIgnoreLine
         $encodedImage = base64_encode(file_get_contents($testImagePath));
         //create a product with media gallery
         $filename1 = 'tiny1' . time() . '.jpg';
@@ -635,7 +716,7 @@ public function testProductWithMediaGallery()
                 'position' => 2,
                 'media_type' => 'image',
                 'disabled' => false,
-                'types' => ['image', 'small_image'],
+                'types' => [],
                 'file' => '/t/i/' . $filename2,
             ],
         ];
@@ -648,7 +729,7 @@ public function testProductWithMediaGallery()
                 'label' => 'tiny1_new_label',
                 'position' => 1,
                 'disabled' => false,
-                'types' => ['image', 'small_image'],
+                'types' => [],
                 'file' => '/t/i/' . $filename1,
             ],
         ];
@@ -662,7 +743,7 @@ public function testProductWithMediaGallery()
                 'media_type' => 'image',
                 'position' => 1,
                 'disabled' => false,
-                'types' => ['image', 'small_image'],
+                'types' => [],
                 'file' => '/t/i/' . $filename1,
             ]
         ];
@@ -682,6 +763,8 @@ public function testProductWithMediaGallery()
     }
 
     /**
+     * Test update() method
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testUpdate()
@@ -725,17 +808,18 @@ public function testUpdateWithExtensionAttributes(): void
     }
 
     /**
+     * Update product
+     *
      * @param array $product
+     * @param string|null $token
      * @return array|bool|float|int|string
      */
-    protected function updateProduct($product)
+    protected function updateProduct($product, ?string $token = null)
     {
         if (isset($product['custom_attributes'])) {
-            for ($i=0; $i<sizeof($product['custom_attributes']); $i++) {
-                if ($product['custom_attributes'][$i]['attribute_code'] == 'category_ids'
-                    && !is_array($product['custom_attributes'][$i]['value'])
-                ) {
-                    $product['custom_attributes'][$i]['value'] = [""];
+            foreach ($product['custom_attributes'] as &$attribute) {
+                if ($attribute['attribute_code'] == 'category_ids' && !is_array($attribute['value'])) {
+                    $attribute['value'] = [""];
                 }
             }
         }
@@ -755,12 +839,17 @@ protected function updateProduct($product)
                 'operation' => self::SERVICE_NAME . 'Save',
             ],
         ];
+        if ($token) {
+            $serviceInfo['rest']['token'] = $serviceInfo['soap']['token'] = $token;
+        }
         $requestData = ['product' => $product];
         $response = $this->_webApiCall($serviceInfo, $requestData);
         return $response;
     }
 
     /**
+     * Test delete() method
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testDelete()
@@ -770,6 +859,8 @@ public function testDelete()
     }
 
     /**
+     * Test getList() method
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testGetList()
@@ -832,6 +923,8 @@ public function testGetList()
     }
 
     /**
+     * Test getList() method with additional params
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testGetListWithAdditionalParams()
@@ -871,6 +964,8 @@ public function testGetListWithAdditionalParams()
     }
 
     /**
+     * Test getList() method with filtering by website
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/products_with_websites_and_stores.php
      * @return void
      */
@@ -958,6 +1053,11 @@ public function testGetListWithFilteringByStore(array $searchCriteria, array $sk
         }
     }
 
+    /**
+     * Test getList() method with filtering by store data provider
+     *
+     * @return array
+     */
     public function testGetListWithFilteringByStoreDataProvider()
     {
         return [
@@ -997,6 +1097,8 @@ public function testGetListWithFilteringByStoreDataProvider()
     }
 
     /**
+     * Test getList() method with multiple filter groups and sorting and pagination
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/products_for_search.php
      */
     public function testGetListWithMultipleFilterGroupsAndSortingAndPagination()
@@ -1066,6 +1168,8 @@ public function testGetListWithMultipleFilterGroupsAndSortingAndPagination()
     }
 
     /**
+     * Convert custom attributes to associative array
+     *
      * @param $customAttributes
      * @return array
      */
@@ -1075,10 +1179,13 @@ protected function convertCustomAttributesToAssociativeArray($customAttributes)
         foreach ($customAttributes as $customAttribute) {
             $converted[$customAttribute['attribute_code']] = $customAttribute['value'];
         }
+
         return $converted;
     }
 
     /**
+     * Convert associative array to custom attributes
+     *
      * @param $data
      * @return array
      */
@@ -1088,10 +1195,13 @@ protected function convertAssociativeArrayToCustomAttributes($data)
         foreach ($data as $attributeCode => $attributeValue) {
             $customAttributes[] = ['attribute_code' => $attributeCode, 'value' => $attributeValue];
         }
+
         return $customAttributes;
     }
 
     /**
+     * Test eav attributes
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      */
     public function testEavAttributes()
@@ -1135,7 +1245,6 @@ protected function getSimpleProductData($productData = [])
             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' => ''],
@@ -1145,18 +1254,21 @@ protected function getSimpleProductData($productData = [])
     }
 
     /**
+     * Save Product
+     *
      * @param $product
      * @param string|null $storeCode
+     * @param string|null $token
      * @return mixed
      */
-    protected function saveProduct($product, $storeCode = null)
+    protected function saveProduct($product, $storeCode = null, ?string $token = null)
     {
         if (isset($product['custom_attributes'])) {
-            for ($i=0; $i<sizeof($product['custom_attributes']); $i++) {
-                if ($product['custom_attributes'][$i]['attribute_code'] == 'category_ids'
-                    && !is_array($product['custom_attributes'][$i]['value'])
+            foreach ($product['custom_attributes'] as &$attribute) {
+                if ($attribute['attribute_code'] == 'category_ids'
+                    && !is_array($attribute['value'])
                 ) {
-                    $product['custom_attributes'][$i]['value'] = [""];
+                    $attribute['value'] = [""];
                 }
             }
         }
@@ -1171,7 +1283,11 @@ protected function saveProduct($product, $storeCode = null)
                 'operation' => self::SERVICE_NAME . 'Save',
             ],
         ];
+        if ($token) {
+            $serviceInfo['rest']['token'] = $serviceInfo['soap']['token'] = $token;
+        }
         $requestData = ['product' => $product];
+
         return $this->_webApiCall($serviceInfo, $requestData, null, $storeCode);
     }
 
@@ -1199,6 +1315,9 @@ protected function deleteProduct($sku)
             $this->_webApiCall($serviceInfo, ['sku' => $sku]) : $this->_webApiCall($serviceInfo);
     }
 
+    /**
+     * Test tier prices
+     */
     public function testTierPrices()
     {
         // create a product with tier prices
@@ -1283,6 +1402,8 @@ public function testTierPrices()
     }
 
     /**
+     * Get stock item data
+     *
      * @return array
      */
     private function getStockItemData()
@@ -1315,6 +1436,8 @@ private function getStockItemData()
     }
 
     /**
+     * Test product category links
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
      */
     public function testProductCategoryLinks()
@@ -1337,6 +1460,8 @@ public function testProductCategoryLinks()
     }
 
     /**
+     * Test update product category without categories
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
      */
     public function testUpdateProductCategoryLinksNullOrNotExists()
@@ -1358,6 +1483,8 @@ public function testUpdateProductCategoryLinksNullOrNotExists()
     }
 
     /**
+     * Test update product category links position
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
      */
     public function testUpdateProductCategoryLinksPosistion()
@@ -1375,6 +1502,8 @@ public function testUpdateProductCategoryLinksPosistion()
     }
 
     /**
+     * Test update product category links unassing
+     *
      * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
      */
     public function testUpdateProductCategoryLinksUnassign()
@@ -1387,6 +1516,8 @@ public function testUpdateProductCategoryLinksUnassign()
     }
 
     /**
+     * Get media gallery data
+     *
      * @param $filename1
      * @param $encodedImage
      * @param $filename2
@@ -1412,7 +1543,7 @@ private function getMediaGalleryData($filename1, $encodedImage, $filename2)
                 'media_type' => 'image',
                 'disabled' => false,
                 'label' => 'tiny2',
-                'types' => ['image', 'small_image'],
+                'types' => [],
                 'content' => [
                     'type' => 'image/jpeg',
                     'name' => $filename2,
@@ -1422,6 +1553,9 @@ private function getMediaGalleryData($filename1, $encodedImage, $filename2)
         ];
     }
 
+    /**
+     * Test special price
+     */
     public function testSpecialPrice()
     {
         $productData = $this->getSimpleProductData();
@@ -1471,6 +1605,9 @@ public function testResetSpecialPrice()
         $this->assertFalse(array_key_exists(self::KEY_SPECIAL_PRICE, $customAttributes));
     }
 
+    /**
+     * Test update status
+     */
     public function testUpdateStatus()
     {
         // Create simple product
@@ -1543,6 +1680,8 @@ public function testUpdateMultiselectAttributes()
     }
 
     /**
+     * Get attribute options
+     *
      * @param string $attributeCode
      * @return array|bool|float|int|string
      */
@@ -1564,6 +1703,8 @@ private function getAttributeOptions($attributeCode)
     }
 
     /**
+     * Assert multiselect value
+     *
      * @param string $productSku
      * @param string $multiselectAttributeCode
      * @param string $expectedMultiselectValue
@@ -1582,4 +1723,106 @@ private function assertMultiselectValue($productSku, $multiselectAttributeCode,
         }
         $this->assertEquals($expectedMultiselectValue, $multiselectValue);
     }
+
+    /**
+     * Test design settings authorization
+     *
+     * @magentoApiDataFixture Magento/User/_files/user_with_custom_role.php
+     * @throws \Throwable
+     * @return void
+     */
+    public function testSaveDesign(): void
+    {
+        //Updating our admin user's role to allow saving products but not their design settings.
+        /** @var Role $role */
+        $role = $this->roleFactory->create();
+        $role->load('test_custom_role', 'role_name');
+        /** @var Rules $rules */
+        $rules = $this->rulesFactory->create();
+        $rules->setRoleId($role->getId());
+        $rules->setResources(['Magento_Catalog::products']);
+        $rules->saveRel();
+        //Using the admin user with custom role.
+        $token = $this->adminTokens->createAdminAccessToken(
+            'customRoleUser',
+            \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD
+        );
+
+        $productData = $this->getSimpleProductData();
+        $productData['custom_attributes'][] = ['attribute_code' => 'custom_design', 'value' => '1'];
+
+        //Creating new product with design settings.
+        $exceptionMessage = null;
+        try {
+            $this->saveProduct($productData, null, $token);
+        } catch (\Throwable $exception) {
+            if ($restResponse = json_decode($exception->getMessage(), true)) {
+                //REST
+                $exceptionMessage = $restResponse['message'];
+            } else {
+                //SOAP
+                $exceptionMessage = $exception->getMessage();
+            }
+        }
+        //We don't have the permissions.
+        $this->assertEquals('Not allowed to edit the product\'s design attributes', $exceptionMessage);
+
+        //Updating the user role to allow access to design properties.
+        /** @var Rules $rules */
+        $rules = Bootstrap::getObjectManager()->create(Rules::class);
+        $rules->setRoleId($role->getId());
+        $rules->setResources(['Magento_Catalog::products', 'Magento_Catalog::edit_product_design']);
+        $rules->saveRel();
+        //Making the same request with design settings.
+        $result = $this->saveProduct($productData, null, $token);
+        $this->assertArrayHasKey('id', $result);
+        //Product must be saved.
+        $productSaved = $this->getProduct($productData[ProductInterface::SKU]);
+        $savedCustomDesign = null;
+        foreach ($productSaved['custom_attributes'] as $customAttribute) {
+            if ($customAttribute['attribute_code'] === 'custom_design') {
+                $savedCustomDesign = $customAttribute['value'];
+                break;
+            }
+        }
+        $this->assertEquals('1', $savedCustomDesign);
+        $productData = $productSaved;
+
+        //Updating our role to remove design properties access.
+        /** @var Rules $rules */
+        $rules = Bootstrap::getObjectManager()->create(Rules::class);
+        $rules->setRoleId($role->getId());
+        $rules->setResources(['Magento_Catalog::products']);
+        $rules->saveRel();
+        //Updating the product but with the same design properties values.
+        //Removing the design attribute and keeping existing value.
+        $attributes = $productData['custom_attributes'];
+        foreach ($attributes as $i => $attribute) {
+            if ($attribute['attribute_code'] === 'custom_design') {
+                unset($productData['custom_attributes'][$i]);
+                break;
+            }
+        }
+        unset($attributes, $attribute, $i);
+        $result = $this->updateProduct($productData, $token);
+        //We haven't changed the design so operation is successful.
+        $this->assertArrayHasKey('id', $result);
+
+        //Changing a design property.
+        $productData['custom_attributes'][] = ['attribute_code' => 'custom_design', 'value' => '2'];
+        $exceptionMessage = null;
+        try {
+            $this->updateProduct($productData, $token);
+        } catch (\Throwable $exception) {
+            if ($restResponse = json_decode($exception->getMessage(), true)) {
+                //REST
+                $exceptionMessage = $restResponse['message'];
+            } else {
+                //SOAP
+                $exceptionMessage = $exception->getMessage();
+            }
+        }
+        //We don't have permissions to do that.
+        $this->assertEquals('Not allowed to edit the product\'s design attributes', $exceptionMessage);
+    }
 }
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 5422362afd73c..f1d6949408f5b 100644
--- a/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/ProductRepositoryInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/ProductRepositoryInterfaceTest.php
@@ -306,7 +306,8 @@ protected function getProduct($sku)
     protected function saveProduct($product)
     {
         if (isset($product['custom_attributes'])) {
-            for ($i=0; $i<sizeof($product['custom_attributes']); $i++) {
+            $count = count($product['custom_attributes']);
+            for ($i=0; $i < $count; $i++) {
                 if ($product['custom_attributes'][$i]['attribute_code'] == 'category_ids'
                     && !is_array($product['custom_attributes'][$i]['value'])
                 ) {
@@ -339,7 +340,8 @@ protected function saveProduct($product)
     protected function updateProduct($product)
     {
         if (isset($product['custom_attributes'])) {
-            for ($i=0; $i<sizeof($product['custom_attributes']); $i++) {
+            $count = count($product['custom_attributes']);
+            for ($i=0; $i < $count; $i++) {
                 if ($product['custom_attributes'][$i]['attribute_code'] == 'category_ids'
                     && !is_array($product['custom_attributes'][$i]['value'])
                 ) {
diff --git a/dev/tests/api-functional/testsuite/Magento/Cms/Api/PageRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Cms/Api/PageRepositoryTest.php
index c40d1918cca67..015eb067e4c8e 100644
--- a/dev/tests/api-functional/testsuite/Magento/Cms/Api/PageRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Cms/Api/PageRepositoryTest.php
@@ -5,16 +5,23 @@
  */
 namespace Magento\Cms\Api;
 
+use Magento\Authorization\Model\Role;
+use Magento\Authorization\Model\Rules;
+use Magento\Authorization\Model\RoleFactory;
+use Magento\Authorization\Model\RulesFactory;
 use Magento\Cms\Api\Data\PageInterface;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SortOrder;
 use Magento\Framework\Api\SortOrderBuilder;
+use Magento\Integration\Api\AdminTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 /**
  * Tests for cms page service.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PageRepositoryTest extends WebapiAbstract
 {
@@ -47,6 +54,21 @@ class PageRepositoryTest extends WebapiAbstract
      */
     protected $currentPage;
 
+    /**
+     * @var RoleFactory
+     */
+    private $roleFactory;
+
+    /**
+     * @var RulesFactory
+     */
+    private $rulesFactory;
+
+    /**
+     * @var AdminTokenServiceInterface
+     */
+    private $adminTokens;
+
     /**
      * Execute per test initialization.
      */
@@ -57,6 +79,9 @@ public function setUp()
         $this->dataObjectHelper = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\DataObjectHelper::class);
         $this->dataObjectProcessor = Bootstrap::getObjectManager()
             ->create(\Magento\Framework\Reflection\DataObjectProcessor::class);
+        $this->roleFactory = Bootstrap::getObjectManager()->get(RoleFactory::class);
+        $this->rulesFactory = Bootstrap::getObjectManager()->get(RulesFactory::class);
+        $this->adminTokens = Bootstrap::getObjectManager()->get(AdminTokenServiceInterface::class);
     }
 
     /**
@@ -379,4 +404,109 @@ private function deletePageByIdentifier($pageId)
 
         $this->_webApiCall($serviceInfo, [PageInterface::PAGE_ID => $pageId]);
     }
+
+    /**
+     * Check that extra authorization is required for the design properties.
+     *
+     * @magentoApiDataFixture Magento/User/_files/user_with_custom_role.php
+     * @throws \Throwable
+     * @return void
+     */
+    public function testSaveDesign(): void
+    {
+        //Updating our admin user's role to allow saving pages but not their design settings.
+        /** @var Role $role */
+        $role = $this->roleFactory->create();
+        $role->load('test_custom_role', 'role_name');
+        /** @var Rules $rules */
+        $rules = $this->rulesFactory->create();
+        $rules->setRoleId($role->getId());
+        $rules->setResources(['Magento_Cms::page']);
+        $rules->saveRel();
+        //Using the admin user with custom role.
+        $token = $this->adminTokens->createAdminAccessToken(
+            'customRoleUser',
+            \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD
+        );
+
+        $id = 'test-cms-page';
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH,
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+                'token' => $token,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'Save',
+                'token' => $token
+            ],
+        ];
+        $requestData = [
+            'page' => [
+                PageInterface::IDENTIFIER => $id,
+                PageInterface::TITLE => 'Page title',
+                PageInterface::CUSTOM_THEME => 1
+            ],
+        ];
+
+        //Creating new page with design settings.
+        $exceptionMessage = null;
+        try {
+            $this->_webApiCall($serviceInfo, $requestData);
+        } catch (\Throwable $exception) {
+            if ($restResponse = json_decode($exception->getMessage(), true)) {
+                //REST
+                $exceptionMessage = $restResponse['message'];
+            } else {
+                //SOAP
+                $exceptionMessage = $exception->getMessage();
+            }
+        }
+        //We don't have the permissions.
+        $this->assertEquals('You are not allowed to change CMS pages design settings', $exceptionMessage);
+
+        //Updating the user role to allow access to design properties.
+        /** @var Rules $rules */
+        $rules = Bootstrap::getObjectManager()->create(Rules::class);
+        $rules->setRoleId($role->getId());
+        $rules->setResources(['Magento_Cms::page', 'Magento_Cms::save_design']);
+        $rules->saveRel();
+        //Making the same request with design settings.
+        $result = $this->_webApiCall($serviceInfo, $requestData);
+        $this->assertArrayHasKey('id', $result);
+        //Page must be saved.
+        $this->currentPage = $this->pageRepository->getById($result['id']);
+        $this->assertEquals($id, $this->currentPage->getIdentifier());
+        $this->assertEquals(1, $this->currentPage->getCustomTheme());
+        $requestData['page']['id'] = $this->currentPage->getId();
+
+        //Updating our role to remove design properties access.
+        /** @var Rules $rules */
+        $rules = Bootstrap::getObjectManager()->create(Rules::class);
+        $rules->setRoleId($role->getId());
+        $rules->setResources(['Magento_Cms::page']);
+        $rules->saveRel();
+        //Updating the page but with the same design properties values.
+        $result = $this->_webApiCall($serviceInfo, $requestData);
+        //We haven't changed the design so operation is successful.
+        $this->assertArrayHasKey('id', $result);
+        //Changing a design property.
+        $requestData['page'][PageInterface::CUSTOM_THEME] = 2;
+        $exceptionMessage = null;
+        try {
+            $this->_webApiCall($serviceInfo, $requestData);
+        } catch (\Throwable $exception) {
+            if ($restResponse = json_decode($exception->getMessage(), true)) {
+                //REST
+                $exceptionMessage = $restResponse['message'];
+            } else {
+                //SOAP
+                $exceptionMessage = $exception->getMessage();
+            }
+        }
+        //We don't have permissions to do that.
+        $this->assertEquals('You are not allowed to change CMS pages design settings', $exceptionMessage);
+    }
 }
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 dc32bb2fc129a..1dc7ca1ad44a6 100644
--- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php
@@ -462,7 +462,8 @@ protected function deleteProductBySku($productSku)
     protected function saveProduct($product)
     {
         if (isset($product['custom_attributes'])) {
-            for ($i=0; $i<sizeof($product['custom_attributes']); $i++) {
+            $count = count($product['custom_attributes']);
+            for ($i=0; $i < $count; $i++) {
                 if ($product['custom_attributes'][$i]['attribute_code'] == 'category_ids'
                     && !is_array($product['custom_attributes'][$i]['value'])
                 ) {
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementMeTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementMeTest.php
index 31894c1332ad5..88bb3a8d59afd 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementMeTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementMeTest.php
@@ -228,14 +228,21 @@ public function testGetCustomerActivateCustomer()
                 'token' => $this->token
             ]
         ];
-        $requestData = ['confirmationKey' => $this->customerData[CustomerInterface::CONFIRMATION]];
+
+        $requestData = ['confirmationKey' => CustomerHelper::CONFIRMATION];
         if (TESTS_WEB_API_ADAPTER === 'soap') {
             $requestData['customerId'] = 0;
         }
-        $customerResponseData = $this->_webApiCall($serviceInfo, $requestData);
-        $this->assertEquals($this->customerData[CustomerInterface::ID], $customerResponseData[CustomerInterface::ID]);
-        // Confirmation key is removed after confirmation
-        $this->assertFalse(isset($customerResponseData[CustomerInterface::CONFIRMATION]));
+
+        try {
+            $customerResponseData = $this->_webApiCall($serviceInfo, $requestData);
+            $this->assertEquals(
+                $this->customerData[CustomerInterface::ID],
+                $customerResponseData[CustomerInterface::ID]
+            );
+        } catch (\Exception $e) {
+            $this->fail('Customer is not activated.');
+        }
     }
 
     /**
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 b2276d79f5ecf..a93bbcbdf04b2 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php
@@ -249,7 +249,15 @@ public function testCreateCustomerWithoutOptionalFields()
     public function testActivateCustomer()
     {
         $customerData = $this->_createCustomer();
-        $this->assertNotNull($customerData[Customer::CONFIRMATION], 'Customer activation is not required');
+
+        // Update the customer's confirmation key to a known value
+        $customerData = $this->customerHelper->updateSampleCustomer(
+            $customerData[Customer::ID],
+            [
+                'id' => $customerData[Customer::ID],
+                'confirmation' => CustomerHelper::CONFIRMATION
+            ]
+        );
 
         $serviceInfo = [
             'rest' => [
@@ -265,16 +273,15 @@ public function testActivateCustomer()
 
         $requestData = [
             'email' => $customerData[Customer::EMAIL],
-            'confirmationKey' => $customerData[Customer::CONFIRMATION],
+            'confirmationKey' => CustomerHelper::CONFIRMATION
         ];
 
-        $result = $this->_webApiCall($serviceInfo, $requestData);
-
-        $this->assertEquals($customerData[Customer::ID], $result[Customer::ID], 'Wrong customer!');
-        $this->assertTrue(
-            !isset($result[Customer::CONFIRMATION]) || $result[Customer::CONFIRMATION] === null,
-            'Customer is not activated!'
-        );
+        try {
+            $result = $this->_webApiCall($serviceInfo, $requestData);
+            $this->assertEquals($customerData[Customer::ID], $result[Customer::ID], 'Wrong customer!');
+        } catch (\Exception $e) {
+            $this->fail('Customer is not activated.');
+        }
     }
 
     public function testGetCustomerActivateCustomer()
@@ -294,14 +301,15 @@ public function testGetCustomerActivateCustomer()
         ];
         $requestData = [
             'email' => $customerData[Customer::EMAIL],
-            'confirmationKey' => $customerData[Customer::CONFIRMATION],
+            'confirmationKey' => CustomerHelper::CONFIRMATION
         ];
 
-        $customerResponseData = $this->_webApiCall($serviceInfo, $requestData);
-
-        $this->assertEquals($customerData[Customer::ID], $customerResponseData[Customer::ID]);
-        // Confirmation key is removed after confirmation
-        $this->assertFalse(isset($customerResponseData[Customer::CONFIRMATION]));
+        try {
+            $customerResponseData = $this->_webApiCall($serviceInfo, $requestData);
+            $this->assertEquals($customerData[Customer::ID], $customerResponseData[Customer::ID]);
+        } catch (\Exception $e) {
+            $this->fail('Customer is not activated.');
+        }
     }
 
     public function testValidateResetPasswordLinkToken()
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 709abbbb8fbf9..7a02e2f843719 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
@@ -10,6 +10,9 @@
 use Magento\Customer\Api\Data\AddressInterface as Address;
 use Magento\Framework\Api\SortOrder;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Webapi\Rest\Request;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Helper\Customer as CustomerHelper;
 use Magento\TestFramework\TestCase\WebapiAbstract;
@@ -780,6 +783,66 @@ public function testSearchCustomersMultipleFilterGroups()
         $this->assertEquals(0, $searchResults['total_count']);
     }
 
+    /**
+     * Test revoking all access Tokens for customer
+     */
+    public function testRevokeAllAccessTokensForCustomer()
+    {
+        $customerData = $this->_createCustomer();
+
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = Bootstrap::getObjectManager()->create(CustomerTokenServiceInterface::class);
+        $token = $customerTokenService->createCustomerAccessToken(
+            $customerData[Customer::EMAIL],
+            CustomerHelper::PASSWORD
+        );
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '/me',
+                'httpMethod' => Request::HTTP_METHOD_GET,
+                'token' => $token,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'GetSelf',
+                'token' => $token,
+            ],
+        ];
+
+        $customerLoadedData = $this->_webApiCall($serviceInfo, ['customerId' => $customerData[Customer::ID]]);
+        self::assertGreaterThanOrEqual($customerData[Customer::UPDATED_AT], $customerLoadedData[Customer::UPDATED_AT]);
+        unset($customerData[Customer::UPDATED_AT]);
+        self::assertArraySubset($customerData, $customerLoadedData);
+
+        $revokeToken = $customerTokenService->revokeCustomerAccessToken($customerData[Customer::ID]);
+        self::assertTrue($revokeToken);
+
+        try {
+            $customerTokenService->revokeCustomerAccessToken($customerData[Customer::ID]);
+        } catch (\Throwable $exception) {
+            $this->assertInstanceOf(LocalizedException::class, $exception);
+            $this->assertEquals('This customer has no tokens.', $exception->getMessage());
+        }
+
+        $expectedMessage = 'The consumer isn\'t authorized to access %resources.';
+
+        try {
+            $this->_webApiCall($serviceInfo, ['customerId' => $customerData[Customer::ID]]);
+        } catch (\SoapFault $e) {
+            $this->assertContains(
+                $expectedMessage,
+                $e->getMessage(),
+                'SoapFault does not contain expected message.'
+            );
+        } catch (\Throwable $e) {
+            $errorObj = $this->processRestExceptionResult($e);
+            $this->assertEquals($expectedMessage, $errorObj['message']);
+            $this->assertEquals(['resources' => 'self'], $errorObj['parameters']);
+            $this->assertEquals(HTTPExceptionCodes::HTTP_UNAUTHORIZED, $e->getCode());
+        }
+    }
+
     /**
      * Retrieve customer data by Id
      *
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 c881969a3b679..3a24aab30cb65 100644
--- a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/LinkRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/LinkRepositoryTest.php
@@ -12,6 +12,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
+/**
+ * API tests for Magento\Downloadable\Model\LinkRepository.
+ */
 class LinkRepositoryTest extends WebapiAbstract
 {
     /**
@@ -135,10 +138,12 @@ public function testCreateUploadsProvidedFileContent()
                 'number_of_downloads' => 100,
                 'link_type' => 'file',
                 'link_file_content' => [
+                    //phpcs:ignore Magento2.Functions.DiscouragedFunction
                     'file_data' => base64_encode(file_get_contents($this->testImagePath)),
                     'name' => 'image.jpg',
                 ],
                 'sample_file_content' => [
+                    //phpcs:ignore Magento2.Functions.DiscouragedFunction
                     'file_data' => base64_encode(file_get_contents($this->testImagePath)),
                     'name' => 'image.jpg',
                 ],
@@ -292,6 +297,64 @@ public function testCreateThrowsExceptionIfLinkFileContentIsNotAValidBase64Encod
         $this->_webApiCall($this->createServiceInfo, $requestData);
     }
 
+    /**
+     * Check that error appears when link file not existing in filesystem.
+     *
+     * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Link file not found. Please try again.
+     * @return void
+     */
+    public function testCreateLinkWithMissingLinkFileThrowsException(): void
+    {
+        $requestData = [
+            'isGlobalScopeContent' => false,
+            'sku' => 'downloadable-product',
+            'link' => [
+                'title' => 'Link Title',
+                'sort_order' => 1,
+                'price' => 10,
+                'is_shareable' => 1,
+                'number_of_downloads' => 100,
+                'link_type' => 'file',
+                'link_file' => '/n/o/nexistfile.png',
+                'sample_type' => 'url',
+                'sample_file' => 'http://google.com',
+            ],
+        ];
+
+        $this->_webApiCall($this->createServiceInfo, $requestData);
+    }
+
+    /**
+     * Check that error appears when link sample file not existing in filesystem.
+     *
+     * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Link sample file not found. Please try again.
+     * @return void
+     */
+    public function testCreateLinkWithMissingSampleFileThrowsException(): void
+    {
+        $requestData = [
+            'isGlobalScopeContent' => false,
+            'sku' => 'downloadable-product',
+            'link' => [
+                'title' => 'Link Title',
+                'sort_order' => 1,
+                'price' => 10,
+                'is_shareable' => 1,
+                'number_of_downloads' => 100,
+                'link_type' => 'url',
+                'link_url' => 'http://www.example.com/',
+                'sample_type' => 'file',
+                'sample_file' => '/n/o/nexistfile.png',
+            ],
+        ];
+
+        $this->_webApiCall($this->createServiceInfo, $requestData);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable.php
      * @expectedException \Exception
@@ -339,6 +402,7 @@ public function testCreateThrowsExceptionIfLinkFileNameContainsForbiddenCharacte
                 'number_of_downloads' => 100,
                 'link_type' => 'file',
                 'link_file_content' => [
+                    //phpcs:ignore Magento2.Functions.DiscouragedFunction
                     'file_data' => base64_encode(file_get_contents($this->testImagePath)),
                     'name' => 'name/with|forbidden{characters',
                 ],
@@ -370,6 +434,7 @@ public function testCreateThrowsExceptionIfSampleFileNameContainsForbiddenCharac
                 'link_url' => 'http://www.example.com/',
                 'sample_type' => 'file',
                 'sample_file_content' => [
+                    //phpcs:ignore Magento2.Functions.DiscouragedFunction
                     'file_data' => base64_encode(file_get_contents($this->testImagePath)),
                     'name' => 'name/with|forbidden{characters',
                 ],
@@ -405,6 +470,58 @@ public function testCreateThrowsExceptionIfLinkUrlHasWrongFormat()
         $this->_webApiCall($this->createServiceInfo, $requestData);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Link URL's domain is not in list of downloadable_domains in env.php.
+     */
+    public function testCreateThrowsExceptionIfLinkUrlUsesDomainNotInWhitelist()
+    {
+        $requestData = [
+            'isGlobalScopeContent' => false,
+            'sku' => 'downloadable-product',
+            'link' => [
+                'title' => 'Link Title',
+                'sort_order' => 1,
+                'price' => 10,
+                'is_shareable' => 1,
+                'number_of_downloads' => 100,
+                'link_type' => 'url',
+                'link_url' => 'http://notAnywhereInEnv.com/',
+                'sample_type' => 'url',
+                'sample_url' => 'http://www.example.com/',
+            ],
+        ];
+
+        $this->_webApiCall($this->createServiceInfo, $requestData);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Sample URL's domain is not in list of downloadable_domains in env.php.
+     */
+    public function testCreateThrowsExceptionIfSampleUrlUsesDomainNotInWhitelist()
+    {
+        $requestData = [
+            'isGlobalScopeContent' => false,
+            'sku' => 'downloadable-product',
+            'link' => [
+                'title' => 'Link Title',
+                'sort_order' => 1,
+                'price' => 10,
+                'is_shareable' => 1,
+                'number_of_downloads' => 100,
+                'link_type' => 'url',
+                'link_url' => 'http://example.com/',
+                'sample_type' => 'url',
+                'sample_url' => 'http://www.notAnywhereInEnv.com/',
+            ],
+        ];
+
+        $this->_webApiCall($this->createServiceInfo, $requestData);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable.php
      * @expectedException \Exception
@@ -610,7 +727,9 @@ public function testUpdate()
                 'is_shareable' => 0,
                 'number_of_downloads' => 50,
                 'link_type' => 'url',
+                'link_url' => 'http://google.com',
                 'sample_type' => 'url',
+                'sample_url' => 'http://google.com',
             ],
         ];
         $this->assertEquals($linkId, $this->_webApiCall($this->updateServiceInfo, $requestData));
@@ -643,7 +762,9 @@ public function testUpdateSavesDataInGlobalScopeAndDoesNotAffectValuesStoredInSt
                 'is_shareable' => 0,
                 'number_of_downloads' => 50,
                 'link_type' => 'url',
+                'link_url' => 'http://google.com',
                 'sample_type' => 'url',
+                'sample_url' => 'http://google.com',
             ],
         ];
 
diff --git a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
index 769abadf20585..c2393d0a5ad2d 100644
--- a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
@@ -27,7 +27,14 @@ class ProductRepositoryTest extends WebapiAbstract
 
     protected function setUp()
     {
+        parent::setUp();
         $this->testImagePath = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'test_image.jpg';
+
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var DomainManagerInterface $domainManager */
+        $domainManager = $objectManager->get(DomainManagerInterface::class);
+        $domainManager->addDomains(['www.example.com']);
     }
 
     /**
@@ -37,6 +44,12 @@ public function tearDown()
     {
         $this->deleteProductBySku(self::PRODUCT_SKU);
         parent::tearDown();
+
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var DomainManagerInterface $domainManager */
+        $domainManager = $objectManager->get(DomainManagerInterface::class);
+        $domainManager->removeDomains(['www.example.com']);
     }
 
     protected function getLinkData()
@@ -227,7 +240,9 @@ public function testUpdateDownloadableProductLinks()
             'price' => 5.0,
             'number_of_downloads' => 999,
             'link_type' => 'file',
-            'sample_type' => 'file'
+            'link_file' => $linkFile,
+            'sample_type' => 'file',
+            'sample_file' => $sampleFile,
         ];
         $linkData = $this->getLinkData();
 
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 b537947d5e4db..a97e4c5d9e119 100644
--- a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/SampleRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/SampleRepositoryTest.php
@@ -11,6 +11,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
+/**
+ * API tests for Magento\Downloadable\Model\SampleRepository.
+ */
 class SampleRepositoryTest extends WebapiAbstract
 {
     /**
@@ -131,6 +134,7 @@ public function testCreateUploadsProvidedFileContent()
                 'title' => 'Title',
                 'sort_order' => 1,
                 'sample_file_content' => [
+                    //phpcs:ignore Magento2.Functions.DiscouragedFunction
                     'file_data' => base64_encode(file_get_contents($this->testImagePath)),
                     'name' => 'image.jpg',
                 ],
@@ -223,6 +227,30 @@ public function testCreateThrowsExceptionIfSampleTypeIsInvalid()
         $this->_webApiCall($this->createServiceInfo, $requestData);
     }
 
+    /**
+     * Check that error appears when sample file not existing in filesystem.
+     *
+     * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Sample file not found. Please try again.
+     * @return void
+     */
+    public function testCreateSampleWithMissingFileThrowsException(): void
+    {
+        $requestData = [
+            'isGlobalScopeContent' => false,
+            'sku' => 'downloadable-product',
+            'sample' => [
+                'title' => 'Link Title',
+                'sort_order' => 1,
+                'sample_type' => 'file',
+                'sample_file' => '/n/o/nexistfile.png',
+            ],
+        ];
+
+        $this->_webApiCall($this->createServiceInfo, $requestData);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable.php
      * @expectedException \Exception
@@ -262,6 +290,7 @@ public function testCreateThrowsExceptionIfSampleFileNameContainsForbiddenCharac
                 'sort_order' => 15,
                 'sample_type' => 'file',
                 'sample_file_content' => [
+                    //phpcs:ignore Magento2.Functions.DiscouragedFunction
                     'file_data' => base64_encode(file_get_contents($this->testImagePath)),
                     'name' => 'name/with|forbidden{characters',
                 ],
@@ -380,6 +409,7 @@ public function testUpdate()
                 'title' => 'Updated Title',
                 'sort_order' => 2,
                 'sample_type' => 'url',
+                'sample_url' => 'http://google.com',
             ],
         ];
 
@@ -408,6 +438,7 @@ public function testUpdateSavesDataInGlobalScopeAndDoesNotAffectValuesStoredInSt
                 'title' => 'Updated Title',
                 'sort_order' => 2,
                 'sample_type' => 'url',
+                'sample_url' => 'http://google.com',
             ],
         ];
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Customer/SetPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Customer/SetPaymentMethodTest.php
index 0ca1be775258d..e9ab4456fae81 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Customer/SetPaymentMethodTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/AuthorizenetAcceptjs/Customer/SetPaymentMethodTest.php
@@ -126,17 +126,19 @@ public function dataProviderTestPlaceOrder(): array
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
      * @dataProvider dataProviderSetPaymentInvalidInput
      * @param \Closure $getMutationClosure
-     * @param string $expectedMessage
+     * @param array $expectedMessages
      * @expectedException \Exception
      */
-    public function testSetPaymentInvalidInput(\Closure $getMutationClosure, string $expectedMessage)
+    public function testSetPaymentInvalidInput(\Closure $getMutationClosure, array $expectedMessages)
     {
         $reservedOrderId = 'test_quote';
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
 
         $setPaymentMutation = $getMutationClosure($maskedQuoteId);
 
-        $this->expectExceptionMessage($expectedMessage);
+        foreach ($expectedMessages as $expectedMessage) {
+            $this->expectExceptionMessage($expectedMessage);
+        }
         $this->graphQlMutation($setPaymentMutation, [], '', $this->getHeaderMap());
     }
 
@@ -152,13 +154,20 @@ public function dataProviderSetPaymentInvalidInput(): array
                 function (string $maskedQuoteId) {
                     return $this->getInvalidSetPaymentMutation($maskedQuoteId);
                 },
-                'Required parameter "authorizenet_acceptjs" for "payment_method" is missing.',
+                [
+                    'Required parameter "authorizenet_acceptjs" for "payment_method" is missing.'
+                ]
             ],
             [
                 function (string $maskedQuoteId) {
                     return $this->getEmptyAcceptJsInput($maskedQuoteId);
                 },
-                'for "authorizenet_acceptjs" is missing.',
+                [
+                    'Field AuthorizenetInput.cc_last_4 of required type Int! was not provided.',
+                    'Field AuthorizenetInput.opaque_data_descriptor of required type String! was not provided.',
+                    'Field AuthorizenetInput.opaque_data_value of required type String! was not provided.'
+                ]
+
             ],
             [
                 function (string $maskedQuoteId) {
@@ -168,13 +177,17 @@ function (string $maskedQuoteId) {
                         static::VALID_NONCE
                     );
                 },
-                'parameter "cc_last_4" for "authorizenet_acceptjs" is missing',
+                [
+                    'Field AuthorizenetInput.cc_last_4 of required type Int! was not provided',
+                ]
             ],
             [
                 function (string $maskedQuoteId) {
                     return $this->getMissingOpaqueDataValueAcceptJsInput($maskedQuoteId, static::VALID_DESCRIPTOR);
                 },
-                'parameter "opaque_data_value" for "authorizenet_acceptjs" is missing',
+                [
+                    'Field AuthorizenetInput.opaque_data_value of required type String! was not provided',
+                ]
             ],
         ];
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/CreateBraintreeClientTokenTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/CreateBraintreeClientTokenTest.php
index 1564d00fa5996..7d69c49ae6aa3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/CreateBraintreeClientTokenTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/CreateBraintreeClientTokenTest.php
@@ -20,6 +20,7 @@ class CreateBraintreeClientTokenTest extends GraphQlAbstract
      * @magentoConfigFixture default_store payment/braintree/active 1
      * @magentoConfigFixture default_store payment/braintree/environment sandbox
      * @magentoConfigFixture default_store payment/braintree/merchant_id def_merchant_id
+     * @magentoConfigFixture default_store payment/braintree/merchant_account_id def_merchant_id
      * @magentoConfigFixture default_store payment/braintree/public_key def_public_key
      * @magentoConfigFixture default_store payment/braintree/private_key def_private_key
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Customer/SetPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Customer/SetPaymentMethodTest.php
index 2694423687952..a282b295c2974 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Customer/SetPaymentMethodTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Customer/SetPaymentMethodTest.php
@@ -8,6 +8,7 @@
 namespace Magento\GraphQl\Braintree\Customer;
 
 use Magento\Braintree\Gateway\Command\GetPaymentNonceCommand;
+use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Registry;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
@@ -258,6 +259,43 @@ public function testSetPaymentMethodInvalidMethodInput(string $methodCode)
             $methodCode
         );
         $this->expectExceptionMessage("for \"$methodCode\" is missing.");
+        $expectedExceptionMessages = [
+            'braintree' =>
+                'Field BraintreeInput.is_active_payment_token_enabler of required type Boolean! was not provided.',
+            'braintree_cc_vault' =>
+                'Field BraintreeCcVaultInput.public_hash of required type String! was not provided.'
+        ];
+
+        $this->expectExceptionMessage($expectedExceptionMessages[$methodCode]);
+        $this->graphQlMutation($setPaymentQuery, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoConfigFixture default_store carriers/flatrate/active 1
+     * @magentoConfigFixture default_store payment/braintree/active 1
+     * @magentoConfigFixture default_store payment/braintree_cc_vault/active 1
+     * @magentoConfigFixture default_store payment/braintree/environment sandbox
+     * @magentoConfigFixture default_store payment/braintree/merchant_id def_merchant_id
+     * @magentoConfigFixture default_store payment/braintree/public_key def_public_key
+     * @magentoConfigFixture default_store payment/braintree/private_key def_private_key
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     * @expectedException \Exception
+     */
+    public function testSetPaymentMethodWithoutRequiredPaymentMethodInput()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+
+        $setPaymentQuery = $this->getSetPaymentBraintreeQueryInvalidPaymentMethodInput($maskedQuoteId);
+        $this->expectExceptionMessage(
+            'Field BraintreeInput.is_active_payment_token_enabler of required type Boolean! was not provided.'
+        );
         $this->graphQlMutation($setPaymentQuery, [], '', $this->getHeaderMap());
     }
 
@@ -371,6 +409,33 @@ private function getSetPaymentBraintreeQueryInvalidInput(string $maskedQuoteId,
 QUERY;
     }
 
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getSetPaymentBraintreeQueryInvalidPaymentMethodInput(string $maskedQuoteId): string
+    {
+        return <<<QUERY
+mutation {
+  setPaymentMethodOnCart(input:{
+    cart_id:"{$maskedQuoteId}"
+    payment_method:{
+      code:"braintree"
+      braintree:{
+        payment_method_nonce:"fake-valid-nonce"
+      }
+    }
+  }) {
+    cart {
+      selected_payment_method {
+        code
+      }
+    }
+  }
+}
+QUERY;
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $methodCode
@@ -437,7 +502,7 @@ private function getPaymentTokenQuery(): string
      * @param string $username
      * @param string $password
      * @return array
-     * @throws \Magento\Framework\Exception\AuthenticationException
+     * @throws AuthenticationException
      */
     private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Guest/SetPaymentMethodTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Guest/SetPaymentMethodTest.php
index 5ee7dd457657c..c0a7491cbc1bf 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Guest/SetPaymentMethodTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Braintree/Guest/SetPaymentMethodTest.php
@@ -151,7 +151,14 @@ public function testSetPaymentMethodInvalidMethodInput()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
 
         $setPaymentQuery = $this->getSetPaymentBraintreeQueryInvalidMethodInput($maskedQuoteId);
-        $this->expectExceptionMessage("for \"braintree\" is missing.");
+
+        $this->expectExceptionMessage(
+            'Field BraintreeInput.is_active_payment_token_enabler of required type Boolean! was not provided'
+        );
+        $this->expectExceptionMessage(
+            'Field BraintreeInput.payment_method_nonce of required type String! was not provided.'
+        );
+
         $this->graphQlMutation($setPaymentQuery);
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartTest.php
new file mode 100644
index 0000000000000..826083b0b3378
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartTest.php
@@ -0,0 +1,274 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Bundle;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+
+/**
+ * Test adding bundled products to cart
+ */
+class AddBundleProductToCartTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quote = $objectManager->create(Quote::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Bundle/_files/product_1.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddBundleProductToCart()
+    {
+        $sku = 'bundle-product';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+
+        $product = $this->productRepository->get($sku);
+
+        /** @var $typeInstance \Magento\Bundle\Model\Product\Type */
+        $typeInstance = $product->getTypeInstance();
+        $typeInstance->setStoreFilter($product->getStoreId(), $product);
+        /** @var $option \Magento\Bundle\Model\Option */
+        $option = $typeInstance->getOptionsCollection($product)->getFirstItem();
+        /** @var \Magento\Catalog\Model\Product $selection */
+        $selection = $typeInstance->getSelectionsCollection([$option->getId()], $product)->getFirstItem();
+        $optionId = $option->getId();
+        $selectionId = $selection->getSelectionId();
+
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = <<<QUERY
+mutation {  
+  addBundleProductsToCart(input:{
+    cart_id:"{$maskedQuoteId}"
+    cart_items:[
+      {
+        data:{
+          sku:"{$sku}"
+          quantity:1
+        }
+        bundle_options:[
+          {
+            id:{$optionId}
+            quantity:1
+            value:[
+              "{$selectionId}"
+            ]
+          }
+        ]
+      }
+    ]
+  }) {
+    cart {
+      items {
+        id
+        quantity
+        product {
+          sku
+        }
+        ... on BundleCartItem {
+          bundle_options {
+            id
+            label
+            type
+            values {
+              id
+              label
+              price
+              quantity
+            }
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlMutation($query);
+
+        $this->assertArrayHasKey('addBundleProductsToCart', $response);
+        $this->assertArrayHasKey('cart', $response['addBundleProductsToCart']);
+        $cart = $response['addBundleProductsToCart']['cart'];
+        $bundleItem = current($cart['items']);
+        $this->assertEquals($sku, $bundleItem['product']['sku']);
+        $bundleItemOption = current($bundleItem['bundle_options']);
+        $this->assertEquals($optionId, $bundleItemOption['id']);
+        $this->assertEquals($option->getTitle(), $bundleItemOption['label']);
+        $this->assertEquals($option->getType(), $bundleItemOption['type']);
+        $value = current($bundleItemOption['values']);
+        $this->assertEquals($selection->getSelectionId(), $value['id']);
+        $this->assertEquals((float) $selection->getSelectionPriceValue(), $value['price']);
+        $this->assertEquals(1, $value['quantity']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Bundle/_files/quote_with_bundle_and_options.php
+     * @dataProvider dataProviderTestUpdateBundleItemQuantity
+     */
+    public function testUpdateBundleItemQuantity(int $quantity)
+    {
+        $this->quoteResource->load(
+            $this->quote,
+            'test_cart_with_bundle_and_options',
+            'reserved_order_id'
+        );
+
+        $item = current($this->quote->getAllVisibleItems());
+
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $mutation = <<<QUERY
+mutation {
+  updateCartItems(
+    input: {
+      cart_id: "{$maskedQuoteId}"
+      cart_items: {
+        cart_item_id: {$item->getId()}
+        quantity: {$quantity}
+      }
+    }
+  ) {
+    cart {
+      items {
+        id
+        quantity
+        product {
+          sku
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlMutation($mutation);
+
+        $this->assertArrayHasKey('updateCartItems', $response);
+        $this->assertArrayHasKey('cart', $response['updateCartItems']);
+        $cart = $response['updateCartItems']['cart'];
+        if ($quantity === 0) {
+            $this->assertCount(0, $cart['items']);
+            return;
+        }
+
+        $bundleItem = current($cart['items']);
+        $this->assertEquals($quantity, $bundleItem['quantity']);
+    }
+
+    public function dataProviderTestUpdateBundleItemQuantity(): array
+    {
+        return [
+            [2],
+            [0],
+        ];
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Bundle/_files/product_1.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Please select all required options
+     */
+    public function testAddBundleToCartWithoutOptions()
+    {
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = <<<QUERY
+mutation {  
+  addBundleProductsToCart(input:{
+    cart_id:"{$maskedQuoteId}"
+    cart_items:[
+      {
+        data:{
+          sku:"bundle-product"
+          quantity:1
+        }
+        bundle_options:[
+          {
+            id:555
+            quantity:1
+            value:[
+              "555"
+            ]
+          }
+        ]
+      }
+    ]
+  }) {
+    cart {
+      items {
+        id
+        quantity
+        product {
+          sku
+        }
+        ... on BundleCartItem {
+          bundle_options {
+            id
+            label
+            type
+            values {
+              id
+              label
+              price
+              quantity
+            }
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        $this->graphQlMutation($query);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryCanonicalUrlTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryCanonicalUrlTest.php
new file mode 100644
index 0000000000000..794df3a8b6f44
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryCanonicalUrlTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Catalog\Api\Data\CategoryInterface;
+
+/**
+ * Test for getting canonical url data from category
+ */
+class CategoryCanonicalUrlTest extends GraphQlAbstract
+{
+    /** @var ObjectManager $objectManager */
+    private $objectManager;
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     * @magentoConfigFixture default_store catalog/seo/category_canonical_tag 1
+     */
+    public function testCategoryWithCanonicalLinksMetaTagSettingsEnabled()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        /** @var CategoryCollection $categoryCollection */
+        $categoryCollection = $this->objectManager->create(CategoryCollection::class);
+        $categoryCollection->addFieldToFilter('name', 'Category 1.1.1');
+        /** @var CategoryInterface $category */
+        $category = $categoryCollection->getFirstItem();
+        $categoryId = $category->getId();
+        $query = <<<QUERY
+    {
+categoryList(filters: {ids: {in: ["$categoryId"]}}) {
+    id
+    name
+   url_key
+   url_suffix
+   canonical_url
+ }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertNotEmpty($response['categoryList'], 'Category list should not be empty');
+        $this->assertEquals('.html', $response['categoryList'][0]['url_suffix']);
+        $this->assertEquals(
+            'category-1/category-1-1/category-1-1-1.html',
+            $response['categoryList'][0]['canonical_url']
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     * @magentoConfigFixture default_store catalog/seo/category_canonical_tag 0
+     */
+    public function testCategoryWithCanonicalLinksMetaTagSettingsDisabled()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        /** @var CategoryCollection $categoryCollection */
+        $categoryCollection = $this->objectManager->create(CategoryCollection::class);
+        $categoryCollection->addFieldToFilter('name', 'Category 1.1');
+        /** @var CategoryInterface $category */
+        $category = $categoryCollection->getFirstItem();
+        $categoryId = $category->getId();
+        $query = <<<QUERY
+    {
+categoryList(filters: {ids: {in: ["$categoryId"]}}) {
+    id
+    name
+   url_key
+   canonical_url
+ }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertNotEmpty($response['categoryList'], 'Category list should not be empty');
+        $this->assertNull(
+            $response['categoryList'][0]['canonical_url']
+        );
+        $this->assertEquals('category-1-1', $response['categoryList'][0]['url_key']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
new file mode 100644
index 0000000000000..96e8ae79b612e
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
@@ -0,0 +1,556 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test CategoryList GraphQl query
+ */
+class CategoryListTest extends GraphQlAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     * @dataProvider filterSingleCategoryDataProvider
+     * @param $field
+     * @param $condition
+     * @param $value
+     */
+    public function testFilterSingleCategoryByField($field, $condition, $value, $expectedResult)
+    {
+        $query = <<<QUERY
+{
+    categoryList(filters: { $field : { $condition : "$value" } }){
+        id
+        name
+        url_key
+        url_path
+        children_count
+        path
+        position
+    }
+}
+QUERY;
+        $result = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertCount(1, $result['categoryList']);
+        $this->assertResponseFields($result['categoryList'][0], $expectedResult);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     * @dataProvider filterMultipleCategoriesDataProvider
+     * @param $field
+     * @param $condition
+     * @param $value
+     * @param $expectedResult
+     */
+    public function testFilterMultipleCategoriesByField($field, $condition, $value, $expectedResult)
+    {
+        $query = <<<QUERY
+{
+    categoryList(filters: { $field : { $condition : $value } }){
+        id
+        name
+        url_key
+        url_path
+        children_count
+        path
+        position
+    }
+}
+QUERY;
+        $result = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertCount(count($expectedResult), $result['categoryList']);
+        foreach ($expectedResult as $i => $expected) {
+            $this->assertResponseFields($result['categoryList'][$i], $expected);
+        }
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testFilterCategoryByMultipleFields()
+    {
+        $query = <<<QUERY
+{
+    categoryList(filters: {ids: {in: ["6","7","8","9","10"]}, name: {match: "Movable"}}){
+        id
+        name
+        url_key
+        url_path
+        children_count
+        path
+        position
+    }
+}
+QUERY;
+        $result = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertCount(3, $result['categoryList']);
+
+        $expectedCategories = [7 => 'Movable', 9 => 'Movable Position 1', 10 => 'Movable Position 2'];
+        $actualCategories = array_column($result['categoryList'], 'name', 'id');
+        $this->assertEquals($expectedCategories, $actualCategories);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testFilterWithInactiveCategory()
+    {
+        $query = <<<QUERY
+{
+    categoryList(filters: {url_key: {in: ["inactive", "category-2"]}}){
+        id
+        name
+        url_key
+        url_path
+    }
+}
+QUERY;
+        $result = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertCount(1, $result['categoryList']);
+        $actualCategories = array_column($result['categoryList'], 'url_key', 'id');
+        $this->assertContains('category-2', $actualCategories);
+        $this->assertNotContains('inactive', $actualCategories);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testQueryChildCategoriesWithProducts()
+    {
+        $query =  <<<QUERY
+{
+    categoryList(filters: {ids: {in: ["3"]}}){
+        id
+        name
+        url_key
+        url_path
+        description
+        products{
+          total_count
+          items{
+            name
+            sku
+          }
+        }
+        children{
+          name
+          url_key
+          description
+          products{
+            total_count
+            items{
+              name
+              sku
+            }
+          }
+          children{
+            name
+          }
+        }
+    }
+}
+QUERY;
+        $result = $this->graphQlQuery($query);
+
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertCount(1, $result['categoryList']);
+        $baseCategory = $result['categoryList'][0];
+
+        $this->assertEquals('Category 1', $baseCategory['name']);
+        $this->assertArrayHasKey('products', $baseCategory);
+        //Check base category products
+        $expectedBaseCategoryProducts = [
+            ['sku' => 'simple', 'name' => 'Simple Product'],
+            ['sku' => '12345', 'name' => 'Simple Product Two'],
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
+        ];
+        $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
+        //Check base category children
+        $expectedBaseCategoryChildren = [
+            ['name' => 'Category 1.1', 'description' => 'Category 1.1 description.'],
+            ['name' => 'Category 1.2', 'description' => 'Its a description of Test Category 1.2']
+        ];
+        $this->assertCategoryChildren($baseCategory, $expectedBaseCategoryChildren);
+
+        //Check first child category
+        $firstChildCategory = $baseCategory['children'][0];
+        $this->assertEquals('Category 1.1', $firstChildCategory['name']);
+        $this->assertEquals('Category 1.1 description.', $firstChildCategory['description']);
+        $firstChildCategoryExpectedProducts = [
+            ['sku' => 'simple', 'name' => 'Simple Product'],
+            ['sku' => '12345', 'name' => 'Simple Product Two'],
+        ];
+        $this->assertCategoryProducts($firstChildCategory, $firstChildCategoryExpectedProducts);
+        $firstChildCategoryChildren = [['name' =>'Category 1.1.1']];
+        $this->assertCategoryChildren($firstChildCategory, $firstChildCategoryChildren);
+        //Check second child category
+        $secondChildCategory = $baseCategory['children'][1];
+        $this->assertEquals('Category 1.2', $secondChildCategory['name']);
+        $this->assertEquals('Its a description of Test Category 1.2', $secondChildCategory['description']);
+        $firstChildCategoryExpectedProducts = [
+            ['sku' => 'simple', 'name' => 'Simple Product'],
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
+        ];
+        $this->assertCategoryProducts($secondChildCategory, $firstChildCategoryExpectedProducts);
+        $firstChildCategoryChildren = [];
+        $this->assertCategoryChildren($secondChildCategory, $firstChildCategoryChildren);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories_disabled.php
+     */
+    public function testQueryCategoryWithDisabledChildren()
+    {
+        $query =  <<<QUERY
+{
+    categoryList(filters: {ids: {in: ["3"]}}){
+        id
+        name
+        image
+        url_key
+        url_path
+        description
+        products{
+          total_count
+          items{
+            name
+            sku
+          }
+        }
+        children{
+          name
+          image
+          url_key
+          description
+          products{
+            total_count
+            items{
+              name
+              sku
+            }
+          }
+          children{
+            name
+            image
+            children{
+              name
+              image
+            }
+          }
+        }
+    }
+}
+QUERY;
+        $result = $this->graphQlQuery($query);
+
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertCount(1, $result['categoryList']);
+        $baseCategory = $result['categoryList'][0];
+
+        $this->assertEquals('Category 1', $baseCategory['name']);
+        $this->assertArrayHasKey('products', $baseCategory);
+        //Check base category products
+        $expectedBaseCategoryProducts = [
+            ['sku' => 'simple', 'name' => 'Simple Product'],
+            ['sku' => '12345', 'name' => 'Simple Product Two'],
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
+        ];
+        $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
+        //Check base category children
+        $expectedBaseCategoryChildren = [
+            ['name' => 'Category 1.2', 'description' => 'Its a description of Test Category 1.2']
+        ];
+        $this->assertCategoryChildren($baseCategory, $expectedBaseCategoryChildren);
+
+        //Check first child category
+        $firstChildCategory = $baseCategory['children'][0];
+        $this->assertEquals('Category 1.2', $firstChildCategory['name']);
+        $this->assertEquals('Its a description of Test Category 1.2', $firstChildCategory['description']);
+
+        $firstChildCategoryExpectedProducts = [
+            ['sku' => 'simple', 'name' => 'Simple Product'],
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
+        ];
+        $this->assertCategoryProducts($firstChildCategory, $firstChildCategoryExpectedProducts);
+        $firstChildCategoryChildren = [];
+        $this->assertCategoryChildren($firstChildCategory, $firstChildCategoryChildren);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testNoResultsFound()
+    {
+        $query = <<<QUERY
+{
+    categoryList(filters: {url_key: {in: ["inactive", "does-not-exist"]}}){
+        id
+        name
+        url_key
+        url_path
+        children_count
+        path
+        position
+    }
+}
+QUERY;
+        $result = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertArrayHasKey('categoryList', $result);
+        $this->assertEquals([], $result['categoryList']);
+    }
+
+    /**
+     * When no filters are supplied, the root category is returned
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testEmptyFiltersReturnRootCategory()
+    {
+        $query = <<<QUERY
+{
+    categoryList{
+        id
+        name
+        url_key
+        url_path
+        children_count
+        path
+        position
+    }
+}
+QUERY;
+        $storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
+        $storeRootCategoryId = $storeManager->getStore()->getRootCategoryId();
+
+        $result = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertArrayHasKey('categoryList', $result);
+        $this->assertEquals('Default Category', $result['categoryList'][0]['name']);
+        $this->assertEquals($storeRootCategoryId, $result['categoryList'][0]['id']);
+    }
+
+    /**
+     * Filtering with match value less than minimum query should return empty result
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testMinimumMatchQueryLength()
+    {
+        $query = <<<QUERY
+{
+    categoryList(filters: {name: {match: "mo"}}){
+        id
+        name
+        url_key
+        url_path
+        children_count
+        path
+        position
+    }
+}
+QUERY;
+        $result = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertArrayHasKey('categoryList', $result);
+        $this->assertEquals([], $result['categoryList']);
+    }
+
+    /**
+     * @return array
+     */
+    public function filterSingleCategoryDataProvider(): array
+    {
+        return [
+            [
+                'ids',
+                'eq',
+                '4',
+                [
+                    'id' => '4',
+                    'name' => 'Category 1.1',
+                    'url_key' => 'category-1-1',
+                    'url_path' => 'category-1/category-1-1',
+                    'children_count' => '0',
+                    'path' => '1/2/3/4',
+                    'position' => '1'
+                ]
+            ],
+            [
+                'name',
+                'match',
+                'Movable Position 2',
+                [
+                    'id' => '10',
+                    'name' => 'Movable Position 2',
+                    'url_key' => 'movable-position-2',
+                    'url_path' => 'movable-position-2',
+                    'children_count' => '0',
+                    'path' => '1/2/10',
+                    'position' => '6'
+                ]
+            ],
+            [
+                'url_key',
+                'eq',
+                'category-1-1-1',
+                [
+                    'id' => '5',
+                    'name' => 'Category 1.1.1',
+                    'url_key' => 'category-1-1-1',
+                    'url_path' => 'category-1/category-1-1/category-1-1-1',
+                    'children_count' => '0',
+                    'path' => '1/2/3/4/5',
+                    'position' => '1'
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @return array
+     */
+    public function filterMultipleCategoriesDataProvider(): array
+    {
+        return[
+            //Filter by multiple IDs
+            [
+                'ids',
+                'in',
+                '["4", "9", "10"]',
+                [
+                    [
+                        'id' => '4',
+                        'name' => 'Category 1.1',
+                        'url_key' => 'category-1-1',
+                        'url_path' => 'category-1/category-1-1',
+                        'children_count' => '0',
+                        'path' => '1/2/3/4',
+                        'position' => '1'
+                    ],
+                    [
+                        'id' => '9',
+                        'name' => 'Movable Position 1',
+                        'url_key' => 'movable-position-1',
+                        'url_path' => 'movable-position-1',
+                        'children_count' => '0',
+                        'path' => '1/2/9',
+                        'position' => '5'
+                    ],
+                    [
+                        'id' => '10',
+                        'name' => 'Movable Position 2',
+                        'url_key' => 'movable-position-2',
+                        'url_path' => 'movable-position-2',
+                        'children_count' => '0',
+                        'path' => '1/2/10',
+                        'position' => '6'
+                    ]
+                ]
+            ],
+            //Filter by multiple url keys
+            [
+                'url_key',
+                'in',
+                '["category-1-2", "movable"]',
+                [
+                    [
+                        'id' => '7',
+                        'name' => 'Movable',
+                        'url_key' => 'movable',
+                        'url_path' => 'movable',
+                        'children_count' => '0',
+                        'path' => '1/2/7',
+                        'position' => '3'
+                    ],
+                    [
+                        'id' => '13',
+                        'name' => 'Category 1.2',
+                        'url_key' => 'category-1-2',
+                        'url_path' => 'category-1/category-1-2',
+                        'children_count' => '0',
+                        'path' => '1/2/3/13',
+                        'position' => '2'
+                    ]
+                ]
+            ],
+            //Filter by matching multiple names
+            [
+                'name',
+                'match',
+                '"Position"',
+                [
+                    [
+                        'id' => '9',
+                        'name' => 'Movable Position 1',
+                        'url_key' => 'movable-position-1',
+                        'url_path' => 'movable-position-1',
+                        'children_count' => '0',
+                        'path' => '1/2/9',
+                        'position' => '5'
+                    ],
+                    [
+                        'id' => '10',
+                        'name' => 'Movable Position 2',
+                        'url_key' => 'movable-position-2',
+                        'url_path' => 'movable-position-2',
+                        'children_count' => '0',
+                        'path' => '1/2/10',
+                        'position' => '6'
+                    ],
+                    [
+                        'id' => '11',
+                        'name' => 'Movable Position 3',
+                        'url_key' => 'movable-position-3',
+                        'url_path' => 'movable-position-3',
+                        'children_count' => '0',
+                        'path' => '1/2/11',
+                        'position' => '7'
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Check category products
+     *
+     * @param array $category
+     * @param array $expectedProducts
+     */
+    private function assertCategoryProducts(array $category, array $expectedProducts)
+    {
+        $this->assertEquals(count($expectedProducts), $category['products']['total_count']);
+        $this->assertCount(count($expectedProducts), $category['products']['items']);
+        $this->assertResponseFields($category['products']['items'], $expectedProducts);
+    }
+
+    /**
+     * Check category child categories
+     *
+     * @param array $category
+     * @param array $expectedChildren
+     */
+    private function assertCategoryChildren(array $category, array $expectedChildren)
+    {
+        $this->assertArrayHasKey('children', $category);
+        $this->assertCount(count($expectedChildren), $category['children']);
+        foreach ($expectedChildren as $i => $expectedChild) {
+            $this->assertResponseFields($category['children'][$i], $expectedChild);
+        }
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
index 8f0260a1b1dae..480388db98d2f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -13,6 +13,7 @@
 use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
 use Magento\Framework\DataObject;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -553,6 +554,54 @@ public function testBreadCrumbs()
         $this->assertEquals($expectedResponse, $response);
     }
 
+    /**
+     * Test category image is returned as full url (not relative path)
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/catalog_category_with_image.php
+     */
+    public function testCategoryImage()
+    {
+        $categoryCollection = $this->objectManager->get(CategoryCollection::class);
+        $categoryModel = $categoryCollection
+            ->addAttributeToSelect('image')
+            ->addAttributeToFilter('name', ['eq' => 'Parent Image Category'])
+            ->getFirstItem();
+        $categoryId = $categoryModel->getId();
+
+        $query = <<<QUERY
+    {
+categoryList(filters: {ids: {in: ["$categoryId"]}}) {
+    id
+  name
+  url_key
+  image
+  children {
+    id
+    name
+    url_key
+    image
+  }
+
+ }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $response);
+        $this->assertNotEmpty($response['categoryList']);
+        $categoryList = $response['categoryList'];
+        $storeBaseUrl = $this->objectManager->get(StoreManagerInterface::class)->getStore()->getBaseUrl('media');
+        $expectedImageUrl = rtrim($storeBaseUrl, '/'). '/' . ltrim($categoryModel->getImage(), '/');
+
+        $this->assertEquals($categoryId, $categoryList[0]['id']);
+        $this->assertEquals('Parent Image Category', $categoryList[0]['name']);
+        $this->assertEquals($expectedImageUrl, $categoryList[0]['image']);
+
+        $childCategory = $categoryList[0]['children'][0];
+        $this->assertEquals('Child Image Category', $childCategory['name']);
+        $this->assertEquals($expectedImageUrl, $childCategory['image']);
+    }
+
     /**
      * @param ProductInterface $product
      * @param array $actualResponse
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductCanonicalUrlTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductCanonicalUrlTest.php
new file mode 100644
index 0000000000000..308e159b0dd77
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductCanonicalUrlTest.php
@@ -0,0 +1,74 @@
+<?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;
+
+/**
+ * Test for getting canonical_url for products
+ */
+class ProductCanonicalUrlTest extends GraphQlAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoConfigFixture default_store catalog/seo/product_canonical_tag 1
+     *
+     */
+    public function testProductWithCanonicalLinksMetaTagSettingsEnabled()
+    {
+        $productSku = 'simple';
+        $query
+            = <<<QUERY
+{
+    products (filter: {sku: {eq: "{$productSku}"}}) {
+        items {
+            name
+            sku
+            canonical_url
+        }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertNotEmpty($response['products']['items']);
+
+        $this->assertEquals(
+            'simple-product.html',
+            $response['products']['items'][0]['canonical_url']
+        );
+        $this->assertEquals('simple', $response['products']['items'][0]['sku']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoConfigFixture default_store catalog/seo/product_canonical_tag 0
+     */
+    public function testProductWithCanonicalLinksMetaTagSettingsDisabled()
+    {
+        $productSku = 'simple';
+        $query
+            = <<<QUERY
+{
+    products (filter: {sku: {eq: "{$productSku}"}}) {
+        items {
+            name
+            sku
+            canonical_url
+        }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertNull(
+            $response['products']['items'][0]['canonical_url']
+        );
+        $this->assertEquals('simple', $response['products']['items'][0]['sku']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
new file mode 100644
index 0000000000000..f647dc74ea55f
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class ProductSearchAggregationsTest extends GraphQlAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products_with_boolean_attribute.php
+     */
+    public function testAggregationBooleanAttribute()
+    {
+        $this->reindex();
+
+        $skus= '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"';
+        $query = <<<QUERY
+{
+    products(filter: {sku: {in: [{$skus}]}}){
+    items{
+      id
+      sku
+      name
+    }
+    aggregations{
+      label
+      attribute_code
+      count
+      options{
+        label
+        value
+        count
+      }
+    }
+  }
+}
+QUERY;
+
+        $result = $this->graphQlQuery($query);
+
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertArrayHasKey('items', $result['products']);
+        $this->assertCount(5, $result['products']['items']);
+        $this->assertArrayHasKey('aggregations', $result['products']);
+
+        $booleanAggregation = array_filter(
+            $result['products']['aggregations'],
+            function ($a) {
+                return $a['attribute_code'] == 'boolean_attribute';
+            }
+        );
+        $this->assertNotEmpty($booleanAggregation);
+        $booleanAggregation = reset($booleanAggregation);
+        $this->assertEquals('Boolean Attribute', $booleanAggregation['label']);
+        $this->assertEquals('boolean_attribute', $booleanAggregation['attribute_code']);
+        $this->assertContains(['label' => '1', 'value'=> '1', 'count' => '3'], $booleanAggregation['options']);
+
+        $this->markTestIncomplete('MC-22184: Elasticsearch returns incorrect aggregation options for booleans');
+        $this->assertEquals(2, $booleanAggregation['count']);
+        $this->assertCount(2, $booleanAggregation['options']);
+        $this->assertContains(['label' => '0', 'value'=> '0', 'count' => '2'], $booleanAggregation['options']);
+    }
+
+    /**
+     * Reindex
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function reindex()
+    {
+        $appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
+        // phpcs:ignore Magento2.Security.InsecureFunction
+        exec("php -f {$appDir}/bin/magento indexer:reindex");
+    }
+}
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 e1615eb9a667e..9ee3b3baa5fc2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -31,6 +31,37 @@
  */
 class ProductSearchTest extends GraphQlAbstract
 {
+    /**
+     * Verify that filters for non-existing category are empty
+     *
+     * @throws \Exception
+     */
+    public function testFilterForNonExistingCategory()
+    {
+        $query = <<<QUERY
+{
+  products(filter: {category_id: {eq: "99999999"}}) {
+    filters {
+      name  
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey(
+            'filters',
+            $response['products'],
+            'Filters are missing in product query result.'
+        );
+
+        $this->assertEmpty(
+            $response['products']['filters'],
+            'Returned filters data set does not empty'
+        );
+    }
+
     /**
      * Verify that layered navigation filters and aggregations are correct for product query
      *
@@ -41,6 +72,7 @@ class ProductSearchTest extends GraphQlAbstract
      */
     public function testFilterLn()
     {
+        $this->reIndexAndCleanCache();
         $query = <<<QUERY
 {
     products (
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 dae71c1767caf..3ade1a0ef17d0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
@@ -292,11 +292,8 @@ public function testQueryAllFieldsSimpleProduct()
             'Filter category',
             $responseObject->getData('products/items/0/categories/1/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')
-        );
+        //canonical_url will be null unless the admin setting catalog/seo/product_canonical_tag is turned ON
+        self::assertNull($responseObject->getData('products/items/0/canonical_url'));
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/StoreConfigTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/StoreConfigTest.php
index 7a30023c89f7e..0982007daaa44 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/StoreConfigTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/StoreConfigTest.php
@@ -59,4 +59,50 @@ public function testGetStoreConfig()
         $this->assertEquals('asc', $response['storeConfig']['catalog_default_sort_by']);
         $this->assertEquals(2, $response['storeConfig']['root_category_id']);
     }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/store.php
+     * @magentoConfigFixture catalog/seo/product_url_suffix global_test_product_suffix
+     * @magentoConfigFixture catalog/seo/category_url_suffix global_test_category_suffix
+     * @magentoConfigFixture catalog/seo/title_separator __
+     * @magentoConfigFixture catalog/frontend/list_mode 3
+     * @magentoConfigFixture catalog/frontend/grid_per_page_values 16
+     * @magentoConfigFixture catalog/frontend/list_per_page_values 8
+     * @magentoConfigFixture catalog/frontend/grid_per_page 16
+     * @magentoConfigFixture catalog/frontend/list_per_page 8
+     * @magentoConfigFixture catalog/frontend/default_sort_by asc
+     */
+    public function testGetStoreConfigGlobal()
+    {
+        $query
+            = <<<QUERY
+{
+  storeConfig{
+    product_url_suffix,
+    category_url_suffix,
+    title_separator,
+    list_mode,
+    grid_per_page_values,
+    list_per_page_values,
+    grid_per_page,
+    list_per_page,
+    catalog_default_sort_by,
+    root_category_id
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('storeConfig', $response);
+
+        $this->assertEquals('global_test_product_suffix', $response['storeConfig']['product_url_suffix']);
+        $this->assertEquals('global_test_category_suffix', $response['storeConfig']['category_url_suffix']);
+        $this->assertEquals('__', $response['storeConfig']['title_separator']);
+        $this->assertEquals('3', $response['storeConfig']['list_mode']);
+        $this->assertEquals('16', $response['storeConfig']['grid_per_page_values']);
+        $this->assertEquals(16, $response['storeConfig']['grid_per_page']);
+        $this->assertEquals('8', $response['storeConfig']['list_per_page_values']);
+        $this->assertEquals(8, $response['storeConfig']['list_per_page']);
+        $this->assertEquals('asc', $response['storeConfig']['catalog_default_sort_by']);
+        $this->assertEquals(2, $response['storeConfig']['root_category_id']);
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/UrlRewritesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/UrlRewritesTest.php
index 43796d780646c..0d808c6dd0696 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/UrlRewritesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/UrlRewritesTest.php
@@ -12,6 +12,8 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite as UrlRewriteDTO;
+use Magento\Eav\Model\Config as EavConfig;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Test of getting URL rewrites data from products
@@ -54,9 +56,22 @@ public function testProductWithNoCategoriesAssigned()
         $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
         $product = $productRepository->get('virtual-product', false, null, true);
 
+        $storeId = ObjectManager::getInstance()->get(StoreManagerInterface::class)->getStore()->getId();
         $urlFinder = ObjectManager::getInstance()->get(UrlFinderInterface::class);
+        $entityType = ObjectManager::getInstance()->create(EavConfig::class)->getEntityType('catalog_product');
 
-        $rewritesCollection = $urlFinder->findAllByData([UrlRewriteDTO::ENTITY_ID => $product->getId()]);
+        $entityTypeCode = $entityType->getEntityTypeCode();
+        if ($entityTypeCode === 'catalog_product') {
+            $entityTypeCode = 'product';
+        }
+
+        $rewritesCollection = $urlFinder->findAllByData(
+            [
+                UrlRewriteDTO::ENTITY_ID => $product->getId(),
+                UrlRewriteDTO::ENTITY_TYPE => $entityTypeCode,
+                UrlRewriteDTO::STORE_ID => $storeId
+            ]
+        );
 
         /* There should be only one rewrite */
         /** @var UrlRewriteDTO $urlRewrite */
@@ -110,18 +125,32 @@ public function testProductWithOneCategoryAssigned()
         $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
         $product = $productRepository->get('simple', false, null, true);
 
+        $storeId = ObjectManager::getInstance()->get(StoreManagerInterface::class)->getStore()->getId();
         $urlFinder = ObjectManager::getInstance()->get(UrlFinderInterface::class);
+        $entityType = ObjectManager::getInstance()->create(EavConfig::class)->getEntityType('catalog_product');
 
-        $rewritesCollection = $urlFinder->findAllByData([UrlRewriteDTO::ENTITY_ID => $product->getId()]);
-        $rewritesCount = count($rewritesCollection);
+        $entityTypeCode = $entityType->getEntityTypeCode();
+        if ($entityTypeCode === 'catalog_product') {
+            $entityTypeCode = 'product';
+        }
 
+        $rewritesCollection = $urlFinder->findAllByData(
+            [
+                UrlRewriteDTO::ENTITY_ID => $product->getId(),
+                UrlRewriteDTO::ENTITY_TYPE => $entityTypeCode,
+                UrlRewriteDTO::STORE_ID => $storeId
+            ]
+        );
+
+        $rewritesCount = count($rewritesCollection);
         $this->assertArrayHasKey('url_rewrites', $response['products']['items'][0]);
+        $this->assertCount(1, $response['products']['items'][0]['url_rewrites']);
         $this->assertCount($rewritesCount, $response['products']['items'][0]['url_rewrites']);
 
-        for ($i = 0; $i < $rewritesCount; $i++) {
-            $urlRewrite = $rewritesCollection[$i];
+        for ($index = 0; $index < $rewritesCount; $index++) {
+            $urlRewrite = $rewritesCollection[$index];
             $this->assertResponseFields(
-                $response['products']['items'][0]['url_rewrites'][$i],
+                $response['products']['items'][0]['url_rewrites'][$index],
                 [
                     "url" => $urlRewrite->getRequestPath(),
                     "parameters" => $this->getUrlParameters($urlRewrite->getTargetPath())
@@ -140,11 +169,12 @@ private function getUrlParameters(string $targetPath): array
     {
         $urlParameters = [];
         $targetPathParts = explode('/', trim($targetPath, '/'));
-
-        for ($i = 3; ($i < sizeof($targetPathParts) - 1); $i += 2) {
+        $count = count($targetPathParts) - 1;
+        //phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
+        for ($index = 3; $index < $count; $index += 2) {
             $urlParameters[] = [
-                'name' => $targetPathParts[$i],
-                'value' => $targetPathParts[$i + 1]
+                'name' => $targetPathParts[$index],
+                'value' => $targetPathParts[$index + 1]
             ];
         }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCms/CategoryBlockTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCms/CategoryBlockTest.php
new file mode 100644
index 0000000000000..52985422c3355
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCms/CategoryBlockTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\CatalogCms;
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Cms\Api\BlockRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Widget\Model\Template\FilterEmulate;
+
+/**
+ * Test category cms fields are resolved correctly
+ */
+class CategoryBlockTest extends GraphQlAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/category_tree.php
+     * @magentoApiDataFixture Magento/Cms/_files/block.php
+     */
+    public function testCategoryCmsBlock()
+    {
+        $blockId = 'fixture_block';
+        /** @var BlockRepositoryInterface $blockRepository */
+        $blockRepository = Bootstrap::getObjectManager()->get(BlockRepositoryInterface::class);
+        $block = $blockRepository->getById($blockId);
+        $filter = Bootstrap::getObjectManager()->get(FilterEmulate::class);
+        $renderedContent = $filter->setUseSessionInUrl(false)->filter($block->getContent());
+
+        /** @var CategoryRepositoryInterface $categoryRepository */
+        $categoryRepository = Bootstrap::getObjectManager()->get(CategoryRepositoryInterface::class);
+        $category = $categoryRepository->get(401);
+        $category->setLandingPage($block->getId());
+        $categoryRepository->save($category);
+
+        $query = <<<QUERY
+{
+    category(id: 401){
+        name
+        cms_block{
+            identifier
+            title
+            content
+        }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $response);
+        $this->assertNotEmpty($response['category']);
+        $actualBlock = $response['category']['cms_block'];
+
+        $this->assertEquals($block->getTitle(), $actualBlock['title']);
+        $this->assertEquals($block->getIdentifier(), $actualBlock['identifier']);
+        $this->assertEquals($renderedContent, $actualBlock['content']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogUrlRewrite/UrlResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogUrlRewrite/UrlResolverTest.php
index b15cfe3a5b913..29696e29908fe 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogUrlRewrite/UrlResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogUrlRewrite/UrlResolverTest.php
@@ -65,33 +65,25 @@ public function testProductUrlResolver()
                 'store_id' => $storeId
             ]
         );
-        $targetPath = $actualUrls->getTargetPath();
+        $relativePath = $actualUrls->getRequestPath();
         $expectedType = $actualUrls->getEntityType();
+        $redirectCode =  $actualUrls->getRedirectType();
 
-        $query
-            = <<<QUERY
-{
-  urlResolver(url:"{$urlPath}")
-  {
-   id
-   relative_url
-   type
-  }
-}
-QUERY;
-        $response = $this->graphQlQuery($query);
-        $this->assertArrayHasKey('urlResolver', $response);
-        $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']);
-        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
-        $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
+        $this->queryUrlAndAssertResponse(
+            (int) $product->getEntityId(),
+            $urlPath,
+            $relativePath,
+            $expectedType,
+            $redirectCode
+        );
     }
 
     /**
-     * Tests the use case where relative_url is provided as resolver input in the Query
+     * Test the use case where non seo friendly is provided as resolver input in the Query
      *
      * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
      */
-    public function testProductUrlWithCanonicalUrlInput()
+    public function testProductUrlWithNonSeoFriendlyUrlInput()
     {
         $productSku = 'p002';
         /** @var ProductRepositoryInterface $productRepository */
@@ -122,25 +114,127 @@ public function testProductUrlWithCanonicalUrlInput()
                 'store_id' => $storeId
             ]
         );
-        $targetPath = $actualUrls->getTargetPath();
+        // even of non seo friendly path requested, the seo friendly path should be prefered
+        $relativePath = $actualUrls->getRequestPath();
         $expectedType = $actualUrls->getEntityType();
-        $canonicalPath = $actualUrls->getTargetPath();
+        $nonSeoFriendlyPath = $actualUrls->getTargetPath();
+        $redirectCode =  $actualUrls->getRedirectType();
+
+        $this->queryUrlAndAssertResponse(
+            (int) $product->getEntityId(),
+            $nonSeoFriendlyPath,
+            $relativePath,
+            $expectedType,
+            $redirectCode
+        );
+    }
+
+    /**
+     * Test the use case where non seo friendly is provided as resolver input in the Query
+     *
+     * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
+     */
+    public function testRedirectsAndCustomInput()
+    {
+        $productSku = 'p002';
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku, false, null, true);
+
+        // generate permanent redirects
+        $renamedKey = 'p002-ren';
+        $product->setUrlKey($renamedKey)->setData('save_rewrites_history', true)->save();
+
+        $storeId = $product->getStoreId();
+
         $query
             = <<<QUERY
 {
-  urlResolver(url:"{$canonicalPath}")
-  {
-   id
-   relative_url
-   type
-  }
+    products(filter: {sku: {eq: "{$productSku}"}})
+    {
+        items {
+               url_key
+               url_suffix
+            }
+    }
 }
 QUERY;
         $response = $this->graphQlQuery($query);
-        $this->assertArrayHasKey('urlResolver', $response);
-        $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']);
-        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
-        $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
+        $urlPath = $response['products']['items'][0]['url_key'] . $response['products']['items'][0]['url_suffix'];
+        $suffix = $response['products']['items'][0]['url_suffix'];
+
+        /** @var  UrlFinderInterface $urlFinder */
+        $urlFinder = $this->objectManager->get(UrlFinderInterface::class);
+        $actualUrls = $urlFinder->findOneByData(
+            [
+                'request_path' => $urlPath,
+                'store_id' => $storeId
+            ]
+        );
+        // querying the end redirect gives the same record
+        $this->queryUrlAndAssertResponse(
+            (int) $product->getEntityId(),
+            $renamedKey . $suffix,
+            $actualUrls->getRequestPath(),
+            $actualUrls->getEntityType(),
+            0
+        );
+
+        // querying a url that's a redirect the active redirected final url
+        $this->queryUrlAndAssertResponse(
+            (int) $product->getEntityId(),
+            $productSku . $suffix,
+            $actualUrls->getRequestPath(),
+            $actualUrls->getEntityType(),
+            301
+        );
+
+        // create custom url that doesn't redirect
+        /** @var  UrlRewrite $urlRewriteModel */
+        $urlRewriteModel = $this->objectManager->create(UrlRewrite::class);
+
+        $customUrl = 'custom-path';
+        $urlRewriteArray = [
+            'entity_type' => 'custom',
+            'entity_id' => '0',
+            'request_path' => $customUrl,
+            'target_path' => 'p002.html',
+            'redirect_type' => '0',
+            'store_id' => '1',
+            'description' => '',
+            'is_autogenerated' => '0',
+            'metadata' => null,
+        ];
+        foreach ($urlRewriteArray as $key => $value) {
+            $urlRewriteModel->setData($key, $value);
+        }
+        $urlRewriteModel->save();
+
+        // querying a custom url that should return the target entity but relative should be the custom url
+        $this->queryUrlAndAssertResponse(
+            (int) $product->getEntityId(),
+            $customUrl,
+            $customUrl,
+            $actualUrls->getEntityType(),
+            0
+        );
+
+        // change custom url that does redirect
+        $urlRewriteModel->setRedirectType('301');
+        $urlRewriteModel->setId($urlRewriteModel->getId());
+        $urlRewriteModel->save();
+
+        ObjectManager::getInstance()->get(\Magento\TestFramework\Helper\CacheCleaner::class)->cleanAll();
+
+        //modifying query by adding spaces to avoid getting cached values.
+        $this->queryUrlAndAssertResponse(
+            (int) $product->getEntityId(),
+            $customUrl,
+            $actualUrls->getRequestPath(),
+            strtoupper($actualUrls->getEntityType()),
+            301
+        );
+        $urlRewriteModel->delete();
     }
 
     /**
@@ -166,7 +260,7 @@ public function testCategoryUrlResolver()
             ]
         );
         $categoryId = $actualUrls->getEntityId();
-        $targetPath = $actualUrls->getTargetPath();
+        $relativePath = $actualUrls->getRequestPath();
         $expectedType = $actualUrls->getEntityType();
 
         $query
@@ -181,26 +275,17 @@ public function testCategoryUrlResolver()
         $response = $this->graphQlQuery($query);
         $urlPath = $response['category']['url_key'] . $response['category']['url_suffix'];
 
-        $query
-            = <<<QUERY
-{
-  urlResolver(url:"{$urlPath}")
-  {
-   id
-   relative_url
-   type
-  }
-}
-QUERY;
-        $response = $this->graphQlQuery($query);
-        $this->assertArrayHasKey('urlResolver', $response);
-        $this->assertEquals($categoryId, $response['urlResolver']['id']);
-        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
-        $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
+        $this->queryUrlAndAssertResponse(
+            (int) $categoryId,
+            $urlPath,
+            $relativePath,
+            $expectedType,
+            0
+        );
     }
 
     /**
-     * Tests the use case where the url_key of the existing product is changed
+     * Test the use case where the url_key of the existing product is changed
      *
      * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
      */
@@ -238,24 +323,16 @@ public function testProductUrlRewriteResolver()
                 'store_id' => $storeId
             ]
         );
-        $targetPath = $actualUrls->getTargetPath();
+        $relativePath = $actualUrls->getRequestPath();
         $expectedType = $actualUrls->getEntityType();
-        $query
-            = <<<QUERY
-{
-  urlResolver(url:"{$urlPath}")
-  {
-   id
-   relative_url
-   type
-  }
-}
-QUERY;
-        $response = $this->graphQlQuery($query);
-        $this->assertArrayHasKey('urlResolver', $response);
-        $this->assertEquals($product->getEntityId(), $response['urlResolver']['id']);
-        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
-        $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
+
+        $this->queryUrlAndAssertResponse(
+            (int) $product->getEntityId(),
+            $urlPath,
+            $relativePath,
+            $expectedType,
+            0
+        );
     }
 
     /**
@@ -288,6 +365,7 @@ public function testInvalidUrlResolverInput()
    id
    relative_url
    type
+   redirectCode
   }
 }
 QUERY;
@@ -319,7 +397,7 @@ public function testCategoryUrlWithLeadingSlash()
             ]
         );
         $categoryId = $actualUrls->getEntityId();
-        $targetPath = $actualUrls->getTargetPath();
+        $relativePath = $actualUrls->getRequestPath();
         $expectedType = $actualUrls->getEntityType();
 
         $query
@@ -333,22 +411,14 @@ public function testCategoryUrlWithLeadingSlash()
 QUERY;
         $response = $this->graphQlQuery($query);
         $urlPath = $response['category']['url_key'] . $response['category']['url_suffix'];
-
-        $query = <<<QUERY
-{
-  urlResolver(url:"/{$urlPath}")
-  {
-   id
-   relative_url
-   type
-  }
-}
-QUERY;
-        $response = $this->graphQlQuery($query);
-        $this->assertArrayHasKey('urlResolver', $response);
-        $this->assertEquals($categoryId, $response['urlResolver']['id']);
-        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
-        $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
+        $urlPathWithLeadingSlash = "/{$urlPath}";
+        $this->queryUrlAndAssertResponse(
+            (int) $categoryId,
+            $urlPathWithLeadingSlash,
+            $relativePath,
+            $expectedType,
+            0
+        );
     }
 
     /**
@@ -371,7 +441,7 @@ public function testGetNonExistentUrlRewrite()
                 'store_id' => 1
             ]
         );
-        $targetPath = $actualUrls->getTargetPath();
+        $relativePath = $actualUrls->getRequestPath();
 
         $query = <<<QUERY
 {
@@ -380,12 +450,50 @@ public function testGetNonExistentUrlRewrite()
    id
    relative_url
    type
+   redirectCode
   }
 }
 QUERY;
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('urlResolver', $response);
         $this->assertEquals('PRODUCT', $response['urlResolver']['type']);
-        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
+        $this->assertEquals($relativePath, $response['urlResolver']['relative_url']);
+        $this->assertEquals(0, $response['urlResolver']['redirectCode']);
+    }
+
+    /**
+     * Assert response from GraphQl
+     *
+     * @param string $productId
+     * @param string $urlKey
+     * @param string $relativePath
+     * @param string $expectedType
+     * @param int $redirectCode
+     */
+    private function queryUrlAndAssertResponse(
+        int $productId,
+        string $urlKey,
+        string $relativePath,
+        string $expectedType,
+        int $redirectCode
+    ): void {
+        $query
+            = <<<QUERY
+{
+  urlResolver(url:"{$urlKey}")
+  {
+   id
+   relative_url
+   type
+   redirectCode
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('urlResolver', $response);
+        $this->assertEquals($productId, $response['urlResolver']['id']);
+        $this->assertEquals($relativePath, $response['urlResolver']['relative_url']);
+        $this->assertEquals(strtoupper($expectedType), $response['urlResolver']['type']);
+        $this->assertEquals($redirectCode, $response['urlResolver']['redirectCode']);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CmsUrlRewrite/UrlResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CmsUrlRewrite/UrlResolverTest.php
index ece421925a31c..072c6bc38de70 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CmsUrlRewrite/UrlResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CmsUrlRewrite/UrlResolverTest.php
@@ -53,13 +53,34 @@ public function testCMSPageUrlResolver()
    id
    relative_url
    type
+   redirectCode
   }
 }
 QUERY;
         $response = $this->graphQlQuery($query);
         $this->assertEquals($cmsPageId, $response['urlResolver']['id']);
-        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
+        $this->assertEquals($requestPath, $response['urlResolver']['relative_url']);
         $this->assertEquals(strtoupper(str_replace('-', '_', $expectedEntityType)), $response['urlResolver']['type']);
+        $this->assertEquals(0, $response['urlResolver']['redirectCode']);
+
+        // querying by non seo friendly url path should return seo friendly relative url
+        $query
+            = <<<QUERY
+{
+  urlResolver(url:"{$targetPath}")
+  {
+   id
+   relative_url
+   type
+   redirectCode
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertEquals($cmsPageId, $response['urlResolver']['id']);
+        $this->assertEquals($requestPath, $response['urlResolver']['relative_url']);
+        $this->assertEquals(strtoupper(str_replace('-', '_', $expectedEntityType)), $response['urlResolver']['type']);
+        $this->assertEquals(0, $response['urlResolver']['redirectCode']);
     }
 
     /**
@@ -77,10 +98,6 @@ public function testResolveSlash()
         $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
 {
@@ -89,13 +106,15 @@ public function testResolveSlash()
    id
    relative_url
    type
+   redirectCode
   }
 }
 QUERY;
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('urlResolver', $response);
         $this->assertEquals($homePageId, $response['urlResolver']['id']);
-        $this->assertEquals($targetPath, $response['urlResolver']['relative_url']);
+        $this->assertEquals($homePageIdentifier, $response['urlResolver']['relative_url']);
         $this->assertEquals('CMS_PAGE', $response['urlResolver']['type']);
+        $this->assertEquals(0, $response['urlResolver']['redirectCode']);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
index 39b69f86cbe13..b1858e843bf0f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
@@ -265,7 +265,8 @@ public function testAddNonExistentConfigurableProductVariationToCart()
 
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage(
-            'Could not add the product with SKU configurable to the shopping cart: Could not find specified product.'
+            'Could not add the product with SKU configurable to the shopping cart: The product that was requested ' .
+            'doesn\'t exist. Verify the product and try again.'
         );
 
         $this->graphQlMutation($query);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/UpdateConfigurableCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/UpdateConfigurableCartItemsTest.php
index 4f4e7ecab6fe3..8f32caa9dcf0f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/UpdateConfigurableCartItemsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/UpdateConfigurableCartItemsTest.php
@@ -9,7 +9,7 @@
 namespace Magento\GraphQl\ConfigurableProduct;
 
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\Framework\Exception\NoSuchEntityException as NoSuchEntityException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Quote\Model\Quote\Item;
 use Magento\Quote\Model\QuoteFactory;
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
index f36200c8e9218..bf01ad4b37218 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
@@ -48,7 +48,7 @@ class ChangeCustomerPasswordTest extends GraphQlAbstract
      */
     private $customerRepository;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
         $this->accountManagement = Bootstrap::getObjectManager()->get(AccountManagementInterface::class);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
index 04fb304305250..81300e967f6a2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
@@ -29,7 +29,7 @@ class CreateCustomerAddressTest extends GraphQlAbstract
      */
     private $addressRepository;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -49,7 +49,7 @@ public function testCreateCustomerAddress()
                 'region_id' => 4,
                 'region_code' => 'AZ'
             ],
-            'country_id' => 'US',
+            'country_code' => 'US',
             'street' => ['Line 1 Street', 'Line 2'],
             'company' => 'Company name',
             'telephone' => '123456789',
@@ -75,7 +75,7 @@ public function testCreateCustomerAddress()
         region_id: {$newAddress['region']['region_id']}
         region_code: "{$newAddress['region']['region_code']}"
     }
-    country_id: {$newAddress['country_id']}
+    country_code: {$newAddress['country_code']}
     street: ["{$newAddress['street'][0]}","{$newAddress['street'][1]}"]
     company: "{$newAddress['company']}"
     telephone: "{$newAddress['telephone']}"
@@ -98,7 +98,7 @@ public function testCreateCustomerAddress()
       region_id
       region_code
     }
-    country_id
+    country_code
     street
     company
     telephone
@@ -133,6 +133,75 @@ public function testCreateCustomerAddress()
         $this->assertCustomerAddressesFields($address, $newAddress);
     }
 
+    /**
+     * Test case for deprecated `country_id` field.
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testCreateCustomerAddressWithCountryId()
+    {
+        $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
+  }) {
+    country_id
+  }
+}
+MUTATION;
+
+        $userName = 'customer@example.com';
+        $password = 'password';
+
+        $response = $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $this->assertArrayHasKey('createCustomerAddress', $response);
+        $this->assertEquals($newAddress['country_id'], $response['createCustomerAddress']['country_id']);
+    }
+
     /**
      * @expectedException Exception
      * @expectedExceptionMessage The current customer isn't authorized.
@@ -153,7 +222,7 @@ public function testCreateCustomerAddressIfUserIsNotAuthorized()
     region: {
         region_id: 1
     }
-    country_id: US
+    country_code: US
     postcode: "9999"
     default_shipping: true
     default_billing: false
@@ -182,7 +251,7 @@ public function testCreateCustomerAddressWithMissingAttribute()
     region: {
         region_id: 1
     }
-    country_id: US
+    country_code: US
     street: ["Line 1 Street","Line 2"]
     company: "Company name"
     telephone: "123456789"
@@ -202,6 +271,27 @@ public function testCreateCustomerAddressWithMissingAttribute()
         $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
+     * @expectedException Exception
+     * @expectedExceptionMessage "input" value should be specified
+     */
+    public function testCreateCustomerAddressWithMissingInput()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $mutation = <<<MUTATION
+mutation {
+  createCustomerAddress(
+    input: {}
+  ) {
+    city
+  }
+}
+MUTATION;
+        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -214,7 +304,7 @@ public function testCreateCustomerAddressWithRedundantStreetLine()
                 'region_id' => 4,
                 'region_code' => 'AZ'
             ],
-            'country_id' => 'US',
+            'country_code' => 'US',
             'street' => ['Line 1 Street', 'Line 2', 'Line 3'],
             'company' => 'Company name',
             'telephone' => '123456789',
@@ -240,7 +330,7 @@ public function testCreateCustomerAddressWithRedundantStreetLine()
         region_id: {$newAddress['region']['region_id']}
         region_code: "{$newAddress['region']['region_code']}"
     }
-    country_id: {$newAddress['country_id']}
+    country_code: {$newAddress['country_code']}
     street: ["{$newAddress['street'][0]}","{$newAddress['street'][1]}","{$newAddress['street'][2]}"]
     company: "{$newAddress['company']}"
     telephone: "{$newAddress['telephone']}"
@@ -268,6 +358,67 @@ public function testCreateCustomerAddressWithRedundantStreetLine()
         $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
+     * @magentoConfigFixture default_store general/country/optional_zip_countries UA
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testCreateCustomerAddressWithOptionalZipCode()
+    {
+        $newAddress = [
+            'country_code' => 'UA',
+            'street' => ['Line 1 Street', 'Line 2'],
+            'company' => 'Company name',
+            'telephone' => '123456789',
+            'fax' => '123123123',
+            '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: {
+    country_code: {$newAddress['country_code']}
+    street: ["{$newAddress['street'][0]}","{$newAddress['street'][1]}"]
+    company: "{$newAddress['company']}"
+    telephone: "{$newAddress['telephone']}"
+    fax: "{$newAddress['fax']}"
+    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
+  }
+}
+MUTATION;
+
+        $userName = 'customer@example.com';
+        $password = 'password';
+
+        $response = $this->graphQlMutation(
+            $mutation,
+            [],
+            '',
+            $this->getCustomerAuthHeaders($userName, $password)
+        );
+        $this->assertNotEmpty($response['createCustomerAddress']['id']);
+    }
+
     /**
      * Create new address with invalid input
      *
@@ -313,12 +464,15 @@ public function invalidInputDataProvider()
      *
      * @param AddressInterface $address
      * @param array $actualResponse
+     * @param string $countryFieldName
      */
-    private function assertCustomerAddressesFields(AddressInterface $address, array $actualResponse): void
-    {
+    private function assertCustomerAddressesFields(
+        AddressInterface $address,
+        array $actualResponse
+    ): void {
         /** @var  $addresses */
         $assertionMap = [
-            ['response_field' => 'country_id', 'expected_value' => $address->getCountryId()],
+            ['response_field' => 'country_code', '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()],
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
index 0be968d6d340d..a6455a9728fec 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
@@ -13,7 +13,7 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Test for create customer functionallity
+ * Test for create customer functionality
  */
 class CreateCustomerTest extends GraphQlAbstract
 {
@@ -27,7 +27,7 @@ class CreateCustomerTest extends GraphQlAbstract
      */
     private $customerRepository;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -114,7 +114,7 @@ public function testCreateCustomerAccountWithoutPassword()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Field CustomerInput.email of required type String! was not provided
+     * @expectedExceptionMessage "input" value should be specified
      */
     public function testCreateCustomerIfInputDataIsEmpty()
     {
@@ -140,7 +140,7 @@ public function testCreateCustomerIfInputDataIsEmpty()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Field CustomerInput.email of required type String! was not provided
+     * @expectedExceptionMessage  Required parameters are missing: Email
      */
     public function testCreateCustomerIfEmailMissed()
     {
@@ -308,7 +308,40 @@ public function testCreateCustomerSubscribed()
         $this->assertEquals(false, $response['createCustomer']['customer']['is_subscribed']);
     }
 
-    public function tearDown()
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage A customer with the same email address already exists in an associated website.
+     */
+    public function testCreateCustomerIfCustomerWithProvidedEmailAlreadyExists()
+    {
+        $existedEmail = 'customer@example.com';
+        $password = 'test123#';
+        $firstname = 'John';
+        $lastname = 'Smith';
+
+        $query = <<<QUERY
+mutation {
+    createCustomer(
+        input: {
+            email: "{$existedEmail}"
+            password: "{$password}"
+            firstname: "{$firstname}"
+            lastname: "{$lastname}"
+        }
+    ) {
+        customer {
+            firstname
+            lastname
+            email
+        }
+    }
+}
+QUERY;
+        $this->graphQlMutation($query);
+    }
+
+    public function tearDown(): void
     {
         $newEmail = 'new_customer@example.com';
         try {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
index 443b9d7ec53e5..31065f3f6f98b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
@@ -39,7 +39,7 @@ class DeleteCustomerAddressTest extends GraphQlAbstract
      */
     private $lockCustomer;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetAddressesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetAddressesTest.php
index c1573d7dbd8af..ed360919d8320 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetAddressesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetAddressesTest.php
@@ -31,7 +31,7 @@ class GetAddressesTest extends GraphQlAbstract
      */
     private $lockCustomer;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetCustomerTest.php
index b15a799ae7521..c645d8953981a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetCustomerTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Customer;
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\CustomerAuthUpdate;
 use Magento\Customer\Model\CustomerRegistry;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
@@ -30,13 +31,19 @@ class GetCustomerTest extends GraphQlAbstract
      */
     private $customerAuthUpdate;
 
-    protected function setUp()
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
         $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
         $this->customerAuthUpdate = Bootstrap::getObjectManager()->get(CustomerAuthUpdate::class);
+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
     }
 
     /**
@@ -57,7 +64,12 @@ public function testGetCustomer()
     }
 }
 QUERY;
-        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $response = $this->graphQlQuery(
+            $query,
+            [],
+            '',
+            $this->getCustomerAuthHeaders($currentEmail, $currentPassword)
+        );
 
         $this->assertEquals(null, $response['customer']['id']);
         $this->assertEquals('John', $response['customer']['firstname']);
@@ -104,7 +116,38 @@ public function testGetCustomerIfAccountIsLocked()
     }
 }
 QUERY;
-        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+        $this->graphQlQuery(
+            $query,
+            [],
+            '',
+            $this->getCustomerAuthHeaders($currentEmail, $currentPassword)
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer_confirmation_config_enable.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedExceptionMessage This account isn't confirmed. Verify and try again.
+     */
+    public function testAccountIsNotConfirmed()
+    {
+        $customerEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $headersMap = $this->getCustomerAuthHeaders($customerEmail, $currentPassword);
+        $customer = $this->customerRepository->getById(1)->setConfirmation(
+            \Magento\Customer\Api\AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED
+        );
+        $this->customerRepository->save($customer);
+        $query = <<<QUERY
+query {
+    customer {
+        firstname
+        lastname
+        email
+    }
+}
+QUERY;
+        $this->graphQlQuery($query, [], '', $headersMap);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php
index bbb7e245c91fd..4cba8323793dc 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/SubscriptionStatusTest.php
@@ -29,7 +29,7 @@ class SubscriptionStatusTest extends GraphQlAbstract
      */
     private $subscriberFactory;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -162,7 +162,7 @@ private function getHeaderMap(string $email, string $password): array
         return ['Authorization' => 'Bearer ' . $customerToken];
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
index 625d027f58d24..da67900994940 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
@@ -40,7 +40,7 @@ class UpdateCustomerAddressTest extends GraphQlAbstract
      */
     private $lockCustomer;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -76,6 +76,56 @@ public function testUpdateCustomerAddress()
         $this->assertCustomerAddressesFields($address, $updateAddress);
     }
 
+    /**
+     * Test case for deprecated `country_id` field.
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testUpdateCustomerAddressWithCountryId()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $addressId = 1;
+
+        $updateAddress = $this->getAddressData();
+
+        $mutation =  $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_code']}
+    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: true
+    default_billing: true
+  }) {
+    country_id
+  }
+}
+MUTATION;
+
+        $response = $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $this->assertArrayHasKey('updateCustomerAddress', $response);
+        $this->assertEquals($updateAddress['country_code'], $response['updateCustomerAddress']['country_id']);
+    }
+
     /**
      * @expectedException Exception
      * @expectedExceptionMessage The current customer isn't authorized.
@@ -126,17 +176,63 @@ public function testUpdateCustomerAddressWithMissingAttribute()
         $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
+    /**
+     * Test custom attributes of the customer's address
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
+     * @magentoApiDataFixture Magento/Customer/_files/attribute_user_defined_address_custom_attribute.php
+     */
+    public function testUpdateCustomerAddressHasCustomAttributes()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $addressId = 1;
+        $attributes = [
+            [
+                'attribute_code' => 'custom_attribute1',
+                'value'=> '[new-value1,new-value2]'
+            ],
+            [
+                'attribute_code' => 'custom_attribute2',
+                'value'=> '"new-value3"'
+            ]
+        ];
+        $attributesFragment = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($attributes));
+        $mutation
+            = <<<MUTATION
+mutation {
+  updateCustomerAddress(
+    id: {$addressId}
+    input: {
+      custom_attributes: {$attributesFragment}
+    }
+  ) {
+    custom_attributes {
+      attribute_code
+      value
+    }
+  }
+}
+MUTATION;
+
+        $response = $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+        $this->assertEquals($attributes, $response['updateCustomerAddress']['custom_attributes']);
+    }
+
     /**
      * Verify the fields for Customer address
      *
      * @param AddressInterface $address
      * @param array $actualResponse
+     * @param string $countryFieldName
      */
-    private function assertCustomerAddressesFields(AddressInterface $address, $actualResponse): void
-    {
+    private function assertCustomerAddressesFields(
+        AddressInterface $address,
+        $actualResponse
+    ): void {
         /** @var  $addresses */
         $assertionMap = [
-            ['response_field' => 'country_id', 'expected_value' => $address->getCountryId()],
+            ['response_field' => 'country_code', '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()],
@@ -187,7 +283,7 @@ public function testUpdateCustomerAddressWithMissingId()
         region_id: {$updateAddress['region']['region_id']}
         region_code: "{$updateAddress['region']['region_code']}"
     }
-    country_id: {$updateAddress['country_id']}
+    country_code: {$updateAddress['country_code']}
     street: ["{$updateAddress['street'][0]}","{$updateAddress['street'][1]}"]
     company: "{$updateAddress['company']}"
     telephone: "{$updateAddress['telephone']}"
@@ -243,7 +339,7 @@ public function testUpdateCustomerAddressWithInvalidIdType()
         region_id: {$updateAddress['region']['region_id']}
         region_code: "{$updateAddress['region']['region_code']}"
     }
-    country_id: {$updateAddress['country_id']}
+    country_code: {$updateAddress['country_code']}
     street: ["{$updateAddress['street'][0]}","{$updateAddress['street'][1]}"]
     company: "{$updateAddress['company']}"
     telephone: "{$updateAddress['telephone']}"
@@ -382,11 +478,11 @@ private function getAddressData(): array
     {
         return [
             'region' => [
-                'region' => 'Alaska',
-                'region_id' => 2,
-                'region_code' => 'AK'
+                'region' => 'Alberta',
+                'region_id' => 66,
+                'region_code' => 'AB'
             ],
-            'country_id' => 'US',
+            'country_code' => 'CA',
             'street' => ['Line 1 Street', 'Line 2'],
             'company' => 'Company Name',
             'telephone' => '123456789',
@@ -423,7 +519,7 @@ private function getMutation(int $addressId): string
         region_id: {$updateAddress['region']['region_id']}
         region_code: "{$updateAddress['region']['region_code']}"
     }
-    country_id: {$updateAddress['country_id']}
+    country_code: {$updateAddress['country_code']}
     street: ["{$updateAddress['street'][0]}","{$updateAddress['street'][1]}"]
     company: "{$updateAddress['company']}"
     telephone: "{$updateAddress['telephone']}"
@@ -446,7 +542,7 @@ private function getMutation(int $addressId): string
       region_id
       region_code
     }
-    country_id
+    country_code
     street
     company
     telephone
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
index d1c6638e8d5ff..7121f12bc2a42 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
@@ -33,7 +33,7 @@ class UpdateCustomerTest extends GraphQlAbstract
      */
     private $lockCustomer;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CustomerDownloadableProduct/CustomerDownloadableProductTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CustomerDownloadableProduct/CustomerDownloadableProductTest.php
index 6b8aad83edac7..d0ad772e9bb27 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CustomerDownloadableProduct/CustomerDownloadableProductTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CustomerDownloadableProduct/CustomerDownloadableProductTest.php
@@ -63,6 +63,18 @@ public function testGuestCannotAccessDownloadableProducts()
     {
         $this->graphQlQuery($this->getQuery());
     }
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable_with_download_limit.php
+     * @magentoApiDataFixture Magento/Downloadable/_files/customer_order_with_downloadable_product.php
+     */
+    public function testRemainingDownloads()
+    {
+        $query = $this->getQuery();
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+        self::assertArrayHasKey('remaining_downloads', $response['customerDownloadableProducts']['items'][0]);
+        self::assertEquals(100, $response['customerDownloadableProducts']['items'][0]['remaining_downloads']);
+    }
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Framework/RequiredInputArgumentTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Framework/RequiredInputArgumentTest.php
new file mode 100644
index 0000000000000..9fecc954d1182
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Framework/RequiredInputArgumentTest.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\Framework;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
+
+/**
+ * Test that required input parameters are properly validated on framework level
+ */
+class RequiredInputArgumentTest extends GraphQlAbstract
+{
+
+    /**
+     * Test that a simple input value will be treated as required
+     *
+     * We should see error message from framework not the Resolver
+     * urlResolver query has required input arg "url"
+     */
+    public function testSimpleInputArgumentRequired()
+    {
+        $query = <<<QUERY
+    {
+        urlResolver{
+            id
+            type
+        }
+    }
+QUERY;
+
+        $expectedExceptionsMessage = 'GraphQL response contains errors:'
+            . ' Field "urlResolver" argument "url" of type "String!" is required but not provided.';
+        $this->expectException(ResponseContainsErrorsException::class);
+        $this->expectExceptionMessage($expectedExceptionsMessage);
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Test that a more complex required argument is handled properly
+     *
+     * updateCartItems mutation has required parameter input.cart_items.cart_item_id
+     */
+    public function testInputObjectArgumentRequired()
+    {
+        $query = <<<QUERY
+    mutation {
+        updateCartItems(
+            input: {
+                cart_id: "foobar"
+                cart_items: [
+                    {
+                        quantity: 2
+                    }
+                ]
+            }
+        ) {
+            cart {
+                total_quantity
+            }
+        }
+    }
+QUERY;
+
+        $expectedExceptionsMessage = 'GraphQL response contains errors:'
+            . ' Field CartItemUpdateInput.cart_item_id of required type Int! was not provided.';
+        $this->expectException(ResponseContainsErrorsException::class);
+        $this->expectExceptionMessage($expectedExceptionsMessage);
+
+        $this->graphQlMutation($query);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php
index 69bcc73dd27a1..0c22bea2a42f8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php
@@ -56,6 +56,124 @@ public function testIntrospectionQuery()
         $this->assertArrayHasKey('__schema', $this->graphQlQuery($query));
     }
 
+    /**
+     * Tests that Introspection is allowed by default
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testIntrospectionQueryWithOnlySchema()
+    {
+        $query
+            = <<<QUERY
+ {
+  __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->assertArrayHasKey('__schema', $this->graphQlQuery($query));
+        $response = $this->graphQlQuery($query);
+
+        $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->assertArrayHasKey('__schema', $this->graphQlQuery($query));
+        $responseFields = $this->graphQlQuery($query);
+        $this->assertResponseFields($response, $responseFields);
+        $this->assertEquals($responseFields, $response);
+    }
+
+    /**
+     * Tests that Introspection is allowed by default
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testIntrospectionQueryWithOnlyType()
+    {
+        $query
+            = <<<QUERY
+{
+  __type(name:"Query")
+    {
+    name
+      kind
+    fields(includeDeprecated:true){
+      name
+      type{
+        kind
+        name
+      }
+      description
+      isDeprecated
+      deprecationReason
+    }
+  }
+} 
+QUERY;
+        $this->assertArrayHasKey('__type', $this->graphQlQuery($query));
+        $response = $this->graphQlQuery($query);
+        $this->assertNotEmpty($response['__type']['fields']);
+    }
+
     /**
      * Tests that Introspection Query with deprecated annotations on enum values, fields are read.
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductWithCustomOptionsToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductWithCustomOptionsToCartTest.php
index fa7d1194c7f83..8b8973ad0fd95 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductWithCustomOptionsToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductWithCustomOptionsToCartTest.php
@@ -58,7 +58,11 @@ public function testAddDownloadableProductWithOptions()
 
         $customOptionsValues = $this->getCustomOptionsValuesForQueryBySku->execute($sku);
         /* Generate customizable options fragment for GraphQl request */
-        $queryCustomizableOptionValues = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
+        $queryCustomizableOptionValues = preg_replace(
+            '/"([^"]+)"\s*:\s*/',
+            '$1:',
+            json_encode(array_values($customOptionsValues))
+        );
         $customizableOptions = "customizable_options: {$queryCustomizableOptionValues}";
 
         $query = $this->getQuery($maskedQuoteId, $qty, $sku, $customizableOptions, $linkId);
@@ -68,13 +72,14 @@ public function testAddDownloadableProductWithOptions()
         self::assertCount($qty, $response['addDownloadableProductsToCart']['cart']);
         $customizableOptionsOutput =
             $response['addDownloadableProductsToCart']['cart']['items'][0]['customizable_options'];
-        $assignedOptionsCount = count($customOptionsValues);
-        for ($counter = 0; $counter < $assignedOptionsCount; $counter++) {
-            $expectedValues = $this->buildExpectedValuesArray($customOptionsValues[$counter]['value_string']);
+        $count = 0;
+        foreach ($customOptionsValues as $value) {
+            $expectedValues = $this->buildExpectedValuesArray($value['value_string']);
             self::assertEquals(
                 $expectedValues,
-                $customizableOptionsOutput[$counter]['values']
+                $customizableOptionsOutput[$count]['values']
             );
+            $count++;
         }
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php
index b0b116b0cddad..5c2bc10bf771e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php
@@ -57,7 +57,11 @@ public function testAddSimpleProductWithOptions()
 
         $customOptionsValues = $this->getCustomOptionsValuesForQueryBySku->execute($sku);
         /* Generate customizable options fragment for GraphQl request */
-        $queryCustomizableOptionValues = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
+        $queryCustomizableOptionValues = preg_replace(
+            '/"([^"]+)"\s*:\s*/',
+            '$1:',
+            json_encode(array_values($customOptionsValues))
+        );
 
         $customizableOptions = "customizable_options: {$queryCustomizableOptionValues}";
         $query = $this->getQuery($maskedQuoteId, $sku, $quantity, $customizableOptions);
@@ -68,13 +72,14 @@ public function testAddSimpleProductWithOptions()
         self::assertCount(1, $response['addSimpleProductsToCart']['cart']);
 
         $customizableOptionsOutput = $response['addSimpleProductsToCart']['cart']['items'][0]['customizable_options'];
-        $assignedOptionsCount = count($customOptionsValues);
-        for ($counter = 0; $counter < $assignedOptionsCount; $counter++) {
-            $expectedValues = $this->buildExpectedValuesArray($customOptionsValues[$counter]['value_string']);
+        $count = 0;
+        foreach ($customOptionsValues as $type => $value) {
+            $expectedValues = $this->buildExpectedValuesArray($value['value_string'], $type);
             self::assertEquals(
                 $expectedValues,
-                $customizableOptionsOutput[$counter]['values']
+                $customizableOptionsOutput[$count]['values']
             );
+            $count++;
         }
     }
 
@@ -99,6 +104,33 @@ public function testAddSimpleProductWithMissedRequiredOptionsSet()
         $this->graphQlMutation($query);
     }
 
+    /**
+     * Test adding a simple product with wrong format value for date option
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_options.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddSimpleProductWithWrongDateOptionFormat()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $sku = 'simple';
+        $quantity = 1;
+
+        $customOptionsValues = $this->getCustomOptionsValuesForQueryBySku->execute($sku);
+        $customOptionsValues['date']['value_string'] = '12-12-12';
+        $queryCustomizableOptionValues = preg_replace(
+            '/"([^"]+)"\s*:\s*/',
+            '$1:',
+            json_encode(array_values($customOptionsValues))
+        );
+        $customizableOptions = "customizable_options: {$queryCustomizableOptionValues}";
+        $query = $this->getQuery($maskedQuoteId, $sku, $quantity, $customizableOptions);
+
+        $this->expectExceptionMessage('Invalid format provided. Please use \'Y-m-d H:i:s\' format.');
+
+        $this->graphQlMutation($query);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $sku
@@ -145,10 +177,14 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity, s
      * Build the part of expected response.
      *
      * @param string $assignedValue
+     * @param string $type option type
      * @return array
      */
-    private function buildExpectedValuesArray(string $assignedValue) : array
+    private function buildExpectedValuesArray(string $assignedValue, string $type) : array
     {
+        if ($type === 'date') {
+            return [['value' => date('M d, Y', strtotime($assignedValue))]];
+        }
         $assignedOptionsArray = explode(',', trim($assignedValue, '[]'));
         $expectedArray = [];
         foreach ($assignedOptionsArray as $assignedOption) {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php
index a8088b0b46b87..561318889e325 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php
@@ -57,7 +57,11 @@ public function testAddVirtualProductWithOptions()
 
         $customOptionsValues = $this->getCustomOptionsValuesForQueryBySku->execute($sku);
         /* Generate customizable options fragment for GraphQl request */
-        $queryCustomizableOptionValues = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
+        $queryCustomizableOptionValues = preg_replace(
+            '/"([^"]+)"\s*:\s*/',
+            '$1:',
+            json_encode(array_values($customOptionsValues))
+        );
 
         $customizableOptions = "customizable_options: {$queryCustomizableOptionValues}";
         $query = $this->getQuery($maskedQuoteId, $sku, $quantity, $customizableOptions);
@@ -68,13 +72,14 @@ public function testAddVirtualProductWithOptions()
         self::assertCount(1, $response['addVirtualProductsToCart']['cart']);
 
         $customizableOptionsOutput = $response['addVirtualProductsToCart']['cart']['items'][0]['customizable_options'];
-        $assignedOptionsCount = count($customOptionsValues);
-        for ($counter = 0; $counter < $assignedOptionsCount; $counter++) {
-            $expectedValues = $this->buildExpectedValuesArray($customOptionsValues[$counter]['value_string']);
+        $count = 0;
+        foreach ($customOptionsValues as $value) {
+            $expectedValues = $this->buildExpectedValuesArray($value['value_string']);
             self::assertEquals(
                 $expectedValues,
-                $customizableOptionsOutput[$counter]['values']
+                $customizableOptionsOutput[$count]['values']
             );
+            $count++;
         }
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php
index e1b93e0bdb857..0c676d86a33da 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddSimpleProductToCartTest.php
@@ -29,7 +29,7 @@ class AddSimpleProductToCartTest extends GraphQlAbstract
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
@@ -50,14 +50,42 @@ public function testAddSimpleProductToCart()
         $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
+        self::assertArrayHasKey('shipping_addresses', $response['addSimpleProductsToCart']['cart']);
+        self::assertEmpty($response['addSimpleProductsToCart']['cart']['shipping_addresses']);
         self::assertEquals($quantity, $response['addSimpleProductsToCart']['cart']['items'][0]['quantity']);
         self::assertEquals($sku, $response['addSimpleProductsToCart']['cart']['items'][0]['product']['sku']);
+        self::assertArrayHasKey('prices', $response['addSimpleProductsToCart']['cart']['items'][0]);
+
+        self::assertArrayHasKey('price', $response['addSimpleProductsToCart']['cart']['items'][0]['prices']);
+        $price = $response['addSimpleProductsToCart']['cart']['items'][0]['prices']['price'];
+        self::assertArrayHasKey('value', $price);
+        self::assertEquals(10, $price['value']);
+        self::assertArrayHasKey('currency', $price);
+        self::assertEquals('USD', $price['currency']);
+
+        self::assertArrayHasKey('row_total', $response['addSimpleProductsToCart']['cart']['items'][0]['prices']);
+        $rowTotal = $response['addSimpleProductsToCart']['cart']['items'][0]['prices']['row_total'];
+        self::assertArrayHasKey('value', $rowTotal);
+        self::assertEquals(20, $rowTotal['value']);
+        self::assertArrayHasKey('currency', $rowTotal);
+        self::assertEquals('USD', $rowTotal['currency']);
+
+        self::assertArrayHasKey(
+            'row_total_including_tax',
+            $response['addSimpleProductsToCart']['cart']['items'][0]['prices']
+        );
+        $rowTotalIncludingTax =
+            $response['addSimpleProductsToCart']['cart']['items'][0]['prices']['row_total_including_tax'];
+        self::assertArrayHasKey('value', $rowTotalIncludingTax);
+        self::assertEquals(20, $rowTotalIncludingTax['value']);
+        self::assertArrayHasKey('currency', $rowTotalIncludingTax);
+        self::assertEquals('USD', $rowTotalIncludingTax['currency']);
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException Exception
-     * @expectedExceptionMessage Required parameter "cart_id" is missing
+     * @expectedExceptionMessage Field AddSimpleProductsToCartInput.cart_id of required type String! was not provided.
      */
     public function testAddSimpleProductToCartIfCartIdIsMissed()
     {
@@ -110,7 +138,6 @@ public function testAddSimpleProductToCartIfCartIdIsEmpty()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException Exception
-     * @expectedExceptionMessage Required parameter "cart_items" is missing
      */
     public function testAddSimpleProductToCartIfCartItemsAreMissed()
     {
@@ -130,6 +157,11 @@ public function testAddSimpleProductToCartIfCartItemsAreMissed()
 }
 QUERY;
 
+        $this->expectExceptionMessage(
+            'Field AddSimpleProductsToCartInput.cart_items of required type'
+            . ' [SimpleProductCartItemInput]! was not provided.'
+        );
+
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
@@ -262,6 +294,34 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity):
         product {
           sku
         }
+        prices {
+          price {
+           value
+           currency
+          }
+          row_total {
+           value
+           currency
+          }
+          row_total_including_tax {
+           value
+           currency
+          }
+        }
+      }
+      shipping_addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          code
+          label
+        }
+        __typename
       }
     }
   }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php
index ae0208ca3101b..a7a3028f2a369 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/AddVirtualProductToCartTest.php
@@ -57,7 +57,7 @@ public function testAddVirtualProductToCart()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException Exception
-     * @expectedExceptionMessage Required parameter "cart_id" is missing
+     * @expectedExceptionMessage Field AddSimpleProductsToCartInput.cart_id of required type String! was not provided.
      */
     public function testAddVirtualProductToCartIfCartIdIsMissed()
     {
@@ -109,8 +109,6 @@ public function testAddVirtualProductToCartIfCartIdIsEmpty()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @expectedException Exception
-     * @expectedExceptionMessage Required parameter "cart_items" is missing
      */
     public function testAddVirtualProductToCartIfCartItemsAreMissed()
     {
@@ -129,6 +127,11 @@ public function testAddVirtualProductToCartIfCartItemsAreMissed()
   }
 }
 QUERY;
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage(
+            'Field AddSimpleProductsToCartInput.cart_items of required type [SimpleProductCartItemInput]!'
+            . ' was not provided.'
+        );
 
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
index df138f9014706..fa96443eaee1e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/ApplyCouponToCartTest.php
@@ -217,11 +217,11 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         return [
             'missed_cart_id' => [
                 'coupon_code: "test"',
-                'Required parameter "cart_id" is missing'
+                'Field ApplyCouponToCartInput.cart_id of required type String! was not provided.'
             ],
             'missed_coupon_code' => [
                 'cart_id: "test_quote"',
-                'Required parameter "coupon_code" is missing'
+                'Field ApplyCouponToCartInput.coupon_code of required type String! was not provided.'
             ],
         ];
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php
index 273799446a8ee..ddf94fbcc1edf 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php
@@ -259,7 +259,6 @@ private function setBillingAddress(string $cartId): void
           telephone: "88776655"
           region: "TX"
           country_code: "US"
-          save_in_address_book: false
          }
       }
     }
@@ -298,7 +297,6 @@ private function setShippingAddress(string $cartId): array
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
-            save_in_address_book: false
           }
         }
       ]
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
index e7f87f362044a..7ffce2a7f541d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php
@@ -65,6 +65,8 @@ public function testGetCart()
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
 
         self::assertArrayHasKey('cart', $response);
+        self::assertArrayHasKey('id', $response['cart']);
+        self::assertEquals($maskedQuoteId, $response['cart']['id']);
         self::assertArrayHasKey('items', $response['cart']);
         self::assertCount(2, $response['cart']['items']);
 
@@ -192,7 +194,8 @@ public function testGetCartWithNotDefaultStore()
      * @magentoApiDataFixture Magento/Store/_files/second_store.php
      *
      * @expectedException Exception
-     * @expectedExceptionMessage Wrong store code specified for cart
+     * @expectedExceptionMessage The account sign-in was incorrect or your account is disabled temporarily.
+     * Please wait and try again later.
      */
     public function testGetCartWithWrongStore()
     {
@@ -255,6 +258,7 @@ private function getQuery(string $maskedQuoteId): string
         return <<<QUERY
 {
   cart(cart_id: "{$maskedQuoteId}") {
+    id
     items {
       id
       quantity
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCustomerCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCustomerCartTest.php
new file mode 100644
index 0000000000000..8100bce4ac718
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCustomerCartTest.php
@@ -0,0 +1,244 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Exception;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for getting Customer cart information
+ */
+class GetCustomerCartTest extends GraphQlAbstract
+{
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * Query for an existing active customer cart
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testGetActiveCustomerCart()
+    {
+        $quantity = 2;
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $customerCartQuery = $this->getCustomerCartQuery();
+        $response = $this->graphQlQuery($customerCartQuery, [], '', $this->getHeaderMap());
+        $this->assertArrayHasKey('customerCart', $response);
+        $this->assertArrayHasKey('items', $response['customerCart']);
+        $this->assertNotEmpty($response['customerCart']['items']);
+        $this->assertEquals(2, $response['customerCart']['total_quantity']);
+        $this->assertArrayHasKey('id', $response['customerCart']);
+        $this->assertNotEmpty($response['customerCart']['id']);
+        $this->assertEquals($maskedQuoteId, $response['customerCart']['id']);
+        $this->assertEquals(
+            $quantity,
+            $response['customerCart']['items'][0]['quantity'],
+            'Incorrect quantity of products in cart'
+        );
+    }
+
+    /**
+     * Query for an existing customer cart with no masked quote id
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart_without_masked_quote_id.php
+     */
+    public function testGetLoggedInCustomerCartWithoutMaskedQuoteId()
+    {
+        $customerCartQuery = $this->getCustomerCartQuery();
+        $response = $this->graphQlQuery($customerCartQuery, [], '', $this->getHeaderMap());
+        $this->assertArrayHasKey('customerCart', $response);
+        $this->assertArrayHasKey('items', $response['customerCart']);
+        $this->assertEmpty($response['customerCart']['items']);
+        $this->assertEquals(0, $response['customerCart']['total_quantity']);
+        $this->assertArrayHasKey('id', $response['customerCart']);
+        $this->assertNotEmpty($response['customerCart']['id']);
+        $this->assertNotNull($response['customerCart']['id']);
+    }
+
+    /**
+     * Query for customer cart for a user with no existing active cart
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testGetNewCustomerCart()
+    {
+        $customerCartQuery = $this->getCustomerCartQuery();
+        $response = $this->graphQlQuery($customerCartQuery, [], '', $this->getHeaderMap());
+        $this->assertArrayHasKey('customerCart', $response);
+        $this->assertArrayHasKey('id', $response['customerCart']);
+        $this->assertNotNull($response['customerCart']['id']);
+        $this->assertNotEmpty($response['customerCart']['id']);
+        $this->assertEmpty($response['customerCart']['items']);
+        $this->assertEquals(0, $response['customerCart']['total_quantity']);
+    }
+
+    /**
+     * Query for customer cart with no customer token passed
+     *
+     * @expectedException Exception
+     * @expectedExceptionMessage The request is allowed for logged in customer
+     */
+    public function testGetCustomerCartWithNoCustomerToken()
+    {
+        $customerCartQuery = $this->getCustomerCartQuery();
+        $this->graphQlQuery($customerCartQuery);
+    }
+
+    /**
+     * Query for customer cart after customer token is revoked
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The request is allowed for logged in customer
+     */
+    public function testGetCustomerCartAfterTokenRevoked()
+    {
+        $customerCartQuery = $this->getCustomerCartQuery();
+        $headers = $this->getHeaderMap();
+        $response = $this->graphQlMutation($customerCartQuery, [], '', $headers);
+        $this->assertArrayHasKey('customerCart', $response);
+        $this->assertArrayHasKey('id', $response['customerCart']);
+        $this->assertNotNull($response['customerCart']['id']);
+        $this->assertNotEmpty($response['customerCart']['id']);
+        $this->revokeCustomerToken();
+        $customerCartQuery = $this->getCustomerCartQuery();
+        $this->graphQlQuery($customerCartQuery, [], '', $headers);
+    }
+
+    /**
+     * Querying for the customer cart twice->should return the same cart
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testRequestCustomerCartTwice()
+    {
+        $customerCartQuery = $this->getCustomerCartQuery();
+        $response = $this->graphQlMutation($customerCartQuery, [], '', $this->getHeaderMap());
+        $this->assertArrayHasKey('customerCart', $response);
+        $this->assertArrayHasKey('id', $response['customerCart']);
+        $this->assertNotNull($response['customerCart']['id']);
+        $cartId = $response['customerCart']['id'];
+        $customerCartQuery = $this->getCustomerCartQuery();
+        $response2 = $this->graphQlQuery($customerCartQuery, [], '', $this->getHeaderMap());
+        $this->assertEquals($cartId, $response2['customerCart']['id']);
+    }
+
+    /**
+     *  Query for inactive Customer cart - in case of not finding an active cart, it should create a new one
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/make_cart_inactive.php
+     */
+    public function testGetInactiveCustomerCart()
+    {
+        $customerCartQuery = $this->getCustomerCartQuery();
+        $response = $this->graphQlQuery($customerCartQuery, [], '', $this->getHeaderMap());
+        $this->assertArrayHasKey('customerCart', $response);
+        $this->assertNotEmpty($response['customerCart']['id']);
+        $this->assertEmpty($response['customerCart']['items']);
+        $this->assertEmpty($response['customerCart']['total_quantity']);
+    }
+
+    /**
+     * Querying for an existing customer cart for second store
+     *
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote_customer_not_default_store.php
+     */
+    public function testGetCustomerCartSecondStore()
+    {
+        $maskedQuoteIdSecondStore = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_not_default_store');
+        $customerCartQuery = $this->getCustomerCartQuery();
+
+        $headerMap = $this->getHeaderMap();
+        $headerMap['Store'] = 'fixture_second_store';
+        $responseSecondStore = $this->graphQlQuery($customerCartQuery, [], '', $headerMap);
+        $this->assertEquals($maskedQuoteIdSecondStore, $responseSecondStore['customerCart']['id']);
+    }
+
+    /**
+     * Query to revoke customer token
+     *
+     * @return void
+     */
+    private function revokeCustomerToken(): void
+    {
+        $query = <<<QUERY
+mutation{
+  revokeCustomerToken{
+    result
+  }
+}
+QUERY;
+
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * Query customer cart
+     *
+     * @return string
+     */
+    private function getCustomerCartQuery(): string
+    {
+        return <<<QUERY
+{
+  customerCart {
+    total_quantity
+    id
+    items {
+      id
+      quantity
+      product {
+        sku
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * Create a header with customer token
+     *
+     * @param string $username
+     * @param string $password
+     * @return array
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
index b6dde46871cbb..e5353fc841c5d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedBillingAddressTest.php
@@ -91,29 +91,7 @@ public function testGetSpecifiedBillingAddressIfBillingAddressIsNotSet()
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
         self::assertArrayHasKey('cart', $response);
         self::assertArrayHasKey('billing_address', $response['cart']);
-
-        $expectedBillingAddressData = [
-            'firstname' => null,
-            'lastname' => null,
-            'company' => null,
-            'street' => [
-                ''
-            ],
-            'city' => null,
-            'region' => [
-                'code' => null,
-                'label' => null,
-            ],
-            'postcode' => null,
-            'country' => [
-                'code' => null,
-                'label' => null,
-            ],
-            'telephone' => null,
-            '__typename' => 'BillingCartAddress',
-            'customer_notes' => null,
-        ];
-        self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
+        self::assertNull($response['cart']['billing_address']);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/MergeCartsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/MergeCartsTest.php
new file mode 100644
index 0000000000000..b78c8894970b5
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/MergeCartsTest.php
@@ -0,0 +1,293 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote\Customer;
+
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+
+/**
+ * Test for merging customer carts
+ */
+class MergeCartsTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    protected function tearDown()
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, '1', 'customer_id');
+        $this->quoteResource->delete($quote);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testMergeGuestWithCustomerCart()
+    {
+        $customerQuote = $this->quoteFactory->create();
+        $this->quoteResource->load($customerQuote, 'test_quote', 'reserved_order_id');
+
+        $guestQuote = $this->quoteFactory->create();
+        $this->quoteResource->load(
+            $guestQuote,
+            'test_order_with_virtual_product_without_address',
+            'reserved_order_id'
+        );
+
+        $customerQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$customerQuote->getId());
+        $guestQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$guestQuote->getId());
+
+        $query = $this->getCartMergeMutation($guestQuoteMaskedId, $customerQuoteMaskedId);
+        $mergeResponse = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        self::assertArrayHasKey('mergeCarts', $mergeResponse);
+        $cartResponse = $mergeResponse['mergeCarts'];
+        self::assertArrayHasKey('items', $cartResponse);
+        self::assertCount(2, $cartResponse['items']);
+        $cartResponse = $this->graphQlMutation(
+            $this->getCartQuery($customerQuoteMaskedId),
+            [],
+            '',
+            $this->getHeaderMap()
+        );
+
+        self::assertArrayHasKey('cart', $cartResponse);
+        self::assertArrayHasKey('items', $cartResponse['cart']);
+        self::assertCount(2, $cartResponse['cart']['items']);
+        $item1 = $cartResponse['cart']['items'][0];
+        self::assertArrayHasKey('quantity', $item1);
+        self::assertEquals(2, $item1['quantity']);
+        $item2 = $cartResponse['cart']['items'][1];
+        self::assertArrayHasKey('quantity', $item2);
+        self::assertEquals(1, $item2['quantity']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Current user does not have an active cart.
+     */
+    public function testGuestCartExpiryAfterMerge()
+    {
+        $customerQuote = $this->quoteFactory->create();
+        $this->quoteResource->load($customerQuote, 'test_quote', 'reserved_order_id');
+
+        $guestQuote = $this->quoteFactory->create();
+        $this->quoteResource->load(
+            $guestQuote,
+            'test_order_with_virtual_product_without_address',
+            'reserved_order_id'
+        );
+
+        $customerQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$customerQuote->getId());
+        $guestQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$guestQuote->getId());
+
+        $query = $this->getCartMergeMutation($guestQuoteMaskedId, $customerQuoteMaskedId);
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        $this->graphQlMutation(
+            $this->getCartQuery($guestQuoteMaskedId),
+            [],
+            '',
+            $this->getHeaderMap()
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current user cannot perform operations on cart
+     */
+    public function testMergeTwoCustomerCarts()
+    {
+        $firstQuote = $this->quoteFactory->create();
+        $this->quoteResource->load($firstQuote, 'test_quote', 'reserved_order_id');
+        $firstMaskedId = $this->quoteIdToMaskedId->execute((int)$firstQuote->getId());
+
+        $createCartResponse = $this->graphQlMutation(
+            $this->getCreateEmptyCartMutation(),
+            [],
+            '',
+            $this->getHeaderMap('customer_two@example.com')
+        );
+        self::assertArrayHasKey('createEmptyCart', $createCartResponse);
+        $secondMaskedId = $createCartResponse['createEmptyCart'];
+        $this->addSimpleProductToCart($secondMaskedId, $this->getHeaderMap());
+
+        $query = $this->getCartMergeMutation($firstMaskedId, $secondMaskedId);
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * Add simple product to cart
+     *
+     * @param string $maskedId
+     * @param array $headerMap
+     * @throws \Exception
+     */
+    private function addSimpleProductToCart(string $maskedId, array $headerMap): void
+    {
+        $result = $this->graphQlMutation($this->getAddProductToCartMutation($maskedId), [], '', $headerMap);
+        self::assertArrayHasKey('addSimpleProductsToCart', $result);
+        self::assertArrayHasKey('cart', $result['addSimpleProductsToCart']);
+        self::assertArrayHasKey('items', $result['addSimpleProductsToCart']['cart']);
+        self::assertArrayHasKey(0, $result['addSimpleProductsToCart']['cart']['items']);
+        self::assertArrayHasKey('quantity', $result['addSimpleProductsToCart']['cart']['items'][0]);
+        self::assertEquals(1, $result['addSimpleProductsToCart']['cart']['items'][0]['quantity']);
+        self::assertArrayHasKey('product', $result['addSimpleProductsToCart']['cart']['items'][0]);
+        self::assertArrayHasKey('sku', $result['addSimpleProductsToCart']['cart']['items'][0]['product']);
+        self::assertEquals('simple_product', $result['addSimpleProductsToCart']['cart']['items'][0]['product']['sku']);
+    }
+
+    /**
+     * Create the mergeCart mutation
+     *
+     * @param string $guestQuoteMaskedId
+     * @param string $customerQuoteMaskedId
+     * @return string
+     */
+    private function getCartMergeMutation(string $guestQuoteMaskedId, string $customerQuoteMaskedId): string
+    {
+        return <<<QUERY
+mutation {
+  mergeCarts(
+    source_cart_id: "{$guestQuoteMaskedId}"
+    destination_cart_id: "{$customerQuoteMaskedId}"
+  ){
+  items {
+      quantity
+      product {
+        sku
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * Get cart query
+     *
+     * @param string $maskedId
+     * @return string
+     */
+    private function getCartQuery(string $maskedId): string
+    {
+        return <<<QUERY
+{
+  cart(cart_id: "{$maskedId}") {
+    items {
+      quantity
+      product {
+        sku
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * Get create empty cart mutation
+     *
+     * @return string
+     */
+    private function getCreateEmptyCartMutation(): string
+    {
+        return <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
+    }
+
+    /**
+     * Get add product to cart mutation
+     *
+     * @param string $maskedId
+     * @return string
+     */
+    private function getAddProductToCartMutation(string $maskedId): string
+    {
+        return <<<QUERY
+mutation {
+  addSimpleProductsToCart(input: {
+    cart_id: "{$maskedId}"
+    cart_items: {
+      data: {
+        quantity: 1
+        sku: "simple_product"
+      }
+    }
+  }) {
+    cart {
+      items {
+        quantity
+        product {
+          sku
+        }
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return array
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        return $headerMap;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
index 38d9ddc4fecc1..189d5ceab838d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/PlaceOrderTest.php
@@ -106,7 +106,7 @@ public function testPlaceOrderIfCartIdIsEmpty()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException Exception
-     * @expectedExceptionMessage Required parameter "cart_id" is missing
+     * @expectedExceptionMessage Field PlaceOrderInput.cart_id of required type String! was not provided.
      */
     public function testPlaceOrderIfCartIdIsMissed()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
index f906b33fe19d1..d4390e902a3f9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveCouponFromCartTest.php
@@ -73,7 +73,7 @@ public function testRemoveCouponFromCartIfCartIdIsEmpty()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException Exception
-     * @expectedExceptionMessage Required parameter "cart_id" is missing
+     * @expectedExceptionMessage Field RemoveCouponFromCartInput.cart_id of required type String! was not provided.
      */
     public function testRemoveCouponFromCartIfCartIdIsMissed()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
index b810022403b65..a14aacc974af6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
@@ -125,11 +125,11 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         return [
             'missed_cart_id' => [
                 'cart_item_id: 1',
-                'Required parameter "cart_id" is missing.'
+                'Field RemoveItemFromCartInput.cart_id of required type String! was not provided.'
             ],
             'missed_cart_item_id' => [
                 'cart_id: "test_quote"',
-                'Required parameter "cart_item_id" is missing.'
+                'Field RemoveItemFromCartInput.cart_item_id of required type Int! was not provided.'
             ],
         ];
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
index 011930e723273..19a10d9466a32 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -7,6 +7,9 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\QuoteFactory;
@@ -45,6 +48,19 @@ class SetBillingAddressOnCartTest extends GraphQlAbstract
      */
     private $customerTokenService;
 
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $customerAddressRepository;
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
@@ -53,6 +69,9 @@ protected function setUp()
         $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->customerAddressRepository = $objectManager->get(AddressRepositoryInterface::class);
+        $this->searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+        $this->customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
     }
 
     /**
@@ -77,12 +96,12 @@ public function testSetNewBillingAddress()
           company: "test company"
           street: ["test street 1", "test street 2"]
           city: "test city"
-          region: "test region"
+          region: "AZ"
           postcode: "887766"
           country_code: "US"
           telephone: "88776655"
-          save_in_address_book: false
          }
+         same_as_shipping: true
       }
     }
   ) {
@@ -101,6 +120,20 @@ public function testSetNewBillingAddress()
         }
         __typename
       }
+      shipping_addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          code
+          label
+        }
+        __typename
+      }
     }
   }
 }
@@ -111,10 +144,15 @@ public function testSetNewBillingAddress()
         $cartResponse = $response['setBillingAddressOnCart']['cart'];
         self::assertArrayHasKey('billing_address', $cartResponse);
         $billingAddressResponse = $cartResponse['billing_address'];
+        self::assertArrayHasKey('shipping_addresses', $cartResponse);
+        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
         $this->assertNewAddressFields($billingAddressResponse);
+        $this->assertNewAddressFields($shippingAddressResponse, 'ShippingCartAddress');
     }
 
     /**
+     * Test case for deprecated `use_for_shipping` param.
+     *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
@@ -136,11 +174,10 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
           company: "test company"
           street: ["test street 1", "test street 2"]
           city: "test city"
-          region: "test region"
+          region: "AZ"
           postcode: "887766"
           country_code: "US"
           telephone: "88776655"
-          save_in_address_book: false
          }
          use_for_shipping: true
       }
@@ -239,6 +276,42 @@ public function testSetBillingAddressFromAddressBook()
         $this->assertSavedBillingAddressFields($billingAddressResponse);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testVerifyBillingAddressType()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      billing_address: {
+          customer_address_id: 1
+       }
+    }
+  ) {
+    cart {
+      billing_address {
+        __typename
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        $billingAddress = $response['setBillingAddressOnCart']['cart']['billing_address'];
+        self::assertArrayHasKey('__typename', $billingAddress);
+        self::assertEquals('BillingCartAddress', $billingAddress['__typename']);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
@@ -297,11 +370,10 @@ public function testSetNewBillingAddressAndFromAddressBookAtSameTime()
           company: "test company"
           street: ["test street 1", "test street 2"]
           city: "test city"
-          region: "test region"
+          region: "AZ"
           postcode: "887766"
           country_code: "US"
           telephone: "88776655"
-          save_in_address_book: false
         }
       }
     }
@@ -337,7 +409,7 @@ public function testSetNewBillingAddressWithoutCustomerAddressIdAndAddress()
     input: {
       cart_id: "$maskedQuoteId"
       billing_address: {
-        use_for_shipping: true
+        same_as_shipping: true
       }
     }
   ) {
@@ -363,7 +435,7 @@ public function testSetNewBillingAddressWithoutCustomerAddressIdAndAddress()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_multishipping_with_two_shipping_addresses.php
      */
-    public function testSetNewBillingAddressWithUseForShippingAndMultishipping()
+    public function testSetNewBillingAddressWithSameAsShippingAndMultishipping()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
@@ -379,13 +451,12 @@ public function testSetNewBillingAddressWithUseForShippingAndMultishipping()
           company: "test company"
           street: ["test street 1", "test street 2"]
           city: "test city"
-          region: "test region"
+          region: "AZ"
           postcode: "887766"
           country_code: "US"
           telephone: "88776655"
-          save_in_address_book: false
         }
-        use_for_shipping: true
+        same_as_shipping: true
       }
     }
   ) {
@@ -399,7 +470,7 @@ public function testSetNewBillingAddressWithUseForShippingAndMultishipping()
 QUERY;
 
         self::expectExceptionMessage(
-            'Using the "use_for_shipping" option with multishipping is not possible.'
+            'Using the "same_as_shipping" option with multishipping is not possible.'
         );
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
@@ -573,7 +644,7 @@ public function testSetBillingAddressWithoutRequiredParameters(string $input, st
 QUERY;
 
         $this->expectExceptionMessage($message);
-        $this->graphQlMutation($query);
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
@@ -589,8 +660,56 @@ public function dataProviderSetWithoutRequiredParameters(): array
             ],
             'missed_cart_id' => [
                 'billing_address: {}',
-                'Required parameter "cart_id" is missing'
-            ]
+                'Field SetBillingAddressOnCartInput.cart_id of required type String! was not provided.'
+            ],
+            'missed_region' => [
+                'cart_id: "cart_id_value"
+                 billing_address: {
+                    address: {
+                        firstname: "test firstname"
+                        lastname: "test lastname"
+                        company: "test company"
+                        street: ["test street 1", "test street 2"]
+                        city: "test city"
+                        postcode: "887766"
+                        country_code: "US"
+                        telephone: "88776655"
+                        }
+                    }',
+                '"regionId" is required. Enter and try again.'
+            ],
+            'missed_multiple_fields' => [
+                'cart_id: "cart_id_value"
+                 billing_address: {
+                    address: {
+                        firstname: "test firstname"
+                        lastname: "test lastname"
+                        company: "test company"
+                        street: ["test street 1", "test street 2"]
+                        city: "test city"
+                        country_code: "US"
+                        telephone: "88776655"
+                        }
+                    }',
+                '"postcode" is required. Enter and try again.
+"regionId" is required. Enter and try again.'
+            ],
+            'wrong_required_region' => [
+                'cart_id: "cart_id_value"
+                 billing_address: {
+                    address: {
+                        firstname: "test firstname"
+                        lastname: "test lastname"
+                        company: "test company"
+                        street: ["test street 1", "test street 2"]
+                        region: "wrong region"
+                        city: "test city"
+                        country_code: "US"
+                        telephone: "88776655"
+                        }
+                    }',
+                'Region is not available for the selected country'
+            ],
         ];
     }
 
@@ -616,11 +735,10 @@ public function testSetNewBillingAddressWithRedundantStreetLine()
           company: "test company"
           street: ["test street 1", "test street 2", "test street 3"]
           city: "test city"
-          region: "test region"
+          region: "AZ"
           postcode: "887766"
           country_code: "US"
           telephone: "88776655"
-          save_in_address_book: false
          }
       }
     }
@@ -659,11 +777,10 @@ public function testSetBillingAddressWithLowerCaseCountry()
           company: "test company"
           street: ["test street 1", "test street 2"]
           city: "test city"
-          region: "test region"
+          region: "AZ"
           postcode: "887766"
           country_code: "us"
           telephone: "88776655"
-          save_in_address_book: false
          }
       }
     }
@@ -696,6 +813,242 @@ public function testSetBillingAddressWithLowerCaseCountry()
         $this->assertNewAddressFields($billingAddressResponse);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetNewBillingAddressWithSaveInAddressBook()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      billing_address: {
+         address: {
+          firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "AZ"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: true
+         }
+      }
+    }
+  ) {
+    cart {
+      billing_address {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          code
+          label
+        }
+        __typename
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        $customer = $this->customerRepository->get('customer@example.com');
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter('parent_id', $customer->getId())->create();
+        $addresses = $this->customerAddressRepository->getList($searchCriteria)->getItems();
+
+        self::assertCount(1, $addresses);
+        self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
+
+        $cartResponse = $response['setBillingAddressOnCart']['cart'];
+        self::assertArrayHasKey('billing_address', $cartResponse);
+        $billingAddressResponse = $cartResponse['billing_address'];
+        $this->assertNewAddressFields($billingAddressResponse);
+
+        foreach ($addresses as $address) {
+            $this->customerAddressRepository->delete($address);
+        }
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetNewBillingAddressWithNotSaveInAddressBook()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      billing_address: {
+         address: {
+          firstname: "test firstname"
+            lastname: "test lastname"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "test city"
+            region: "AZ"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+         }
+      }
+    }
+  ) {
+    cart {
+      billing_address {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          code
+          label
+        }
+        __typename
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        $customer = $this->customerRepository->get('customer@example.com');
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter('parent_id', $customer->getId())->create();
+        $addresses = $this->customerAddressRepository->getList($searchCriteria)->getItems();
+
+        self::assertCount(0, $addresses);
+        self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
+
+        $cartResponse = $response['setBillingAddressOnCart']['cart'];
+        self::assertArrayHasKey('billing_address', $cartResponse);
+        $billingAddressResponse = $cartResponse['billing_address'];
+        $this->assertNewAddressFields($billingAddressResponse);
+
+        foreach ($addresses as $address) {
+            $this->customerAddressRepository->delete($address);
+        }
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testWithInvalidBillingAddressInput()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      billing_address: {
+         address: {
+          firstname: "test firstname"
+          lastname: "test lastname"
+          company: "test company"
+          street: ["test street 1", "test street 2"]
+          city: "test city"
+          region: "AZ"
+          postcode: "887766"
+          country_code: "USS"
+          telephone: "88776655"
+          save_in_address_book: false
+         }
+      }
+    }
+  ) {
+    cart {
+      billing_address {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          code
+          label
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage('Country is not available');
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetShippingAddressesWithNotRequiredRegion()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      billing_address: {
+          address: {
+            firstname: "Vasyl"
+            lastname: "Doe"
+            street: ["1 Svobody"]
+            city: "Lviv"
+            region: "Lviv"
+            postcode: "00000"
+            country_code: "UA"
+            telephone: "555-555-55-55"
+          }
+        }
+    }
+  ) {
+    cart {
+      billing_address {
+        region {
+          label
+        }
+        country {
+          code
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        self::assertArrayHasKey('cart', $response['setBillingAddressOnCart']);
+        $cartResponse = $response['setBillingAddressOnCart']['cart'];
+        self::assertEquals('UA', $cartResponse['billing_address']['country']['code']);
+        self::assertEquals('Lviv', $cartResponse['billing_address']['region']['label']);
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodAndPlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodAndPlaceOrderTest.php
index 981b2af6a9a00..543ce6fe9c8e7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodAndPlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodAndPlaceOrderTest.php
@@ -88,6 +88,71 @@ public function testSetPaymentOnCartWithSimpleProduct()
         self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/set_simple_product_out_of_stock.php
+     *
+     * @dataProvider dataProviderSetPaymentOnCartWithException
+     * @param string $input
+     * @param string $message
+     * @throws \Exception
+     */
+    public function testSetPaymentOnCartWithException(string $input, string $message)
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $input = str_replace('cart_id_value', $maskedQuoteId, $input);
+
+        $query = <<<QUERY
+mutation {
+  setPaymentMethodAndPlaceOrder(
+    input: {
+      {$input}
+    }
+  ) {
+    order {
+      order_number
+    }
+  }
+}
+QUERY;
+
+        $this->expectExceptionMessage($message);
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderSetPaymentOnCartWithException(): array
+    {
+        return [
+            'missed_cart_id' => [
+                'payment_method: {
+                  code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"
+                  }',
+                'Field SetPaymentMethodAndPlaceOrderInput.cart_id of required type String! was not provided.',
+            ],
+            'missed_payment_method' => [
+                'cart_id: "cart_id_value"',
+                'Field SetPaymentMethodAndPlaceOrderInput.payment_method of required type PaymentMethodInput!'
+                . ' was not provided.',
+            ],
+            'place_order_with_out_of_stock_products' => [
+                'cart_id: "cart_id_value"
+                  payment_method: {
+                    code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"
+                    }',
+                'Unable to place order: Some of the products are out of stock.',
+            ],
+        ];
+    }
+
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
index efda719ca153c..da190be333600 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php
@@ -235,11 +235,11 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
         return [
             'missed_cart_id' => [
                 'payment_method: {code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"}',
-                'Required parameter "cart_id" is missing.'
+                'Field SetPaymentMethodOnCartInput.cart_id of required type String! was not provided.'
             ],
             'missed_payment_method' => [
                 'cart_id: "cart_id_value"',
-                'Required parameter "code" for "payment_method" is missing.'
+                'Field SetPaymentMethodOnCartInput.payment_method of required type PaymentMethodInput! was not provided'
             ],
             'missed_payment_method_code' => [
                 'cart_id: "cart_id_value", payment_method: {code: ""}',
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index e74b7c41b3983..47a3a13f05221 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -7,6 +7,9 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Model\QuoteFactory;
@@ -45,6 +48,21 @@ class SetShippingAddressOnCartTest extends GraphQlAbstract
      */
     private $customerTokenService;
 
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $customerAddressRepository;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
@@ -53,6 +71,9 @@ protected function setUp()
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->customerAddressRepository = $objectManager->get(AddressRepositoryInterface::class);
+        $this->searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+        $this->customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
     }
 
     /**
@@ -78,11 +99,10 @@ public function testSetNewShippingAddressOnCartWithSimpleProduct()
             company: "test company"
             street: ["test street 1", "test street 2"]
             city: "test city"
-            region: "test region"
+            region: "AZ"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
-            save_in_address_book: false
           }
           customer_notes: "Test note"
         }
@@ -144,11 +164,10 @@ public function testSetNewShippingAddressOnCartWithVirtualProduct()
             company: "test company"
             street: ["test street 1", "test street 2"]
             city: "test city"
-            region: "test region"
+            region: "AZ"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
-            save_in_address_book: false
           }
         }
       ]
@@ -211,6 +230,43 @@ public function testSetShippingAddressFromAddressBook()
         $this->assertSavedShippingAddressFields($shippingAddressResponse);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testVerifyShippingAddressType()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          customer_address_id: 1
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        __typename
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        $shippingAddresses = current($response['setShippingAddressesOnCart']['cart']['shipping_addresses']);
+        self::assertArrayHasKey('__typename', $shippingAddresses);
+        self::assertEquals('ShippingCartAddress', $shippingAddresses['__typename']);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
@@ -272,11 +328,10 @@ public function testSetNewShippingAddressAndFromAddressBookAtSameTime()
             company: "test company"
             street: ["test street 1", "test street 2"]
             city: "test city"
-            region: "test region"
+            region: "AZ"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
-            save_in_address_book: false
           }
         }
       ]
@@ -406,6 +461,50 @@ public function testSetNewShippingAddressWithMissedRequiredParameters(string $in
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * Covers case with empty street
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Field CartAddressInput.street of required type [String]! was not provided.
+     */
+    public function testSetNewShippingAddressWithMissedRequiredStreetParameters()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            country_code: "US"
+            firstname: "J"
+            lastname: "D"
+            telephone: "+"
+            city: "C"
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+        shipping_addresses {
+            city
+        }
+    }
+  }
+}
+QUERY;
+
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+    }
+
     /**
      * @return array
      */
@@ -423,8 +522,56 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
             ],
             'missed_cart_id' => [
                 'shipping_addresses: {}',
-                'Required parameter "cart_id" is missing'
-            ]
+                'Field SetShippingAddressesOnCartInput.cart_id of required type String! was not provided.'
+            ],
+            'missed_region' => [
+                'cart_id: "cart_id_value"
+                 shipping_addresses: [{
+                    address: {
+                        firstname: "test firstname"
+                        lastname: "test lastname"
+                        company: "test company"
+                        street: ["test street 1", "test street 2"]
+                        city: "test city"
+                        postcode: "887766"
+                        country_code: "US"
+                        telephone: "88776655"
+                        }
+                    }]',
+                '"regionId" is required. Enter and try again.'
+            ],
+            'missed_multiple_fields' => [
+                'cart_id: "cart_id_value"
+                 shipping_addresses: [{
+                    address: {
+                        firstname: "test firstname"
+                        lastname: "test lastname"
+                        company: "test company"
+                        street: ["test street 1", "test street 2"]
+                        city: "test city"
+                        country_code: "US"
+                        telephone: "88776655"
+                        }
+                    }]',
+                '"postcode" is required. Enter and try again.
+"regionId" is required. Enter and try again.'
+            ],
+            'wrong_required_region' => [
+                'cart_id: "cart_id_value"
+                 shipping_addresses: [{
+                    address: {
+                        firstname: "test firstname"
+                        lastname: "test lastname"
+                        company: "test company"
+                        street: ["test street 1", "test street 2"]
+                        region: "wrong region"
+                        city: "test city"
+                        country_code: "US"
+                        telephone: "88776655"
+                        }
+                    }]',
+                'Region is not available for the selected country'
+            ],
         ];
     }
 
@@ -454,11 +601,10 @@ public function testSetMultipleNewShippingAddresses()
             company: "test company"
             street: ["test street 1", "test street 2"]
             city: "test city"
-            region: "test region"
+            region: "AZ"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
-            save_in_address_book: false
           }
         },
         {
@@ -468,11 +614,10 @@ public function testSetMultipleNewShippingAddresses()
             company: "test company 2"
             street: ["test street 1", "test street 2"]
             city: "test city"
-            region: "test region"
+            region: "AZ"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
-            save_in_address_book: false
           }
         }
       ]
@@ -512,11 +657,10 @@ public function testSetNewShippingAddressOnCartWithRedundantStreetLine()
             company: "test company"
             street: ["test street 1", "test street 2", "test street 3"]
             city: "test city"
-            region: "test region"
+            region: "AZ"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
-            save_in_address_book: false
           }
         }
       ]
@@ -657,6 +801,242 @@ public function testSetShippingAddressWithLowerCaseCountry()
         $this->assertEquals('CA', $address['region']['code']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testWithInvalidShippingAddressesInput()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "John"
+            lastname: "Doe"
+            street: ["6161 West Centinella Avenue"]
+            city: "Culver City"
+            region: "CA"
+            postcode: "90230"
+            country_code: "USS"
+            telephone: "555-555-55-55"
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        city
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage('Country is not available');
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetShippingAddressesWithNotRequiredRegion()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "Vasyl"
+            lastname: "Doe"
+            street: ["1 Svobody"]
+            city: "Lviv"
+            region: "Lviv"
+            postcode: "00000"
+            country_code: "UA"
+            telephone: "555-555-55-55"
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        region {
+          label
+        }
+        country {
+          code
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
+        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
+        self::assertEquals('UA', $cartResponse['shipping_addresses'][0]['country']['code']);
+        self::assertEquals('Lviv', $cartResponse['shipping_addresses'][0]['region']['label']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetNewShippingAddressWithSaveInAddressBook()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $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: "AZ"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: true
+          }
+          customer_notes: "Test note"
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          code
+          label
+        }
+        __typename
+        customer_notes
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        $customer = $this->customerRepository->get('customer@example.com');
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter('parent_id', $customer->getId())->create();
+        $addresses = $this->customerAddressRepository->getList($searchCriteria)->getItems();
+
+        self::assertCount(1, $addresses);
+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
+
+        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
+        self::assertArrayHasKey('shipping_addresses', $cartResponse);
+        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
+        $this->assertNewShippingAddressFields($shippingAddressResponse);
+
+        foreach ($addresses as $address) {
+            $this->customerAddressRepository->delete($address);
+        }
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testSetNewShippingAddressWithNotSaveInAddressBook()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $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: "AZ"
+            postcode: "887766"
+            country_code: "US"
+            telephone: "88776655"
+            save_in_address_book: false
+          }
+          customer_notes: "Test note"
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          code
+          label
+        }
+        __typename
+        customer_notes
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        $customer = $this->customerRepository->get('customer@example.com');
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter('parent_id', $customer->getId())->create();
+        $addresses = $this->customerAddressRepository->getList($searchCriteria)->getItems();
+
+        self::assertCount(0, $addresses);
+        self::assertArrayHasKey('cart', $response['setShippingAddressesOnCart']);
+
+        $cartResponse = $response['setShippingAddressesOnCart']['cart'];
+        self::assertArrayHasKey('shipping_addresses', $cartResponse);
+        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
+        $this->assertNewShippingAddressFields($shippingAddressResponse);
+
+        foreach ($addresses as $address) {
+            $this->customerAddressRepository->delete($address);
+        }
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
index 278f21f30b72d..149a2fbb1da32 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingMethodsOnCartTest.php
@@ -174,11 +174,12 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
                     carrier_code: "flatrate"
                     method_code: "flatrate"
                 }]',
-                'Required parameter "cart_id" is missing'
+                'Field SetShippingMethodsOnCartInput.cart_id of required type String! was not provided.'
             ],
             'missed_shipping_methods' => [
                 'cart_id: "cart_id_value"',
-                'Required parameter "shipping_methods" is missing'
+                'Field SetShippingMethodsOnCartInput.shipping_methods of required type [ShippingMethodInput]!'
+                . ' was not provided.'
             ],
             'shipping_methods_are_empty' => [
                 'cart_id: "cart_id_value" shipping_methods: []',
@@ -208,7 +209,7 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
                 'cart_id: "cart_id_value", shipping_methods: [{
                     carrier_code: "flatrate"
                 }]',
-                'Required parameter "method_code" is missing.'
+                'Field ShippingMethodInput.method_code of required type String! was not provided.'
             ],
             'empty_method_code' => [
                 'cart_id: "cart_id_value", shipping_methods: [{
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php
index 48ea4ab7a15e3..1ec2de36a0bc2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/UpdateCartItemsTest.php
@@ -212,7 +212,7 @@ public function testUpdateItemInAnotherCustomerCart()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException \Exception
-     * @expectedExceptionMessage Required parameter "cart_id" is missing.
+     * @expectedExceptionMessage Field UpdateCartItemsInput.cart_id of required type String! was not provided.
      */
     public function testUpdateWithMissedCartItemId()
     {
@@ -277,11 +277,11 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         return [
             'missed_cart_items' => [
                 '',
-                'Required parameter "cart_items" is missing.'
+                'Field UpdateCartItemsInput.cart_items of required type [CartItemUpdateInput]! was not provided.'
             ],
             'missed_cart_item_id' => [
                 'cart_items: [{ quantity: 2 }]',
-                'Required parameter "cart_item_id" for "cart_items" is missing.'
+                'Field CartItemUpdateInput.cart_item_id of required type Int! was not provided.'
             ],
             'missed_cart_item_qty' => [
                 'cart_items: [{ cart_item_id: 1 }]',
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/EditQuoteItemWithCustomOptionsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/EditQuoteItemWithCustomOptionsTest.php
index 62c1ae0dab3c7..d1edf742931c3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/EditQuoteItemWithCustomOptionsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/EditQuoteItemWithCustomOptionsTest.php
@@ -9,7 +9,7 @@
 
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\Exception\NoSuchEntityException as NoSuchEntityException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Model\Quote\Item;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsValuesForQueryBySku.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsValuesForQueryBySku.php
index 7514eb1c4e1d0..62cacd3e07c16 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsValuesForQueryBySku.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsValuesForQueryBySku.php
@@ -40,25 +40,26 @@ public function execute(string $sku): array
 
         foreach ($customOptions as $customOption) {
             $optionType = $customOption->getType();
-            if ($optionType == 'field' || $optionType == 'area') {
-                $customOptionsValues[] = [
-                    'id' => (int)$customOption->getOptionId(),
-                    'value_string' => 'test'
-                ];
-            } elseif ($optionType == 'drop_down') {
-                $optionSelectValues = $customOption->getValues();
-                $customOptionsValues[] = [
-                    'id' => (int)$customOption->getOptionId(),
-                    'value_string' => reset($optionSelectValues)->getOptionTypeId()
-                ];
-            } elseif ($optionType == 'multiple') {
-                $customOptionsValues[] = [
-                    'id' => (int)$customOption->getOptionId(),
-                    'value_string' => '[' . implode(',', array_keys($customOption->getValues())) . ']'
-                ];
+            $customOptionsValues[$optionType]['id'] = (int)$customOption->getOptionId();
+            switch ($optionType) {
+                case 'date':
+                    $customOptionsValues[$optionType]['value_string'] = '2012-12-12 00:00:00';
+                    break;
+                case 'field':
+                case 'area':
+                    $customOptionsValues[$optionType]['value_string'] = 'test';
+                    break;
+                case 'drop_down':
+                    $optionSelectValues = $customOption->getValues();
+                    $customOptionsValues[$optionType]['value_string'] =
+                        reset($optionSelectValues)->getOptionTypeId();
+                    break;
+                case 'multiple':
+                    $customOptionsValues[$optionType]['value_string'] =
+                        '[' . implode(',', array_keys($customOption->getValues())) . ']';
+                    break;
             }
         }
-
         return $customOptionsValues;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
index 4deed99243f9d..59f11be6d5b45 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddSimpleProductToCartTest.php
@@ -45,13 +45,43 @@ public function testAddSimpleProductToCart()
         $response = $this->graphQlMutation($query);
         self::assertArrayHasKey('cart', $response['addSimpleProductsToCart']);
 
+        self::assertArrayHasKey('shipping_addresses', $response['addSimpleProductsToCart']['cart']);
+        self::assertEmpty($response['addSimpleProductsToCart']['cart']['shipping_addresses']);
         self::assertEquals($quantity, $response['addSimpleProductsToCart']['cart']['items'][0]['quantity']);
         self::assertEquals($sku, $response['addSimpleProductsToCart']['cart']['items'][0]['product']['sku']);
+        self::assertArrayHasKey('prices', $response['addSimpleProductsToCart']['cart']['items'][0]);
+        self::assertArrayHasKey('id', $response['addSimpleProductsToCart']['cart']);
+        self::assertEquals($maskedQuoteId, $response['addSimpleProductsToCart']['cart']['id']);
+
+        self::assertArrayHasKey('price', $response['addSimpleProductsToCart']['cart']['items'][0]['prices']);
+        $price = $response['addSimpleProductsToCart']['cart']['items'][0]['prices']['price'];
+        self::assertArrayHasKey('value', $price);
+        self::assertEquals(10, $price['value']);
+        self::assertArrayHasKey('currency', $price);
+        self::assertEquals('USD', $price['currency']);
+
+        self::assertArrayHasKey('row_total', $response['addSimpleProductsToCart']['cart']['items'][0]['prices']);
+        $rowTotal = $response['addSimpleProductsToCart']['cart']['items'][0]['prices']['row_total'];
+        self::assertArrayHasKey('value', $rowTotal);
+        self::assertEquals(20, $rowTotal['value']);
+        self::assertArrayHasKey('currency', $rowTotal);
+        self::assertEquals('USD', $rowTotal['currency']);
+
+        self::assertArrayHasKey(
+            'row_total_including_tax',
+            $response['addSimpleProductsToCart']['cart']['items'][0]['prices']
+        );
+        $rowTotalIncludingTax =
+            $response['addSimpleProductsToCart']['cart']['items'][0]['prices']['row_total_including_tax'];
+        self::assertArrayHasKey('value', $rowTotalIncludingTax);
+        self::assertEquals(20, $rowTotalIncludingTax['value']);
+        self::assertArrayHasKey('currency', $rowTotalIncludingTax);
+        self::assertEquals('USD', $rowTotalIncludingTax['currency']);
     }
 
     /**
      * @expectedException Exception
-     * @expectedExceptionMessage Required parameter "cart_id" is missing
+     * @expectedExceptionMessage Field AddSimpleProductsToCartInput.cart_id of required type String! was not provided.
      */
     public function testAddSimpleProductToCartIfCartIdIsMissed()
     {
@@ -100,10 +130,6 @@ public function testAddSimpleProductToCartIfCartIdIsEmpty()
         $this->graphQlMutation($query);
     }
 
-    /**
-     * @expectedException Exception
-     * @expectedExceptionMessage Required parameter "cart_items" is missing
-     */
     public function testAddSimpleProductToCartIfCartItemsAreMissed()
     {
         $query = <<<QUERY
@@ -121,6 +147,11 @@ public function testAddSimpleProductToCartIfCartItemsAreMissed()
   }
 }
 QUERY;
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage(
+            'Field AddSimpleProductsToCartInput.cart_items of required type [SimpleProductCartItemInput]!'
+            . ' was not provided.'
+        );
 
         $this->graphQlMutation($query);
     }
@@ -226,11 +257,40 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity):
     }
   ) {
     cart {
+    id
       items {
         quantity
         product {
           sku
         }
+        prices {
+          price {
+           value
+           currency
+          }
+          row_total {
+           value
+           currency
+          }
+          row_total_including_tax {
+           value
+           currency
+          }
+        }
+      }
+      shipping_addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          code
+          label
+        }
+        __typename
       }
     }
   }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddVirtualProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddVirtualProductToCartTest.php
index 131ff0c480d64..c5723d137d070 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddVirtualProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AddVirtualProductToCartTest.php
@@ -45,13 +45,15 @@ public function testAddVirtualProductToCart()
         $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('cart', $response['addVirtualProductsToCart']);
+        self::assertArrayHasKey('id', $response['addVirtualProductsToCart']['cart']);
+        self::assertEquals($maskedQuoteId, $response['addVirtualProductsToCart']['cart']['id']);
         self::assertEquals($quantity, $response['addVirtualProductsToCart']['cart']['items'][0]['quantity']);
         self::assertEquals($sku, $response['addVirtualProductsToCart']['cart']['items'][0]['product']['sku']);
     }
 
     /**
      * @expectedException Exception
-     * @expectedExceptionMessage Required parameter "cart_id" is missing
+     * @expectedExceptionMessage Field AddSimpleProductsToCartInput.cart_id of required type String! was not provided.
      */
     public function testAddVirtualProductToCartIfCartIdIsMissed()
     {
@@ -100,10 +102,6 @@ public function testAddVirtualProductToCartIfCartIdIsEmpty()
         $this->graphQlMutation($query);
     }
 
-    /**
-     * @expectedException Exception
-     * @expectedExceptionMessage Required parameter "cart_items" is missing
-     */
     public function testAddVirtualProductToCartIfCartItemsAreMissed()
     {
         $query = <<<QUERY
@@ -122,6 +120,12 @@ public function testAddVirtualProductToCartIfCartItemsAreMissed()
 }
 QUERY;
 
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage(
+            'Field AddSimpleProductsToCartInput.cart_items of required type [SimpleProductCartItemInput]!'
+            . ' was not provided.'
+        );
+
         $this->graphQlMutation($query);
     }
 
@@ -227,6 +231,7 @@ private function getQuery(string $maskedQuoteId, string $sku, float $quantity):
     }
   ) {
     cart {
+      id
       items {
         quantity
         product {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php
index bb9fc77d0a717..60c3cc2e8b24e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/AllowGuestCheckoutOptionTest.php
@@ -104,11 +104,10 @@ public function testSetBillingAddressToGuestCustomerCart()
           company: "test company"
           street: ["test street 1", "test street 2"]
           city: "test city"
-          region: "test region"
+          region: "AZ"
           postcode: "887766"
           country_code: "US"
           telephone: "88776655"
-          save_in_address_book: false
         }
       }
     }
@@ -217,11 +216,10 @@ public function testSetNewShippingAddressOnCartWithGuestCheckoutDisabled()
             company: "test company"
             street: ["test street 1", "test street 2"]
             city: "test city"
-            region: "test region"
+            region: "AZ"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
-            save_in_address_book: false
           }
         }
       ]
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
index 35ad3ad34c7d6..865837e6bd629 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponToCartTest.php
@@ -41,6 +41,8 @@ public function testApplyCouponToCart()
         $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('applyCouponToCart', $response);
+        self::assertArrayHasKey('id', $response['applyCouponToCart']['cart']);
+        self::assertEquals($maskedQuoteId, $response['applyCouponToCart']['cart']['id']);
         self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupon']['code']);
     }
 
@@ -182,11 +184,11 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         return [
             'missed_cart_id' => [
                 'coupon_code: "test"',
-                'Required parameter "cart_id" is missing'
+                'Field ApplyCouponToCartInput.cart_id of required type String! was not provided.'
             ],
             'missed_coupon_code' => [
                 'cart_id: "test_quote"',
-                'Required parameter "coupon_code" is missing'
+                'Field ApplyCouponToCartInput.coupon_code of required type String! was not provided.'
             ],
         ];
     }
@@ -202,6 +204,7 @@ private function getQuery(string $maskedQuoteId, string $couponCode): string
 mutation {
   applyCouponToCart(input: {cart_id: "$maskedQuoteId", coupon_code: "$couponCode"}) {
     cart {
+    id
       applied_coupon {
         code
       }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponsToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponsToCartTest.php
index 9adafa7e097f2..7d5e21cd25b8a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponsToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponsToCartTest.php
@@ -161,11 +161,11 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         return [
             'missed_cart_id' => [
                 'coupon_code: "test"',
-                'Required parameter "cart_id" is missing'
+                'Field ApplyCouponToCartInput.cart_id of required type String! was not provided.'
             ],
             'missed_coupon_code' => [
                 'cart_id: "test_quote"',
-                'Required parameter "coupon_code" is missing'
+                'Field ApplyCouponToCartInput.coupon_code of required type String! was not provided.'
             ],
         ];
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CheckoutEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CheckoutEndToEndTest.php
index 6fbff7659c632..315c046148506 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CheckoutEndToEndTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CheckoutEndToEndTest.php
@@ -219,7 +219,6 @@ private function setBillingAddress(string $cartId): void
           telephone: "88776655"
           region: "TX"
           country_code: "US"
-          save_in_address_book: false
          }
       }
     }
@@ -258,7 +257,6 @@ private function setShippingAddress(string $cartId): array
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
-            save_in_address_book: false
           }
         }
       ]
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
index 81222a84435c8..867aaab7b3a58 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetAvailableShippingMethodsTest.php
@@ -67,11 +67,18 @@ public function testGetAvailableShippingMethods()
                 'value' => 10,
                 'currency' => 'USD',
             ],
+            'base_amount' => null,
         ];
         self::assertEquals(
             $expectedAddressData,
             $response['cart']['shipping_addresses'][0]['available_shipping_methods'][0]
         );
+        self::assertCount(1, $response['cart']['shipping_addresses'][0]['cart_items']);
+        self::assertCount(1, $response['cart']['shipping_addresses'][0]['cart_items_v2']);
+        self::assertEquals(
+            'simple_product',
+            $response['cart']['shipping_addresses'][0]['cart_items_v2'][0]['product']['sku']
+        );
     }
 
     /**
@@ -135,25 +142,53 @@ private function getQuery(string $maskedQuoteId): string
 query {
   cart (cart_id: "{$maskedQuoteId}") {
     shipping_addresses {
-        available_shipping_methods {
-          amount {
-            value
-            currency
-          }
-          carrier_code
-          carrier_title
-          error_message
-          method_code
-          method_title
-          price_excl_tax {
-            value
-            currency
-          }
-          price_incl_tax {
-            value
-            currency
-          }
+      cart_items {
+        cart_item_id
+        quantity
+      }
+      cart_items_v2 {
+        id
+        quantity
+        product {
+          sku
+        }
+      }
+      available_shipping_methods {
+        amount {
+          value
+          currency
+        }
+        carrier_code
+        carrier_title
+        error_message
+        method_code
+        method_title
+        price_excl_tax {
+          value
+          currency
+        }
+        price_incl_tax {
+          value
+          currency
+        }
+        base_amount {
+          value
+          currency
+        }
+        carrier_code
+        carrier_title
+        error_message
+        method_code
+        method_title
+        price_excl_tax {
+          value
+          currency
+        }
+        price_incl_tax {
+          value
+          currency
         }
+      }
     }
   }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
index d39f1b42459c7..ae9b7b32b2dab 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetCartTest.php
@@ -44,6 +44,8 @@ public function testGetCart()
 
         self::assertArrayHasKey('cart', $response);
         self::assertArrayHasKey('items', $response['cart']);
+        self::assertArrayHasKey('id', $response['cart']);
+        self::assertEquals($maskedQuoteId, $response['cart']['id']);
         self::assertCount(2, $response['cart']['items']);
 
         self::assertNotEmpty($response['cart']['items'][0]['id']);
@@ -184,6 +186,7 @@ private function getQuery(string $maskedQuoteId): string
         return <<<QUERY
 {
   cart(cart_id: "{$maskedQuoteId}") {
+    id
     items {
       id
       quantity
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php
index 8ddf1641ede8a..cb1565879a81e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedBillingAddressTest.php
@@ -81,28 +81,7 @@ public function testGetSpecifiedBillingAddressIfBillingAddressIsNotSet()
         $response = $this->graphQlQuery($query);
         self::assertArrayHasKey('cart', $response);
         self::assertArrayHasKey('billing_address', $response['cart']);
-
-        $expectedBillingAddressData = [
-            'firstname' => null,
-            'lastname' => null,
-            'company' => null,
-            'street' => [
-                ''
-            ],
-            'city' => null,
-            'region' => [
-                'code' => null,
-                'label' => null,
-            ],
-            'postcode' => null,
-            'country' => [
-                'code' => null,
-                'label' => null,
-            ],
-            'telephone' => null,
-            '__typename' => 'BillingCartAddress',
-        ];
-        self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
+        self::assertNull($response['cart']['billing_address']);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/MergeCartsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/MergeCartsTest.php
new file mode 100644
index 0000000000000..e558ac41eae52
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/MergeCartsTest.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\Quote\Guest;
+
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for merging guest carts
+ */
+class MergeCartsTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var QuoteFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/simple_product.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testMergeGuestCarts()
+    {
+        $firstQuote = $this->quoteFactory->create();
+        $this->quoteResource->load($firstQuote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
+
+        $secondQuote = $this->quoteFactory->create();
+        $this->quoteResource->load(
+            $secondQuote,
+            'test_order_with_virtual_product_without_address',
+            'reserved_order_id'
+        );
+
+        $firstMaskedId = $this->quoteIdToMaskedId->execute((int)$firstQuote->getId());
+        $secondMaskedId = $this->quoteIdToMaskedId->execute((int)$secondQuote->getId());
+
+        $query = $this->getCartMergeMutation($firstMaskedId, $secondMaskedId);
+        $this->graphQlMutation($query);
+    }
+
+    /**
+     * Create the mergeCart mutation
+     *
+     * @param string $guestQuoteMaskedId
+     * @param string $customerQuoteMaskedId
+     * @return string
+     */
+    private function getCartMergeMutation(string $guestQuoteMaskedId, string $customerQuoteMaskedId): string
+    {
+        return <<<QUERY
+mutation {
+  mergeCarts(
+    source_cart_id: "{$guestQuoteMaskedId}"
+    destination_cart_id: "{$customerQuoteMaskedId}"
+  ){
+  items {
+      quantity
+      product {
+        sku
+      }
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
index 52caf836d3b46..c6c1d3be99c59 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
@@ -97,7 +97,7 @@ public function testPlaceOrderIfCartIdIsEmpty()
 
     /**
      * @expectedException Exception
-     * @expectedExceptionMessage Required parameter "cart_id" is missing
+     * @expectedExceptionMessage Field PlaceOrderInput.cart_id of required type String! was not provided.
      */
     public function testPlaceOrderIfCartIdIsMissed()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
index 57a13e2f1bc03..12c3918fcd0ac 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveCouponFromCartTest.php
@@ -63,7 +63,7 @@ public function testRemoveCouponFromCartIfCartIdIsEmpty()
 
     /**
      * @expectedException Exception
-     * @expectedExceptionMessage Required parameter "cart_id" is missing
+     * @expectedExceptionMessage Field RemoveCouponFromCartInput.cart_id of required type String! was not provided.
      */
     public function testRemoveCouponFromCartIfCartIdIsMissed()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
index 7e3d3553ba2f3..c3a66291251c7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
@@ -114,11 +114,11 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         return [
             'missed_cart_id' => [
                 'cart_item_id: 1',
-                'Required parameter "cart_id" is missing.'
+                'Field RemoveItemFromCartInput.cart_id of required type String! was not provided.'
             ],
             'missed_cart_item_id' => [
                 'cart_id: "test_quote"',
-                'Required parameter "cart_item_id" is missing.'
+                'Field RemoveItemFromCartInput.cart_item_id of required type Int! was not provided.'
             ],
         ];
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
index 730e65b4ba8aa..87335bd5c96dd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -42,18 +42,18 @@ public function testSetNewBillingAddress()
     input: {
       cart_id: "$maskedQuoteId"
       billing_address: {
-        address: {
+         address: {
           firstname: "test firstname"
           lastname: "test lastname"
           company: "test company"
           street: ["test street 1", "test street 2"]
           city: "test city"
-          region: "test region"
+          region: "AL"
           postcode: "887766"
           country_code: "US"
           telephone: "88776655"
-          save_in_address_book: false
-        }
+         }
+         same_as_shipping: true
       }
     }
   ) {
@@ -72,6 +72,20 @@ public function testSetNewBillingAddress()
         }
         __typename
       }
+      shipping_addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          code
+          label
+        }
+        __typename
+      }
     }
   }
 }
@@ -83,9 +97,15 @@ public function testSetNewBillingAddress()
         self::assertArrayHasKey('billing_address', $cartResponse);
         $billingAddressResponse = $cartResponse['billing_address'];
         $this->assertNewAddressFields($billingAddressResponse);
+        self::assertArrayHasKey('shipping_addresses', $cartResponse);
+        $shippingAddressResponse = current($cartResponse['shipping_addresses']);
+        $this->assertNewAddressFields($billingAddressResponse);
+        $this->assertNewAddressFields($shippingAddressResponse, 'ShippingCartAddress');
     }
 
     /**
+     * Test case for deprecated `use_for_shipping` param.
+     *
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -106,11 +126,10 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
           company: "test company"
           street: ["test street 1", "test street 2"]
           city: "test city"
-          region: "test region"
+          region: "AL"
           postcode: "887766"
           country_code: "US"
           telephone: "88776655"
-          save_in_address_book: false
          }
          use_for_shipping: true
       }
@@ -182,11 +201,10 @@ public function testSetBillingAddressToCustomerCart()
           company: "test company"
           street: ["test street 1", "test street 2"]
           city: "test city"
-          region: "test region"
+          region: "AL"
           postcode: "887766"
           country_code: "US"
           telephone: "88776655"
-          save_in_address_book: false
         }
       }
     }
@@ -259,11 +277,10 @@ public function testSetBillingAddressOnNonExistentCart()
           company: "test company"
           street: ["test street 1", "test street 2"]
           city: "test city"
-          region: "test region"
+          region: "AL"
           postcode: "887766"
           country_code: "US"
           telephone: "88776655"
-          save_in_address_book: false
         }
       }
     }
@@ -326,7 +343,7 @@ public function dataProviderSetWithoutRequiredParameters(): array
             ],
             'missed_cart_id' => [
                 'billing_address: {}',
-                'Required parameter "cart_id" is missing'
+                'Field SetBillingAddressOnCartInput.cart_id of required type String! was not provided.'
             ]
         ];
     }
@@ -346,7 +363,7 @@ public function testSetNewBillingAddressWithoutCustomerAddressIdAndAddress()
     input: {
       cart_id: "$maskedQuoteId"
       billing_address: {
-        use_for_shipping: true
+        same_as_shipping: true
       }
     }
   ) {
@@ -371,7 +388,7 @@ public function testSetNewBillingAddressWithoutCustomerAddressIdAndAddress()
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_multishipping_with_two_shipping_addresses.php
      */
-    public function testSetNewBillingAddressWithUseForShippingAndMultishipping()
+    public function testSetNewBillingAddressWithSameAsShippingAndMultishipping()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
@@ -387,13 +404,12 @@ public function testSetNewBillingAddressWithUseForShippingAndMultishipping()
           company: "test company"
           street: ["test street 1", "test street 2"]
           city: "test city"
-          region: "test region"
+          region: "AL"
           postcode: "887766"
           country_code: "US"
           telephone: "88776655"
-          save_in_address_book: false
         }
-        use_for_shipping: true
+        same_as_shipping: true
       }
     }
   ) {
@@ -407,7 +423,7 @@ public function testSetNewBillingAddressWithUseForShippingAndMultishipping()
 QUERY;
 
         self::expectExceptionMessage(
-            'Using the "use_for_shipping" option with multishipping is not possible.'
+            'Using the "same_as_shipping" option with multishipping is not possible.'
         );
         $this->graphQlMutation($query);
     }
@@ -433,11 +449,10 @@ public function testSetNewBillingAddressRedundantStreetLine()
           company: "test company"
           street: ["test street 1", "test street 2", "test street 3"]
           city: "test city"
-          region: "test region"
+          region: "AL"
           postcode: "887766"
           country_code: "US"
           telephone: "88776655"
-          save_in_address_book: false
         }
       }
     }
@@ -476,11 +491,10 @@ public function testSetBillingAddressWithLowerCaseCountry()
           company: "test company"
           street: ["test street 1", "test street 2"]
           city: "test city"
-          region: "test region"
+          region: "AL"
           postcode: "887766"
           country_code: "us"
           telephone: "88776655"
-          save_in_address_book: false
         }
       }
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
index fdec9a1dd9853..24ba3e78f9b4e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodOnCartTest.php
@@ -185,11 +185,11 @@ public function dataProviderSetPaymentMethodWithoutRequiredParameters(): array
         return [
             'missed_cart_id' => [
                 'payment_method: {code: "' . Checkmo::PAYMENT_METHOD_CHECKMO_CODE . '"}',
-                'Required parameter "cart_id" is missing.'
+                'Field SetPaymentMethodOnCartInput.cart_id of required type String! was not provided.'
             ],
             'missed_payment_method' => [
                 'cart_id: "cart_id_value"',
-                'Required parameter "code" for "payment_method" is missing.'
+                'Field SetPaymentMethodOnCartInput.payment_method of required type PaymentMethodInput! was not provided'
             ],
             'missed_payment_method_code' => [
                 'cart_id: "cart_id_value", payment_method: {code: ""}',
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
index 0351a4f58a8e0..b142de71e89a3 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -49,11 +49,10 @@ public function testSetNewShippingAddressOnCartWithSimpleProduct()
             company: "test company"
             street: ["test street 1", "test street 2"]
             city: "test city"
-            region: "test region"
+            region: "AL"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
-            save_in_address_book: false
           }
           customer_notes: "Test note"
         }
@@ -114,11 +113,10 @@ public function testSetNewShippingAddressOnCartWithVirtualProduct()
             company: "test company"
             street: ["test street 1", "test street 2"]
             city: "test city"
-            region: "test region"
+            region: "AL"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
-            save_in_address_book: false
           }
         }
       ]
@@ -266,11 +264,10 @@ public function testSetNewShippingAddressOnCartWithRedundantStreetLine()
             company: "test company"
             street: ["test street 1", "test street 2", "test street 3"]
             city: "test city"
-            region: "test region"
+            region: "AL"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
-            save_in_address_book: false
           }
         }
       ]
@@ -305,7 +302,7 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
             ],
             'missed_cart_id' => [
                 'shipping_addresses: {}',
-                'Required parameter "cart_id" is missing'
+                'Field SetShippingAddressesOnCartInput.cart_id of required type String! was not provided.'
             ]
         ];
     }
@@ -335,11 +332,10 @@ public function testSetMultipleNewShippingAddresses()
             company: "test company"
             street: ["test street 1", "test street 2"]
             city: "test city"
-            region: "test region"
+            region: "AL"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
-            save_in_address_book: false
           }
         },
         {
@@ -349,11 +345,10 @@ public function testSetMultipleNewShippingAddresses()
             company: "test company 2"
             street: ["test street 1", "test street 2"]
             city: "test city"
-            region: "test region"
+            region: "AL"
             postcode: "887766"
             country_code: "US"
             telephone: "88776655"
-            save_in_address_book: false
           }
         }
       ]
@@ -389,11 +384,10 @@ public function testSetShippingAddressOnNonExistentCart()
           company: "test company"
           street: ["test street 1", "test street 2"]
           city: "test city"
-          region: "test region"
+          region: "AL"
           postcode: "887766"
           country_code: "US"
           telephone: "88776655"
-          save_in_address_book: false
         }
       }
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
index 117aedf59b5a5..007ada1ce57cf 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingMethodsOnCartTest.php
@@ -191,11 +191,12 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
                     carrier_code: "flatrate"
                     method_code: "flatrate"
                 }]',
-                'Required parameter "cart_id" is missing'
+                'Field SetShippingMethodsOnCartInput.cart_id of required type String! was not provided.'
             ],
             'missed_shipping_methods' => [
                 'cart_id: "cart_id_value"',
-                'Required parameter "shipping_methods" is missing'
+                'Field SetShippingMethodsOnCartInput.shipping_methods of required type [ShippingMethodInput]!'
+                . ' was not provided.'
             ],
             'shipping_methods_are_empty' => [
                 'cart_id: "cart_id_value" shipping_methods: []',
@@ -225,7 +226,7 @@ public function dataProviderSetShippingMethodWithWrongParameters(): array
                 'cart_id: "cart_id_value", shipping_methods: [{
                     carrier_code: "flatrate"
                 }]',
-                'Required parameter "method_code" is missing.'
+                'Field ShippingMethodInput.method_code of required type String! was not provided.'
             ],
             'empty_method_code' => [
                 'cart_id: "cart_id_value", shipping_methods: [{
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
index 988ead7d86df3..48d58a0dd8f17 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
@@ -70,6 +70,17 @@ public function testUpdateCartItemQuantity()
 
         $this->assertEquals($itemId, $item['id']);
         $this->assertEquals($quantity, $item['quantity']);
+
+        //Check that update is correctly reflected in cart
+        $cartQuery = $this->getCartQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($cartQuery);
+
+        $this->assertArrayHasKey('cart', $response);
+
+        $responseCart = $response['cart'];
+        $item = current($responseCart['items']);
+
+        $this->assertEquals($quantity, $item['quantity']);
     }
 
     /**
@@ -91,6 +102,15 @@ public function testRemoveCartItemIfQuantityIsZero()
 
         $responseCart = $response['updateCartItems']['cart'];
         $this->assertCount(0, $responseCart['items']);
+
+        //Check that update is correctly reflected in cart
+        $cartQuery = $this->getCartQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($cartQuery);
+
+        $this->assertArrayHasKey('cart', $response);
+
+        $responseCart = $response['cart'];
+        $this->assertCount(0, $responseCart['items']);
     }
 
     /**
@@ -163,7 +183,7 @@ public function testUpdateItemFromCustomerCart()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Required parameter "cart_id" is missing.
+     * @expectedExceptionMessage Field UpdateCartItemsInput.cart_id of required type String! was not provided.
      */
     public function testUpdateWithMissedCartItemId()
     {
@@ -228,11 +248,11 @@ public function dataProviderUpdateWithMissedRequiredParameters(): array
         return [
             'missed_cart_items' => [
                 '',
-                'Required parameter "cart_items" is missing.'
+                'Field UpdateCartItemsInput.cart_items of required type [CartItemUpdateInput]! was not provided.'
             ],
             'missed_cart_item_id' => [
                 'cart_items: [{ quantity: 2 }]',
-                'Required parameter "cart_item_id" for "cart_items" is missing.'
+                'Field CartItemUpdateInput.cart_item_id of required type Int! was not provided.'
             ],
             'missed_cart_item_qty' => [
                 'cart_items: [{ cart_item_id: 1 }]',
@@ -268,6 +288,26 @@ private function getQuery(string $maskedQuoteId, int $itemId, float $quantity):
     }
   }
 }
+QUERY;
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getCartQuery(string $maskedQuoteId)
+    {
+        return <<<QUERY
+query {
+  cart(cart_id: "{$maskedQuoteId}"){
+    items{
+      product{
+        name
+      }
+      quantity
+    }
+  }
+}
 QUERY;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php
index 11a2216b6668f..5d1f5847e8419 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Sales;
 
+use Exception;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -99,6 +100,25 @@ public function testOrdersQuery()
         }
     }
 
+    /**
+     * @expectedException Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testOrdersQueryNotAuthorized()
+    {
+        $query = <<<QUERY
+{
+  customerOrders {
+    items {
+      increment_id
+      grand_total
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
     /**
      * @param string $email
      * @param string $password
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php
index 048ccb70af0d7..1dc5a813de2b8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Tax/ProductViewTest.php
@@ -38,6 +38,12 @@ class ProductViewTest extends GraphQlAbstract
     /** @var \Magento\Tax\Model\Calculation\Rule[] */
     private $fixtureTaxRules;
 
+    /** @var string */
+    private $defaultRegionSystemSetting;
+
+    /** @var string */
+    private $defaultPriceDisplayType;
+
     /**
      * @var StoreManagerInterface
      */
@@ -52,19 +58,26 @@ protected function setUp()
         /** @var \Magento\Config\Model\ResourceModel\Config $config */
         $config = $this->objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
 
+        /** @var ScopeConfigInterface $scopeConfig */
+        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
+
+        $this->defaultRegionSystemSetting = $scopeConfig->getValue(
+            Config::CONFIG_XML_PATH_DEFAULT_REGION
+        );
+
+        $this->defaultPriceDisplayType = $scopeConfig->getValue(
+            Config::CONFIG_XML_PATH_PRICE_DISPLAY_TYPE
+        );
+
         //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
+            3
         );
         $this->getFixtureTaxRates();
         $this->getFixtureTaxRules();
@@ -72,6 +85,9 @@ protected function setUp()
         /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
         $config = $this->objectManager->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
         $config->reinit();
+        /** @var ScopeConfigInterface $scopeConfig */
+        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
+        $scopeConfig->clean();
     }
 
     public function tearDown()
@@ -82,16 +98,12 @@ public function tearDown()
         //default state tax calculation AL
         $config->saveConfig(
             Config::CONFIG_XML_PATH_DEFAULT_REGION,
-            null,
-            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-            1
+            $this->defaultRegionSystemSetting
         );
 
         $config->saveConfig(
             Config::CONFIG_XML_PATH_PRICE_DISPLAY_TYPE,
-            1,
-            ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-            1
+            $this->defaultPriceDisplayType
         );
         $taxRules = $this->getFixtureTaxRules();
         if (count($taxRules)) {
@@ -107,6 +119,10 @@ public function tearDown()
         /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
         $config = $this->objectManager->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
         $config->reinit();
+
+        /** @var ScopeConfigInterface $scopeConfig */
+        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
+        $scopeConfig->clean();
     }
 
     /**
@@ -253,6 +269,22 @@ private function getFixtureTaxRules()
      */
     private function assertBaseFields($product, $actualResponse)
     {
+        $pricesTypes = [
+            'minimalPrice',
+            'regularPrice',
+            'maximalPrice',
+        ];
+        foreach ($pricesTypes as $priceType) {
+            if (isset($actualResponse['price'][$priceType]['amount']['value'])) {
+                $actualResponse['price'][$priceType]['amount']['value'] =
+                    round($actualResponse['price'][$priceType]['amount']['value'], 4);
+            }
+
+            if (isset($actualResponse['price'][$priceType]['adjustments'][0]['amount']['value'])) {
+                $actualResponse['price'][$priceType]['adjustments'][0]['amount']['value'] =
+                    round($actualResponse['price'][$priceType]['adjustments'][0]['amount']['value'], 4);
+            }
+        }
         // product_object_field_name, expected_value
         $assertionMap = [
             ['response_field' => 'attribute_set_id', 'expected_value' => $product->getAttributeSetId()],
@@ -271,7 +303,7 @@ private function assertBaseFields($product, $actualResponse)
                                 [
                                     'amount' =>
                                         [
-                                            'value' => 0.286501,
+                                            'value' => 0.2865,
                                             'currency' => 'USD',
                                         ],
                                         'code' => 'TAX',
@@ -289,7 +321,7 @@ private function assertBaseFields($product, $actualResponse)
                                 [
                                     'amount' =>
                                         [
-                                            'value' => 0.750001,
+                                            'value' => 0.7500,
                                             'currency' => 'USD',
                                         ],
                                         'code' => 'TAX',
@@ -307,7 +339,7 @@ private function assertBaseFields($product, $actualResponse)
                                 [
                                     'amount' =>
                                         [
-                                            'value' => 0.286501,
+                                            'value' => 0.2865,
                                             'currency' => 'USD',
                                         ],
                                         'code' => 'TAX',
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php
index bd20741fb7417..5e6415f82b25a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/UrlRewrite/UrlResolverTest.php
@@ -39,6 +39,7 @@ public function testNonExistentEntityUrlRewrite()
    id
    relative_url
    type
+   redirectCode
   }
 }
 QUERY;
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceWithFPTTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Weee/ProductPriceWithFPTTest.php
similarity index 86%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceWithFPTTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Weee/ProductPriceWithFPTTest.php
index 3f568c2635d09..385e3419bbf6a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceWithFPTTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Weee/ProductPriceWithFPTTest.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\GraphQl\Catalog;
+namespace Magento\GraphQl\Weee;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
@@ -27,12 +27,64 @@ class ProductPriceWithFPTTest extends GraphQlAbstract
     /** @var ObjectManager $objectManager */
     private $objectManager;
 
+    /** @var string[] $objectManager */
+    private $initialConfig;
+
+    /** @var ScopeConfigInterface */
+    private $scopeConfig;
+
     /**
      * @inheritdoc
      */
-    protected function setUp() :void
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
+
+        /** @var ScopeConfigInterface $scopeConfig */
+        $this->scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
+
+        $currentSettingsArray = [
+            'tax/display/type',
+            'tax/weee/enable',
+            'tax/weee/display',
+            'tax/defaults/region',
+            'tax/weee/apply_vat',
+            'tax/calculation/price_includes_tax'
+        ];
+
+        foreach ($currentSettingsArray as $configPath) {
+            $this->initialConfig[$configPath] = $this->scopeConfig->getValue(
+                $configPath
+            );
+        }
+        /** @var \Magento\Framework\App\Config\ReinitableConfigInterface $config */
+        $config = $this->objectManager->get(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+        $config->reinit();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        $this->writeConfig($this->initialConfig);
+    }
+
+    /**
+     * Write configuration for weee
+     *
+     * @param array $weeTaxSettings
+     * @return void
+     */
+    private function writeConfig(array $weeTaxSettings): void
+    {
+        /** @var WriterInterface $configWriter */
+        $configWriter = $this->objectManager->get(WriterInterface::class);
+
+        foreach ($weeTaxSettings as $path => $value) {
+            $configWriter->save($path, $value);
+        }
+        $this->scopeConfig->clean();
     }
 
     /**
@@ -49,16 +101,7 @@ protected function setUp() :void
      */
     public function testCatalogPriceExcludeTaxAndIncludeFPTOnly(array $weeTaxSettings)
     {
-       /** @var WriterInterface $configWriter */
-        $configWriter = $this->objectManager->get(WriterInterface::class);
-
-        foreach ($weeTaxSettings as $path => $value) {
-            $configWriter->save($path, $value);
-        }
-
-        /** @var ScopeConfigInterface $scopeConfig */
-        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
-        $scopeConfig->clean();
+        $this->writeConfig($weeTaxSettings);
 
         $skus = ['simple-with-ftp'];
         $query = $this->getProductQuery($skus);
@@ -115,16 +158,7 @@ public function catalogPriceExcludeTaxAndIncludeFPTOnlySettingsProvider()
      */
     public function testCatalogPriceExcludeTaxAndIncludeFPTWithDescription(array $weeTaxSettings)
     {
-        /** @var WriterInterface $configWriter */
-        $configWriter = $this->objectManager->get(WriterInterface::class);
-
-        foreach ($weeTaxSettings as $path => $value) {
-            $configWriter->save($path, $value);
-        }
-
-        /** @var ScopeConfigInterface $scopeConfig */
-        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
-        $scopeConfig->clean();
+        $this->writeConfig($weeTaxSettings);
 
         $skus = ['simple-with-ftp'];
         $query = $this->getProductQuery($skus);
@@ -181,16 +215,7 @@ public function catalogPriceExcludeTaxAndIncludeFPTWithDescriptionSettingsProvid
      */
     public function testCatalogPriceExcludeTaxCatalogDisplayIncludeTaxAndIncludeFPTOnly(array $weeTaxSettings)
     {
-        /** @var WriterInterface $configWriter */
-        $configWriter = $this->objectManager->get(WriterInterface::class);
-
-        foreach ($weeTaxSettings as $path => $value) {
-            $configWriter->save($path, $value);
-        }
-
-        /** @var ScopeConfigInterface $scopeConfig */
-        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
-        $scopeConfig->clean();
+        $this->writeConfig($weeTaxSettings);
 
         /** @var TaxClassCollectionFactory $taxClassCollectionFactory */
         $taxClassCollectionFactory = $this->objectManager->get(TaxClassCollectionFactory::class);
@@ -257,16 +282,7 @@ public function catalogPriceExcludeTaxCatalogDisplayIncludeTaxAndIncludeFPTOnlyS
      */
     public function testCatalogPriceExclTaxCatalogDisplayInclTaxAndInclFPTWithDescription(array $weeTaxSettings)
     {
-        /** @var WriterInterface $configWriter */
-        $configWriter = $this->objectManager->get(WriterInterface::class);
-
-        foreach ($weeTaxSettings as $path => $value) {
-            $configWriter->save($path, $value);
-        }
-
-        /** @var ScopeConfigInterface $scopeConfig */
-        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
-        $scopeConfig->clean();
+        $this->writeConfig($weeTaxSettings);
 
         /** @var TaxClassCollectionFactory $taxClassCollectionFactory */
         $taxClassCollectionFactory = $this->objectManager->get(TaxClassCollectionFactory::class);
@@ -333,16 +349,7 @@ public function catalogPriceExclTaxCatalogDisplayInclTaxAndInclFPTWithDescriptio
      */
     public function testCatalogPriceInclTaxCatalogDisplayExclTaxAndInclFPTWithDescription(array $weeTaxSettings)
     {
-        /** @var WriterInterface $configWriter */
-        $configWriter = $this->objectManager->get(WriterInterface::class);
-
-        foreach ($weeTaxSettings as $path => $value) {
-            $configWriter->save($path, $value);
-        }
-
-        /** @var ScopeConfigInterface $scopeConfig */
-        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
-        $scopeConfig->clean();
+        $this->writeConfig($weeTaxSettings);
 
         $skus = ['simple-with-ftp'];
         $query = $this->getProductQuery($skus);
@@ -400,16 +407,7 @@ public function catalogPriceInclTaxCatalogDisplayExclTaxAndInclFPTWithDescriptio
      */
     public function testCatalogPriceInclTaxCatalogDisplayInclTaxAndInclFPTOnly(array $weeTaxSettings)
     {
-        /** @var WriterInterface $configWriter */
-        $configWriter = $this->objectManager->get(WriterInterface::class);
-
-        foreach ($weeTaxSettings as $path => $value) {
-            $configWriter->save($path, $value);
-        }
-
-        /** @var ScopeConfigInterface $scopeConfig */
-        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
-        $scopeConfig->clean();
+        $this->writeConfig($weeTaxSettings);
 
         $skus = ['simple-with-ftp'];
         $query = $this->getProductQuery($skus);
@@ -469,16 +467,8 @@ public function catalogPriceInclTaxCatalogDisplayInclTaxAndInclFPTOnlySettingsPr
     public function testCatalogPriceIncTaxCatalogDisplayInclTaxInclFPTWithDescrWithTaxAppliedOnFPT(
         array $weeTaxSettings
     ) {
-        /** @var WriterInterface $configWriter */
-        $configWriter = $this->objectManager->get(WriterInterface::class);
+        $this->writeConfig($weeTaxSettings);
 
-        foreach ($weeTaxSettings as $path => $value) {
-            $configWriter->save($path, $value);
-        }
-
-        /** @var ScopeConfigInterface $scopeConfig */
-        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
-        $scopeConfig->clean();
         /** @var TaxClassCollectionFactory $taxClassCollectionFactory */
         $taxClassCollectionFactory = $this->objectManager->get(TaxClassCollectionFactory::class);
         $taxClassCollection = $taxClassCollectionFactory->create();
@@ -524,7 +514,7 @@ public function catalogPriceIncTaxCatalogDisplayInclTaxInclFPTWithDescrWithTaxAp
         return [
             [
                 'weeTaxSettings' => [
-                    'tax/calculation/price_includes_tax' > '1',
+                    'tax/calculation/price_includes_tax' => '1',
                     'tax/display/type' => '2',
                     'tax/weee/enable' => '1',
                     'tax/weee/display' => '0',
@@ -552,16 +542,7 @@ public function catalogPriceIncTaxCatalogDisplayInclTaxInclFPTWithDescrWithTaxAp
      */
     public function testCatalogPriceInclTaxCatalogDisplayIncludeTaxAndMuyltipleFPTs(array $weeTaxSettings)
     {
-        /** @var WriterInterface $configWriter */
-        $configWriter = $this->objectManager->get(WriterInterface::class);
-
-        foreach ($weeTaxSettings as $path => $value) {
-            $configWriter->save($path, $value);
-        }
-
-        /** @var ScopeConfigInterface $scopeConfig */
-        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
-        $scopeConfig->clean();
+        $this->writeConfig($weeTaxSettings);
 
         /** @var TaxClassCollectionFactory $taxClassCollectionFactory */
         $taxClassCollectionFactory = $this->objectManager->get(TaxClassCollectionFactory::class);
@@ -631,6 +612,65 @@ public function catalogPriceInclTaxCatalogDisplayIncludeTaxAndMuyltipleFPTsSetti
         ];
     }
 
+    /**
+     * Test FPT disabled feature
+     *
+     * FPT enabled : FALSE
+     *
+     * @param array $weeTaxSettings
+     * @return void
+     *
+     * @dataProvider catalogPriceDisabledFPTSettingsProvider
+     * @magentoApiDataFixture Magento/Weee/_files/product_with_fpt.php
+     */
+    public function testCatalogPriceDisableFPT(array $weeTaxSettings)
+    {
+        $this->writeConfig($weeTaxSettings);
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        /** @var Product $product1 */
+        $product1 = $productRepository->get('simple-with-ftp');
+        $product1->setFixedProductAttribute(
+            [['website_id' => 0, 'country' => 'US', 'state' => 0, 'price' => 10, 'delete' => '']]
+        );
+        $productRepository->save($product1);
+
+        $skus = ['simple-with-ftp'];
+        $query = $this->getProductQuery($skus);
+        $result = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertNotEmpty($result['products']['items']);
+        $product = $result['products']['items'][0];
+        $this->assertEquals(100, round($product['price_range']['minimum_price']['regular_price']['value'], 2));
+        $this->assertCount(
+            0,
+            $product['price_range']['minimum_price']['fixed_product_taxes'],
+            'Fixed product tax count is incorrect'
+        );
+        $this->assertResponseFields(
+            $product['price_range']['minimum_price']['fixed_product_taxes'],
+            []
+        );
+    }
+
+    /**
+     * CatalogPriceDisableFPT settings data provider
+     *
+     * @return array
+     */
+    public function catalogPriceDisabledFPTSettingsProvider()
+    {
+        return [
+            [
+                'weeTaxSettings' => [
+                    'tax/weee/enable' => '0',
+                    'tax/weee/display' => '1',
+                ],
+            ],
+        ];
+    }
+
     /**
      * Get GraphQl query to fetch products by sku
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Weee/StoreConfigFPTTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Weee/StoreConfigFPTTest.php
new file mode 100644
index 0000000000000..451ea78ee308d
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Weee/StoreConfigFPTTest.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Weee;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Framework\ObjectManager\ObjectManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Weee\Model\Tax as WeeeDisplayConfig;
+use Magento\Weee\Model\Config;
+
+/**
+ * Test for storeConfig FPT config values
+ */
+class StoreConfigFPTTest extends GraphQlAbstract
+{
+    /** @var ObjectManager $objectManager */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp() :void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * FPT All Display settings
+     *
+     * @param array $weeTaxSettings
+     * @param string $displayValue
+     * @return void
+     *
+     * @dataProvider sameFPTDisplaySettingsProvider
+     */
+    public function testSameFPTDisplaySettings(array $weeTaxSettings, $displayValue)
+    {
+       /** @var WriterInterface $configWriter */
+        $configWriter = $this->objectManager->get(WriterInterface::class);
+
+        foreach ($weeTaxSettings as $path => $value) {
+            $configWriter->save($path, $value);
+        }
+
+        /** @var ScopeConfigInterface $scopeConfig */
+        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
+        $scopeConfig->clean();
+
+        $query = $this->getStoreConfigQuery();
+        $result = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $result);
+
+        $this->assertNotEmpty($result['storeConfig']['product_fixed_product_tax_display_setting']);
+        $this->assertNotEmpty($result['storeConfig']['category_fixed_product_tax_display_setting']);
+        $this->assertNotEmpty($result['storeConfig']['sales_fixed_product_tax_display_setting']);
+
+        $this->assertEquals($displayValue, $result['storeConfig']['product_fixed_product_tax_display_setting']);
+        $this->assertEquals($displayValue, $result['storeConfig']['category_fixed_product_tax_display_setting']);
+        $this->assertEquals($displayValue, $result['storeConfig']['sales_fixed_product_tax_display_setting']);
+    }
+
+    /**
+     * SameFPTDisplaySettings settings data provider
+     *
+     * @return array
+     */
+    public function sameFPTDisplaySettingsProvider()
+    {
+        return [
+            [
+                'weeTaxSettingsDisplayIncludedOnly' => [
+                    'tax/weee/enable' => '1',
+                    Config::XML_PATH_FPT_DISPLAY_PRODUCT_VIEW => WeeeDisplayConfig::DISPLAY_INCL,
+                    Config::XML_PATH_FPT_DISPLAY_PRODUCT_LIST => WeeeDisplayConfig::DISPLAY_INCL,
+                    Config::XML_PATH_FPT_DISPLAY_SALES => WeeeDisplayConfig::DISPLAY_INCL,
+                ],
+                'displayValue' => 'INCLUDE_FPT_WITHOUT_DETAILS',
+            ],
+            [
+                'weeTaxSettingsDisplayIncludedAndDescription' => [
+                    'tax/weee/enable' => '1',
+                    Config::XML_PATH_FPT_DISPLAY_PRODUCT_VIEW => WeeeDisplayConfig::DISPLAY_INCL_DESCR,
+                    Config::XML_PATH_FPT_DISPLAY_PRODUCT_LIST => WeeeDisplayConfig::DISPLAY_INCL_DESCR,
+                    Config::XML_PATH_FPT_DISPLAY_SALES => WeeeDisplayConfig::DISPLAY_INCL_DESCR,
+                ],
+                'displayValue' => 'INCLUDE_FPT_WITH_DETAILS',
+            ],
+            [
+                'weeTaxSettingsDisplayIncludedAndExcludedAndDescription' => [
+                    'tax/weee/enable' => '1',
+                    Config::XML_PATH_FPT_DISPLAY_PRODUCT_VIEW => WeeeDisplayConfig::DISPLAY_EXCL_DESCR_INCL,
+                    Config::XML_PATH_FPT_DISPLAY_PRODUCT_LIST => WeeeDisplayConfig::DISPLAY_EXCL_DESCR_INCL,
+                    Config::XML_PATH_FPT_DISPLAY_SALES => WeeeDisplayConfig::DISPLAY_EXCL_DESCR_INCL,
+                ],
+                'displayValue' => 'EXCLUDE_FPT_AND_INCLUDE_WITH_DETAILS',
+            ],
+            [
+                'weeTaxSettingsDisplayExcluded' => [
+                    'tax/weee/enable' => '1',
+                    Config::XML_PATH_FPT_DISPLAY_PRODUCT_VIEW => WeeeDisplayConfig::DISPLAY_EXCL,
+                    Config::XML_PATH_FPT_DISPLAY_PRODUCT_LIST => WeeeDisplayConfig::DISPLAY_EXCL,
+                    Config::XML_PATH_FPT_DISPLAY_SALES => WeeeDisplayConfig::DISPLAY_EXCL,
+                ],
+                'displayValue' => 'EXCLUDE_FPT_WITHOUT_DETAILS',
+            ],
+            [
+                'weeTaxSettingsDisplayExcluded' => [
+                    'tax/weee/enable' => '0',
+                    Config::XML_PATH_FPT_DISPLAY_PRODUCT_VIEW => WeeeDisplayConfig::DISPLAY_EXCL,
+                    Config::XML_PATH_FPT_DISPLAY_PRODUCT_LIST => WeeeDisplayConfig::DISPLAY_EXCL,
+                    Config::XML_PATH_FPT_DISPLAY_SALES => WeeeDisplayConfig::DISPLAY_EXCL,
+                ],
+                'displayValue' => 'FPT_DISABLED',
+            ],
+        ];
+    }
+
+    /**
+     * FPT Display setting shuffled
+     *
+     * @param array $weeTaxSettings
+     * @return void
+     *
+     * @dataProvider differentFPTDisplaySettingsProvider
+     */
+    public function testDifferentFPTDisplaySettings(array $weeTaxSettings)
+    {
+        /** @var WriterInterface $configWriter */
+        $configWriter = $this->objectManager->get(WriterInterface::class);
+
+        foreach ($weeTaxSettings as $path => $value) {
+            $configWriter->save($path, $value);
+        }
+
+        /** @var ScopeConfigInterface $scopeConfig */
+        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
+        $scopeConfig->clean();
+
+        $query = $this->getStoreConfigQuery();
+        $result = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $result);
+
+        $this->assertNotEmpty($result['storeConfig']['product_fixed_product_tax_display_setting']);
+        $this->assertNotEmpty($result['storeConfig']['category_fixed_product_tax_display_setting']);
+        $this->assertNotEmpty($result['storeConfig']['sales_fixed_product_tax_display_setting']);
+
+        $this->assertEquals(
+            'INCLUDE_FPT_WITHOUT_DETAILS',
+            $result['storeConfig']['product_fixed_product_tax_display_setting']
+        );
+        $this->assertEquals(
+            'INCLUDE_FPT_WITH_DETAILS',
+            $result['storeConfig']['category_fixed_product_tax_display_setting']
+        );
+        $this->assertEquals(
+            'EXCLUDE_FPT_AND_INCLUDE_WITH_DETAILS',
+            $result['storeConfig']['sales_fixed_product_tax_display_setting']
+        );
+    }
+
+    /**
+     * DifferentFPTDisplaySettings settings data provider
+     *
+     * @return array
+     */
+    public function differentFPTDisplaySettingsProvider()
+    {
+        return [
+            [
+                'weeTaxSettingsDisplay' => [
+                    'tax/weee/enable' => '1',
+                    Config::XML_PATH_FPT_DISPLAY_PRODUCT_VIEW => WeeeDisplayConfig::DISPLAY_INCL,
+                    Config::XML_PATH_FPT_DISPLAY_PRODUCT_LIST => WeeeDisplayConfig::DISPLAY_INCL_DESCR,
+                    Config::XML_PATH_FPT_DISPLAY_SALES => WeeeDisplayConfig::DISPLAY_EXCL_DESCR_INCL,
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * Get GraphQl query to fetch storeConfig and FPT serttings
+     *
+     * @return string
+     */
+    private function getStoreConfigQuery(): string
+    {
+        return <<<QUERY
+{
+    storeConfig {
+          product_fixed_product_tax_display_setting
+          category_fixed_product_tax_display_setting
+          sales_fixed_product_tax_display_setting
+    }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php
new file mode 100644
index 0000000000000..fbd9c53faf7f5
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.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\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\CollectionFactory;
+
+class CustomerWishlistTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $wishlistCollectionFactory;
+
+    protected function setUp()
+    {
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->wishlistCollectionFactory = Bootstrap::getObjectManager()->get(CollectionFactory::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Wishlist/_files/wishlist.php
+     */
+    public function testCustomerWishlist(): void
+    {
+        /** @var \Magento\Wishlist\Model\Wishlist $wishlist */
+        $collection = $this->wishlistCollectionFactory->create()->filterByCustomerId(1);
+
+        /** @var Item $wishlistItem */
+        $wishlistItem = $collection->getFirstItem();
+        $query =
+            <<<QUERY
+{
+  customer {
+    wishlist {
+      id
+      items_count
+      sharing_code
+      updated_at
+      items {
+        product {
+          sku
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery(
+            $query,
+            [],
+            '',
+            $this->getCustomerAuthHeaders('customer@example.com', 'password')
+        );
+        $this->assertEquals((string)$wishlistItem->getId(), $response['customer']['wishlist']['id']);
+        $this->assertEquals($wishlistItem->getItemsCount(), $response['customer']['wishlist']['items_count']);
+        $this->assertEquals($wishlistItem->getSharingCode(), $response['customer']['wishlist']['sharing_code']);
+        $this->assertEquals($wishlistItem->getUpdatedAt(), $response['customer']['wishlist']['updated_at']);
+        $this->assertEquals('simple', $response['customer']['wishlist']['items'][0]['product']['sku']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testCustomerAlwaysHasWishlist(): void
+    {
+        $query =
+            <<<QUERY
+{
+  customer {
+    wishlist {
+      id
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery(
+            $query,
+            [],
+            '',
+            $this->getCustomerAuthHeaders('customer@example.com', 'password')
+        );
+
+        $this->assertNotEmpty($response['customer']['wishlist']['id']);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testGuestCannotGetWishlist()
+    {
+        $query =
+            <<<QUERY
+{
+  customer {
+    wishlist {
+      items_count
+      sharing_code
+      updated_at
+    }
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @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/Multishipping/Api/CartRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Multishipping/Api/CartRepositoryTest.php
new file mode 100644
index 0000000000000..46844438fdd97
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/Multishipping/Api/CartRepositoryTest.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Api;
+
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SortOrderBuilder;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\WebapiAbstract;
+
+/**
+ * Tests web-api for multishipping quote.
+ */
+class CartRepositoryTest extends WebapiAbstract
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var SortOrderBuilder
+     */
+    private $sortOrderBuilder;
+
+    /**
+     * @var FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->filterBuilder = $this->objectManager->create(FilterBuilder::class);
+        $this->sortOrderBuilder = $this->objectManager->create(SortOrderBuilder::class);
+        $this->searchCriteriaBuilder = $this->objectManager->create(SearchCriteriaBuilder::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        try {
+            /** @var CartRepositoryInterface $quoteRepository */
+            $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+            $cart = $this->getCart('multishipping_quote_id');
+            $quoteRepository->delete($cart);
+        } catch (\InvalidArgumentException $e) {
+            // Do nothing if cart fixture was not used
+        }
+        parent::tearDown();
+    }
+
+    /**
+     * Tests that multishipping quote contains all addresses in shipping assignments.
+     *
+     * @magentoApiDataFixture Magento/Multishipping/Fixtures/quote_with_split_items.php
+     */
+    public function testGetMultishippingCart()
+    {
+        $cart = $this->getCart('multishipping_quote_id');
+        $cartId = $cart->getId();
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/carts/' . $cartId,
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ],
+            'soap' => [
+                'service' => 'quoteCartRepositoryV1',
+                'serviceVersion' => 'V1',
+                'operation' => 'quoteCartRepositoryV1Get',
+            ],
+        ];
+
+        $requestData = ['cartId' => $cartId];
+        $cartData = $this->_webApiCall($serviceInfo, $requestData);
+
+        $shippingAssignments = $cart->getExtensionAttributes()->getShippingAssignments();
+        foreach ($shippingAssignments as $key => $shippingAssignment) {
+            $address = $shippingAssignment->getShipping()->getAddress();
+            $cartItem = $shippingAssignment->getItems()[0];
+            $this->assertEquals(
+                $address->getId(),
+                $cartData['extension_attributes']['shipping_assignments'][$key]['shipping']['address']['id']
+            );
+            $this->assertEquals(
+                $cartItem->getSku(),
+                $cartData['extension_attributes']['shipping_assignments'][$key]['items'][0]['sku']
+            );
+            $this->assertEquals(
+                $cartItem->getQty(),
+                $cartData['extension_attributes']['shipping_assignments'][$key]['items'][0]['qty']
+            );
+        }
+    }
+
+    /**
+     * Retrieve quote by given reserved order ID
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     * @throws \InvalidArgumentException
+     */
+    private function getCart(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();
+
+        if (empty($items)) {
+            throw new \InvalidArgumentException('There is no quote with provided reserved order ID.');
+        }
+
+        return array_pop($items);
+    }
+}
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 6d585561ae3a9..08821b08ede5e 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartManagementTest.php
@@ -310,21 +310,20 @@ public function testAssignCustomerThrowsExceptionIfCartIsAssignedToDifferentStor
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
      * @magentoApiDataFixture Magento/Sales/_files/quote.php
-     * @expectedException \Exception
      */
-    public function testAssignCustomerThrowsExceptionIfCustomerAlreadyHasActiveCart()
+    public function testAssignCustomerCartMerged()
     {
         /** @var $customer \Magento\Customer\Model\Customer */
         $customer = $this->objectManager->create(\Magento\Customer\Model\Customer::class)->load(1);
         // Customer has a quote with reserved order ID test_order_1 (see fixture)
         /** @var $customerQuote \Magento\Quote\Model\Quote */
         $customerQuote = $this->objectManager->create(\Magento\Quote\Model\Quote::class)
-            ->load('test_order_1', 'reserved_order_id');
-        $customerQuote->setIsActive(1)->save();
+            ->load('test_order_item_with_items', 'reserved_order_id');
         /** @var $quote \Magento\Quote\Model\Quote */
         $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class)->load('test01', 'reserved_order_id');
+        $expectedQuoteItemsQty = $customerQuote->getItemsQty() + $quote->getItemsQty();
 
         $cartId = $quote->getId();
         $customerId = $customer->getId();
@@ -346,11 +345,13 @@ public function testAssignCustomerThrowsExceptionIfCustomerAlreadyHasActiveCart(
             'customerId' => $customerId,
             'storeId' => 1,
         ];
-        $this->_webApiCall($serviceInfo, $requestData);
+        $this->assertTrue($this->_webApiCall($serviceInfo, $requestData));
 
-        $this->expectExceptionMessage(
-            "The customer can't be assigned to the cart because the customer already has an active cart."
-        );
+        $mergedQuote = $this->objectManager
+            ->create(\Magento\Quote\Model\Quote::class)
+            ->load('test01', 'reserved_order_id');
+
+        $this->assertEquals($expectedQuoteItemsQty, $mergedQuote->getItemsQty());
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartRepositoryTest.php
index 8cb82f5c8f206..5a894758dc9ed 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/CartRepositoryTest.php
@@ -42,6 +42,9 @@ class CartRepositoryTest extends WebapiAbstract
      */
     private $filterBuilder;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -59,8 +62,10 @@ protected function setUp()
     protected function tearDown()
     {
         try {
+            /** @var CartRepositoryInterface $quoteRepository */
+            $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
             $cart = $this->getCart('test01');
-            $cart->delete();
+            $quoteRepository->delete($cart);
         } catch (\InvalidArgumentException $e) {
             // Do nothing if cart fixture was not used
         }
@@ -74,18 +79,27 @@ protected function tearDown()
      * @return \Magento\Quote\Model\Quote
      * @throws \InvalidArgumentException
      */
-    protected function getCart($reservedOrderId)
+    private function getCart($reservedOrderId)
     {
-        /** @var $cart \Magento\Quote\Model\Quote */
-        $cart = $this->objectManager->get(\Magento\Quote\Model\Quote::class);
-        $cart->load($reservedOrderId, 'reserved_order_id');
-        if (!$cart->getId()) {
+        /** @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();
+
+        if (empty($items)) {
             throw new \InvalidArgumentException('There is no quote with provided reserved order ID.');
         }
-        return $cart;
+
+        return array_pop($items);
     }
 
     /**
+     * Tests successfull get cart web-api call.
+     *
      * @magentoApiDataFixture Magento/Sales/_files/quote.php
      */
     public function testGetCart()
@@ -130,6 +144,8 @@ public function testGetCart()
     }
 
     /**
+     * Tests exception when cartId is not provided.
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage No such entity with
      */
@@ -154,6 +170,8 @@ public function testGetCartThrowsExceptionIfThereIsNoCartWithProvidedId()
     }
 
     /**
+     * Tests carts search.
+     *
      * @magentoApiDataFixture Magento/Sales/_files/quote.php
      */
     public function testGetList()
@@ -184,6 +202,7 @@ public function testGetList()
         $this->searchCriteriaBuilder->addFilters([$grandTotalFilter, $subtotalFilter]);
         $this->searchCriteriaBuilder->addFilters([$minCreatedAtFilter]);
         $this->searchCriteriaBuilder->addFilters([$maxCreatedAtFilter]);
+        $this->searchCriteriaBuilder->addFilter('reserved_order_id', 'test01');
         /** @var SortOrder $sortOrder */
         $sortOrder = $this->sortOrderBuilder->setField('subtotal')->setDirection(SortOrder::SORT_ASC)->create();
         $this->searchCriteriaBuilder->setSortOrders([$sortOrder]);
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 bbd1e59f83f90..120781e674d47 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartManagementTest.php
@@ -231,21 +231,20 @@ public function testAssignCustomerThrowsExceptionIfTargetCartIsNotAnonymous()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
      * @magentoApiDataFixture Magento/Sales/_files/quote.php
-     * @expectedException \Exception
      */
-    public function testAssignCustomerThrowsExceptionIfCustomerAlreadyHasActiveCart()
+    public function testAssignCustomerCartMerged()
     {
         /** @var $customer \Magento\Customer\Model\Customer */
         $customer = $this->objectManager->create(\Magento\Customer\Model\Customer::class)->load(1);
         // Customer has a quote with reserved order ID test_order_1 (see fixture)
         /** @var $customerQuote \Magento\Quote\Model\Quote */
         $customerQuote = $this->objectManager->create(\Magento\Quote\Model\Quote::class)
-            ->load('test_order_1', 'reserved_order_id');
-        $customerQuote->setIsActive(1)->save();
+            ->load('test_order_item_with_items', 'reserved_order_id');
         /** @var $quote \Magento\Quote\Model\Quote */
         $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class)->load('test01', 'reserved_order_id');
+        $expectedQuoteItemsQty = $customerQuote->getItemsQty() + $quote->getItemsQty();
 
         $cartId = $quote->getId();
 
@@ -284,11 +283,12 @@ public function testAssignCustomerThrowsExceptionIfCustomerAlreadyHasActiveCart(
             'customerId' => $customerId,
             'storeId' => 1,
         ];
-        $this->_webApiCall($serviceInfo, $requestData);
+        $this->assertTrue($this->_webApiCall($serviceInfo, $requestData));
+        $mergedQuote = $this->objectManager
+            ->create(\Magento\Quote\Model\Quote::class)
+            ->load('test01', 'reserved_order_id');
 
-        $this->expectExceptionMessage(
-            "The customer can't be assigned to the cart because the customer already has an active cart."
-        );
+        $this->assertEquals($expectedQuoteItemsQty, $mergedQuote->getItemsQty());
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentAddTrackTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentAddTrackTest.php
index 054f91a295fd9..639adb8da4624 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentAddTrackTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentAddTrackTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Service\V1;
 
 use Magento\Framework\Webapi\Rest\Request;
@@ -18,17 +20,17 @@
 class ShipmentAddTrackTest extends WebapiAbstract
 {
     /**
-     * Service read name
+     * Read name of service
      */
     const SERVICE_READ_NAME = 'salesShipmentTrackRepositoryV1';
 
     /**
-     * Service version
+     * Version of service
      */
     const SERVICE_VERSION = 'V1';
 
     /**
-     * Shipment increment id
+     * Increment id for shipment
      */
     const SHIPMENT_INCREMENT_ID = '100000001';
 
@@ -74,6 +76,52 @@ public function testShipmentAddTrack()
         self::assertNotEmpty($result[ShipmentTrackInterface::ENTITY_ID]);
         self::assertEquals($shipment->getId(), $result[ShipmentTrackInterface::PARENT_ID]);
     }
+
+    /**
+     * Shipment Tracking throw an error if order doesn't exist.
+     *
+     * @magentoApiDataFixture Magento/Sales/_files/shipment.php
+     * @magentoApiDataFixture Magento/Sales/_files/order_list.php
+     */
+    public function testShipmentTrackWithFailedOrderId()
+    {
+        /** @var \Magento\Sales\Model\Order $order */
+        $orderCollection = $this->objectManager->get(\Magento\Sales\Model\ResourceModel\Order\Collection::class);
+        $order = $orderCollection->getLastItem();
+        // Order ID from Magento/Sales/_files/order_list.php
+        $failedOrderId = $order->getId();
+        $shipmentCollection = $this->objectManager->get(Collection::class);
+        /** @var \Magento\Sales\Model\Order\Shipment $shipment */
+        $shipment = $shipmentCollection->getFirstItem();
+        $trackData = [
+            ShipmentTrackInterface::ENTITY_ID => null,
+            ShipmentTrackInterface::ORDER_ID => $failedOrderId,
+            ShipmentTrackInterface::PARENT_ID => $shipment->getId(),
+            ShipmentTrackInterface::WEIGHT => 20,
+            ShipmentTrackInterface::QTY => 5,
+            ShipmentTrackInterface::TRACK_NUMBER => 2,
+            ShipmentTrackInterface::DESCRIPTION => 'Shipment description',
+            ShipmentTrackInterface::TITLE => 'Shipment title',
+            ShipmentTrackInterface::CARRIER_CODE => Track::CUSTOM_CARRIER_CODE,
+        ];
+        $exceptionMessage = '';
+
+        try {
+            $this->_webApiCall($this->getServiceInfo(), ['entity' => $trackData]);
+        } catch (\SoapFault $e) {
+            $exceptionMessage = $e->getMessage();
+        } catch (\Exception $e) {
+            $errorObj = $this->processRestExceptionResult($e);
+            $exceptionMessage = $errorObj['message'];
+        }
+
+        $this->assertContains(
+            $exceptionMessage,
+            'Could not save the shipment tracking.',
+            'SoapFault or CouldNotSaveException does not contain exception message.'
+        );
+    }
+
     /**
      * Returns details about API endpoints and services.
      *
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/EnvWhitelist.php b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/EnvWhitelist.php
new file mode 100644
index 0000000000000..294cc32e8f712
--- /dev/null
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/EnvWhitelist.php
@@ -0,0 +1,40 @@
+<?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;
+
+/**
+ * Adding and removing domain to whitelist for test execution.
+ */
+class EnvWhitelist extends Cli
+{
+    /**
+     * Parameter domain add command.
+     */
+    const PARAM_DOMAINS = 'downloadable:domains';
+
+    /**
+     * Add host to the whitelist.
+     *
+     * @param string $host
+     */
+    public function addHost($host)
+    {
+        parent::execute(EnvWhitelist::PARAM_DOMAINS . ':add ' . $host);
+    }
+
+    /**
+     * Remove host from the whitelist.
+     *
+     * @param string $host
+     */
+    public function removeHost($host)
+    {
+        parent::execute(EnvWhitelist::PARAM_DOMAINS . ':remove ' . $host);
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Form/AuthorizenetCc.php b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Form/AuthorizenetCc.php
deleted file mode 100644
index 3cae648602531..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Form/AuthorizenetCc.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Authorizenet\Test\Block\Form;
-
-use Magento\Mtf\Client\Locator;
-use Magento\Payment\Test\Block\Form\PaymentCc;
-
-/**
- * Form for credit card data for Authorize.net payment method.
- */
-class AuthorizenetCc extends PaymentCc
-{
-    /**
-     * Authorizenet form locators.
-     *
-     * @var array
-     */
-    private $authorizenetForm = [
-        "cc_number" => "//*[@id='authorizenet_directpost_cc_number']",
-        "cc_exp_month" => "//*[@id='authorizenet_directpost_expiration']",
-        "cc_exp_year" => "//*[@id='authorizenet_directpost_expiration_yr']",
-        "cc_cid" => "//*[@id='authorizenet_directpost_cc_cid']",
-    ];
-
-    /**
-     * Get Filled CC Number.
-     *
-     * @return string
-     */
-    public function getCCNumber()
-    {
-        return $this->_rootElement->find($this->authorizenetForm['cc_number'], Locator::SELECTOR_XPATH)->getValue();
-    }
-
-    /**
-     * Get Filled CC Number.
-     *
-     * @return string
-     */
-    public function getExpMonth()
-    {
-        return $this->_rootElement->find($this->authorizenetForm['cc_exp_month'], Locator::SELECTOR_XPATH)->getValue();
-    }
-
-    /**
-     * Get Expiration Year
-     *
-     * @return string
-     */
-    public function getExpYear()
-    {
-        return $this->_rootElement->find($this->authorizenetForm['cc_exp_year'], Locator::SELECTOR_XPATH)->getValue();
-    }
-
-    /**
-     * Get CID
-     *
-     * @return string
-     */
-    public function getCid()
-    {
-        return $this->_rootElement->find($this->authorizenetForm['cc_cid'], Locator::SELECTOR_XPATH)->getValue();
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Form/AuthorizenetCc.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Form/AuthorizenetCc.xml
deleted file mode 100644
index dbb9b4707f1e7..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Form/AuthorizenetCc.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
- -->
-<mapping strict="0">
-    <fields>
-        <cc_number>
-            <selector>#authorizenet_directpost_cc_number</selector>
-        </cc_number>
-        <cc_exp_month>
-            <selector>#authorizenet_directpost_expiration</selector>
-        </cc_exp_month>
-        <cc_exp_year>
-            <selector>#authorizenet_directpost_expiration_yr</selector>
-        </cc_exp_year>
-        <cc_cid>
-            <selector>#authorizenet_directpost_cc_cid</selector>
-        </cc_cid>
-    </fields>
-</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/AuthorizenetLogin.php b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/AuthorizenetLogin.php
deleted file mode 100644
index 236237361d61e..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/AuthorizenetLogin.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Authorizenet\Test\Block\Sandbox;
-
-use Magento\Mtf\Block\Form;
-use Magento\Mtf\Client\Element\SimpleElement;
-use Magento\Mtf\Fixture\FixtureInterface;
-
-/**
- * Login form.
- */
-class AuthorizenetLogin extends Form
-{
-    /**
-     * Login button on Authorize.Net Sandbox.
-     *
-     * @var string
-     */
-    private $loginButton = '[type=submit]';
-
-    /**
-     * Switch to the form frame and fill form. {@inheritdoc}
-     *
-     * @param FixtureInterface $fixture
-     * @param SimpleElement|null $element
-     * @return $this
-     */
-    public function fill(FixtureInterface $fixture, SimpleElement $element = null)
-    {
-        parent::fill($fixture, $element);
-        return $this;
-    }
-
-    /**
-     * Login to Authorize.Net Sandbox.
-     *
-     * @return void
-     */
-    public function login()
-    {
-        $this->_rootElement->find($this->loginButton)->click();
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/AuthorizenetLogin.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/AuthorizenetLogin.xml
deleted file mode 100644
index 81159d8cf8451..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/AuthorizenetLogin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<mapping strict="1">
-    <fields>
-        <login_id>
-            <selector>[name=MerchantLogin]</selector>
-        </login_id>
-        <password>
-            <selector>[name=Password]</selector>
-        </password>
-    </fields>
-</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/GetStartedModal.php b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/GetStartedModal.php
deleted file mode 100644
index f7efb023b5799..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/GetStartedModal.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Authorizenet\Test\Block\Sandbox;
-
-use Magento\Mtf\Block\Block;
-
-/**
- * 'Get started accepting payments' modal window on Authorize.Net sandbox.
- */
-class GetStartedModal extends Block
-{
-    /**
-     * 'Got It' button selector.
-     * This button is located in notification window which may appear immediately after login.
-     *
-     * @var string
-     */
-    private $gotItButton = '#btnGetStartedGotIt';
-
-    /**
-     * Accept notification if it appears after login.
-     *
-     * @return $this
-     */
-    public function acceptNotification()
-    {
-        $element = $this->browser->find($this->gotItButton);
-        if ($element->isVisible()) {
-            $element->click();
-        }
-        return $this;
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/Menu.php b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/Menu.php
deleted file mode 100644
index e4cdc5b8d1a29..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/Menu.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Authorizenet\Test\Block\Sandbox;
-
-use Magento\Mtf\Block\Block;
-use Magento\Mtf\Client\Locator;
-
-/**
- * Menu block on Authorize.Net sandbox.
- */
-class Menu extends Block
-{
-    /**
-     * Search menu button selector.
-     *
-     * @var string
-     */
-    private $searchMenuButton = './/div[@id="topNav"]//a[contains(@href,"search")]';
-
-    /**
-     * Open 'Search' menu item.
-     *
-     * @return $this
-     */
-    public function openSearchMenu()
-    {
-        $this->_rootElement->find($this->searchMenuButton, Locator::SELECTOR_XPATH)->click();
-        return $this;
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/SearchForm.php b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/SearchForm.php
deleted file mode 100644
index cceda81e61a36..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/SearchForm.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Authorizenet\Test\Block\Sandbox;
-
-use Magento\Mtf\Block\Form;
-
-/**
- * Transactions search form.
- */
-class SearchForm extends Form
-{
-    /**
-     * Search button selector.
-     *
-     * @var string
-     */
-    private $searchButton = '[type=submit]';
-
-    /**
-     * Search for transactions.
-     *
-     * @return void
-     */
-    public function search()
-    {
-        $this->browser->find($this->searchButton)->click();
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/SearchForm.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/SearchForm.xml
deleted file mode 100644
index 993d3b4fda748..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/SearchForm.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<mapping strict="1">
-    <fields>
-        <settlement_date_from>
-            <selector>[name=StartBatch]</selector>
-            <input>select</input>
-        </settlement_date_from>
-        <settlement_date_to>
-            <selector>[name=EndBatch]</selector>
-            <input>select</input>
-        </settlement_date_to>
-    </fields>
-</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/TransactionsGrid.php b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/TransactionsGrid.php
deleted file mode 100644
index c9b6ab3b8152c..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Block/Sandbox/TransactionsGrid.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Authorizenet\Test\Block\Sandbox;
-
-use Magento\Mtf\Block\Block;
-use Magento\Mtf\Client\Locator;
-
-/**
- * Transactions grid block.
- */
-class TransactionsGrid extends Block
-{
-    /**
-     * Transaction selector.
-     *
-     * @var string
-     */
-    private $transaction = './/a[contains(text(), "%s")]';
-
-    /**
-     * 'Approve' button selector.
-     *
-     * @var string
-     */
-    private $transactionApprove = '(//input[@id="btnConfirmApprove"])[1]';
-
-    /**
-     * Confirmation window 'OK' button selector.
-     *
-     * @var string
-     */
-    private $transactionApprovalConfirm = '#btnConfirmYes';
-
-    /**
-     * Find transaction in grid and open it.
-     *
-     * @param string $transactionId
-     * @return $this
-     */
-    public function openTransaction($transactionId)
-    {
-        $this->_rootElement->find(sprintf($this->transaction, $transactionId), Locator::SELECTOR_XPATH)->click();
-        return $this;
-    }
-
-    /**
-     * Approve selected transaction.
-     *
-     * @return $this
-     */
-    public function approveTransaction()
-    {
-        $this->_rootElement->find($this->transactionApprove, Locator::SELECTOR_XPATH)->click();
-        $this->confirmTransactionApproval();
-        return $this;
-    }
-
-    /**
-     * Confirm approval of selected transaction.
-     *
-     * @return void
-     */
-    private function confirmTransactionApproval()
-    {
-        $this->browser->find($this->transactionApprovalConfirm)->click();
-    }
-}
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
deleted file mode 100644
index cd1dfce621806..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Constraint/AssertCreditCardNumberOnOnePageCheckout.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Authorizenet\Test\Constraint;
-
-use Magento\Checkout\Test\Page\CheckoutOnepage;
-use Magento\Mtf\Constraint\AbstractConstraint;
-use Magento\Payment\Test\Fixture\CreditCard;
-
-/**
- * Assert credit card fields have set values from fixture.
- */
-class AssertCreditCardNumberOnOnePageCheckout extends AbstractConstraint
-{
-    /**
-     * Assert payment form values did persist from fixture after checkout blocks refresh
-     *
-     * @param CheckoutOnepage $checkoutOnepage
-     * @param CreditCard $creditCard
-     * @return void
-     */
-    public function processAssert(CheckoutOnepage $checkoutOnepage, CreditCard $creditCard)
-    {
-        \PHPUnit\Framework\Assert::assertEquals(
-            $creditCard->getCcNumber(),
-            $checkoutOnepage->getAuthorizenetBlock()->getCCNumber(),
-            'Credit card data did persist with the values from fixture'
-        );
-    }
-
-    /**
-     * Returns string representation of successful assertion
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'Credit card data did persist with the values from fixture.';
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Fixture/AuthorizenetSandboxCustomer.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Fixture/AuthorizenetSandboxCustomer.xml
deleted file mode 100644
index 89e1aca8c3b78..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Fixture/AuthorizenetSandboxCustomer.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/mtf/etc/fixture.xsd">
-    <fixture name="authorizenet_sandbox_customer"
-             module="Magento_Authorizenet"
-             type="virtual"
-             repository_class="Magento\Authorizenet\Test\Repository\AuthorizenetSandboxCustomer"
-             class="Magento\Authorizenet\Test\Fixture\AuthorizenetSandboxCustomer">
-        <field name="login_id" />
-        <field name="password" />
-    </fixture>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Fixture/TransactionSearch.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Fixture/TransactionSearch.xml
deleted file mode 100644
index 6d644d2bd3996..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Fixture/TransactionSearch.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/mtf/etc/fixture.xsd">
-    <fixture name="authorizenet_trasnsaction_search"
-             module="Magento_Authorizenet"
-             type="virtual"
-             repository_class="Magento\Authorizenet\Test\Repository\TransactionSearch"
-             class="Magento\Authorizenet\Test\Fixture\TransactionSearch">
-        <field name="settlement_date_from" />
-        <field name="settlement_date_to" />
-    </fixture>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Page/CheckoutOnepage.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Page/CheckoutOnepage.xml
deleted file mode 100644
index 34e8a1eea62f3..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Page/CheckoutOnepage.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/mtf/etc/pages.xsd">
-    <page name="CheckoutOnepage" mca="checkout/index">
-        <block name="authorizenetBlock" class="Magento\Authorizenet\Test\Block\Form\AuthorizenetCc" locator="#payment_form_authorizenet_directpost" strategy="css selector"/>
-        <block name="paymentBlock">
-            <render name="authorizenet" class="Magento\Authorizenet\Test\Block\Form\AuthorizenetCc" />
-        </block>
-    </page>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Page/Sandbox/Main.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Page/Sandbox/Main.xml
deleted file mode 100644
index da9fd5df60ceb..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Page/Sandbox/Main.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/pages.xsd">
-    <page name="Main" area="Sandbox" mca="https://sandbox.authorize.net/" module="Magento_Authorizenet">
-        <block name="loginForm" class="Magento\Authorizenet\Test\Block\Sandbox\AuthorizenetLogin" locator="#ctl00_MainContent_welcomeText" strategy="css selector" />
-        <block name="menuBlock" class="Magento\Authorizenet\Test\Block\Sandbox\Menu" locator="body" strategy="css selector" />
-        <block name="modalBlock" class="Magento\Authorizenet\Test\Block\Sandbox\GetStartedModal" locator="body" strategy="css selector" />
-        <block name="searchForm" class="Magento\Authorizenet\Test\Block\Sandbox\SearchForm" locator="#Main" strategy="css selector" />
-        <block name="transactionsGridBlock" class="Magento\Authorizenet\Test\Block\Sandbox\TransactionsGrid" locator="#Main" strategy="css selector" />
-    </page>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Repository/AuthorizenetSandboxCustomer.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Repository/AuthorizenetSandboxCustomer.xml
deleted file mode 100644
index 454da0ef6cecd..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Repository/AuthorizenetSandboxCustomer.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="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
-    <repository class="Magento\Authorizenet\Test\Repository\AuthorizenetSandboxCustomer">
-        <dataset name="sandbox_fraud_hold_review">
-            <field name="login_id" xsi:type="string">AUTHORIZENET_SANDBOX_LOGIN_ID</field>
-            <field name="password" xsi:type="string">AUTHORIZENET_SANDBOX_PASSWORD</field>
-        </dataset>
-    </repository>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Repository/ConfigData.xml
deleted file mode 100644
index c759b537a191d..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Repository/ConfigData.xml
+++ /dev/null
@@ -1,163 +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="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
-    <repository class="Magento\Config\Test\Repository\ConfigData">
-        <dataset name="authorizenet">
-            <field name="payment/authorizenet_directpost/active" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</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="payment/authorizenet_directpost/login" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">%payment_authorizenet_login%</item>
-            </field>
-            <field name="payment/authorizenet_directpost/trans_key" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">%payment_authorizenet_trans_key%</item>
-            </field>
-            <field name="payment/authorizenet_directpost/trans_md5" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">%payment_authorizenet_trans_md5%</item>
-            </field>
-            <field name="payment/authorizenet_directpost/test" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">No</item>
-                <item name="value" xsi:type="number">0</item>
-            </field>
-            <field name="payment/authorizenet_directpost/cgi_url" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">https://test.authorize.net/gateway/transact.dll</item>
-            </field>
-            <field name="payment/authorizenet_directpost/cgi_url_td" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">https://apitest.authorize.net/xml/v1/request.api</item>
-            </field>
-            <field name="payment/authorizenet_directpost/debug" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</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="payment/authorizenet_directpost/useccv" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</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="authorizenet_rollback">
-            <field name="payment/authorizenet_directpost/active" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">No</item>
-                <item name="value" xsi:type="number">0</item>
-            </field>
-        </dataset>
-        <dataset name="authorizenet_fraud_review">
-            <field name="payment/authorizenet_directpost/active" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</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="payment/authorizenet_directpost/login" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">%authorizenet_fraud_review_login%</item>
-            </field>
-            <field name="payment/authorizenet_directpost/trans_key" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">%authorizenet_fraud_review_trans_key%</item>
-            </field>
-            <field name="payment/authorizenet_directpost/trans_md5" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">%authorizenet_fraud_review_md5%</item>
-            </field>
-            <field name="payment/authorizenet_directpost/test" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">No</item>
-                <item name="value" xsi:type="number">0</item>
-            </field>
-            <field name="payment/authorizenet_directpost/cgi_url" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">https://test.authorize.net/gateway/transact.dll</item>
-            </field>
-            <field name="payment/authorizenet_directpost/cgi_url_td" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">https://apitest.authorize.net/xml/v1/request.api</item>
-            </field>
-            <field name="payment/authorizenet_directpost/debug" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</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="payment/authorizenet_directpost/useccv" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</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="authorizenet_fraud_review_rollback">
-            <field name="payment/authorizenet_directpost/active" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">No</item>
-                <item name="value" xsi:type="number">0</item>
-            </field>
-        </dataset>
-        <dataset name="authorizenet_authorize_capture">
-            <field name="payment/authorizenet_directpost/payment_action" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">authorize_capture</item>
-            </field>
-        </dataset>
-        <dataset name="authorizenet_authorize_capture_rollback">
-            <field name="payment/authorizenet_directpost/payment_action" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string">authorize</item>
-            </field>
-        </dataset>
-        <dataset name="authorizenet_wrong_credentials">
-            <field name="payment/authorizenet_directpost/trans_md5" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="string"></item>
-            </field>
-        </dataset>
-    </repository>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Repository/TransactionSearch.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Repository/TransactionSearch.xml
deleted file mode 100644
index 19b2d5eededa6..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/Repository/TransactionSearch.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="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
-    <repository class="Magento\Authorizenet\Test\Repository\TransactionSearch">
-        <dataset name="unsettled">
-            <field name="settlement_date_from" xsi:type="string">Unsettled</field>
-            <field name="settlement_date_to" xsi:type="string">Unsettled</field>
-        </dataset>
-    </repository>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/AuthorizenetFraudCheckoutTest.php b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/AuthorizenetFraudCheckoutTest.php
deleted file mode 100644
index ca0c473eb685f..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/AuthorizenetFraudCheckoutTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Authorizenet\Test\TestCase;
-
-use Magento\Mtf\TestCase\Scenario;
-
-/**
- * Preconditions:
- * 1. Configure payment method.
- * 2. Create products.
- *
- * Steps:
- * 1. Log in Storefront.
- * 2. Add products to the Shopping Cart.
- * 3. Click the 'Proceed to Checkout' button.
- * 4. Fill shipping information.
- * 5. Select shipping method.
- * 6. Select payment method.
- * 7. Click 'Place Order' button.
- * 8. Log in to Authorize.Net sandbox.
- * 9. Accept transaction.
- * 10. Log in to Magento Admin.
- * 11. Open order.
- * 12. Perform assertions.
- *
- * @group Checkout
- * @ZephyrId MAGETWO-38379
- */
-class AuthorizenetFraudCheckoutTest extends Scenario
-{
-    /* tags */
-    const TEST_TYPE = '3rd_party_test';
-    /* end tags */
-
-    /**
-     * Runs one page checkout test.
-     *
-     * @return void
-     */
-    public function test()
-    {
-        $this->executeScenario();
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/AuthorizenetFraudCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/AuthorizenetFraudCheckoutTest.xml
deleted file mode 100644
index 9ba32a4cc7a6b..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/AuthorizenetFraudCheckoutTest.xml
+++ /dev/null
@@ -1,38 +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\Authorizenet\Test\TestCase\AuthorizenetFraudCheckoutTest" summary="Accept transaction for order placed via Authorize.Net.">
-        <variation name="AuthorizenetFraudCheckoutAccept" summary="Accept transaction with 'Authorize and hold for review' fraud action for order placed with 'Authorize and Capture' payment action" ticketId="MAGETWO-38379">
-            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
-            <data name="customer/dataset" xsi:type="string">default</data>
-            <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</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="prices" xsi:type="array">
-                <item name="grandTotal" xsi:type="string">15.00</item>
-            </data>
-            <data name="orderBeforeAccept" xsi:type="array">
-                <item name="invoiceStatus" xsi:type="string">Pending</item>
-                <item name="orderStatus" xsi:type="string">Suspected Fraud</item>
-                <item name="buttonsAvailable" xsi:type="string">Back, Send Email, Get Payment Update</item>
-            </data>
-            <data name="payment/method" xsi:type="string">authorizenet_directpost</data>
-            <data name="creditCard/dataset" xsi:type="string">visa_default</data>
-            <data name="sandboxCustomer/dataset" xsi:type="string">sandbox_fraud_hold_review</data>
-            <data name="transactionSearch/dataset" xsi:type="string">unsettled</data>
-            <data name="configData" xsi:type="string">authorizenet_fraud_review, authorizenet_authorize_capture</data>
-            <data name="status" xsi:type="string">Processing</data>
-            <data name="invoiceStatus" xsi:type="string">Paid</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Send Email, Credit Memo, Hold, Ship, Reorder</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S1</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertInvoiceStatusInOrdersGrid" />
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
-        </variation>
-    </testCase>
-</config>
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
deleted file mode 100644
index 00c1a1557e05b..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutDeclinedTest.xml
+++ /dev/null
@@ -1,25 +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\Checkout\Test\TestCase\OnePageCheckoutDeclinedTest" summary="Error message during OnePageCheckout">
-        <variation name="OnePageCheckoutAuthorizenetWrongCredentials" summary="Error during place order flow with Authorize.net" ticketId="MAGETWO-69995">
-            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
-            <data name="customer/dataset" xsi:type="string">default</data>
-            <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</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">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">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>
-    </testCase>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutPaymentMethodDataPersistenceWithDiscountTest.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutPaymentMethodDataPersistenceWithDiscountTest.xml
deleted file mode 100644
index b979745a99b96..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutPaymentMethodDataPersistenceWithDiscountTest.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/mtf/etc/variations.xsd">
-    <testCase name="Magento\SalesRule\Test\TestCase\OnePageCheckoutPaymentMethodDataPersistenceWithDiscountTest" summary="Checkout with Authorize.net credit card on Storefront with discount applied during checkout">
-        <variation name="OnePageCheckoutPaymentMethodDataPersistWithDiscountTest1" summary="Checkout with Authorize.net credit card on Storefront with discount applied during checkout" ticketId="MAGETWO-69657">
-            <data name="description" xsi:type="string">Use saved for Authorize.net credit card on checkout</data>
-            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
-            <data name="customer/dataset" xsi:type="string">default</data>
-            <data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups</data>
-            <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</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">authorizenet_directpost</data>
-            <data name="paymentForm" xsi:type="string">default</data>
-            <data name="creditCard/dataset" xsi:type="string">visa_default</data>
-            <data name="creditCard/data/payment_code" xsi:type="string">authorizenet</data>
-            <data name="prices" xsi:type="array">
-                <item name="grandTotal" xsi:type="string">10.00</item>
-            </data>
-            <data name="creditCardSave" xsi:type="string">Yes</data>
-            <data name="configData" xsi:type="string">authorizenet</data>
-            <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">severity:S1</data>
-            <constraint name="Magento\Authorizenet\Test\Constraint\AssertCreditCardNumberOnOnePageCheckout" />
-        </variation>
-    </testCase>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
deleted file mode 100644
index a7eaaada1be83..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.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/mtf/etc/variations.xsd">
-    <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest" summary="One page check out with Authorize.Net Direct Post payment method.">
-        <variation name="OnePageCheckoutAuthorizenetTestVariation1" summary="CheckOut with Authorize.Net Direct Post" ticketId="MAGETWO-59170">
-            <data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
-            <data name="customer/dataset" xsi:type="string">default</data>
-            <data name="checkoutMethod" xsi:type="string">login</data>
-            <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</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">15.00</item>
-            </data>
-            <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</data>
-            <data name="status" xsi:type="string">Processing</data>
-            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
-            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
-            <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
-            <constraint name="Magento\Sales\Test\Constraint\AssertAuthorizationInCommentsHistory" />
-        </variation>
-    </testCase>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/ReorderOrderEntityTest.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/ReorderOrderEntityTest.xml
deleted file mode 100644
index b0f4856e28d0d..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/ReorderOrderEntityTest.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/mtf/etc/variations.xsd">
-    <testCase name="Magento\Sales\Test\TestCase\ReorderOrderEntityTest" summary="Reorder Order from Admin using Authorize.Net Direct Post payment method." ticketId="MAGETWO-69939">
-        <variation name="ReorderOrderEntityAuthorizenetTestVariation1">
-            <data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S2</data>
-            <data name="description" xsi:type="string">Reorder placed order using Authorize.Net payment method (update products, billing address).</data>
-            <data name="order/dataset" xsi:type="string">default</data>
-            <data name="customer/dataset" xsi:type="string">default</data>
-            <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</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">565.00</item>
-            </data>
-            <data name="payment/method" xsi:type="string">authorizenet_directpost</data>
-            <data name="configData" xsi:type="string">authorizenet</data>
-            <data name="creditCard/dataset" xsi:type="string">visa_default_admin</data>
-            <data name="previousOrderStatus" xsi:type="string">Processing</data>
-            <data name="status" xsi:type="string">Processing</data>
-            <data name="orderButtonsAvailable" xsi:type="string">Back, Reorder, Cancel, Send Email, Hold, Invoice, Ship, Edit</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderSuccessCreateMessage" />
-            <constraint name="Magento\Sales\Test\Constraint\AssertReorderStatusIsCorrect" />
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
-        </variation>
-    </testCase>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestStep/AcceptTransactionOnAuthorizenetStep.php b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestStep/AcceptTransactionOnAuthorizenetStep.php
deleted file mode 100644
index 0ff6bb486cf81..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestStep/AcceptTransactionOnAuthorizenetStep.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Authorizenet\Test\TestStep;
-
-use Magento\Authorizenet\Test\Fixture\AuthorizenetSandboxCustomer;
-use Magento\Authorizenet\Test\Fixture\TransactionSearch;
-use Magento\Authorizenet\Test\Page\Sandbox\Main;
-use Magento\Mtf\Client\BrowserInterface;
-use Magento\Mtf\TestStep\TestStepInterface;
-use Magento\Sales\Test\Constraint\AssertInvoiceStatusInOrdersGrid;
-use Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable;
-use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
-use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
-
-/**
- * Accept transaction on Authorize.Net sandbox.
- */
-class AcceptTransactionOnAuthorizenetStep implements TestStepInterface
-{
-    /**
-     * Authorize.Net Sandbox customer fixture.
-     *
-     * @var AuthorizenetSandboxCustomer
-     */
-    private $sandboxCustomer;
-
-    /**
-     * Authorize.Net Sandbox account main page.
-     *
-     * @var Main
-     */
-    private $main;
-
-    /**
-     * Sales Order View page.
-     *
-     * @var SalesOrderView
-     */
-    private $salesOrderView;
-
-    /**
-     * Order Index page.
-     *
-     * @var OrderIndex
-     */
-    private $salesOrder;
-
-    /**
-     * Order id.
-     *
-     * @var string
-     */
-    private $orderId;
-
-    /**
-     * Assert invoice status on order page in Admin.
-     *
-     * @var AssertInvoiceStatusInOrdersGrid
-     */
-    private $assertInvoiceStatusInOrdersGrid;
-
-    /**
-     * Unsettled order data.
-     *
-     * @var array
-     */
-    private $orderBeforeAccept;
-
-    /**
-     * Assert that specified in data set buttons exist on order page in Admin.
-     *
-     * @var AssertOrderButtonsAvailable
-     */
-    private $assertOrderButtonsAvailable;
-
-    /**
-     * Client Browser instance.
-     *
-     * @var BrowserInterface
-     */
-    private $browser;
-
-    /**
-     * Form frame selector.
-     *
-     * @var string
-     */
-    private $frame = 'frameset > frame';
-
-    /**
-     * Transaction search fixture.
-     *
-     * @var TransactionSearch
-     */
-    private $transactionSearch;
-
-    /**
-     * @param AuthorizenetSandboxCustomer $sandboxCustomer
-     * @param TransactionSearch $transactionSearch
-     * @param Main $main
-     * @param SalesOrderView $salesOrderView
-     * @param OrderIndex $salesOrder
-     * @param AssertInvoiceStatusInOrdersGrid $assertInvoiceStatusInOrdersGrid
-     * @param AssertOrderButtonsAvailable $assertOrderButtonsAvailable
-     * @param BrowserInterface $browser
-     * @param array $orderBeforeAccept
-     * @param string $orderId
-     *
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     */
-    public function __construct(
-        AuthorizenetSandboxCustomer $sandboxCustomer,
-        TransactionSearch $transactionSearch,
-        Main $main,
-        SalesOrderView $salesOrderView,
-        OrderIndex $salesOrder,
-        AssertInvoiceStatusInOrdersGrid $assertInvoiceStatusInOrdersGrid,
-        AssertOrderButtonsAvailable $assertOrderButtonsAvailable,
-        BrowserInterface $browser,
-        array $orderBeforeAccept,
-        $orderId
-    ) {
-        $this->sandboxCustomer = $sandboxCustomer;
-        $this->transactionSearch = $transactionSearch;
-        $this->main = $main;
-        $this->salesOrderView = $salesOrderView;
-        $this->salesOrder = $salesOrder;
-        $this->assertInvoiceStatusInOrdersGrid = $assertInvoiceStatusInOrdersGrid;
-        $this->assertOrderButtonsAvailable = $assertOrderButtonsAvailable;
-        $this->browser = $browser;
-        $this->orderBeforeAccept = $orderBeforeAccept;
-        $this->orderId = $orderId;
-    }
-
-    /**
-     * Accept transaction on sandbox.authorize.net account.
-     *
-     * @return void
-     * @throws \Exception
-     */
-    public function run()
-    {
-        $this->assertInvoiceStatusInOrdersGrid->processAssert(
-            $this->salesOrderView,
-            $this->orderBeforeAccept['invoiceStatus'],
-            $this->orderId
-        );
-        $this->assertOrderButtonsAvailable->processAssert(
-            $this->salesOrderView,
-            $this->orderBeforeAccept['buttonsAvailable']
-        );
-        $this->salesOrder->open();
-        $this->salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $this->orderId]);
-
-        /** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info $infoTab */
-        $infoTab = $this->salesOrderView->getOrderForm()->openTab('info')->getTab('info');
-        $latestComment = $infoTab->getCommentsHistoryBlock()->getLatestComment();
-        if (!preg_match('/"(\d+)"/', $latestComment['comment'], $matches)) {
-            throw new \Exception('Comment with transaction id cannot be found.');
-        }
-        $transactionId = $matches[1];
-        $this->main->open();
-        $this->browser->switchToFrame($this->browser->find($this->frame)->getLocator());
-        $this->main->getLoginForm()->fill($this->sandboxCustomer)->login();
-        $this->main->getModalBlock()->acceptNotification();
-        $this->main->getMenuBlock()->openSearchMenu();
-        $this->main->getSearchForm()->fill($this->transactionSearch)->search();
-        $this->main->getTransactionsGridBlock()->openTransaction($transactionId)->approveTransaction();
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Authorizenet/Test/etc/testcase.xml
deleted file mode 100644
index 5ce1f811b4fbb..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Authorizenet/Test/etc/testcase.xml
+++ /dev/null
@@ -1,24 +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="../../../../../../vendor/magento/mtf/Magento/Mtf/TestCase/etc/testcase.xsd">
-    <scenario name="AuthorizenetFraudCheckoutTest" firstStep="setupConfiguration">
-        <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
-        <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
-        <step name="addProductsToTheCart" module="Magento_Checkout" next="proceedToCheckout" />
-        <step name="proceedToCheckout" module="Magento_Checkout" next="createCustomer" />
-        <step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod" />
-        <step name="selectCheckoutMethod" module="Magento_Checkout" next="fillShippingAddress" />
-        <step name="fillShippingAddress" module="Magento_Checkout" next="fillShippingMethod" />
-        <step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod" />
-        <step name="selectPaymentMethod" module="Magento_Checkout" next="fillBillingInformation" />
-        <step name="fillBillingInformation" module="Magento_Checkout" next="placeOrder" />
-        <step name="placeOrder" module="Magento_Checkout" next="acceptTransactionOnAuthorizenet" />
-        <step name="acceptTransactionOnAuthorizenet" module="Magento_Authorizenet" next="getPaymentUpdate" />
-        <step name="getPaymentUpdate" module="Magento_Sales" />
-    </scenario>
-</config>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch/Query.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch/Query.php
index a386584a2817b..5e5034b8ec099 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch/Query.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch/Query.php
@@ -32,7 +32,7 @@ public function __construct(FixtureFactory $fixtureFactory, $data, array $params
     {
         $this->params = $params;
         $explodedData = explode('::', $data);
-        switch (sizeof($explodedData)) {
+        switch (count($explodedData)) {
             case 1:
                 $this->data = $explodedData[0];
                 break;
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 01d8401b22fe1..39f5866a3c2ad 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
@@ -47,6 +47,7 @@ public function persist(FixtureInterface $fixture = null)
             $loginForm->fill($fixture);
             $loginForm->submit();
             $loginPage->waitForHeaderBlock();
+            $loginPage->dismissAdminUsageNotification();
         }
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
index c836c4db81ef1..4b72bb836523a 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php
@@ -40,6 +40,11 @@ class AdminAuthLogin extends Page
      */
     protected $messagesBlock = '.messages';
 
+    /**
+     * Admin Analytics selector
+     */
+    protected $adminUsageSelector ='.modal-inner-wrap';
+
     /**
      * Constructor.
      */
@@ -75,13 +80,24 @@ public function getHeaderBlock()
     /**
      * Get global messages block.
      *
-     * @return \Magento\Backend\Test\Block\Messages
+     * @return \Magento\Ui\Test\Block\Adminhtml\Modal
+
      */
     public function getMessagesBlock()
     {
         return Factory::getBlockFactory()->getMagentoBackendMessages($this->browser->find($this->messagesBlock));
     }
 
+    /**
+     * Get modal block
+     *
+     * @return void
+     */
+    public function getModalBlock()
+    {
+        return Factory::getBlockFactory()->getMagentoUiAdminhtmlModal($this->browser->find($this->adminUsageSelector));
+    }
+
     /**
      * Wait for Header block is visible in the page.
      *
@@ -98,4 +114,14 @@ function () use ($browser, $selector) {
             }
         );
     }
+
+    /**
+     * Dismiss admin usage notification
+     *
+     * @return void
+     */
+    public function dismissAdminUsageNotification()
+    {
+        $this->getModalBlock()->dismissIfModalAppears();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireSessionTest.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireSessionTest.xml
index e67ceb99f2eef..195d1330ae78a 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireSessionTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireSessionTest.xml
@@ -8,12 +8,14 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Backend\Test\TestCase\ExpireSessionTest" summary="Admin Session Expire" ticketId="MAGETWO-47723">
         <variation name="ExpireSessionTestVariation1" summary="Check that session expires according with time settings applied in configuration" ticketId="MAGETWO-47722">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="configData" xsi:type="string">default_cookie_lifetime_60_seconds</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="sessionLifetimeInSeconds" xsi:type="number">60</data>
             <constraint name="Magento\Cms\Test\Constraint\AssertAuthorizationLinkIsVisibleOnStoreFront" />
         </variation>
         <variation name="ExpireAdminSession" summary="Expire Admin Session" ticketId="MAGETWO-47723">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="configData" xsi:type="string">admin_session_lifetime_60_seconds</data>
             <data name="sessionLifetimeInSeconds" xsi:type="number">60</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertAdminLoginPageIsAvailable" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml
index fafd9842cc749..c5036555b6635 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml
@@ -49,7 +49,6 @@
         <field name="use_parent_category_settings" is_required="" group="design" />
         <field name="theme" is_required="" group="design" />
         <field name="layout" is_required="" group="design" />
-        <field name="layout_update_xml" is_required="" group="design" />
         <field name="apply_design_to_products" is_required="" group="design" />
         <field name="schedule_update_from" is_required="" group="schedule_design_update" />
         <field name="schedule_update_to" is_required="" group="schedule_design_update" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/TaxClass.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/TaxClass.php
index 23e0236fe7baa..70d2730868dbf 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/TaxClass.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/TaxClass.php
@@ -52,7 +52,7 @@ class TaxClass extends DataSource
     public function __construct(FixtureFactory $fixtureFactory, array $params, $data = [])
     {
         $this->params = $params;
-        if ((!isset($data['dataset']) && !isset($data['tax_product_class']))) {
+        if (!isset($data['dataset']) && !isset($data['tax_product_class'])) {
             $this->data = $data;
             return;
         }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Curl.php
index 5c54b366b7ab4..fb9d6e9772c74 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Curl.php
@@ -251,8 +251,13 @@ protected function getBlockId($landingName)
         $curl->write($url, [], CurlInterface::GET);
         $response = $curl->read();
         $curl->close();
-        preg_match('~\{"value":"(\d+)","label":"' . preg_quote($landingName) . '"\}~', $response, $matches);
-        $id = isset($matches[1]) ? (int)$matches[1] : null;
+        $id = null;
+        //Finding block option in 'Add block' options UI data.
+        preg_match('~\{[^\{\}]*?"label":"' . preg_quote($landingName) . '"[^\{\}]*?\}~', $response, $matches);
+        if (!empty($matches)) {
+            $blockOption = json_decode($matches[0], true);
+            $id = (int)$blockOption['value'];
+        }
 
         return $id;
     }
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 69093b8adb8db..5ea1b692e3eb9 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
@@ -37,7 +37,6 @@
             <data name="category/data/meta_keywords" xsi:type="string">custom meta keywords %isolation%</data>
             <data name="category/data/meta_description" xsi:type="string">Custom meta description %isolation%</data>
             <data name="category/data/layout" xsi:type="string">2 columns with right bar</data>
-            <data name="category/data/layout_update_xml" xsi:type="string">&#60;referenceContainer name=&quot;catalog.leftnav&quot; remove=&quot;true&quot;/&#62;</data>
             <data name="category/data/new_theme" xsi:type="string">Magento Luma</data>
             <data name="category/data/apply_design_to_products" xsi:type="string">Yes</data>
             <data name="category/data/schedule_update_from" xsi:type="string">01/10/2014</data>
@@ -80,7 +79,6 @@
             <data name="category/data/meta_description" xsi:type="string">Custom meta description %isolation%</data>
             <data name="category/data/category_products/dataset" xsi:type="string">catalogProductSimple::default,catalogProductSimple::default</data>
             <data name="category/data/layout" xsi:type="string">2 columns with right bar</data>
-            <data name="category/data/layout_update_xml" xsi:type="string">&#60;referenceContainer name=&quot;content.aside&quot; remove=&quot;true&quot;/&#62;</data>
             <data name="category/data/new_theme" xsi:type="string">Magento Luma</data>
             <data name="category/data/apply_design_to_products" xsi:type="string">Yes</data>
             <data name="category/data/schedule_update_from" xsi:type="string">01/10/2014</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
index 90cd6bdb76328..b97accbf87a93 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
@@ -12,6 +12,7 @@
 use Magento\Downloadable\Test\Block\Adminhtml\Catalog\Product\Edit\Section\Downloadable;
 use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\Util\Command\Cli\EnvWhitelist;
 
 /**
  * Test Creation for ProductTypeSwitchingOnUpdating
@@ -60,22 +61,32 @@ class ProductTypeSwitchingOnUpdateTest extends Injectable
      */
     protected $fixtureFactory;
 
+    /**
+     * DomainWhitelist CLI
+     *
+     * @var EnvWhitelist
+     */
+    private $envWhitelist;
+
     /**
      * Injection data.
      *
      * @param CatalogProductIndex $catalogProductIndex
      * @param CatalogProductEdit $catalogProductEdit
      * @param FixtureFactory $fixtureFactory
+     * @param EnvWhitelist $envWhitelist
      * @return void
      */
     public function __inject(
         CatalogProductIndex $catalogProductIndex,
         CatalogProductEdit $catalogProductEdit,
-        FixtureFactory $fixtureFactory
+        FixtureFactory $fixtureFactory,
+        EnvWhitelist $envWhitelist
     ) {
         $this->catalogProductIndex = $catalogProductIndex;
         $this->catalogProductEdit = $catalogProductEdit;
         $this->fixtureFactory = $fixtureFactory;
+        $this->envWhitelist = $envWhitelist;
     }
 
     /**
@@ -89,6 +100,7 @@ public function __inject(
     public function test($productOrigin, $product, $actionName)
     {
         // Preconditions
+        $this->envWhitelist->addHost('example.com');
         list($fixtureClass, $dataset) = explode('::', $productOrigin);
         $productOrigin = $this->fixtureFactory->createByCode(trim($fixtureClass), ['dataset' => trim($dataset)]);
         $productOrigin->persist();
@@ -144,5 +156,6 @@ protected function clearDownloadableData()
         $downloadableInfoTab = $this->catalogProductEdit->getProductForm()->getSection('downloadable_information');
         $downloadableInfoTab->getDownloadableBlock('Links')->clearDownloadableData();
         $downloadableInfoTab->setIsDownloadable('No');
+        $this->envWhitelist->removeHost('example.com');
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.xml
index 0ff402daca07d..4f74b7ff554db 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.xml
@@ -12,7 +12,7 @@
         <strategy>css selector</strategy>
         <fields>
             <is_active>
-                <input>select</input>
+                <input>switcher</input>
             </is_active>
             <website_ids>
                 <selector>[name='website_ids']</selector>
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 8ac13d407e433..695323990063a 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
@@ -19,7 +19,7 @@ class AssertCatalogPriceRuleInGrid extends AbstractConstraint
      * Fields used to filter rows in the grid.
      * @var array
      */
-    protected $fieldsToFilter = ['name', 'is_active'];
+    protected $fieldsToFilter = ['name'];
 
     /**
      * Assert that data in grid on Catalog Price Rules page according to fixture
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.xml
index 49bf36b0325ba..1f16e28c067d8 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogPriceRuleEntityTest.xml
@@ -10,7 +10,7 @@
         <variation name="CatalogRule_Create_Active_AdminOnly">
             <data name="catalogPriceRule/data/name" xsi:type="string">CatalogPriceRule %isolation%</data>
             <data name="catalogPriceRule/data/description" xsi:type="string">Catalog Price Rule Description</data>
-            <data name="catalogPriceRule/data/is_active" xsi:type="string">Active</data>
+            <data name="catalogPriceRule/data/is_active" xsi:type="string">Yes</data>
             <data name="catalogPriceRule/data/website_ids/option_0" xsi:type="string">Main Website</data>
             <data name="catalogPriceRule/data/customer_group_ids/option_0" xsi:type="string">Wholesale</data>
             <data name="catalogPriceRule/data/simple_action" xsi:type="string">Apply as percentage of original</data>
@@ -24,7 +24,7 @@
             <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="catalogPriceRule/data/name" xsi:type="string">CatalogPriceRule %isolation%</data>
             <data name="catalogPriceRule/data/description" xsi:type="string">Catalog Price Rule Description</data>
-            <data name="catalogPriceRule/data/is_active" xsi:type="string">Inactive</data>
+            <data name="catalogPriceRule/data/is_active" xsi:type="string">No</data>
             <data name="catalogPriceRule/data/website_ids/option_0" xsi:type="string">Main Website</data>
             <data name="catalogPriceRule/data/customer_group_ids/option_0" xsi:type="string">General</data>
             <data name="catalogPriceRule/data/condition" xsi:type="string">-</data>
@@ -39,7 +39,7 @@
         <variation name="CatalogRule_Create_ForGuestUsers_AdjustPriceToPercentage">
             <data name="product" xsi:type="string">MAGETWO-23036</data>
             <data name="catalogPriceRule/data/name" xsi:type="string">rule_name%isolation%</data>
-            <data name="catalogPriceRule/data/is_active" xsi:type="string">Active</data>
+            <data name="catalogPriceRule/data/is_active" xsi:type="string">Yes</data>
             <data name="catalogPriceRule/data/website_ids/option_0" xsi:type="string">Main Website</data>
             <data name="catalogPriceRule/data/customer_group_ids/option_0" xsi:type="string">NOT LOGGED IN</data>
             <data name="conditionEntity" xsi:type="string">category</data>
@@ -54,7 +54,7 @@
             <data name="customer/dataset" xsi:type="string">customer_with_new_customer_group</data>
             <data name="product" xsi:type="string">simple_10_dollar</data>
             <data name="catalogPriceRule/data/name" xsi:type="string">rule_name%isolation%</data>
-            <data name="catalogPriceRule/data/is_active" xsi:type="string">Active</data>
+            <data name="catalogPriceRule/data/is_active" xsi:type="string">Yes</data>
             <data name="catalogPriceRule/data/website_ids/option_0" xsi:type="string">Main Website</data>
             <data name="conditionEntity" xsi:type="string">category</data>
             <data name="catalogPriceRule/data/conditions" xsi:type="string">[Category|is|%category_id%]</data>
@@ -68,7 +68,7 @@
             <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
             <data name="product" xsi:type="string">product_with_custom_color_attribute</data>
             <data name="catalogPriceRule/data/name" xsi:type="string">Catalog Price Rule %isolation%</data>
-            <data name="catalogPriceRule/data/is_active" xsi:type="string">Active</data>
+            <data name="catalogPriceRule/data/is_active" xsi:type="string">Yes</data>
             <data name="catalogPriceRule/data/website_ids/option_0" xsi:type="string">Main Website</data>
             <data name="catalogPriceRule/data/customer_group_ids/option_0" xsi:type="string">NOT LOGGED IN</data>
             <data name="conditionEntity" xsi:type="string">attribute</data>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.xml
index 6c8e86b24ae60..e2916432c8eb7 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.xml
@@ -10,7 +10,7 @@
         <variation name="CatalogRule_Update_Name_Status">
             <data name="catalogPriceRuleOriginal/dataset" xsi:type="string">active_catalog_price_rule_with_conditions</data>
             <data name="catalogPriceRule/data/name" xsi:type="string">New Catalog Price Rule Name %isolation%</data>
-            <data name="catalogPriceRule/data/is_active" xsi:type="string">Inactive</data>
+            <data name="catalogPriceRule/data/is_active" xsi:type="string">No</data>
             <data name="saveAction" xsi:type="string">save</data>
             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleSuccessSaveMessage" />
             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNoticeMessage" />
@@ -24,7 +24,7 @@
             <data name="catalogPriceRuleOriginal/dataset" xsi:type="string">active_catalog_price_rule_with_conditions</data>
             <data name="catalogPriceRule/data/name" xsi:type="string">New Catalog Price Rule Name %isolation%</data>
             <data name="catalogPriceRule/data/description" xsi:type="string">New Catalog Price Rule Description %isolation%</data>
-            <data name="catalogPriceRule/data/is_active" xsi:type="string">Active</data>
+            <data name="catalogPriceRule/data/is_active" xsi:type="string">Yes</data>
             <data name="catalogPriceRule/data/conditions" xsi:type="string">[Category|is|%category_1%]</data>
             <data name="catalogPriceRule/data/simple_action" xsi:type="string">Apply as fixed amount</data>
             <data name="catalogPriceRule/data/discount_amount" xsi:type="string">35</data>
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 4744fa7756c4e..9a26386c82cb8 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
@@ -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\CatalogSearch\Test\TestCase\AdvancedSearchEntityTest" summary="Use Advanced Search" ticketId="MAGETWO-24729">
         <variation name="AdvancedSearchEntityTestVariation1" summary="Use Advanced Search to Find the Product" ticketId="MAGETWO-12421">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, mftf_migrated:yes</data>
             <data name="products/simple_1" xsi:type="string">Yes</data>
             <data name="products/simple_2" xsi:type="string">-</data>
             <data name="productSearch/data/name" xsi:type="string">abc_dfj</data>
@@ -16,6 +16,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Search product in advanced search by name</data>
             <data name="products/simple_1" xsi:type="string">-</data>
             <data name="products/simple_2" xsi:type="string">Yes</data>
@@ -23,6 +24,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation3">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Search product in advanced search by partial name</data>
             <data name="products/simple_1" xsi:type="string">Yes</data>
             <data name="products/simple_2" xsi:type="string">-</data>
@@ -30,6 +32,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation4">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Search product in advanced search by sku</data>
             <data name="products/simple_1" xsi:type="string">Yes</data>
             <data name="products/simple_2" xsi:type="string">-</data>
@@ -37,6 +40,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation5">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Search product in advanced search by partial sku</data>
             <data name="products/simple_1" xsi:type="string">Yes</data>
             <data name="products/simple_2" xsi:type="string">-</data>
@@ -44,6 +48,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation6">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Search product in advanced search by partial sku and description</data>
             <data name="products/simple_1" xsi:type="string">Yes</data>
             <data name="products/simple_2" xsi:type="string">-</data>
@@ -52,6 +57,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation7">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Search product in advanced search by description</data>
             <data name="products/simple_1" xsi:type="string">-</data>
             <data name="products/simple_2" xsi:type="string">Yes</data>
@@ -59,6 +65,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation8">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Search product in advanced search by short description</data>
             <data name="products/simple_1" xsi:type="string">-</data>
             <data name="products/simple_2" xsi:type="string">-</data>
@@ -66,6 +73,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation9">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Search product in advanced search by partial short description</data>
             <data name="products/simple_1" xsi:type="string">Yes</data>
             <data name="products/simple_2" xsi:type="string">-</data>
@@ -73,6 +81,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation10">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Search product in advanced search by price to</data>
             <data name="products/simple_1" xsi:type="string">Yes</data>
             <data name="products/simple_2" xsi:type="string">Yes</data>
@@ -80,6 +89,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation11">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Search product in advanced search by price from and price to</data>
             <data name="products/simple_1" xsi:type="string">Yes</data>
             <data name="products/simple_2" xsi:type="string">-</data>
@@ -88,6 +98,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation12">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Search product in advanced search by name, sku, description, short description, price from and price to</data>
             <data name="products/simple_1" xsi:type="string">Yes</data>
             <data name="products/simple_2" xsi:type="string">-</data>
@@ -100,6 +111,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation13">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Search product in advanced search by name, sku, description, short description, price from and price to</data>
             <data name="products/simple_1" xsi:type="string">Yes</data>
             <data name="products/simple_2" xsi:type="string">-</data>
@@ -112,11 +124,13 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductsResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation14">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Negative product search</data>
             <data name="productSearch/data/name" xsi:type="string">Negative_product_search</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchNoResult" />
         </variation>
         <variation name="AdvancedSearchEntityTestVariation15" summary="Do Advanced Search without entering data" ticketId="MAGETWO-14859">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</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" />
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php
index c00687d91c1ee..038c411768969 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php
@@ -62,6 +62,7 @@ class Item extends Sidebar
      */
     public function removeItemFromMiniCart()
     {
+        $this->waitForDeleteButtonVisible();
         $this->_rootElement->find($this->removeItem)->click();
         $element = $this->browser->find($this->confirmModal);
         /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
@@ -70,6 +71,23 @@ public function removeItemFromMiniCart()
         $modal->waitModalWindowToDisappear();
     }
 
+    /**
+     * Wait for Delete button is visible in the block.
+     *
+     * @return bool|null
+     */
+    private function waitForDeleteButtonVisible()
+    {
+        $rootElement = $this->_rootElement;
+        $deleteButtonSelector = $this->removeItem;
+        return $rootElement->waitUntil(
+            function () use ($rootElement, $deleteButtonSelector) {
+                $element = $rootElement->find($deleteButtonSelector);
+                return $element->isVisible() ? true : null;
+            }
+        );
+    }
+
     /**
      * Click "Edit item" button.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
index 7d6bd93180230..fba5a2b062343 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
@@ -14,6 +14,7 @@
 use Magento\Mtf\TestCase\Injectable;
 use Magento\Mtf\TestStep\TestStepFactory;
 use Magento\Mtf\Util\Command\Cli\Cache;
+use Magento\Mtf\Util\Command\Cli\EnvWhitelist;
 
 /**
  * Preconditions:
@@ -99,6 +100,13 @@ class AddProductsToShoppingCartEntityTest extends Injectable
      */
     private $cache;
 
+    /**
+     * DomainWhitelist CLI
+     *
+     * @var EnvWhitelist
+     */
+    private $envWhitelist;
+
     /**
      * Prepare test data.
      *
@@ -108,6 +116,7 @@ class AddProductsToShoppingCartEntityTest extends Injectable
      * @param CheckoutCart $cartPage
      * @param TestStepFactory $testStepFactory
      * @param Cache $cache
+     * @param EnvWhitelist $envWhitelist
      * @return void
      */
     public function __prepare(
@@ -116,7 +125,8 @@ public function __prepare(
         CatalogProductView $catalogProductView,
         CheckoutCart $cartPage,
         TestStepFactory $testStepFactory,
-        Cache $cache
+        Cache $cache,
+        EnvWhitelist $envWhitelist
     ) {
         $this->browser = $browser;
         $this->fixtureFactory = $fixtureFactory;
@@ -124,6 +134,7 @@ public function __prepare(
         $this->cartPage = $cartPage;
         $this->testStepFactory = $testStepFactory;
         $this->cache = $cache;
+        $this->envWhitelist = $envWhitelist;
     }
 
     /**
@@ -146,6 +157,7 @@ public function test(
         // Preconditions
         $this->configData = $configData;
         $this->flushCache = $flushCache;
+        $this->envWhitelist->addHost('example.com');
 
         $this->testStepFactory->create(
             \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
@@ -224,7 +236,7 @@ public function tearDown()
             $_ENV['app_frontend_url'] = preg_replace('/(http[s]?)/', 'http', $_ENV['app_frontend_url']);
             $this->cache->flush();
         }
-
+        $this->envWhitelist->removeHost('example.com');
         $this->testStepFactory->create(
             \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
             ['configData' => $this->configData, 'rollback' => true, 'flushCache' => $this->flushCache]
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.php
index 54f59b03ef81d..6f5512b2e8293 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Checkout\Test\TestCase;
 
 use Magento\Mtf\TestCase\Scenario;
+use Magento\Mtf\Util\Command\Cli\EnvWhitelist;
 
 /**
  * Preconditions:
@@ -43,6 +44,23 @@ class OnePageCheckoutOfflinePaymentMethodsTest extends Scenario
     const SEVERITY = 'S0';
     /* end tags */
 
+    /**
+     * DomainWhitelist CLI
+     *
+     * @var EnvWhitelist
+     */
+    private $envWhitelist;
+
+    /**
+     * Perform needed injections
+     *
+     * @param EnvWhitelist $envWhitelist
+     */
+    public function __inject(EnvWhitelist $envWhitelist)
+    {
+        $this->envWhitelist = $envWhitelist;
+    }
+
     /**
      * Runs one page checkout test.
      *
@@ -50,6 +68,17 @@ class OnePageCheckoutOfflinePaymentMethodsTest extends Scenario
      */
     public function test()
     {
+        $this->envWhitelist->addHost('example.com');
         $this->executeScenario();
     }
+
+    /**
+     * Clean data after running test.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        $this->envWhitelist->removeHost('example.com');
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPagerTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPagerTest.xml
index 8b6b69b73b894..e03351de7a2b1 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPagerTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/ShoppingCartPagerTest.xml
@@ -8,24 +8,24 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Checkout\Test\TestCase\ShoppingCartPagerTest" summary="Verify pager on Shopping Cart" ticketId="MAGETWO-63337">
         <variation name="ShoppingCartPagerTestFor20ItemsPerPageAnd20Products" summary="Verify pager is NOT presented on Shopping Cart page if qty of products = 20, by default system configuration" ticketId="MAGETWO-63337">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertPagersNotPresentInShoppingCart"/>
         </variation>
         <variation name="ShoppingCartPagerTestFor20ItemsPerPageAnd21Products" summary="Verify pager is presented on Shopping Cart page if items qty=21, by default system configuration" ticketId="MAGETWO-63338">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
             <data name="config/dataset" xsi:type="string">default_number_of_items_per_page_on_shopping_cart</data>
             <data name="products/21" xsi:type="string">catalogProductSimple::default</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertPagersPresentInShoppingCart"/>
             <constraint name="Magento\Checkout\Test\Constraint\AssertPagersSummaryText"/>
         </variation>
         <variation name="ShoppingCartPagerTestFor20ItemsPerPageAndRemovingOneProduct" summary="Verify pager is disapeared from Shopping Cart page if change qty from 21 to 20, by default system configuration" ticketId="MAGETWO-63339">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
             <data name="products/21" xsi:type="string">catalogProductSimple::default</data>
             <data name="itemsToRemove" xsi:type="string">1</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertPagersNotPresentInShoppingCart"/>
         </variation>
         <variation name="ShoppingCartPagerTestForOneItemPerPageAnd20Products" summary="Verify Pager is presented on Shopping Cart page with non-default system configuration" ticketId="MAGETWO-63340">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
             <data name="configData" xsi:type="string">one_item_per_page_on_shopping_cart</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertPagersPresentInShoppingCart" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertPagersSummaryText" />
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 af267cfa30ec1..36b4f4b3eb39b 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
@@ -12,6 +12,7 @@
 use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Mtf\TestCase\Injectable;
 use Magento\Customer\Test\Fixture\Customer;
+use Magento\Mtf\Util\Command\Cli\EnvWhitelist;
 
 /**
  * Preconditions:
@@ -58,22 +59,32 @@ class UpdateProductFromMiniShoppingCartEntityTest extends Injectable
      */
     protected $fixtureFactory;
 
+    /**
+     * DomainWhitelist CLI
+     *
+     * @var EnvWhitelist
+     */
+    private $envWhitelist;
+
     /**
      * Inject data.
      *
      * @param CmsIndex $cmsIndex
      * @param CatalogProductView $catalogProductView
      * @param FixtureFactory $fixtureFactory
+     * @param EnvWhitelist $envWhitelist
      * @return void
      */
     public function __inject(
         CmsIndex $cmsIndex,
         CatalogProductView $catalogProductView,
-        FixtureFactory $fixtureFactory
+        FixtureFactory $fixtureFactory,
+        EnvWhitelist $envWhitelist
     ) {
         $this->cmsIndex = $cmsIndex;
         $this->catalogProductView = $catalogProductView;
         $this->fixtureFactory = $fixtureFactory;
+        $this->envWhitelist = $envWhitelist;
     }
 
     /**
@@ -97,6 +108,7 @@ public function test(
         Customer $customer = null
     ) {
         // Preconditions:
+        $this->envWhitelist->addHost('example.com');
         if ($customer !== null) {
             $customer->persist();
         }
@@ -162,4 +174,14 @@ protected function addToCart(FixtureInterface $product)
         );
         $addToCartStep->run();
     }
+
+    /**
+     * Clean data after running test.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        $this->envWhitelist->removeHost('example.com');
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageUrlRewriteEntityTest.xml
index 8262d88bdff1a..ea9d49d662bdd 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageUrlRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageUrlRewriteEntityTest.xml
@@ -8,20 +8,20 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Cms\Test\TestCase\DeleteCmsPageUrlRewriteEntityTest" summary="Delete Cms Page URL Rewrites" ticketId="MAGETWO-25915">
         <variation name="DeleteCmsPageUrlRewriteEntityTestVariation1">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
             <data name="urlRewrite/dataset" xsi:type="string">cms_default_no_redirect</data>
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteDeletedMessage" />
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteNotInGrid" />
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertPageByUrlRewriteIsNotFound" />
         </variation>
         <variation name="DeleteCmsPageUrlRewriteEntityTestVariation2">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
             <data name="urlRewrite/dataset" xsi:type="string">cms_default_permanent_redirect</data>
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteDeletedMessage" />
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertPageByUrlRewriteIsNotFound" />
         </variation>
         <variation name="DeleteCmsPageUrlRewriteEntityTestVariation3">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
             <data name="urlRewrite/dataset" xsi:type="string">cms_default_temporary_redirect</data>
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteDeletedMessage" />
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertPageByUrlRewriteIsNotFound" />
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.xml
index 6ff68599beeb3..1125ce8d916c1 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.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\Cms\Test\TestCase\UpdateCmsPageRewriteEntityTest" summary="Update Cms Page URL Rewrites " ticketId="MAGETWO-26173">
         <variation name="UpdateCmsPageRewriteEntityTestVariation1">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
             <data name="cmsPageRewrite/dataset" xsi:type="string">cms_default_no_redirect</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/%default%</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%</data>
@@ -18,7 +18,7 @@
             <constraint name="Magento\Cms\Test\Constraint\AssertUrlRewriteCmsPageRedirect" />
         </variation>
         <variation name="UpdateCmsPageRewriteEntityTestVariation2">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
             <data name="cmsPageRewrite/dataset" xsi:type="string">cms_default_temporary_redirect</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%.html</data>
@@ -28,7 +28,7 @@
             <constraint name="Magento\Cms\Test\Constraint\AssertUrlRewriteCmsPageRedirect" />
         </variation>
         <variation name="UpdateCmsPageRewriteEntityTestVariation3">
-            <data name="tag" xsi:type="string">severity:S2</data>
+            <data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
             <data name="cmsPageRewrite/dataset" xsi:type="string">cms_default_permanent_redirect</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%.htm</data>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php
index 496b7a280ca18..de71cdff7ae4c 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php
@@ -11,6 +11,7 @@
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
 use Magento\Downloadable\Test\Fixture\DownloadableProduct;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\Util\Command\Cli\EnvWhitelist;
 
 /**
  * Steps:
@@ -53,6 +54,13 @@ class CreateDownloadableProductEntityTest extends Injectable
      */
     protected $catalogProductNew;
 
+    /**
+     * DomainWhitelist CLI
+     *
+     * @var EnvWhitelist
+     */
+    private $envWhitelist;
+
     /**
      * Persist category
      *
@@ -73,16 +81,19 @@ public function __prepare(Category $category)
      * @param Category $category
      * @param CatalogProductIndex $catalogProductIndexNewPage
      * @param CatalogProductNew $catalogProductNewPage
+     * @param EnvWhitelist $envWhitelist
      * @return void
      */
     public function __inject(
         Category $category,
         CatalogProductIndex $catalogProductIndexNewPage,
-        CatalogProductNew $catalogProductNewPage
+        CatalogProductNew $catalogProductNewPage,
+        EnvWhitelist $envWhitelist
     ) {
         $this->category = $category;
         $this->catalogProductIndex = $catalogProductIndexNewPage;
         $this->catalogProductNew = $catalogProductNewPage;
+        $this->envWhitelist = $envWhitelist;
     }
 
     /**
@@ -95,10 +106,21 @@ public function __inject(
     public function test(DownloadableProduct $product, Category $category)
     {
         // Steps
+        $this->envWhitelist->addHost('example.com');
         $this->catalogProductIndex->open();
         $this->catalogProductIndex->getGridPageActionBlock()->addProduct('downloadable');
         $productBlockForm = $this->catalogProductNew->getProductForm();
         $productBlockForm->fill($product, null, $category);
         $this->catalogProductNew->getFormPageActions()->save();
     }
+
+    /**
+     * Clean data after running test.
+     *
+     * @return void
+     */
+    protected function tearDown()
+    {
+        $this->envWhitelist->removeHost('example.com');
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportSubmittedMessage.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportSubmittedMessage.php
index 59b1c7570c3de..363614825e568 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportSubmittedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportSubmittedMessage.php
@@ -16,7 +16,8 @@ class AssertExportSubmittedMessage extends AbstractConstraint
     /**
      * Text value to be checked.
      */
-    const MESSAGE = 'Message is added to queue, wait to get your file soon';
+    const MESSAGE = 'Message is added to queue, wait to get your file soon.'
+        . ' Make sure your cron job is running to export the file';
 
     /**
      * Assert that export submitted message is visible after exporting.
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 86906d4c09406..ed0c4119dd825 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
@@ -30,7 +30,7 @@
         <variation name="InstallTestVariation3" firstConstraint="Magento\Install\Test\Constraint\AssertSuccessInstall" summary="Install with table prefix">
             <data name="user/dataset" xsi:type="string">default</data>
             <data name="install/dbTablePrefix" xsi:type="string">pref_</data>
-            <data name="install/storeLanguage" xsi:type="string">Chinese (China)</data>
+            <data name="install/storeLanguage" xsi:type="string">Chinese</data>
             <constraint name="Magento\Install\Test\Constraint\AssertSuccessInstall" next="Magento\User\Test\Constraint\AssertUserSuccessLogin" />
             <constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogin" prev="Magento\Install\Test\Constraint\AssertSuccessInstall" />
         </variation>
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.xml
index 607c0abf4302e..a43b88469faae 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/DeleteIntegrationEntityTest.xml
@@ -11,6 +11,7 @@
             <data name="integration/dataset" xsi:type="string">default</data>
             <constraint name="Magento\Integration\Test\Constraint\AssertIntegrationSuccessDeleteMessage" />
             <constraint name="Magento\Integration\Test\Constraint\AssertIntegrationNotInGrid" />
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
         </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.xml b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.xml
index 9c9c917f8a66d..48129ef287498 100644
--- a/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.xml
+++ b/dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/TestCase/FilterProductListTest.xml
@@ -94,7 +94,9 @@
             <constraint name="Magento\LayeredNavigation\Test\Constraint\AssertFilterProductList" />
         </variation>
         <variation name="FilterProductListTestVariation4" summary="Use sorting category filter when layered navigation is applied" ticketId="MAGETWO-42701">
+            <data name="tag" xsi:type="string">test_type:mysql_search</data>
             <data name="configData" xsi:type="string">layered_navigation_manual_range_10</data>
+            <data name="runReindex" xsi:type="boolean">true</data>
             <data name="category/dataset" xsi:type="string">default_anchor_subcategory</data>
             <data name="category/data/category_products/dataset" xsi:type="string">catalogProductSimple::product_10_dollar, catalogProductSimple::product_20_dollar, configurableProduct::filterable_two_options_with_zero_price</data>
             <data name="layeredNavigation" xsi:type="array">
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Invoice/Grid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Invoice/Grid.php
index a5c172da3a992..4d37ebe95a7ec 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Invoice/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Invoice/Grid.php
@@ -24,10 +24,10 @@ class Grid extends \Magento\Ui\Test\Block\Adminhtml\DataGrid
             'selector' => 'input[name="order_increment_id"]',
         ],
         'grand_total_from' => [
-            'selector' => 'input[name="base_grand_total[from]"]',
+            'selector' => 'input[name="grand_total[from]"]',
         ],
         'grand_total_to' => [
-            'selector' => 'input[name="base_grand_total[to]"]',
+            'selector' => 'input[name="grand_total[to]"]',
         ],
     ];
 
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Creditmemo/Totals.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Creditmemo/Totals.php
index 28bb00757dac1..8aff098fb9c3e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Creditmemo/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Creditmemo/Totals.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Sales\Test\Block\Adminhtml\Order\Creditmemo;
 
 use Magento\Mtf\Client\Locator;
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 c4e03b94d2ada..b1e3b9a9d9f1e 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
@@ -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\CreateOrderBackendTest" summary="Create Order from Admin within Offline Payment Methods" ticketId="MAGETWO-28696">
         <variation name="CreateOrderBackendTestVariation18" summary="Create order with condition available product qty = ordered product qty" ticketId="MAGETWO-12798">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::product_with_qty_25</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
@@ -24,6 +25,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductsOutOfStock" />
         </variation>
         <variation name="CreateOrderBackendTestVariation19" summary="'Reorder' button is not visible for customer if ordered item is out of stock" ticketId="MAGETWO-63924">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::default_qty_1</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="billingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.php
index 4dce560693ab3..cf93da5e9f6fb 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveRecentlyComparedProductsOnOrderPageTest.php
@@ -8,10 +8,13 @@
 
 use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
+use Magento\Catalog\Test\TestStep\CreateProductsStep;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Fixture\Customer;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
+use Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep;
+use Magento\Mtf\Util\Command\Cli\Config;
 use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
 use Magento\Mtf\Client\BrowserInterface;
 use Magento\Mtf\TestCase\Injectable;
@@ -91,21 +94,27 @@ class MoveRecentlyComparedProductsOnOrderPageTest extends Injectable
      */
     protected $catalogProductCompare;
 
+    /**
+     * @var Config
+     */
+    private $config;
+
     /**
      * Create customer.
-     *
      * @param Customer $customer
      * @param BrowserInterface $browser
+     * @param Config $config
      * @return array
      */
-    public function __prepare(Customer $customer, BrowserInterface $browser)
+    public function __prepare(Customer $customer, BrowserInterface $browser, Config $config)
     {
         $customer->persist();
         // Login under customer
         $this->objectManager
-            ->create(\Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep::class, ['customer' => $customer])
+            ->create(LoginCustomerOnFrontendStep::class, ['customer' => $customer])
             ->run();
         $this->browser = $browser;
+        $this->config = $config;
 
         return ['customer' => $customer];
     }
@@ -137,20 +146,26 @@ public function __inject(
         $this->catalogProductCompare = $catalogProductCompare;
     }
 
+    public function setUp()
+    {
+        $this->config->setConfig('reports/options/enabled', 1);
+        parent::setUp();
+    }
+
     /**
      * Move recently compared products on order page.
-     *
      * @param Customer $customer
      * @param string $products
      * @param bool $productsIsConfigured
      * @return array
+     * @throws \Exception
      */
     public function test(Customer $customer, $products, $productsIsConfigured = false)
     {
         // Preconditions
         // Create product
         $products = $this->objectManager->create(
-            \Magento\Catalog\Test\TestStep\CreateProductsStep::class,
+            CreateProductsStep::class,
             ['products' => $products]
         )->run()['products'];
         foreach ($products as $itemProduct) {
@@ -171,4 +186,10 @@ public function test(Customer $customer, $products, $productsIsConfigured = fals
 
         return ['products' => $products, 'productsIsConfigured' => $productsIsConfigured];
     }
+
+    public function tearDown()
+    {
+        $this->config->setConfig('reports/options/enabled', 0);
+        parent::tearDown();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.php
index 01e43defde814..9eb13734531d9 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/PrintOrderFrontendGuestTest.php
@@ -8,6 +8,7 @@
 
 use Magento\Mtf\Client\BrowserInterface;
 use Magento\Mtf\TestCase\Scenario;
+use Magento\Mtf\Util\Command\Cli\EnvWhitelist;
 
 /**
  * Preconditions:
@@ -41,14 +42,25 @@ class PrintOrderFrontendGuestTest extends Scenario
      */
     protected $browser;
 
+    /**
+     * DomainWhitelist CLI
+     *
+     * @var EnvWhitelist
+     */
+    private $envWhitelist;
+
     /**
      * Prepare data.
      *
      * @param BrowserInterface $browser
+     * @param EnvWhitelist $envWhitelist
      */
-    public function __prepare(BrowserInterface $browser)
-    {
+    public function __prepare(
+        BrowserInterface $browser,
+        EnvWhitelist $envWhitelist
+    ) {
         $this->browser = $browser;
+        $this->envWhitelist = $envWhitelist;
     }
 
     /**
@@ -58,6 +70,7 @@ public function __prepare(BrowserInterface $browser)
      */
     public function test()
     {
+        $this->envWhitelist->addHost('example.com');
         $this->executeScenario();
     }
 
@@ -68,6 +81,7 @@ public function test()
      */
     public function tearDown()
     {
+        $this->envWhitelist->removeHost('example.com');
         $this->browser->closeWindow();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateCreditMemoStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateCreditMemoStep.php
index 25b576a06dd3f..6ef1713c8542f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateCreditMemoStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateCreditMemoStep.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Sales\Test\TestStep;
 
 use Magento\Checkout\Test\Fixture\Cart;
@@ -100,7 +102,6 @@ public function run()
             if ($hasChangeTotals) {
                 $this->orderCreditMemoNew->getTotalsBlock()->clickUpdateTotals();
             }
-
             $this->orderCreditMemoNew->getFormBlock()->submit();
         }
 
@@ -139,7 +140,7 @@ private function isTotalsDataChanged(array $data): bool
         ];
 
         foreach ($compareData as $fieldName => $fieldValue) {
-            if (isset($data['form_data'][$fieldName]) && $fieldValue != $data['form_data'][$fieldName]) {
+            if (isset($data['form_data'][$fieldName]) && $fieldValue !== $data['form_data'][$fieldName]) {
                 return true;
             }
         }
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/NewCustomerPasswordComplexityTest.xml b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/NewCustomerPasswordComplexityTest.xml
index a169a3f175cc6..534f692a36aef 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/NewCustomerPasswordComplexityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/NewCustomerPasswordComplexityTest.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\Security\Test\TestCase\NewCustomerPasswordComplexityTest" summary="New customer password complexity" ticketId="MAGETWO-49044">
         <variation name="PasswordLengthTest" summary="Customer password length is below 8 characters">
-            <data name="tag" xsi:type="string">severity:S1</data>
+            <data name="tag" xsi:type="string">severity:S1,mftf_migrated:yes</data>
             <data name="customer/data/firstname" xsi:type="string">john</data>
             <data name="customer/data/lastname" xsi:type="string">doe</data>
             <data name="customer/data/email" xsi:type="string">johndoe%isolation%@example.com</data>
@@ -18,7 +18,7 @@
             <constraint name="Magento\Security\Test\Constraint\AssertPasswordLengthErrorMessage" />
         </variation>
         <variation name="PasswordComplexityTest" summary="Customer password is not secure enough">
-            <data name="tag" xsi:type="string">severity:S1</data>
+            <data name="tag" xsi:type="string">severity:S1,mftf_migrated:yes</data>
             <data name="customer/data/firstname" xsi:type="string">john</data>
             <data name="customer/data/lastname" xsi:type="string">doe</data>
             <data name="customer/data/email" xsi:type="string">johndoe%isolation%@example.com</data>
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 c9b3ce35e84ed..7a82b43dba76d 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
@@ -132,6 +132,8 @@ public function test(
 
         // Check application version
         $this->adminDashboard->open();
+        $this->adminDashboard->getModalMessage()->dismissIfModalAppears();
+        $this->adminDashboard->getModalMessage()->waitModalWindowToDisappear();
         $assertApplicationVersion->processAssert($this->adminDashboard, $version);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/CreateShipmentEntityTest.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/CreateShipmentEntityTest.xml
index 06acf95effdbf..3fa93602e5256 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/CreateShipmentEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/CreateShipmentEntityTest.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\Shipping\Test\TestCase\CreateShipmentEntityTest" summary="Create Shipment for Offline Payment Methods" ticketId="MAGETWO-28708">
         <variation name="CreateShipmentEntityTestVariation1" summary="Shipment with tracking number">
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test,mftf_migrated:yes</data>
             <data name="order/dataset" xsi:type="string">default</data>
             <data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::default</data>
             <data name="order/data/total_qty_ordered/0" xsi:type="string">1</data>
@@ -38,6 +38,7 @@
             <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentInShipmentsGrid" />
             <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentItems" />
             <constraint name="Magento\Shipping\Test\Constraint\AssertShipTotalQuantity" />
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
         </variation>
     </testCase>
 </config>
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 5c27776c09620..eb949dccb7ffc 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
@@ -163,6 +163,30 @@ function () {
         );
     }
 
+    /**
+     * Dismiss the modal if it appears
+     *
+     * @return void
+     */
+    public function dismissIfModalAppears()
+    {
+        $browser = $this->browser;
+        $selector = $this->dismissWarningSelector;
+        $browser->waitUntil(
+            function () use ($browser, $selector) {
+                $item = $browser->find($selector);
+                if ($item->isVisible()) {
+                    return true;
+                }
+                $this->waitModalAnimationFinished();
+                return true;
+            }
+        );
+        if ($this->browser->find($selector)->isVisible()) {
+            $this->browser->find($selector)->click();
+        }
+    }
+
     /**
      * Waiting until CSS animation is done.
      * Transition-duration is set at this file: "<magento_root>/lib/web/css/source/components/_modals.less"
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.xml
index 56440e8a8492b..42f71b8d01f76 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/DeleteCategoryUrlRewriteEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\UrlRewrite\Test\TestCase\DeleteCategoryUrlRewriteEntityTest" summary="Delete Category URL Rewrites" ticketId="MAGETWO-25086">
         <variation name="DeleteCategoryUrlRewriteEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="urlRewrite/data/target_path/entity" xsi:type="string">catalog/category/view/id/%category::default%</data>
             <data name="urlRewrite/data/redirect_type" xsi:type="string">No</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">-</data>
@@ -15,6 +16,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertPageByUrlRewriteIsNotFound" />
         </variation>
         <variation name="DeleteCategoryUrlRewriteEntityTestVariation2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="urlRewrite/data/target_path/entity" xsi:type="string">catalog/category/view/id/%category::default%</data>
             <data name="urlRewrite/data/redirect_type" xsi:type="string">No</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">example%isolation%.html</data>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
index 42914cd697bfd..81d9fe8393aee 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.php
@@ -117,6 +117,8 @@ public function testDeleteAdminUserEntity(
             $this->adminAuthLogin->open();
             $this->adminAuthLogin->getLoginBlock()->fill($user);
             $this->adminAuthLogin->getLoginBlock()->submit();
+            $this->adminAuthLogin->waitForHeaderBlock();
+            $this->adminAuthLogin->dismissAdminUsageNotification();
         }
         $this->userIndex->open();
         $this->userIndex->getUserGrid()->searchAndOpen($filter);
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
index 47c5a4095830d..2a1c9feb440b9 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.php
@@ -117,6 +117,8 @@ public function testDeleteAdminUserRole(
             $this->adminAuthLogin->open();
             $this->adminAuthLogin->getLoginBlock()->fill($adminUser);
             $this->adminAuthLogin->getLoginBlock()->submit();
+            $this->adminAuthLogin->waitForHeaderBlock();
+            $this->adminAuthLogin->dismissAdminUsageNotification();
         }
         $this->userRoleIndex->open();
         $this->userRoleIndex->getRoleGrid()->searchAndOpen($filter);
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LockAdminUserEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LockAdminUserEntityTest.xml
index 052197e3db33c..f89f94ba03e73 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LockAdminUserEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/LockAdminUserEntityTest.xml
@@ -24,6 +24,7 @@
             <data name="incorrectPassword" xsi:type="string">honey boo boo</data>
             <data name="attempts" xsi:type="string">7</data>
             <constraint name="Magento\User\Test\Constraint\AssertUserFailedLoginMessage" />
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
         </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
index e8869de13462a..dab4cec22c86d 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.php
@@ -147,6 +147,8 @@ public function testUpdateAdminUser(
             $this->adminAuth->open();
             $this->adminAuth->getLoginBlock()->fill($initialUser);
             $this->adminAuth->getLoginBlock()->submit();
+            $this->adminAuth->waitForHeaderBlock();
+            $this->adminAuth->dismissAdminUsageNotification();
         }
         $this->userIndex->open();
         $this->userIndex->getUserGrid()->searchAndOpen($filter);
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml
index a89d1ede80112..ac99c2d8721f3 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml
@@ -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\User\Test\TestCase\UpdateAdminUserEntityTest" summary="Update Admin User" ticketId="MAGETWO-24345">
         <variation name="UpdateAdminUserEntityTestVariation2">
-            <data name="tag" xsi:type="string">severity:S3</data>
+            <data name="tag" xsi:type="string">severity:S3, mftf_migrated:yes</data>
             <data name="initialUser/dataset" xsi:type="string">custom_admin_with_default_role</data>
             <data name="user/data/role_id/dataset" xsi:type="string">role::role_sales</data>
             <data name="user/data/current_password" xsi:type="string">123123q</data>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
index 58450abc71633..c7031e9fccbeb 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest.php
@@ -102,6 +102,8 @@ public function testUpdateAdminUserRolesEntity(
         $this->adminAuthLogin->open();
         $this->adminAuthLogin->getLoginBlock()->fill($user);
         $this->adminAuthLogin->getLoginBlock()->submit();
+        $this->adminAuthLogin->waitForHeaderBlock();
+        $this->adminAuthLogin->dismissAdminUsageNotification();
         $this->rolePage->open();
         $this->rolePage->getRoleGrid()->searchAndOpen($filter);
         $this->userRoleEditRole->getRoleFormTabs()->fill($role);
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 c244e27d42899..3e2a3a3d59fc1 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
@@ -119,6 +119,8 @@ private function login()
     {
         $this->adminAuth->getLoginBlock()->fill($this->user);
         $this->adminAuth->getLoginBlock()->submit();
+        $this->adminAuth->waitForHeaderBlock();
+        $this->adminAuth->dismissAdminUsageNotification();
         $this->adminAuth->getLoginBlock()->waitFormNotVisible();
     }
 }
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 5a67fe43a691b..bf70f0f901352 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,8 +89,27 @@ public function processAssert(
         $this->addProducts($products);
         $this->removeCompareProducts();
 
+        $cmsIndex->open();
+        //Widgets data is cache via LocalStorage so it might take couple of refreshes before cache is invalidated.
+        $refreshCount = 3;
+        $refreshNo = 1;
+        $isVisible = false;
+        while (!$isVisible && $refreshNo <= $refreshCount) {
+            $browser->refresh();
+            try {
+                $isVisible = $browser->waitUntil(
+                    function () use ($widget) {
+                        return $this->catalogProductCompare->getWidgetView()
+                            ->isWidgetVisible($widget, 'Recently Compared') ? true : null;
+                    }
+                );
+            } catch (\Throwable $exception) {
+                $isVisible = false;
+            }
+            $refreshNo++;
+        }
         \PHPUnit\Framework\Assert::assertTrue(
-            $this->catalogProductCompare->getWidgetView()->isWidgetVisible($widget, 'Recently Compared'),
+            $isVisible,
             'Widget is absent on Product Compare page.'
         );
     }
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php
index 9c5ffb9dd8013..c12b2d0991224 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Wishlist\Test\TestCase;
 
 use Magento\Customer\Test\Fixture\Customer;
+use Magento\Mtf\Util\Command\Cli\EnvWhitelist;
 
 /**
  * Test Flow:
@@ -30,15 +31,26 @@ class AddProductToWishlistEntityTest extends AbstractWishlistTest
     const MVP = 'no';
     /* end tags */
 
+    /**
+     * DomainWhitelist CLI
+     *
+     * @var EnvWhitelist
+     */
+    private $envWhitelist;
+
     /**
      * Prepare data for test
      *
      * @param Customer $customer
+     * @param EnvWhitelist $envWhitelist
      * @return array
      */
-    public function __prepare(Customer $customer)
-    {
+    public function __prepare(
+        Customer $customer,
+        EnvWhitelist $envWhitelist
+    ) {
         $customer->persist();
+        $this->envWhitelist = $envWhitelist;
 
         return ['customer' => $customer];
     }
@@ -53,6 +65,7 @@ public function __prepare(Customer $customer)
      */
     public function test(Customer $customer, $product, $configure = true)
     {
+        $this->envWhitelist->addHost('example.com');
         $product = $this->createProducts($product)[0];
 
         // Steps:
@@ -61,4 +74,14 @@ public function test(Customer $customer, $product, $configure = true)
 
         return ['product' => $product];
     }
+
+    /**
+     * Clean data after running test.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        $this->envWhitelist->removeHost('example.com');
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php
index ee3bf77a1aa0d..27c60281660bb 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnBackendTest.php
@@ -9,6 +9,7 @@
 use Magento\Customer\Test\Fixture\Customer;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
+use Magento\Mtf\Util\Command\Cli\EnvWhitelist;
 
 /**
  * Preconditions:
@@ -35,15 +36,26 @@ class ConfigureProductInCustomerWishlistOnBackendTest extends AbstractWishlistTe
     const MVP = 'no';
     /* end tags */
 
+    /**
+     * DomainWhitelist CLI
+     *
+     * @var EnvWhitelist
+     */
+    private $envWhitelist;
+
     /**
      * Create customer.
      *
      * @param Customer $customer
+     * @param EnvWhitelist $envWhitelist
      * @return array
      */
-    public function __prepare(Customer $customer)
-    {
+    public function __prepare(
+        Customer $customer,
+        EnvWhitelist $envWhitelist
+    ) {
         $customer->persist();
+        $this->envWhitelist = $envWhitelist;
 
         return ['customer' => $customer];
     }
@@ -64,6 +76,7 @@ public function test(
         CustomerIndexEdit $customerIndexEdit
     ) {
         // Preconditions
+        $this->envWhitelist->addHost('example.com');
         $product = $this->createProducts($product)[0];
         $this->loginCustomer($customer);
         $this->addToWishlist([$product]);
@@ -80,4 +93,14 @@ public function test(
 
         return['product' => $product];
     }
+
+    /**
+     * Clean data after running test.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        $this->envWhitelist->removeHost('example.com');
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml
index d6b930d999537..26593636d3fcb 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductsFromWishlistOnFrontendTest.xml
@@ -39,6 +39,7 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertWishlistIsEmpty" />
         </variation>
         <variation name="DeleteProductsFromWishlistOnFrontendTestVariation4">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="products/0" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
             <data name="removedProductsIndex" xsi:type="array">
                 <item name="0" xsi:type="string">1</item>
@@ -46,6 +47,7 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertWishlistIsEmpty" />
         </variation>
         <variation name="DeleteProductsFromWishlistOnFrontendTestVariation5">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="products/0" xsi:type="string">bundleProduct::bundle_fixed_product</data>
             <data name="removedProductsIndex" xsi:type="array">
                 <item name="0" xsi:type="string">1</item>
@@ -53,6 +55,7 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertWishlistIsEmpty" />
         </variation>
         <variation name="DeleteProductsFromWishlistOnFrontendTestVariation6">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="products/0" xsi:type="string">configurableProduct::default</data>
             <data name="removedProductsIndex" xsi:type="array">
                 <item name="0" xsi:type="string">1</item>
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 95e6a854ed266..aa3b646161a17 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
@@ -15,6 +15,7 @@
             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
         </variation>
         <variation name="MoveProductFromShoppingCartToWishlistTestVariation2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/0" xsi:type="string">catalogProductVirtual::default</data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertMoveProductToWishlistSuccessMessage" />
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
@@ -29,7 +30,7 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
         </variation>
         <variation name="MoveProductFromShoppingCartToWishlistTestVariation4">
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, mftf_migrated:yes</data>
             <data name="product/0" xsi:type="string">configurableProduct::default</data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertMoveProductToWishlistSuccessMessage" />
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist" />
@@ -37,6 +38,7 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
         </variation>
         <variation name="MoveProductFromShoppingCartToWishlistTestVariation5">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</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" />
@@ -44,6 +46,7 @@
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductDetailsInWishlist" />
         </variation>
         <variation name="MoveProductFromShoppingCartToWishlistTestVariation6">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</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/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php
index f81f87d5b6227..1bba73cdf5e9f 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php
@@ -9,6 +9,7 @@
 use Magento\Customer\Test\Fixture\Customer;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
+use Magento\Mtf\Util\Command\Cli\EnvWhitelist;
 
 /**
  * Test Flow:
@@ -34,15 +35,26 @@ class ViewProductInCustomerWishlistOnBackendTest extends AbstractWishlistTest
     const MVP = 'no';
     /* end tags */
 
+    /**
+     * DomainWhitelist CLI
+     *
+     * @var EnvWhitelist
+     */
+    private $envWhitelist;
+
     /**
      * Prepare customer for test.
      *
      * @param Customer $customer
+     * @param EnvWhitelist $envWhitelist
      * @return array
      */
-    public function __prepare(Customer $customer)
-    {
+    public function __prepare(
+        Customer $customer,
+        EnvWhitelist $envWhitelist
+    ) {
         $customer->persist();
+        $this->envWhitelist = $envWhitelist;
 
         return ['customer' => $customer];
     }
@@ -63,6 +75,7 @@ public function test(
         CustomerIndexEdit $customerIndexEdit
     ) {
         // Preconditions
+        $this->envWhitelist->addHost('example.com');
         $product = $this->createProducts($product)[0];
         $this->loginCustomer($customer);
         $this->addToWishlist([$product], true);
@@ -74,4 +87,14 @@ public function test(
 
         return['product' => $product];
     }
+
+    /**
+     * Clean data after running test.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        $this->envWhitelist->removeHost('example.com');
+    }
 }
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/acceptance.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/acceptance.xml
index 6a8e2c615f847..2eae769416c29 100644
--- a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/acceptance.xml
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/acceptance.xml
@@ -13,6 +13,7 @@
         </allow>
         <deny>
             <tag group="stable" value="no" />
+            <tag group="mftf_migrated" value="yes" />
         </deny>
     </rule>
     <rule scope="variation">
@@ -21,6 +22,7 @@
         </allow>
         <deny>
             <tag group="stable" value="no" />
+            <tag group="mftf_migrated" value="yes" />
         </deny>
     </rule>
 </config>
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 17578fcfe85b1..6141151518332 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
@@ -22,7 +22,7 @@
     </rule>
     <rule scope="variation">
         <deny>
-            <tag group="test_type" value="3rd_party_test, 3rd_party_test_single_flow" />
+            <tag group="test_type" value="3rd_party_test, 3rd_party_test_single_flow, mysql_search" />
             <tag group="stable" value="no" />
             <tag group="mftf_migrated" value="yes" />
             <tag group="to_maintain" value="yes" />
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/mysql_search.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/mysql_search.xml
new file mode 100644
index 0000000000000..17578fcfe85b1
--- /dev/null
+++ b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/mysql_search.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="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
+    <rule scope="testcase">
+        <deny>
+            <tag group="stable" value="no" />
+            <tag group="to_maintain" value="yes" />
+            <tag group="mftf_migrated" value="yes" />
+        </deny>
+    </rule>
+    <rule scope="testsuite">
+        <deny>
+            <module value="Magento_Setup" strict="1" />
+            <module value="Magento_SampleData" strict="1" />
+        </deny>
+    </rule>
+    <rule scope="variation">
+        <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>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleCatalogSearch/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleCatalogSearch/etc/module.xml
new file mode 100644
index 0000000000000..bae0739d237e1
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCatalogSearch/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_TestModuleCatalogSearch">
+        <sequence>
+            <module name="Magento_CatalogSearch"/>
+        </sequence>
+    </module>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleCatalogSearch/registration.php b/dev/tests/integration/_files/Magento/TestModuleCatalogSearch/registration.php
new file mode 100644
index 0000000000000..78fb97a9e1134
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCatalogSearch/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_TestModuleCatalogSearch') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleCatalogSearch', __DIR__);
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspConfig/composer.json b/dev/tests/integration/_files/Magento/TestModuleCspConfig/composer.json
new file mode 100644
index 0000000000000..f4d4075fe3377
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspConfig/composer.json
@@ -0,0 +1,21 @@
+{
+  "name": "magento/module-csp-config",
+  "description": "test csp module",
+  "config": {
+    "sort-packages": true
+  },
+  "require": {
+    "php": "~7.1.3||~7.2.0||~7.3.0",
+    "magento/framework": "*",
+    "magento/module-integration": "*"
+  },
+  "type": "magento2-module",
+  "extra": {
+    "map": [
+      [
+        "*",
+        "Magento/TestModuleCspConfig"
+      ]
+    ]
+  }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspConfig/etc/csp_whitelist.xml b/dev/tests/integration/_files/Magento/TestModuleCspConfig/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..e9eb1fe21aa4f
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspConfig/etc/csp_whitelist.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp/etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="object-src">
+            <values>
+                <value id="mage-base" type="host">https://magento.com</value>
+                <value id="hash" type="hash" algorithm="sha256">B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=</value>
+            </values>
+        </policy>
+        <policy id="media-src">
+            <values>
+                <value id="mage-base" type="host">https://magento.com</value>
+                <value id="devdocs-base" type="host">https://devdocs.magento.com</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspConfig/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleCspConfig/etc/module.xml
new file mode 100644
index 0000000000000..ee90595cacf19
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspConfig/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_TestModuleCspConfig" active="true" />
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspConfig/registration.php b/dev/tests/integration/_files/Magento/TestModuleCspConfig/registration.php
new file mode 100644
index 0000000000000..9749bf5a7f621
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspConfig/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_TestModuleCspConfig') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleCspConfig', __DIR__);
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspConfig2/composer.json b/dev/tests/integration/_files/Magento/TestModuleCspConfig2/composer.json
new file mode 100644
index 0000000000000..ebf1d57fe6593
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspConfig2/composer.json
@@ -0,0 +1,21 @@
+{
+  "name": "magento/module-csp-config2",
+  "description": "test csp module 2",
+  "config": {
+    "sort-packages": true
+  },
+  "require": {
+    "php": "~7.1.3||~7.2.0||~7.3.0",
+    "magento/framework": "*",
+    "magento/module-integration": "*"
+  },
+  "type": "magento2-module",
+  "extra": {
+    "map": [
+      [
+        "*",
+        "Magento/TestModuleCspConfig2"
+      ]
+    ]
+  }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspConfig2/etc/csp_whitelist.xml b/dev/tests/integration/_files/Magento/TestModuleCspConfig2/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..eff59271bf422
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspConfig2/etc/csp_whitelist.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp/etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="object-src">
+            <values>
+                <value id="devdocs-base" type="host">https://devdocs.magento.com</value>
+                <value id="mage-base" type="host">http://magento.com</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspConfig2/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleCspConfig2/etc/module.xml
new file mode 100644
index 0000000000000..de3c2ea25f4f2
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspConfig2/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_TestModuleCspConfig2" active="true">
+        <sequence>
+            <module name="Magento_TestModuleCspConfig"/>
+        </sequence>
+    </module>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspConfig2/registration.php b/dev/tests/integration/_files/Magento/TestModuleCspConfig2/registration.php
new file mode 100644
index 0000000000000..539d9cd20e10f
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspConfig2/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_TestModuleCspConfig2') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleCspConfig2', __DIR__);
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/Model/FooFilter.php b/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/Model/FooFilter.php
new file mode 100644
index 0000000000000..9cdf909f41823
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/Model/FooFilter.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TestModuleSimpleTemplateDirective\Model;
+
+use Magento\Framework\Filter\SimpleDirective\ProcessorInterface;
+use Magento\Framework\Filter\Template;
+
+/**
+ * Filters a value for testing purposes
+ */
+class FooFilter implements \Magento\Framework\Filter\DirectiveProcessor\FilterInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function filterValue(string $value, array $params): string
+    {
+        $arg1 = $params[0] ?? null;
+
+        return strtoupper(strrev($value . $arg1 ?? ''));
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string
+    {
+        return 'foofilter';
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/Model/LegacyFilter.php b/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/Model/LegacyFilter.php
new file mode 100644
index 0000000000000..2f45183585dec
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/Model/LegacyFilter.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TestModuleSimpleTemplateDirective\Model;
+
+use Magento\Framework\Filter\Template;
+
+/**
+ * A legacy directive test entity
+ */
+class LegacyFilter extends Template
+{
+    /**
+     * Filter a directive
+     *
+     * @param $construction
+     * @return string
+     */
+    protected function coolDirective($construction)
+    {
+        return 'value1: ' . $construction[1] . ':' . $construction[2];
+    }
+
+    /**
+     * Filter a directive
+     *
+     * @param $construction
+     * @return string
+     */
+    public function coolerDirective($construction)
+    {
+        return 'value2: ' . $construction[1] . ':' . $construction[2];
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/Model/MyDirProcessor.php b/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/Model/MyDirProcessor.php
new file mode 100644
index 0000000000000..faf4728f3c338
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/Model/MyDirProcessor.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TestModuleSimpleTemplateDirective\Model;
+
+use Magento\Framework\Filter\SimpleDirective\ProcessorInterface;
+use Magento\Framework\Filter\Template;
+
+/**
+ * Handles the {{mydir}} directive
+ */
+class MyDirProcessor implements ProcessorInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string
+    {
+        return 'mydir';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(
+        $value,
+        array $parameters,
+        ?string $html
+    ): string {
+        return $value . $parameters['param1'] . $html;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getDefaultFilters(): ?array
+    {
+        return ['foofilter'];
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/etc/di.xml b/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/etc/di.xml
new file mode 100644
index 0000000000000..e102c28c7307d
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/etc/di.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:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\Filter\SimpleDirective\ProcessorPool">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="mydir" xsi:type="object">Magento\TestModuleSimpleTemplateDirective\Model\MyDirProcessor</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Filter\DirectiveProcessor\Filter\FilterPool">
+        <arguments>
+            <argument name="filters" xsi:type="array">
+                <item name="foofilter" xsi:type="object">Magento\TestModuleSimpleTemplateDirective\Model\FooFilter</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/etc/module.xml
new file mode 100644
index 0000000000000..30f1c3f08cbfe
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/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_TestModuleSimpleTemplateDirective" />
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/registration.php b/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/registration.php
new file mode 100644
index 0000000000000..4b1c200857b90
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSimpleTemplateDirective/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_TestModuleSimpleTemplateDirective') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleSimpleTemplateDirective', __DIR__);
+}
diff --git a/dev/tests/integration/etc/di/preferences/ce.php b/dev/tests/integration/etc/di/preferences/ce.php
index b8264ea977750..2770283637dc7 100644
--- a/dev/tests/integration/etc/di/preferences/ce.php
+++ b/dev/tests/integration/etc/di/preferences/ce.php
@@ -31,4 +31,10 @@
         \Magento\TestFramework\Lock\Backend\DummyLocker::class,
     \Magento\Framework\Session\SessionStartChecker::class => \Magento\TestFramework\Session\SessionStartChecker::class,
     \Magento\Framework\HTTP\AsyncClientInterface::class => \Magento\TestFramework\HTTP\AsyncClientInterfaceMock::class,
+    \Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager::class =>
+        \Magento\TestFramework\Catalog\Model\CategoryLayoutUpdateManager::class,
+    \Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager::class =>
+        \Magento\TestFramework\Catalog\Model\ProductLayoutUpdateManager::class,
+    \Magento\Cms\Model\Page\CustomLayoutManagerInterface::class =>
+        \Magento\TestFramework\Cms\Model\CustomLayoutManager::class
 ];
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/CategoryLayoutUpdateManager.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/CategoryLayoutUpdateManager.php
new file mode 100644
index 0000000000000..48ff3a6496722
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/CategoryLayoutUpdateManager.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager;
+
+/**
+ * Easy way to fake available files.
+ */
+class CategoryLayoutUpdateManager extends LayoutUpdateManager
+{
+    /**
+     * @var array Keys are category IDs, values - file names.
+     */
+    private $fakeFiles = [];
+
+    /**
+     * Supply fake files for a category.
+     *
+     * @param int $forCategoryId
+     * @param string[]|null $files Pass null to reset.
+     */
+    public function setCategoryFakeFiles(int $forCategoryId, ?array $files): void
+    {
+        if ($files === null) {
+            unset($this->fakeFiles[$forCategoryId]);
+        } else {
+            $this->fakeFiles[$forCategoryId] = $files;
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function fetchAvailableFiles(CategoryInterface $category): array
+    {
+        if (array_key_exists($category->getId(), $this->fakeFiles)) {
+            return $this->fakeFiles[$category->getId()];
+        }
+
+        return parent::fetchAvailableFiles($category);
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Attribute/DataProvider/MediaImage.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Attribute/DataProvider/MediaImage.php
new file mode 100644
index 0000000000000..dd706ab29c326
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Attribute/DataProvider/MediaImage.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Attribute\DataProvider;
+
+use Magento\TestFramework\Eav\Model\Attribute\DataProvider\AbstractBaseAttributeData;
+
+/**
+ * Product attribute data for attribute with input type media image.
+ */
+class MediaImage extends AbstractBaseAttributeData
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->defaultAttributePostData['used_for_sort_by'] = '0';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeData(): array
+    {
+        $result = parent::getAttributeData();
+        unset($result["{$this->getFrontendInput()}_with_default_value"]);
+        unset($result["{$this->getFrontendInput()}_without_default_value"]);
+
+        return $result;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeDataWithCheckArray(): array
+    {
+        $result = parent::getAttributeDataWithCheckArray();
+        unset($result["{$this->getFrontendInput()}_with_default_value"]);
+        unset($result["{$this->getFrontendInput()}_without_default_value"]);
+
+        return $result;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getFrontendInput(): string
+    {
+        return 'media_image';
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Attribute/DataProvider/Price.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Attribute/DataProvider/Price.php
new file mode 100644
index 0000000000000..04ee6bb0a5740
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Attribute/DataProvider/Price.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Attribute\DataProvider;
+
+use Magento\TestFramework\Eav\Model\Attribute\DataProvider\AbstractBaseAttributeData;
+
+/**
+ * Product attribute data for attribute with input type weee.
+ */
+class Price extends AbstractBaseAttributeData
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->defaultAttributePostData['is_filterable'] = '0';
+        $this->defaultAttributePostData['is_filterable_in_search'] = '0';
+        $this->defaultAttributePostData['used_for_sort_by'] = '0';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeData(): array
+    {
+        $result = parent::getAttributeData();
+        unset($result["{$this->getFrontendInput()}_with_default_value"]);
+        unset($result["{$this->getFrontendInput()}_without_default_value"]);
+
+        return $result;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeDataWithCheckArray(): array
+    {
+        $result = parent::getAttributeDataWithCheckArray();
+        unset($result["{$this->getFrontendInput()}_with_default_value"]);
+        unset($result["{$this->getFrontendInput()}_without_default_value"]);
+
+        return $result;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getFrontendInput(): string
+    {
+        return 'price';
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractBase.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractBase.php
new file mode 100644
index 0000000000000..36a4f6662cb09
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractBase.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
+
+/**
+ * Base custom options data provider.
+ */
+abstract class AbstractBase
+{
+    /**
+     * Return data for create options for all cases.
+     *
+     * @return array
+     */
+    public function getDataForCreateOptions(): array
+    {
+        return [
+            "type_{$this->getType()}_title" => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => $this->getType(),
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            "type_{$this->getType()}_required_options" => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => $this->getType(),
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            "type_{$this->getType()}_not_required_options" => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 0,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => $this->getType(),
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            "type_{$this->getType()}_options_with_fixed_price" => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => $this->getType(),
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            "type_{$this->getType()}_options_with_percent_price" => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => $this->getType(),
+                    'price' => 10,
+                    'price_type' => 'percent',
+                ],
+            ],
+            "type_{$this->getType()}_price" => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => $this->getType(),
+                    'price' => 22,
+                    'price_type' => 'percent',
+                ],
+            ],
+            "type_{$this->getType()}_sku" => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => $this->getType(),
+                    'price' => 22,
+                    'price_type' => 'percent',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Return data for create options for all cases.
+     *
+     * @return array
+     */
+    public function getDataForUpdateOptions(): array
+    {
+        return array_merge_recursive(
+            $this->getDataForCreateOptions(),
+            [
+                "type_{$this->getType()}_title" => [
+                    [
+                        'title' => 'Test updated option title',
+                    ]
+                ],
+                "type_{$this->getType()}_required_options" => [
+                    [
+                        'is_require' => 0,
+                    ],
+                ],
+                "type_{$this->getType()}_not_required_options" => [
+                    [
+                        'is_require' => 1,
+                    ],
+                ],
+                "type_{$this->getType()}_options_with_fixed_price" => [
+                    [
+                        'price_type' => 'percent',
+                    ],
+                ],
+                "type_{$this->getType()}_options_with_percent_price" => [
+                    [
+                        'price_type' => 'fixed',
+                    ],
+                ],
+                "type_{$this->getType()}_price" => [
+                    [
+                        'price' => 60,
+                    ],
+                ],
+                "type_{$this->getType()}_sku" => [
+                    [
+                        'sku' => 'Updated option sku',
+                    ],
+                ],
+            ]
+        );
+    }
+
+    /**
+     * Return option type.
+     *
+     * @return string
+     */
+    abstract protected function getType(): string;
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractSelect.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractSelect.php
new file mode 100644
index 0000000000000..0cbe64bf1d965
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractSelect.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
+
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractBase;
+
+/**
+ * Abstract data provider for options from select group.
+ */
+abstract class AbstractSelect extends AbstractBase
+{
+    /**
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function getDataForCreateOptions(): array
+    {
+        return [
+            "type_{$this->getType()}_title" => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option title 1',
+                    'type' => $this->getType(),
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            "type_{$this->getType()}_required_options" => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option title 1',
+                    'type' => $this->getType(),
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            "type_{$this->getType()}_not_required_options" => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 0,
+                    'title' => 'Test option title 1',
+                    'type' => $this->getType(),
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            "type_{$this->getType()}_options_with_fixed_price" => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option title 1',
+                    'type' => $this->getType(),
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            "type_{$this->getType()}_options_with_percent_price" => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option title 1',
+                    'type' => $this->getType(),
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'percent',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            "type_{$this->getType()}_price" => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option title 1',
+                    'type' => $this->getType(),
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 22,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            "type_{$this->getType()}_sku" => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option title 1',
+                    'type' => $this->getType(),
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDataForUpdateOptions(): array
+    {
+        return array_merge_recursive(
+            $this->getDataForCreateOptions(),
+            [
+                "type_{$this->getType()}_title" => [
+                    [
+                        'title' => 'Updated test option title 1',
+                    ],
+                    [],
+                ],
+                "type_{$this->getType()}_required_options" => [
+                    [
+                        'is_require' => 0,
+                    ],
+                    [],
+                ],
+                "type_{$this->getType()}_not_required_options" => [
+                    [
+                        'is_require' => 1,
+                    ],
+                    [],
+                ],
+                "type_{$this->getType()}_options_with_fixed_price" => [
+                    [],
+                    [
+                        'price_type' => 'percent',
+                    ],
+                ],
+                "type_{$this->getType()}_options_with_percent_price" => [
+                    [],
+                    [
+                        'price_type' => 'fixed',
+                    ],
+                ],
+                "type_{$this->getType()}_price" => [
+                    [],
+                    [
+                        'price' => 666,
+                    ],
+                ],
+                "type_{$this->getType()}_sku" => [
+                    [],
+                    [
+                        'sku' => 'updated-test-option-1-value-1',
+                    ],
+                ],
+            ]
+        );
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractText.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractText.php
new file mode 100644
index 0000000000000..42028eee632be
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/AbstractText.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
+
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractBase;
+
+/**
+ * Abstract data provider for options from text group.
+ */
+abstract class AbstractText extends AbstractBase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getDataForCreateOptions(): array
+    {
+        return array_merge_recursive(
+            parent::getDataForCreateOptions(),
+            [
+                "type_{$this->getType()}_options_with_max_charters_configuration" => [
+                    [
+                        'record_id' => 0,
+                        'sort_order' => 1,
+                        'is_require' => 1,
+                        'sku' => 'test-option-title-1',
+                        'max_characters' => 30,
+                        'title' => 'Test option title 1',
+                        'type' => $this->getType(),
+                        'price' => 10,
+                        'price_type' => 'fixed',
+                    ],
+                ],
+                "type_{$this->getType()}_options_without_max_charters_configuration" => [
+                    [
+                        'record_id' => 0,
+                        'sort_order' => 1,
+                        'is_require' => 1,
+                        'sku' => 'test-option-title-1',
+                        'title' => 'Test option title 1',
+                        'type' => $this->getType(),
+                        'price' => 10,
+                        'price_type' => 'fixed',
+                    ],
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDataForUpdateOptions(): array
+    {
+        return array_merge_recursive(
+            parent::getDataForUpdateOptions(),
+            [
+                "type_{$this->getType()}_options_with_max_charters_configuration" => [
+                    [
+                        'max_characters' => 0,
+                    ],
+                ],
+                "type_{$this->getType()}_options_without_max_charters_configuration" => [
+                    [
+                        'max_characters' => 55,
+                    ],
+                ],
+            ]
+        );
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Area.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Area.php
new file mode 100644
index 0000000000000..137e77412f7b9
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Area.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractText;
+
+/**
+ * Data provider for custom options from text group with type "area".
+ */
+class Area extends AbstractText
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getType(): string
+    {
+        return ProductCustomOptionInterface::OPTION_TYPE_AREA;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Checkbox.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Checkbox.php
new file mode 100644
index 0000000000000..9a5f57d30946b
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Checkbox.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractSelect;
+
+/**
+ * Data provider for custom options from select group with type "Checkbox".
+ */
+class Checkbox extends AbstractSelect
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getType(): string
+    {
+        return ProductCustomOptionInterface::OPTION_TYPE_CHECKBOX;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Date.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Date.php
new file mode 100644
index 0000000000000..501265849be93
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Date.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractBase;
+
+/**
+ * Data provider for custom options from date group with type "date".
+ */
+class Date extends AbstractBase
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getType(): string
+    {
+        return ProductCustomOptionInterface::OPTION_TYPE_DATE;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/DateTime.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/DateTime.php
new file mode 100644
index 0000000000000..e3e154cc386e0
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/DateTime.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractBase;
+
+/**
+ * Data provider for custom options from date group with type "date & time".
+ */
+class DateTime extends AbstractBase
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getType(): string
+    {
+        return ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/DropDown.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/DropDown.php
new file mode 100644
index 0000000000000..2c8b9f2f25dc6
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/DropDown.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractSelect;
+
+/**
+ * Data provider for custom options from select group with type "Drop-down".
+ */
+class DropDown extends AbstractSelect
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getType(): string
+    {
+        return ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Field.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Field.php
new file mode 100644
index 0000000000000..12df838bd46c2
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Field.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractText;
+
+/**
+ * Data provider for custom options from text group with type "field".
+ */
+class Field extends AbstractText
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getType(): string
+    {
+        return ProductCustomOptionInterface::OPTION_TYPE_FIELD;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/File.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/File.php
new file mode 100644
index 0000000000000..35f449a404410
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/File.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractBase;
+
+/**
+ * Data provider for options from file group with type "file".
+ */
+class File extends AbstractBase
+{
+    /**
+     * @inheritdoc
+     */
+    public function getDataForCreateOptions(): array
+    {
+        return array_merge_recursive(
+            parent::getDataForCreateOptions(),
+            [
+                "type_{$this->getType()}_option_file_extension" => [
+                    [
+                        'record_id' => 0,
+                        'sort_order' => 1,
+                        'is_require' => 1,
+                        'sku' => 'test-option-title-1',
+                        'max_characters' => 30,
+                        'title' => 'Test option title 1',
+                        'type' => $this->getType(),
+                        'price' => 10,
+                        'price_type' => 'fixed',
+                        'file_extension' => 'gif',
+                        'image_size_x' => 10,
+                        'image_size_y' => 20,
+                    ],
+                ],
+                "type_{$this->getType()}_option_maximum_file_size" => [
+                    [
+                        'record_id' => 0,
+                        'sort_order' => 1,
+                        'is_require' => 1,
+                        'sku' => 'test-option-title-1',
+                        'title' => 'Test option title 1',
+                        'type' => $this->getType(),
+                        'price' => 10,
+                        'price_type' => 'fixed',
+                        'file_extension' => 'gif',
+                        'image_size_x' => 10,
+                        'image_size_y' => 20,
+                    ],
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDataForUpdateOptions(): array
+    {
+        return array_merge_recursive(
+            parent::getDataForUpdateOptions(),
+            [
+                "type_{$this->getType()}_option_file_extension" => [
+                    [
+                        'file_extension' => 'jpg',
+                    ],
+                ],
+                "type_{$this->getType()}_option_maximum_file_size" => [
+                    [
+                        'image_size_x' => 300,
+                        'image_size_y' => 815,
+                    ],
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getType(): string
+    {
+        return ProductCustomOptionInterface::OPTION_TYPE_FILE;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/MultipleSelect.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/MultipleSelect.php
new file mode 100644
index 0000000000000..3e958b1ac39a0
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/MultipleSelect.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractSelect;
+
+/**
+ * Data provider for custom options from select group with type "Drop-down".
+ */
+class MultipleSelect extends AbstractSelect
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getType(): string
+    {
+        return ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/RadioButtons.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/RadioButtons.php
new file mode 100644
index 0000000000000..345aa289283e8
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/RadioButtons.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractSelect;
+
+/**
+ * Data provider for custom options from select group with type "Radio Buttons".
+ */
+class RadioButtons extends AbstractSelect
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getType(): string
+    {
+        return ProductCustomOptionInterface::OPTION_TYPE_RADIO;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Time.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Time.php
new file mode 100644
index 0000000000000..cc6fb1e86a6c6
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/Time.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractBase;
+
+/**
+ * Data provider for custom options from date group with type "time".
+ */
+class Time extends AbstractBase
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getType(): string
+    {
+        return ProductCustomOptionInterface::OPTION_TYPE_TIME;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/ProductLayoutUpdateManager.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/ProductLayoutUpdateManager.php
new file mode 100644
index 0000000000000..6c8826583be70
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/ProductLayoutUpdateManager.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager;
+
+/**
+ * Easy way to fake available files.
+ */
+class ProductLayoutUpdateManager extends LayoutUpdateManager
+{
+    /**
+     * @var array Keys are product IDs, values - file names.
+     */
+    private $fakeFiles = [];
+
+    /**
+     * Supply fake files for a product.
+     *
+     * @param int $forProductId
+     * @param string[]|null $files Pass null to reset.
+     */
+    public function setFakeFiles(int $forProductId, ?array $files): void
+    {
+        if ($files === null) {
+            unset($this->fakeFiles[$forProductId]);
+        } else {
+            $this->fakeFiles[$forProductId] = $files;
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function fetchAvailableFiles(ProductInterface $product): array
+    {
+        if (array_key_exists($product->getId(), $this->fakeFiles)) {
+            return $this->fakeFiles[$product->getId()];
+        }
+
+        return parent::fetchAvailableFiles($product);
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Cms/Model/CustomLayoutManager.php b/dev/tests/integration/framework/Magento/TestFramework/Cms/Model/CustomLayoutManager.php
new file mode 100644
index 0000000000000..527454c297d48
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Cms/Model/CustomLayoutManager.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Cms\Model;
+
+use Magento\Cms\Api\Data\PageInterface;
+
+/**
+ * Manager allowing to fake available files.
+ */
+class CustomLayoutManager extends \Magento\Cms\Model\Page\CustomLayout\CustomLayoutManager
+{
+    /**
+     * @var string[][]
+     */
+    private $files = [];
+
+    /**
+     * Fake available files for given page.
+     *
+     * Pass null to unassign fake files.
+     *
+     * @param int $forPageId
+     * @param string[]|null $files
+     * @return void
+     */
+    public function fakeAvailableFiles(int $forPageId, ?array $files): void
+    {
+        if ($files === null) {
+            unset($this->files[$forPageId]);
+        } else {
+            $this->files[$forPageId] = $files;
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function fetchAvailableFiles(PageInterface $page): array
+    {
+        if (array_key_exists($page->getId(), $this->files)) {
+            return $this->files[$page->getId()];
+        }
+
+        return parent::fetchAvailableFiles($page);
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/AbstractAttributeDataWithOptions.php b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/AbstractAttributeDataWithOptions.php
new file mode 100644
index 0000000000000..8f25651e2e036
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/AbstractAttributeDataWithOptions.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Eav\Model\Attribute\DataProvider;
+
+/**
+ * Base POST data for create attribute with options.
+ */
+abstract class AbstractAttributeDataWithOptions extends AbstractBaseAttributeData
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->defaultAttributePostData['serialized_options_arr'] = $this->getOptionsDataArr();
+        $this->defaultAttributePostData['is_filterable'] = '0';
+        $this->defaultAttributePostData['is_filterable_in_search'] = '0';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeData(): array
+    {
+        $result = parent::getAttributeData();
+        unset($result["{$this->getFrontendInput()}_with_default_value"]);
+        unset($result["{$this->getFrontendInput()}_without_default_value"]);
+
+        return $result;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeDataWithErrorMessage(): array
+    {
+        $wrongSerializeMessage = 'The attribute couldn\'t be saved due to an error. Verify your information and ';
+        $wrongSerializeMessage .= 'try again. If the error persists, please try again later.';
+
+        return array_replace_recursive(
+            parent::getAttributeDataWithErrorMessage(),
+            [
+                "{$this->getFrontendInput()}_with_wrong_serialized_options" => [
+                    array_merge(
+                        $this->defaultAttributePostData,
+                        [
+                            'serialized_options_arr' => [],
+                            'serialized_options' => '?.\\//',
+                        ]
+                    ),
+                    (string)__($wrongSerializeMessage)
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeDataWithCheckArray(): array
+    {
+        $result = parent::getAttributeDataWithCheckArray();
+        unset($result["{$this->getFrontendInput()}_with_default_value"]);
+        unset($result["{$this->getFrontendInput()}_without_default_value"]);
+
+        return $result;
+    }
+
+    /**
+     * Return attribute options data.
+     *
+     * @return array
+     */
+    protected function getOptionsDataArr(): array
+    {
+        return [
+            [
+                'option' => [
+                    'order' => [
+                        'option_0' => '1',
+                    ],
+                    'value' => [
+                        'option_0' => [
+                            'Admin value 1',
+                            'Default store view value 1',
+                        ],
+                    ],
+                    'delete' => [
+                        'option_0' => '',
+                    ],
+                ],
+            ],
+            [
+                'option' => [
+                    'order' => [
+                        'option_1' => '2',
+                    ],
+                    'value' => [
+                        'option_1' => [
+                            'Admin value 2',
+                            'Default store view value 2',
+                        ],
+                    ],
+                    'delete' => [
+                        'option_1' => '',
+                    ],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/AbstractBaseAttributeData.php b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/AbstractBaseAttributeData.php
new file mode 100644
index 0000000000000..af9e58d02fb5a
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/AbstractBaseAttributeData.php
@@ -0,0 +1,224 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Eav\Model\Attribute\DataProvider;
+
+use Magento\Store\Model\Store;
+
+/**
+ * Base POST data for create attribute.
+ */
+abstract class AbstractBaseAttributeData
+{
+    /**
+     * Default POST data for create attribute.
+     *
+     * @var array
+     */
+    protected $defaultAttributePostData = [
+        'active_tab' => 'main',
+        'frontend_label' => [
+            Store::DEFAULT_STORE_ID => 'Test attribute name',
+        ],
+        'is_required' => '0',
+        'dropdown_attribute_validation' => '',
+        'dropdown_attribute_validation_unique' => '',
+        'attribute_code' => '',
+        '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_used_for_promo_rules' => '0',
+        'is_html_allowed_on_front' => '1',
+        'is_visible_on_front' => '0',
+        'used_in_product_listing' => '0',
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct()
+    {
+        $this->defaultAttributePostData['frontend_input'] = $this->getFrontendInput();
+    }
+
+    /**
+     * Return create product attribute data set.
+     *
+     * @return array
+     */
+    public function getAttributeData(): array
+    {
+        return [
+            "{$this->getFrontendInput()}_with_required_fields" => [
+                $this->defaultAttributePostData,
+            ],
+            "{$this->getFrontendInput()}_with_store_view_scope" => [
+                $this->defaultAttributePostData,
+            ],
+            "{$this->getFrontendInput()}_with_global_scope" => [
+                array_merge($this->defaultAttributePostData, ['is_global' => '1']),
+            ],
+            "{$this->getFrontendInput()}_with_website_scope" => [
+                array_merge($this->defaultAttributePostData, ['is_global' => '2']),
+            ],
+            "{$this->getFrontendInput()}_with_attribute_code" => [
+                array_merge($this->defaultAttributePostData, ['attribute_code' => 'test_custom_attribute_code']),
+            ],
+            "{$this->getFrontendInput()}_with_default_value" => [
+                array_merge($this->defaultAttributePostData, ['default_value_text' => 'Default attribute value']),
+            ],
+            "{$this->getFrontendInput()}_without_default_value" => [
+                $this->defaultAttributePostData,
+            ],
+            "{$this->getFrontendInput()}_with_unique_value" => [
+                array_merge($this->defaultAttributePostData, ['is_unique' => '1']),
+            ],
+            "{$this->getFrontendInput()}_without_unique_value" => [
+                $this->defaultAttributePostData,
+            ],
+            "{$this->getFrontendInput()}_with_enabled_add_to_column_options" => [
+                array_merge($this->defaultAttributePostData, ['is_used_in_grid' => '1']),
+            ],
+            "{$this->getFrontendInput()}_without_enabled_add_to_column_options" => [
+                array_merge($this->defaultAttributePostData, ['is_used_in_grid' => '0']),
+            ],
+            "{$this->getFrontendInput()}_with_enabled_use_in_filter_options" => [
+                $this->defaultAttributePostData,
+            ],
+            "{$this->getFrontendInput()}_without_enabled_use_in_filter_options" => [
+                array_merge($this->defaultAttributePostData, ['is_filterable_in_grid' => '0']),
+            ],
+        ];
+    }
+
+    /**
+     * Return create product attribute data set with error message.
+     *
+     * @return array
+     */
+    public function getAttributeDataWithErrorMessage(): array
+    {
+        $wrongAttributeCode = 'Attribute code "????" is invalid. Please use only letters (a-z or A-Z), numbers ';
+        $wrongAttributeCode .= '(0-9) or underscore (_) in this field, and the first character should be a letter.';
+
+        return [
+            "{$this->getFrontendInput()}_with_wrong_frontend_input" => [
+                array_merge($this->defaultAttributePostData, ['frontend_input' => 'wrong_input_type']),
+                (string)__('Input type "wrong_input_type" not found in the input types list.')
+            ],
+            "{$this->getFrontendInput()}_with_wrong_attribute_code" => [
+                array_merge($this->defaultAttributePostData, ['attribute_code' => '????']),
+                (string)__($wrongAttributeCode)
+            ],
+        ];
+    }
+
+    /**
+     * Return create product attribute data set with array for check data.
+     *
+     * @return array
+     */
+    public function getAttributeDataWithCheckArray(): array
+    {
+        return array_merge_recursive(
+            $this->getAttributeData(),
+            [
+                "{$this->getFrontendInput()}_with_required_fields" => [
+                    [
+                        'attribute_code' => 'test_attribute_name',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_store_view_scope" => [
+                    [
+                        'attribute_code' => 'test_attribute_name',
+                        'is_global' => '0',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_global_scope" => [
+                    [
+                        'attribute_code' => 'test_attribute_name',
+                        'is_global' => '1',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_website_scope" => [
+                    [
+                        'attribute_code' => 'test_attribute_name',
+                        'is_global' => '2',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_attribute_code" => [
+                    [
+                        'attribute_code' => 'test_custom_attribute_code',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_default_value" => [
+                    [
+                        'attribute_code' => 'test_attribute_name',
+                        'default_value' => 'Default attribute value',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_default_value" => [
+                    [
+                        'attribute_code' => 'test_attribute_name',
+                        'default_value_text' => '',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_unique_value" => [
+                    [
+                        'attribute_code' => 'test_attribute_name',
+                        'is_unique' => '1',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_unique_value" => [
+                    [
+                        'attribute_code' => 'test_attribute_name',
+                        'is_unique' => '0',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_enabled_add_to_column_options" => [
+                    [
+                        'attribute_code' => 'test_attribute_name',
+                        'is_used_in_grid' => '1',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_enabled_add_to_column_options" => [
+                    [
+                        'attribute_code' => 'test_attribute_name',
+                        'is_used_in_grid' => false,
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_enabled_use_in_filter_options" => [
+                    [
+                        'attribute_code' => 'test_attribute_name',
+                        'is_filterable_in_grid' => '1',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_enabled_use_in_filter_options" => [
+                    [
+                        'attribute_code' => 'test_attribute_name',
+                        'is_filterable_in_grid' => false,
+                    ],
+                ],
+            ]
+        );
+    }
+
+    /**
+     * Return attribute frontend input.
+     *
+     * @return string
+     */
+    abstract protected function getFrontendInput(): string;
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/Date.php b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/Date.php
new file mode 100644
index 0000000000000..7a6f8ee41c1f8
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/Date.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Eav\Model\Attribute\DataProvider;
+
+/**
+ * Product attribute data for attribute with input type date.
+ */
+class Date extends AbstractBaseAttributeData
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->defaultAttributePostData['used_for_sort_by'] = '0';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeData(): array
+    {
+        return array_replace_recursive(
+            parent::getAttributeData(),
+            [
+                "{$this->getFrontendInput()}_with_default_value" => [
+                    [
+                        'default_value_text' => '',
+                        'default_value_date' => '10/29/2019',
+                    ]
+                ]
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeDataWithCheckArray(): array
+    {
+        return array_replace_recursive(
+            parent::getAttributeDataWithCheckArray(),
+            [
+                "{$this->getFrontendInput()}_with_default_value" => [
+                    1 => [
+                        'default_value' => '2019-10-29 00:00:00',
+                    ],
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getFrontendInput(): string
+    {
+        return 'date';
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/DropDown.php b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/DropDown.php
new file mode 100644
index 0000000000000..3c1acb5a33a54
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/DropDown.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Eav\Model\Attribute\DataProvider;
+
+/**
+ * Product attribute data for attribute with input type dropdown.
+ */
+class DropDown extends AbstractAttributeDataWithOptions
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->defaultAttributePostData['used_for_sort_by'] = '0';
+        $this->defaultAttributePostData['swatch_input_type'] = 'dropdown';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getFrontendInput(): string
+    {
+        return 'select';
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/MultipleSelect.php b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/MultipleSelect.php
new file mode 100644
index 0000000000000..5fb5f745aebdc
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/MultipleSelect.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Eav\Model\Attribute\DataProvider;
+
+/**
+ * Product attribute data for attribute with input type multiple select.
+ */
+class MultipleSelect extends AbstractAttributeDataWithOptions
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getFrontendInput(): string
+    {
+        return 'multiselect';
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/Text.php b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/Text.php
new file mode 100644
index 0000000000000..5b37248e27361
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/Text.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Eav\Model\Attribute\DataProvider;
+
+/**
+ * Product attribute data for attribute with input type text.
+ */
+class Text extends AbstractBaseAttributeData
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->defaultAttributePostData['frontend_class'] = '';
+        $this->defaultAttributePostData['used_for_sort_by'] = '0';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeData(): array
+    {
+        return array_replace_recursive(
+            parent::getAttributeData(),
+            [
+                "{$this->getFrontendInput()}_with_input_validation" => [
+                    array_merge($this->defaultAttributePostData, ['frontend_class' => 'validate-alpha']),
+                ],
+                "{$this->getFrontendInput()}_without_input_validation" => [
+                    $this->defaultAttributePostData,
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeDataWithCheckArray(): array
+    {
+        return array_merge_recursive(
+            parent::getAttributeDataWithCheckArray(),
+            [
+                "{$this->getFrontendInput()}_with_input_validation" => [
+                    [
+                        'attribute_code' => 'test_attribute_name',
+                        'frontend_class' => 'validate-alpha',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_input_validation" => [
+                    [
+                        'attribute_code' => 'test_attribute_name',
+                        'frontend_class' => '',
+                    ],
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getFrontendInput(): string
+    {
+        return 'text';
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/TextArea.php b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/TextArea.php
new file mode 100644
index 0000000000000..7588b12700272
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/TextArea.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Eav\Model\Attribute\DataProvider;
+
+/**
+ * Product attribute data for attribute with text area input type.
+ */
+class TextArea extends AbstractBaseAttributeData
+{
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeData(): array
+    {
+        return array_replace_recursive(
+            parent::getAttributeData(),
+            [
+                "{$this->getFrontendInput()}_with_default_value" => [
+                    [
+                        'default_value_text' => '',
+                        'default_value_textarea' => 'Default attribute value',
+                    ],
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getFrontendInput(): string
+    {
+        return 'textarea';
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/TextEditor.php b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/TextEditor.php
new file mode 100644
index 0000000000000..d7a6276c1720f
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/TextEditor.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Eav\Model\Attribute\DataProvider;
+
+/**
+ * Product attribute data for attribute with text editor input type.
+ */
+class TextEditor extends AbstractBaseAttributeData
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->defaultAttributePostData['used_for_sort_by'] = '0';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeData(): array
+    {
+        return array_replace_recursive(
+            parent::getAttributeData(),
+            [
+                "{$this->getFrontendInput()}_with_default_value" => [
+                    [
+                        'default_value_text' => '',
+                        'default_value_textarea' => 'Default attribute value',
+                    ],
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAttributeDataWithCheckArray(): array
+    {
+        return array_replace_recursive(
+            parent::getAttributeDataWithCheckArray(),
+            [
+                "{$this->getFrontendInput()}_with_required_fields" => [
+                    1 => [
+                        'frontend_input' => 'textarea',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_store_view_scope" => [
+                    1 => [
+                        'frontend_input' => 'textarea'
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_global_scope" => [
+                    1 => [
+                        'frontend_input' => 'textarea'
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_website_scope" => [
+                    1 => [
+                        'frontend_input' => 'textarea'
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_attribute_code" => [
+                    1 => [
+                        'frontend_input' => 'textarea'
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_default_value" => [
+                    1 => [
+                        'frontend_input' => 'textarea'
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_default_value" => [
+                    1 => [
+                        'frontend_input' => 'textarea'
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_unique_value" => [
+                    1 => [
+                        'frontend_input' => 'textarea'
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_unique_value" => [
+                    1 => [
+                        'frontend_input' => 'textarea'
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_enabled_add_to_column_options" => [
+                    1 => [
+                        'frontend_input' => 'textarea'
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_enabled_add_to_column_options" => [
+                    1 => [
+                        'frontend_input' => 'textarea'
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_enabled_use_in_filter_options" => [
+                    1 => [
+                        'frontend_input' => 'textarea'
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_enabled_use_in_filter_options" => [
+                    1 => [
+                        'frontend_input' => 'textarea'
+                    ],
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getFrontendInput(): string
+    {
+        return 'texteditor';
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/YesNo.php b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/YesNo.php
new file mode 100644
index 0000000000000..8fece70f0273c
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/Attribute/DataProvider/YesNo.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Eav\Model\Attribute\DataProvider;
+
+/**
+ * Product attribute data for attribute with yes/no input type.
+ */
+class YesNo extends AbstractBaseAttributeData
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->defaultAttributePostData['is_filterable'] = '0';
+        $this->defaultAttributePostData['is_filterable_in_search'] = '0';
+        $this->defaultAttributePostData['used_for_sort_by'] = '0';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeData(): array
+    {
+        return array_replace_recursive(
+            parent::getAttributeData(),
+            [
+                "{$this->getFrontendInput()}_with_default_value" => [
+                    [
+                        'default_value_text' => '',
+                        'default_value_yesno' => 1,
+                    ],
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeDataWithCheckArray(): array
+    {
+        return array_replace_recursive(
+            parent::getAttributeDataWithCheckArray(),
+            [
+                "{$this->getFrontendInput()}_with_default_value" => [
+                    1 => [
+                        'default_value' => 1,
+                    ],
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getFrontendInput(): string
+    {
+        return 'boolean';
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/GetAttributeGroupByName.php b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/GetAttributeGroupByName.php
new file mode 100644
index 0000000000000..65ebe326fb939
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/GetAttributeGroupByName.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Eav\Model;
+
+use Magento\Eav\Api\AttributeGroupRepositoryInterface;
+use Magento\Eav\Api\Data\AttributeGroupInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+
+/**
+ * Search and return attribute group by name.
+ */
+class GetAttributeGroupByName
+{
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var AttributeGroupRepositoryInterface
+     */
+    private $groupRepository;
+
+    /**
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param AttributeGroupRepositoryInterface $attributeGroupRepository
+     */
+    public function __construct(
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        AttributeGroupRepositoryInterface $attributeGroupRepository
+    ) {
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->groupRepository = $attributeGroupRepository;
+    }
+
+    /**
+     * Returns attribute group by name.
+     *
+     * @param int $setId
+     * @param string $groupName
+     * @return AttributeGroupInterface|null
+     */
+    public function execute(int $setId, string $groupName): ?AttributeGroupInterface
+    {
+        $searchCriteria =  $this->searchCriteriaBuilder->addFilter(
+            AttributeGroupInterface::GROUP_NAME,
+            $groupName
+        )->addFilter(
+            AttributeGroupInterface::ATTRIBUTE_SET_ID,
+            $setId
+        )->create();
+        $result = $this->groupRepository->getList($searchCriteria)->getItems();
+
+        return array_shift($result);
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/GetAttributeSetByName.php b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/GetAttributeSetByName.php
new file mode 100644
index 0000000000000..d7a7f0646742a
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/GetAttributeSetByName.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Eav\Model;
+
+use Magento\Eav\Api\AttributeSetRepositoryInterface;
+use Magento\Eav\Api\Data\AttributeSetInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+
+/**
+ * Search and return attribute set by name.
+ */
+class GetAttributeSetByName
+{
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var AttributeSetRepositoryInterface
+     */
+    private $attributeSetRepository;
+
+    /**
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param AttributeSetRepositoryInterface $attributeSetRepository
+     */
+    public function __construct(
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        AttributeSetRepositoryInterface $attributeSetRepository
+    ) {
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->attributeSetRepository = $attributeSetRepository;
+    }
+
+    /**
+     * Find attribute set by name and return it.
+     *
+     * @param string $attributeSetName
+     * @return AttributeSetInterface|null
+     */
+    public function execute(string $attributeSetName): ?AttributeSetInterface
+    {
+        $this->searchCriteriaBuilder->addFilter('attribute_set_name', $attributeSetName);
+        $searchCriteria = $this->searchCriteriaBuilder->create();
+        $result = $this->attributeSetRepository->getList($searchCriteria);
+        $items = $result->getItems();
+
+        return array_pop($items);
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/ResourceModel/GetEntityIdByAttributeId.php b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/ResourceModel/GetEntityIdByAttributeId.php
new file mode 100644
index 0000000000000..edb75a5d8d1bd
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Eav/Model/ResourceModel/GetEntityIdByAttributeId.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Eav\Model\ResourceModel;
+
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set as AttributeSetResource;
+
+/**
+ * Search and return attribute data from eav entity attribute table.
+ */
+class GetEntityIdByAttributeId
+{
+    /**
+     * @var AttributeSetResource
+     */
+    private $attributeSetResource;
+
+    /**
+     * @param AttributeSetResource $setResource
+     */
+    public function __construct(
+        AttributeSetResource $setResource
+    ) {
+        $this->attributeSetResource = $setResource;
+    }
+
+    /**
+     * Returns entity attribute by id.
+     *
+     * @param int $setId
+     * @param int $attributeId
+     * @return int|null
+     */
+    public function execute(int $setId, int $attributeId): ?int
+    {
+        $select = $this->attributeSetResource->getConnection()->select()
+            ->from($this->attributeSetResource->getTable('eav_entity_attribute'))
+            ->where('attribute_set_id = ?', $setId)
+            ->where('attribute_id = ?', $attributeId);
+
+        $result = $this->attributeSetResource->getConnection()->fetchOne($select);
+        return $result ? (int)$result : null;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php b/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php
index 0924bf8b7db0b..933d86fe6a4f5 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php
@@ -10,6 +10,9 @@
  */
 namespace Magento\TestFramework\Helper;
 
+/**
+ * Integration Test Framework memory management logic.
+ */
 class Memory
 {
     /**
@@ -38,21 +41,21 @@ public function __construct(\Magento\Framework\Shell $shell)
     /**
      * Retrieve the effective memory usage of the current process
      *
-     * memory_get_usage() cannot be used because of the bug
-     * @link https://bugs.php.net/bug.php?id=62467
+     * Function memory_get_usage() cannot be used because of the bug
      *
+     * @link https://bugs.php.net/bug.php?id=62467
      * @return int Memory usage in bytes
      */
     public function getRealMemoryUsage()
     {
         $pid = getmypid();
         try {
+            // fall back to the Unix command line
+            $result = $this->_getUnixProcessMemoryUsage($pid);
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
             // try to use the Windows command line
             // some ports of Unix commands on Windows, such as MinGW, have limited capabilities and cannot be used
             $result = $this->_getWinProcessMemoryUsage($pid);
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            // fall back to the Unix command line
-            $result = $this->_getUnixProcessMemoryUsage($pid);
         }
         return $result;
     }
@@ -100,9 +103,11 @@ protected function _getWinProcessMemoryUsage($pid)
      * @return int
      * @throws \InvalidArgumentException
      * @throws \OutOfBoundsException
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     public static function convertToBytes($number)
     {
+        // phpcs:enable Magento2.Functions.StaticFunction
         if (!preg_match('/^(.*\d)\h*(\D)$/', $number, $matches)) {
             throw new \InvalidArgumentException("Number format '{$number}' is not recognized.");
         }
@@ -132,12 +137,14 @@ public static function convertToBytes($number)
      * - but the value has only one delimiter, such as "234,56", then it is impossible to know whether it is decimal
      *   separator or not. Only knowing the right format would allow this.
      *
-     * @param $number
+     * @param string $number
      * @return string
      * @throws \InvalidArgumentException
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     protected static function _convertToNumber($number)
     {
+        // phpcs:enable Magento2.Functions.StaticFunction
         preg_match_all('/(\D+)/', $number, $matches);
         if (count(array_unique($matches[0])) > 1) {
             throw new \InvalidArgumentException(
@@ -152,9 +159,11 @@ protected static function _convertToNumber($number)
      *
      * @link http://php.net/manual/en/function.php-uname.php
      * @return boolean
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     public static function isMacOs()
     {
+        // phpcs:enable Magento2.Functions.StaticFunction
         return strtoupper(PHP_OS) === 'DARWIN';
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Mail/Template/TransportBuilderMock.php b/dev/tests/integration/framework/Magento/TestFramework/Mail/Template/TransportBuilderMock.php
index 9f697a1be6339..cd9512c227893 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Mail/Template/TransportBuilderMock.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Mail/Template/TransportBuilderMock.php
@@ -6,6 +6,9 @@
 
 namespace Magento\TestFramework\Mail\Template;
 
+/**
+ * Class TransportBuilderMock
+ */
 class TransportBuilderMock extends \Magento\Framework\Mail\Template\TransportBuilder
 {
     /**
@@ -38,11 +41,12 @@ public function getSentMessage()
      * Return transport mock.
      *
      * @return \Magento\TestFramework\Mail\TransportInterfaceMock
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getTransport()
     {
         $this->prepareMessage();
         $this->reset();
-        return new \Magento\TestFramework\Mail\TransportInterfaceMock();
+        return new \Magento\TestFramework\Mail\TransportInterfaceMock($this->message);
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Mail/TransportInterfaceMock.php b/dev/tests/integration/framework/Magento/TestFramework/Mail/TransportInterfaceMock.php
index 8f967b501a59f..5bf98b76e7d59 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Mail/TransportInterfaceMock.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Mail/TransportInterfaceMock.php
@@ -6,8 +6,28 @@
 
 namespace Magento\TestFramework\Mail;
 
+use Magento\Framework\Mail\EmailMessageInterface;
+
+/**
+ * Class TransportInterfaceMock
+ */
 class TransportInterfaceMock implements \Magento\Framework\Mail\TransportInterface
 {
+    /**
+     * @var null|EmailMessageInterface
+     */
+    private $message;
+
+    /**
+     * TransportInterfaceMock constructor.
+     *
+     * @param null|EmailMessageInterface $message
+     */
+    public function __construct($message = null)
+    {
+        $this->message = $message;
+    }
+
     /**
      * Mock of send a mail using transport
      *
@@ -15,16 +35,17 @@ class TransportInterfaceMock implements \Magento\Framework\Mail\TransportInterfa
      */
     public function sendMessage()
     {
+        //phpcs:ignore Squiz.PHP.NonExecutableCode.ReturnNotRequired
         return;
     }
 
     /**
      * Get message
      *
-     * @return string
+     * @return null|EmailMessageInterface
      */
     public function getMessage()
     {
-        return '';
+        return $this->message;
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Quote/Model/GetQuoteByReservedOrderId.php b/dev/tests/integration/framework/Magento/TestFramework/Quote/Model/GetQuoteByReservedOrderId.php
new file mode 100644
index 0000000000000..bd83bc595692f
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Quote/Model/GetQuoteByReservedOrderId.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Quote\Model;
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Search and return quote by reserved order id.
+ */
+class GetQuoteByReservedOrderId
+{
+    /** @var SearchCriteriaBuilder */
+    private $searchCriteriaBuilder;
+
+    /** @var CartRepositoryInterface */
+    private $cartRepository;
+
+    /**
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param CartRepositoryInterface $cartRepository
+     */
+    public function __construct(SearchCriteriaBuilder $searchCriteriaBuilder, CartRepositoryInterface $cartRepository)
+    {
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->cartRepository = $cartRepository;
+    }
+
+    /**
+     * Return quote by reserved order id.
+     *
+     * @param string $reservedOrderId
+     * @return CartInterface|null
+     */
+    public function execute(string $reservedOrderId): ?CartInterface
+    {
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)->create();
+        $quotes = $this->cartRepository->getList($searchCriteria)->getItems();
+
+        return array_shift($quotes);
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/SalesRule/Model/GetSalesRuleByName.php b/dev/tests/integration/framework/Magento/TestFramework/SalesRule/Model/GetSalesRuleByName.php
new file mode 100644
index 0000000000000..db94d9ee97e04
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/SalesRule/Model/GetSalesRuleByName.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\SalesRule\Model;
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
+use Magento\SalesRule\Api\Data\RuleInterface;
+
+/**
+ * Search and return Sales rule by name.
+ */
+class GetSalesRuleByName
+{
+    /** @var SearchCriteriaBuilder */
+    private $searchCriteriaBuilder;
+
+    /** @var RuleRepositoryInterface */
+    private $ruleRepository;
+
+    /**
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param RuleRepositoryInterface $ruleRepository
+     */
+    public function __construct(SearchCriteriaBuilder $searchCriteriaBuilder, RuleRepositoryInterface $ruleRepository)
+    {
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->ruleRepository = $ruleRepository;
+    }
+
+    /**
+     * Return Sales Rule by name.
+     *
+     * @param string $name
+     * @return RuleInterface|null
+     */
+    public function execute(string $name): ?RuleInterface
+    {
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter('name', $name)->create();
+        $salesRules = $this->ruleRepository->getList($searchCriteria)->getItems();
+
+        return array_shift($salesRules);
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Swatches/Model/Attribute/DataProvider/AbstractSwatchAttributeData.php b/dev/tests/integration/framework/Magento/TestFramework/Swatches/Model/Attribute/DataProvider/AbstractSwatchAttributeData.php
new file mode 100644
index 0000000000000..ce9a6b551986c
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Swatches/Model/Attribute/DataProvider/AbstractSwatchAttributeData.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Swatches\Model\Attribute\DataProvider;
+
+use Magento\TestFramework\Eav\Model\Attribute\DataProvider\AbstractAttributeDataWithOptions;
+
+/**
+ * Base attribute data for swatch attributes.
+ */
+abstract class AbstractSwatchAttributeData extends AbstractAttributeDataWithOptions
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->defaultAttributePostData = array_replace(
+            $this->defaultAttributePostData,
+            [
+                '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' => '',
+                'used_for_sort_by' => 0,
+            ]
+        );
+        $this->defaultAttributePostData['swatch_input_type'] = 'text';
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Swatches/Model/Attribute/DataProvider/TextSwatch.php b/dev/tests/integration/framework/Magento/TestFramework/Swatches/Model/Attribute/DataProvider/TextSwatch.php
new file mode 100644
index 0000000000000..c63873469e2f8
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Swatches/Model/Attribute/DataProvider/TextSwatch.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Swatches\Model\Attribute\DataProvider;
+
+use Magento\Swatches\Model\Swatch;
+
+/**
+ * Product attribute data for attribute with input type visual swatch.
+ */
+class TextSwatch extends AbstractSwatchAttributeData
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->defaultAttributePostData['swatch_input_type'] = 'text';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeDataWithCheckArray(): array
+    {
+        return array_replace_recursive(
+            parent::getAttributeDataWithCheckArray(),
+            [
+                "{$this->getFrontendInput()}_with_required_fields" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_store_view_scope" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_global_scope" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_website_scope" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_attribute_code" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_unique_value" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_unique_value" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_enabled_add_to_column_options" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_enabled_add_to_column_options" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_enabled_use_in_filter_options" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_enabled_use_in_filter_options" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getOptionsDataArr(): array
+    {
+        return [
+            [
+                'optiontext' => [
+                    'order' => [
+                        'option_0' => '1',
+                    ],
+                    'value' => [
+                        'option_0' => [
+                            0 => 'Admin value description 1',
+                            1 => 'Default store view value description 1',
+                        ],
+                    ],
+                    'delete' => [
+                        'option_0' => '',
+                    ],
+                ],
+                'defaulttext' => [
+                    0 => 'option_0',
+                ],
+                'swatchtext' => [
+                    'value' => [
+                        'option_0' => [
+                            0 => 'Admin value 1',
+                            1 => 'Default store view value 1',
+                        ],
+                    ],
+                ],
+            ],
+            [
+                'optiontext' => [
+                    'order' => [
+                        'option_1' => '2',
+                    ],
+                    'value' => [
+                        'option_1' => [
+                            0 => 'Admin value description 2',
+                            1 => 'Default store view value description 2',
+                        ],
+                    ],
+                    'delete' => [
+                        'option_1' => '',
+                    ],
+                ],
+                'swatchtext' => [
+                    'value' => [
+                        'option_1' => [
+                            0 => 'Admin value 2',
+                            1 => 'Default store view value 2',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getFrontendInput(): string
+    {
+        return Swatch::SWATCH_TYPE_TEXTUAL_ATTRIBUTE_FRONTEND_INPUT;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Swatches/Model/Attribute/DataProvider/VisualSwatch.php b/dev/tests/integration/framework/Magento/TestFramework/Swatches/Model/Attribute/DataProvider/VisualSwatch.php
new file mode 100644
index 0000000000000..b5e32c40ef8a1
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Swatches/Model/Attribute/DataProvider/VisualSwatch.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Swatches\Model\Attribute\DataProvider;
+
+use Magento\Swatches\Model\Swatch;
+
+/**
+ * Product attribute data for attribute with input type visual swatch.
+ */
+class VisualSwatch extends AbstractSwatchAttributeData
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->defaultAttributePostData['swatch_input_type'] = 'visual';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeDataWithCheckArray(): array
+    {
+        return array_replace_recursive(
+            parent::getAttributeDataWithCheckArray(),
+            [
+                "{$this->getFrontendInput()}_with_required_fields" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_store_view_scope" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_global_scope" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_website_scope" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_attribute_code" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_unique_value" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_unique_value" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_enabled_add_to_column_options" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_enabled_add_to_column_options" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_with_enabled_use_in_filter_options" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+                "{$this->getFrontendInput()}_without_enabled_use_in_filter_options" => [
+                    1 => [
+                        'frontend_input' => 'select',
+                    ],
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getOptionsDataArr(): array
+    {
+        return [
+            [
+                'optionvisual' => [
+                    'order' => [
+                        'option_0' => '1',
+                    ],
+                    'value' => [
+                        'option_0' => [
+                            0 => 'Admin black test 1',
+                            1 => 'Default store view black test 1',
+                        ],
+                    ],
+                    'delete' => [
+                        'option_0' => '',
+                    ]
+                ],
+                'swatchvisual' => [
+                    'value' => [
+                        'option_0' => '#000000',
+                    ]
+                ]
+            ],
+            [
+                'optionvisual' => [
+                    'order' => [
+                        'option_1' => '2',
+                    ],
+                    'value' => [
+                        'option_1' => [
+                            0 => 'Admin white test 2',
+                            1 => 'Default store view white test 2',
+                        ],
+                    ],
+                    'delete' => [
+                        'option_1' => '',
+                    ],
+                ],
+                'swatchvisual' => [
+                    'value' => [
+                        'option_1' => '#ffffff',
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getFrontendInput(): string
+    {
+        return Swatch::SWATCH_TYPE_VISUAL_ATTRIBUTE_FRONTEND_INPUT;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
index 7a387bd41eec2..920cde4b7df09 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
@@ -41,6 +41,13 @@ abstract class AbstractBackendController extends \Magento\TestFramework\TestCase
      */
     protected $httpMethod;
 
+    /**
+     * Expected no access response
+     *
+     * @var int
+     */
+    protected $expectedNoAccessResponseCode = 403;
+
     /**
      * @inheritDoc
      *
@@ -84,21 +91,6 @@ protected function tearDown()
         parent::tearDown();
     }
 
-    /**
-     * Utilize backend session model by default
-     *
-     * @param \PHPUnit\Framework\Constraint\Constraint $constraint
-     * @param string|null $messageType
-     * @param string $messageManagerClass
-     */
-    public function assertSessionMessages(
-        \PHPUnit\Framework\Constraint\Constraint $constraint,
-        $messageType = null,
-        $messageManagerClass = \Magento\Framework\Message\Manager::class
-    ) {
-        parent::assertSessionMessages($constraint, $messageType, $messageManagerClass);
-    }
-
     /**
      * Test ACL configuration for action working.
      */
@@ -111,8 +103,8 @@ public function testAclHasAccess()
             $this->getRequest()->setMethod($this->httpMethod);
         }
         $this->dispatch($this->uri);
-        $this->assertNotSame(403, $this->getResponse()->getHttpResponseCode());
         $this->assertNotSame(404, $this->getResponse()->getHttpResponseCode());
+        $this->assertNotSame($this->expectedNoAccessResponseCode, $this->getResponse()->getHttpResponseCode());
     }
 
     /**
@@ -130,6 +122,6 @@ public function testAclNoAccess()
             ->getAcl()
             ->deny(null, $this->resource);
         $this->dispatch($this->uri);
-        $this->assertSame(403, $this->getResponse()->getHttpResponseCode());
+        $this->assertSame($this->expectedNoAccessResponseCode, $this->getResponse()->getHttpResponseCode());
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Weee/Model/Attribute/DataProvider/FixedProductTax.php b/dev/tests/integration/framework/Magento/TestFramework/Weee/Model/Attribute/DataProvider/FixedProductTax.php
new file mode 100644
index 0000000000000..2f1f625ad48ac
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Weee/Model/Attribute/DataProvider/FixedProductTax.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Weee\Model\Attribute\DataProvider;
+
+use Magento\TestFramework\Eav\Model\Attribute\DataProvider\AbstractBaseAttributeData;
+
+/**
+ * Product attribute data for attribute with input type fixed product tax.
+ */
+class FixedProductTax extends AbstractBaseAttributeData
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->defaultAttributePostData['used_for_sort_by'] = '0';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeData(): array
+    {
+        $result = parent::getAttributeData();
+        unset($result["{$this->getFrontendInput()}_with_default_value"]);
+        unset($result["{$this->getFrontendInput()}_without_default_value"]);
+
+        return $result;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAttributeDataWithCheckArray(): array
+    {
+        $result = parent::getAttributeDataWithCheckArray();
+        unset($result["{$this->getFrontendInput()}_with_default_value"]);
+        unset($result["{$this->getFrontendInput()}_without_default_value"]);
+
+        return $result;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getFrontendInput(): string
+    {
+        return 'weee';
+    }
+}
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Helper/MemoryTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Helper/MemoryTest.php
index a033aba7e90b6..04a82607668ec 100644
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Helper/MemoryTest.php
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Helper/MemoryTest.php
@@ -21,16 +21,7 @@ public function testGetRealMemoryUsageUnix()
     {
         $object = new \Magento\TestFramework\Helper\Memory($this->_shell);
         $this->_shell->expects(
-            $this->at(0)
-        )->method(
-            'execute'
-        )->with(
-            $this->stringStartsWith('tasklist.exe ')
-        )->will(
-            $this->throwException(new \Magento\Framework\Exception\LocalizedException(__('command not found')))
-        );
-        $this->_shell->expects(
-            $this->at(1)
+            $this->once()
         )->method(
             'execute'
         )->with(
@@ -44,7 +35,16 @@ public function testGetRealMemoryUsageUnix()
     public function testGetRealMemoryUsageWin()
     {
         $this->_shell->expects(
-            $this->once()
+            $this->at(0)
+        )->method(
+            'execute'
+        )->with(
+            $this->stringStartsWith('ps ')
+        )->will(
+            $this->throwException(new \Magento\Framework\Exception\LocalizedException(__('command not found')))
+        );
+        $this->_shell->expects(
+            $this->at(1)
         )->method(
             'execute'
         )->with(
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 b4f38d207c1f4..ce0cc79b0a5e0 100644
--- a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php
+++ b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php
@@ -6,6 +6,7 @@
 namespace Magento\AdvancedPricingImportExport\Model\Export;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\File\Csv;
 use Magento\TestFramework\Indexer\TestCase;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\Filesystem;
@@ -19,6 +20,8 @@
 
 /**
  * Advanced pricing test
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AdvancedPricingTest extends TestCase
 {
@@ -161,6 +164,110 @@ public function testExportMultipleWebsites()
         }
     }
 
+    /**
+     * Export and Import of Advanced Pricing with different Price Types.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/two_simple_products_with_tier_price.php
+     * @return void
+     */
+    public function testExportImportOfAdvancedPricing(): void
+    {
+        $csvfile = uniqid('importexport_') . '.csv';
+        $exportContent = $this->exportData($csvfile);
+        $this->assertContains(
+            'second_simple,"All Websites [USD]","ALL GROUPS",10.0000,3.00,Discount',
+            $exportContent
+        );
+        $this->assertContains(
+            'simple,"All Websites [USD]",General,5.0000,95.000000,Fixed',
+            $exportContent
+        );
+        $this->updateTierPriceDataInCsv($csvfile);
+        $this->importData($csvfile);
+
+        /** @var  ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $firstProductTierPrices = $productRepository->get('simple')->getTierPrices();
+        $secondProductTierPrices = $productRepository->get('second_simple')->getTierPrices();
+
+        $this->assertSame(
+            ['0', '1'],
+            [
+                $firstProductTierPrices[0]->getExtensionAttributes()->getWebsiteId(),
+                $firstProductTierPrices[0]->getCustomerGroupId(),
+            ]
+        );
+
+        $this->assertEquals(
+            ['5.0000', '90.000000'],
+            [
+                $firstProductTierPrices[0]->getQty(),
+                $firstProductTierPrices[0]->getValue(),
+            ],
+            '',
+            0.1
+        );
+
+        $this->assertSame(
+            ['0', \Magento\Customer\Model\Group::CUST_GROUP_ALL],
+            [
+                $secondProductTierPrices[0]->getExtensionAttributes()->getWebsiteId(),
+                $secondProductTierPrices[0]->getCustomerGroupId(),
+            ]
+        );
+
+        $this->assertEquals(
+            ['5.00', '10.0000'],
+            [
+                $secondProductTierPrices[0]->getExtensionAttributes()->getPercentageValue(),
+                $secondProductTierPrices[0]->getQty(),
+            ],
+            '',
+            0.1
+        );
+    }
+
+    /**
+     * Update tier price data in CSV.
+     *
+     * @param string $csvfile
+     * @return void
+     */
+    private function updateTierPriceDataInCsv(string $csvfile): void
+    {
+        $csvNewData = [
+            0 => [
+                0 => 'sku',
+                1 => 'tier_price_website',
+                2 => 'tier_price_customer_group',
+                3 => 'tier_price_qty',
+                4 => 'tier_price',
+                5 => 'tier_price_value_type',
+            ],
+            1 => [
+                0 => 'simple',
+                1 => 'All Websites [USD]',
+                2 => 'General',
+                3 => '5',
+                4 => '90',
+                5 => 'Fixed',
+            ],
+            2 => [
+                0 => 'second_simple',
+                1 => 'All Websites [USD]',
+                2 => 'ALL GROUPS',
+                3 => '10',
+                4 => '5',
+                5 => 'Discount',
+            ],
+        ];
+
+        /** @var Csv $csv */
+        $csv = $this->objectManager->get(Csv::class);
+        $varDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+        $csv->appendData($varDirectory->getAbsolutePath($csvfile), $csvNewData);
+    }
+
     /**
      * @param string $csvFile
      * @return string
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable.php
index e74f995f8b57b..7e0d7594c3510 100644
--- a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable.php
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable.php
@@ -52,7 +52,22 @@
         'error_code' => 2222,
         'result_message' => 'Entity with ID=4 does not exist',
     ],
-
+    [
+        'bulk_uuid' => 'bulk-uuid-searchable-6',
+        'topic_name' => 'topic-5',
+        'serialized_data' => json_encode(['entity_id' => 5]),
+        'status' => OperationInterface::STATUS_TYPE_OPEN,
+        'error_code' => null,
+        'result_message' => '',
+    ],
+    [
+        'bulk_uuid' => 'bulk-uuid-searchable-6',
+        'topic_name' => 'topic-5',
+        'serialized_data' => json_encode(['entity_id' => 5]),
+        'status' => OperationInterface::STATUS_TYPE_OPEN,
+        'error_code' => null,
+        'result_message' => '',
+    ]
 ];
 
 $bulkQuery = "INSERT INTO {$bulkTable} (`uuid`, `user_id`, `description`, `operation_count`, `start_time`)"
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/Tab/Products/ViewedTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/Tab/Products/ViewedTest.php
index 0c400cd76b9a1..f1a9e97ecaa9c 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/Tab/Products/ViewedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/Tab/Products/ViewedTest.php
@@ -49,6 +49,7 @@ protected function setUp()
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/reports/options/enabled 1
      */
     public function testGetPreparedCollectionProductPrice()
     {
@@ -57,9 +58,11 @@ public function testGetPreparedCollectionProductPrice()
         $product = $this->productRepository->getById(1);
         $this->eventManager->dispatch('catalog_controller_product_view', ['product' => $product]);
 
+        $collection = $viewedProductsTabBlock->getPreparedCollection();
+
         $this->assertEquals(
             10,
-            $viewedProductsTabBlock->getPreparedCollection()->getFirstItem()->getDataByKey('price')
+            $collection->getFirstItem()->getDataByKey('price')
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/Magento_Backend/layout/layout_test_grid_handle.xml b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/Magento_Backend/layout/layout_test_grid_handle.xml
index 621e9f13409f1..70bf2af6a5fcf 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/Magento_Backend/layout/layout_test_grid_handle.xml
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/_files/design/adminhtml/Magento/test_default/Magento_Backend/layout/layout_test_grid_handle.xml
@@ -55,12 +55,12 @@
                     <item name="option_id1" xsi:type="array">
                         <item name="label" xsi:type="string" translate="true">Option One</item>
                         <item name="url" xsi:type="string">*/*/option1</item>
-                        <item name="complete" xsi:type="string">Test</item>
+                        <item name="complete" xsi:type="string" translate="true">Test</item>
                     </item>
                     <item name="option_id2" xsi:type="array">
                         <item name="label" xsi:type="string" translate="true">Option Two</item>
                         <item name="url" xsi:type="string">*/*/option2</item>
-                        <item name="confirm" xsi:type="string">Are you sure?</item>
+                        <item name="confirm" xsi:type="string" translate="true">Are you sure?</item>
                     </item>
                     <item name="option_id3" xsi:type="array">
                         <item name="label" xsi:type="string" translate="true">Option Three</item>
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
index bd4dd0c8daf0c..4466434caef0e 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/ProductsViewedTest.php
@@ -15,6 +15,7 @@ class ProductsViewedTest extends \Magento\TestFramework\TestCase\AbstractBackend
     /**
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Reports/_files/viewed_products.php
+     * @magentoConfigFixture default/reports/options/enabled 1
      */
     public function testExecute()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php
index 5ef518fd2152f..42b1c10ee301e 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php
@@ -22,15 +22,10 @@ class SessionTest extends \PHPUnit\Framework\TestCase
     private $auth;
 
     /**
-     * @var Session
+     * @var \Magento\Backend\Model\Auth\Session
      */
     private $authSession;
 
-    /**
-     * @var SessionFactory
-     */
-    private $authSessionFactory;
-
     /**
      * @var \Magento\Framework\ObjectManagerInterface
      */
@@ -43,8 +38,7 @@ protected function setUp()
         $this->objectManager->get(\Magento\Framework\Config\ScopeInterface::class)
             ->setCurrentScope(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
         $this->auth = $this->objectManager->create(\Magento\Backend\Model\Auth::class);
-        $this->authSession = $this->objectManager->create(Session::class);
-        $this->authSessionFactory = $this->objectManager->get(SessionFactory::class);
+        $this->authSession = $this->objectManager->create(\Magento\Backend\Model\Auth\Session::class);
         $this->auth->setAuthStorage($this->authSession);
         $this->auth->logout();
     }
@@ -73,55 +67,4 @@ public function loginDataProvider()
     {
         return [[false], [true]];
     }
-
-    /**
-     * Check that persisting user data is working.
-     */
-    public function testStorage()
-    {
-        $this->auth->login(TestHelper::ADMIN_NAME, TestHelper::ADMIN_PASSWORD);
-        $user = $this->authSession->getUser();
-        $acl = $this->authSession->getAcl();
-        /** @var Session $session */
-        $session = $this->authSessionFactory->create();
-        $persistedUser = $session->getUser();
-        $persistedAcl = $session->getAcl();
-
-        $this->assertEquals($user->getData(), $persistedUser->getData());
-        $this->assertEquals($user->getAclRole(), $persistedUser->getAclRole());
-        $this->assertEquals($acl->getRoles(), $persistedAcl->getRoles());
-        $this->assertEquals($acl->getResources(), $persistedAcl->getResources());
-    }
-
-    /**
-     * Check that session manager can work with user storage in the old way.
-     */
-    public function testInnerStorage(): void
-    {
-        /** @var \Magento\Framework\Session\StorageInterface $innerStorage */
-        $innerStorage = Bootstrap::getObjectManager()->get(\Magento\Framework\Session\StorageInterface::class);
-        $this->authSession = $this->authSessionFactory->create(['storage' => $innerStorage]);
-        $this->auth->login(TestHelper::ADMIN_NAME, TestHelper::ADMIN_PASSWORD);
-        $user = $this->auth->getAuthStorage()->getUser();
-        $acl = $this->auth->getAuthStorage()->getAcl();
-        $this->assertNotEmpty($user);
-        $this->assertNotEmpty($acl);
-        $this->auth->logout();
-        $this->assertEmpty($this->auth->getAuthStorage()->getUser());
-        $this->assertEmpty($this->auth->getAuthStorage()->getAcl());
-        $this->authSession->setUser($user);
-        $this->authSession->setAcl($acl);
-        $this->assertTrue($user === $this->authSession->getUser());
-        $this->assertTrue($acl === $this->authSession->getAcl());
-        $this->authSession->destroy();
-        $innerStorage->setUser($user);
-        $innerStorage->setAcl($acl);
-        $this->assertTrue($user === $this->authSession->getUser());
-        $this->assertTrue($acl === $this->authSession->getAcl());
-        /** @var Session $newSession */
-        $newSession = $this->authSessionFactory->create(['storage' => $innerStorage]);
-        $this->assertTrue($newSession->hasUser());
-        $this->assertTrue($newSession->hasAcl());
-        $this->assertEquals($user->getId(), $newSession->getUser()->getId());
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/Locale/ResolverTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/Locale/ResolverTest.php
index 88662a65c7428..2754e055b71fe 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Model/Locale/ResolverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/Locale/ResolverTest.php
@@ -3,12 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Backend\Model\Locale;
 
 use Magento\Framework\Locale\Resolver;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\User\Model\User;
 
 /**
  * @magentoAppArea adminhtml
@@ -41,7 +39,7 @@ public function testSetLocaleWithDefaultLocale()
      */
     public function testSetLocaleWithBaseInterfaceLocale()
     {
-        $user = Bootstrap::getObjectManager()->create(User::class);
+        $user = new \Magento\Framework\DataObject();
         $session = Bootstrap::getObjectManager()->get(
             \Magento\Backend\Model\Auth\Session::class
         );
@@ -78,6 +76,38 @@ public function testSetLocaleWithRequestLocale()
         $this->_checkSetLocale('de_DE');
     }
 
+    /**
+     * Tests setLocale() with parameter
+     *
+     * @param string|null $localeParam
+     * @param string|null $localeRequestParam
+     * @param string $localeExpected
+     * @dataProvider setLocaleWithParameterDataProvider
+     */
+    public function testSetLocaleWithParameter(
+        ?string $localeParam,
+        ?string $localeRequestParam,
+        string $localeExpected
+    ) {
+        $request = Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\App\RequestInterface::class);
+        $request->setPostValue(['locale' => $localeRequestParam]);
+        $this->_model->setLocale($localeParam);
+        $this->assertEquals($localeExpected, $this->_model->getLocale());
+    }
+
+    /**
+     * @return array
+     */
+    public function setLocaleWithParameterDataProvider(): array
+    {
+        return [
+            ['ko_KR', 'ja_JP', 'ja_JP'],
+            ['ko_KR', null, 'ko_KR'],
+            [null, 'ja_JP', 'ja_JP'],
+        ];
+    }
+
     /**
      * Check set locale
      *
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php
index 91cea7dc96602..56bf2c53f6728 100644
--- a/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Fixtures/assign_items_per_address.php
@@ -30,7 +30,7 @@
 
 // assign virtual product to the billing address
 $billingAddress = $quote->getBillingAddress();
-$virtualItem = $items[sizeof($items) - 1];
+$virtualItem = $items[count($items) - 1];
 $billingAddress->setTotalQty(1);
 $billingAddress->addItem($virtualItem);
 
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
index 03949115ea62c..c79e943ba4be3 100644
--- 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
@@ -8,7 +8,7 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 
-require __DIR__ . 'product_with_multiple_options.php';
+require __DIR__ . '/product_with_multiple_options.php';
 
 $objectManager = Bootstrap::getObjectManager();
 
@@ -49,6 +49,14 @@
 $cart->getQuote()->setReservedOrderId('test_cart_with_bundle_and_options');
 $cart->save();
 
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+    ->create();
+$quoteIdMask->setQuoteId($cart->getQuote()->getId());
+$quoteIdMask->setDataChanges(true);
+$quoteIdMask->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
index d32d6fab33319..591aec9190f9f 100644
--- 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
@@ -22,7 +22,7 @@
 $quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMask::class);
 $quoteIdMask->delete($quote->getId());
 
-require __DIR__ . 'product_with_multiple_options_rollback.php';
+require __DIR__ . '/product_with_multiple_options_rollback.php';
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Category/TopMenuTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Category/TopMenuTest.php
new file mode 100644
index 0000000000000..0dc8016c3ef8b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Category/TopMenuTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Block\Category;
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Theme\Block\Html\Topmenu;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class checks top menu link behaviour.
+ *
+ * @magentoAppArea frontend
+ * @magentoDbIsolation enabled
+ */
+class TopMenuTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var Topmenu */
+    private $block;
+
+    /** @var CategoryFactory */
+    private $categoryFactory;
+
+    /** @var CategoryRepositoryInterface */
+    private $categoryRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->categoryFactory = $this->objectManager->create(CategoryFactory::class);
+        $this->categoryRepository = $this->objectManager->create(CategoryRepositoryInterface::class);
+        $this->block = $this->objectManager->get(LayoutInterface::class)->createBlock(Topmenu::class);
+    }
+
+    /**
+     * Checks menu item displaying.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/category.php
+     * @return void
+     */
+    public function testTopMenuItemDisplay(): void
+    {
+        $output = $this->block->getHtml('level-top', 'submenu', 0);
+        $this->assertContains('Category 1', $output);
+    }
+
+    /**
+     * Checks that menu item is not displayed if the category is disabled or include in menu is disabled.
+     *
+     * @dataProvider invisibilityDataProvider
+     * @param array $data
+     * @return void
+     */
+    public function testTopMenuItemInvisibility(array $data): void
+    {
+        $category = $this->categoryFactory->create();
+        $category->setData($data);
+        $this->categoryRepository->save($category);
+        $output = $this->block->getHtml('level-top', 'submenu', 0);
+        $this->assertEmpty($output, 'The category is displayed in top menu navigation');
+    }
+
+    /**
+     * @return array
+     */
+    public function invisibilityDataProvider(): array
+    {
+        return [
+            'include_in_menu_disable' => [
+                'data' => [
+                    'name' => 'Test Category',
+                    'path' => '1/2/',
+                    'is_active' => '1',
+                    'include_in_menu' => false,
+                ],
+            ],
+            'category_disable' => [
+                'data' => [
+                    'name' => 'Test Category 2',
+                    'path' => '1/2/',
+                    'is_active' => false,
+                    'include_in_menu' => true,
+                ],
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/ProductInCategoriesViewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/ProductInCategoriesViewTest.php
new file mode 100644
index 0000000000000..b9adb051981c0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/ProductInCategoriesViewTest.php
@@ -0,0 +1,297 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Block\Product\ListProduct;
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Block\Product\ListProduct;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Eav\Model\Entity\Collection\AbstractCollection;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Checks products displaying on category page
+ *
+ * @magentoDbIsolation disabled
+ * @magentoAppIsolation enabled
+ */
+class ProductInCategoriesViewTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var ListProduct */
+    private $block;
+
+    /** @var CategoryRepositoryInterface */
+    private $categoryRepository;
+
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
+    /** @var LayoutInterface */
+    private $layout;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->categoryRepository = $this->objectManager->create(CategoryRepositoryInterface::class);
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $this->layout = $this->objectManager->get(LayoutInterface::class);
+        $this->block = $this->layout->createBlock(ListProduct::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category_with_two_products.php
+     * @dataProvider productDataProvider
+     * @param array $data
+     * @return void
+     */
+    public function testCategoryProductView(array $data): void
+    {
+        $this->updateProduct($data['sku'], $data);
+        $collection = $this->getCategoryProductCollection(333);
+
+        $this->assertEquals(1, $collection->getSize());
+        $this->assertEquals('simple333', $collection->getFirstItem()->getSku());
+    }
+
+    /**
+     * @return array
+     */
+    public function productDataProvider(): array
+    {
+        return [
+            'simple_product_enabled_disabled' => [
+                [
+                    'sku' => 'simple2',
+                    'status' => 0,
+                ],
+            ],
+            'simple_product_in_stock_out_of_stock' => [
+                [
+                    'sku' => 'simple2',
+                    'stock_data' => [
+                        'use_config_manage_stock' => 1,
+                        'qty' => 0,
+                        'is_qty_decimal' => 0,
+                        'is_in_stock' => 0,
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
+     * @dataProvider productVisibilityProvider
+     * @param array $data
+     * @return void
+     */
+    public function testCategoryProductVisibility(array $data): void
+    {
+        $this->updateProduct($data['data']['sku'], $data['data']);
+        $collection = $this->getCategoryProductCollection(333);
+
+        $this->assertEquals($data['expected_count'], $collection->getSize());
+    }
+
+    /**
+     * @return array
+     */
+    public function productVisibilityProvider(): array
+    {
+        return [
+            'not_visible' => [
+                [
+                    'data' => [
+                        'sku' => 'simple333',
+                        'visibility' => Visibility::VISIBILITY_NOT_VISIBLE,
+                    ],
+                    'expected_count' => 0,
+                ],
+
+            ],
+            'catalog_search' => [
+                [
+                    'data' => [
+                        'sku' => 'simple333',
+                        'visibility' => Visibility::VISIBILITY_BOTH,
+                    ],
+                    'expected_count' => 1,
+                ],
+
+            ],
+            'search' => [
+                [
+                    'data' => [
+                        'sku' => 'simple333',
+                        'visibility' => Visibility::VISIBILITY_IN_SEARCH,
+                    ],
+                    'expected_count' => 0,
+                ],
+            ],
+            'catalog' => [
+                [
+                    'data' => [
+                        'sku' => 'simple333',
+                        'visibility' => Visibility::VISIBILITY_IN_CATALOG,
+                    ],
+                    'expected_count' => 1,
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category_tree.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @return void
+     */
+    public function testAnchorCategoryProductVisibility(): void
+    {
+        $this->updateCategoryIsAnchor(400, true);
+        $this->assignProductCategories('simple2', [402]);
+        $parentCategoryCollection = $this->getCategoryProductCollection(400);
+        $childCategoryCollection = $this->getCategoryProductCollection(402, true);
+
+        $this->assertEquals(1, $parentCategoryCollection->getSize());
+        $this->assertEquals(
+            $childCategoryCollection->getAllIds(),
+            $parentCategoryCollection->getAllIds()
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category_tree.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @return void
+     */
+    public function testNonAnchorCategoryProductVisibility(): void
+    {
+        $this->updateCategoryIsAnchor(400, false);
+        $this->assignProductCategories('simple2', [402]);
+        $parentCategoryCollectionSize = $this->getCategoryProductCollection(400)->getSize();
+        $childCategoryCollectionSize = $this->getCategoryProductCollection(402, true)->getSize();
+
+        $this->assertEquals(0, $parentCategoryCollectionSize);
+        $this->assertEquals(1, $childCategoryCollectionSize);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/products_with_websites_and_stores.php
+     * @magentoDataFixture Magento/Catalog/_files/category.php
+     * @return void
+     */
+    public function testCategoryProductViewOnMultiWebsite(): void
+    {
+        $this->assignProductCategories(['simple-1', 'simple-2'], [3, 333]);
+        $store = $this->storeManager->getStore('fixture_second_store');
+        $currentStore = $this->storeManager->getStore();
+
+        try {
+            $this->storeManager->setCurrentStore($store->getId());
+            $collection = $this->block->getLoadedProductCollection();
+            $collectionSize = $collection->getSize();
+        } finally {
+            $this->storeManager->setCurrentStore($currentStore);
+        }
+
+        $this->assertEquals(1, $collectionSize);
+        $this->assertNull($collection->getItemByColumnValue('sku', 'simple-1'));
+        $this->assertNotNull($collection->getItemByColumnValue('sku', 'simple-2'));
+    }
+
+    /**
+     * Set categories to the products
+     *
+     * @param string|array $sku
+     * @param $categoryIds
+     * @return void
+     */
+    private function assignProductCategories($sku, array $categoryIds): void
+    {
+        $skus = !is_array($sku) ? [$sku] : $sku;
+        foreach ($skus as $sku) {
+            $product = $this->productRepository->get($sku);
+            $product->setCategoryIds($categoryIds);
+            $this->productRepository->save($product);
+        }
+    }
+
+    /**
+     * Update product
+     *
+     * @param string $sku
+     * @param array $data
+     * @return void
+     */
+    private function updateProduct(string $sku, array $data): void
+    {
+        $product = $this->productRepository->get($sku);
+        $product->addData($data);
+        $this->productRepository->save($product);
+    }
+
+    /**
+     * Returns category collection by category id
+     *
+     * @param int $categoryId
+     * @param bool $refreshBlock
+     * @return AbstractCollection
+     */
+    private function getCategoryProductCollection(int $categoryId, bool $refreshBlock = false): AbstractCollection
+    {
+        $block = $this->getListingBlock($refreshBlock);
+        $block->getLayer()->setCurrentCategory($categoryId);
+
+        return $block->getLoadedProductCollection();
+    }
+
+    /**
+     * Update is_anchor attribute of the category
+     *
+     * @param int $categoryId
+     * @param bool $isAnchor
+     * @return void
+     */
+    private function updateCategoryIsAnchor(int $categoryId, bool $isAnchor): void
+    {
+        $category = $this->categoryRepository->get($categoryId);
+        $category->setIsAnchor($isAnchor);
+        $this->categoryRepository->save($category);
+    }
+
+    /**
+     * Get product listing block
+     *
+     * @param bool $refresh
+     * @return ListProduct
+     */
+    private function getListingBlock(bool $refresh): ListProduct
+    {
+        if ($refresh) {
+            $this->block = $this->layout->createBlock(ListProduct::class);
+        }
+
+        return $this->block;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/AbstractLinksTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/AbstractLinksTest.php
new file mode 100644
index 0000000000000..f8e778498211d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/AbstractLinksTest.php
@@ -0,0 +1,323 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Block\Product\ProductList;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductLinkInterface;
+use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Block\Product\AbstractProduct;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductLink\Link;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class AbstractLinks - abstract class when testing blocks of linked products
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+abstract class AbstractLinksTest extends TestCase
+{
+    /** @var ObjectManager */
+    protected $objectManager;
+
+    /** @var ProductRepositoryInterface */
+    protected $productRepository;
+
+    /** @var LayoutInterface */
+    protected $layout;
+
+    /** @var ProductInterface|Product */
+    protected $product;
+
+    /** @var ProductLinkInterfaceFactory */
+    protected $productLinkInterfaceFactory;
+
+    /** @var StoreManagerInterface */
+    protected $storeManager;
+
+    /** @var array */
+    protected $existingProducts = [
+        'wrong-simple' => [
+            'position' => 1,
+        ],
+        'simple-249' => [
+            'position' => 2,
+        ],
+        'simple-156' => [
+            'position' => 3,
+        ],
+    ];
+
+    /** @var AbstractProduct */
+    protected $block;
+
+    /** @var string */
+    protected $linkType;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->layout = $this->objectManager->get(LayoutInterface::class);
+        $this->productLinkInterfaceFactory = $this->objectManager->get(ProductLinkInterfaceFactory::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+    }
+
+    /**
+     * Provide test data to verify the display of linked products.
+     *
+     * @return array
+     */
+    public function displayLinkedProductsProvider(): array
+    {
+        return [
+            'product_all_displayed' => [
+                'data' => [
+                    'updateProducts' => [],
+                    'expectedProductLinks' => [
+                        'wrong-simple',
+                        'simple-249',
+                        'simple-156',
+                    ],
+                ],
+            ],
+            'product_disabled' => [
+                'data' => [
+                    'updateProducts' => [
+                        'wrong-simple' => ['status' => Status::STATUS_DISABLED],
+                    ],
+                    'expectedProductLinks' => [
+                        'simple-249',
+                        'simple-156',
+                    ],
+                ],
+            ],
+            'product_invisibility' => [
+                'data' => [
+                    'updateProducts' => [
+                        'simple-249' => ['visibility' => Visibility::VISIBILITY_NOT_VISIBLE],
+                    ],
+                    'expectedProductLinks' => [
+                        'wrong-simple',
+                        'simple-156',
+                    ],
+                ],
+            ],
+            'product_invisible_in_catalog' => [
+                'data' => [
+                    'updateProducts' => [
+                        'simple-249' => ['visibility' => Visibility::VISIBILITY_IN_SEARCH],
+                    ],
+                    'expectedProductLinks' => [
+                        'wrong-simple',
+                        'simple-156',
+                    ],
+                ],
+            ],
+            'product_out_of_stock' => [
+                'data' => [
+                    'updateProducts' => [
+                        'simple-156' => [
+                            'stock_data' => [
+                                'use_config_manage_stock'   => 1,
+                                'qty'                       => 0,
+                                'is_qty_decimal'            => 0,
+                                'is_in_stock'               => 0,
+                            ],
+                        ],
+                    ],
+                    'expectedProductLinks' => [
+                        'wrong-simple',
+                        'simple-249',
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Provide test data to verify the display of linked products on different websites.
+     *
+     * @return array
+     */
+    public function multipleWebsitesLinkedProductsProvider(): array
+    {
+        return [
+            'first_website' => [
+                'data' => [
+                    'storeCode' => 'default',
+                    'productLinks' => [
+                        'simple-2' => ['position' => 4],
+                    ],
+                    'expectedProductLinks' => [
+                        'wrong-simple',
+                        'simple-2',
+                    ],
+                ],
+            ],
+            'second_website' => [
+                'data' => [
+                    'storeCode' => 'fixture_second_store',
+                    'productLinks' => [
+                        'simple-2' => ['position' => 4],
+                    ],
+                    'expectedProductLinks' => [
+                        'simple-249',
+                        'simple-2',
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Get test data to check position of related, up-sells and cross-sells products
+     *
+     * @return array
+     */
+    protected function getPositionData(): array
+    {
+        return [
+            'productLinks' => array_replace_recursive(
+                $this->existingProducts,
+                [
+                    'wrong-simple' => ['position' => 2],
+                    'simple-249' => ['position' => 3],
+                    'simple-156' => ['position' => 1],
+                ]
+            ),
+            'expectedProductLinks' => [
+                'simple-156',
+                'wrong-simple',
+                'simple-249',
+            ],
+        ];
+    }
+
+    /**
+     * Prepare a block of linked products
+     *
+     * @return void
+     */
+    protected function prepareBlock(): void
+    {
+        $this->block->setLayout($this->layout);
+        $this->block->setTemplate('Magento_Catalog::product/list/items.phtml');
+        $this->block->setType($this->linkType);
+    }
+
+    /**
+     * Set linked products by link type for current product received from array
+     *
+     * @param ProductInterface $product
+     * @param array $productData
+     * @return void
+     */
+    private function setCustomProductLinks(ProductInterface $product, array $productData): void
+    {
+        $productLinks = [];
+        foreach ($productData as $sku => $data) {
+            /** @var ProductLinkInterface|Link $productLink */
+            $productLink = $this->productLinkInterfaceFactory->create();
+            $productLink->setSku($product->getSku());
+            $productLink->setLinkedProductSku($sku);
+            if (isset($data['position'])) {
+                $productLink->setPosition($data['position']);
+            }
+            $productLink->setLinkType($this->linkType);
+            $productLinks[] = $productLink;
+        }
+        $product->setProductLinks($productLinks);
+    }
+
+    /**
+     * Update product attributes
+     *
+     * @param array $products
+     * @return void
+     */
+    protected function updateProducts(array $products): void
+    {
+        foreach ($products as $sku => $data) {
+            /** @var ProductInterface|Product $product */
+            $product = $this->productRepository->get($sku);
+            $product->addData($data);
+            $this->productRepository->save($product);
+        }
+    }
+
+    /**
+     * Get an array of received linked products
+     *
+     * @param array $items
+     * @return array
+     */
+    protected function getActualLinks(array $items): array
+    {
+        $actualLinks = [];
+        /** @var ProductInterface $productItem */
+        foreach ($items as $productItem) {
+            $actualLinks[] = $productItem->getSku();
+        }
+
+        return $actualLinks;
+    }
+
+    /**
+     * Link products to an existing product
+     *
+     * @param string $sku
+     * @param array $productLinks
+     * @return void
+     */
+    protected function linkProducts(string $sku, array $productLinks): void
+    {
+        $product = $this->productRepository->get($sku);
+        $this->setCustomProductLinks($product, $productLinks);
+        $this->productRepository->save($product);
+    }
+
+    /**
+     * Prepare the necessary websites for all products
+     *
+     * @return array
+     */
+    protected function prepareWebsiteIdsProducts(): array
+    {
+        $websiteId = $this->storeManager->getWebsite('test')->getId();
+        $defaultWebsiteId = $this->storeManager->getWebsite('base')->getId();
+
+        return [
+            'simple-1' => [
+                'website_ids' => [$defaultWebsiteId, $websiteId],
+            ],
+            'simple-2' => [
+                'website_ids' => [$defaultWebsiteId, $websiteId],
+            ],
+            'wrong-simple' => [
+                'website_ids' => [$defaultWebsiteId],
+            ],
+            'simple-249' => [
+                'website_ids' => [$websiteId],
+            ],
+            'simple-156' => [
+                'website_ids' => [],
+            ],
+        ];
+    }
+}
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 9f0f04508e468..c71a481a79379 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
@@ -3,84 +3,150 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Block\Product\ProductList;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection as LinkProductCollection;
+
 /**
- * Test class for \Magento\Catalog\Block\Product\List\Related.
+ * Check the correct behavior of related products on the product view page
  *
- * @magentoDataFixture Magento/Catalog/_files/products_related.php
+ * @see \Magento\Catalog\Block\Product\ProductList\Related
  * @magentoDbIsolation disabled
+ * @magentoAppArea frontend
  */
-class RelatedTest extends \PHPUnit\Framework\TestCase
+class RelatedTest extends AbstractLinksTest
 {
-    /**
-     * @var \Magento\Catalog\Block\Product\ProductList\Related
-     */
+    /** @var Related */
     protected $block;
 
     /**
-     * @var \Magento\Catalog\Api\Data\ProductInterface
-     */
-    protected $product;
-
-    /**
-     * @var \Magento\Catalog\Api\Data\ProductInterface
+     * @inheritdoc
      */
-    protected $relatedProduct;
-
     protected function setUp()
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea(\Magento\Framework\App\Area::AREA_FRONTEND);
-
-        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-
-        $this->relatedProduct = $productRepository->get('simple');
-        $this->product = $productRepository->get('simple_with_cross');
-        $objectManager->get(\Magento\Framework\Registry::class)->register('product', $this->product);
+        parent::setUp();
 
-        $this->block = $objectManager->get(\Magento\Framework\View\LayoutInterface::class)
-            ->createBlock(\Magento\Catalog\Block\Product\ProductList\Related::class);
-
-        $this->block->setLayout($objectManager->get(\Magento\Framework\View\LayoutInterface::class));
-        $this->block->setTemplate('Magento_Catalog::product/list/items.phtml');
-        $this->block->setType('related');
-        $this->block->addChild('addto', \Magento\Catalog\Block\Product\ProductList\Item\Container::class);
-        $this->block->getChildBlock(
-            'addto'
-        )->addChild(
-            'compare',
-            \Magento\Catalog\Block\Product\ProductList\Item\AddTo\Compare::class,
-            ['template' => 'Magento_Catalog::product/list/addto/compare.phtml']
-        );
+        $this->block = $this->layout->createBlock(Related::class);
+        $this->linkType = 'related';
     }
 
     /**
-     * @magentoAppIsolation enabled
+     * Checks for a related product when block code is generated
+     *
+     * @magentoDataFixture Magento/Catalog/_files/products_related.php
+     * @return void
      */
-    public function testAll()
+    public function testAll(): void
     {
+        /** @var ProductInterface $relatedProduct */
+        $relatedProduct = $this->productRepository->get('simple');
+        $this->product = $this->productRepository->get('simple_with_cross');
+        $this->block->setProduct($this->product);
+        $this->prepareBlock();
         $html = $this->block->toHtml();
         $this->assertNotEmpty($html);
-        $this->assertContains('Simple Related Product', $html);
+        $this->assertContains($relatedProduct->getName(), $html);
         /* name */
-        $this->assertContains('"product":"' . $this->relatedProduct->getId() . '"', $html);
+        $this->assertContains('id="related-checkbox' . $relatedProduct->getId() . '"', $html);
         /* part of url */
         $this->assertInstanceOf(
-            \Magento\Catalog\Model\ResourceModel\Product\Link\Product\Collection::class,
+            LinkProductCollection::class,
             $this->block->getItems()
         );
     }
 
     /**
-     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Catalog/_files/products_related.php
+     * @return void
      */
-    public function testGetIdentities()
+    public function testGetIdentities(): void
     {
-        $expectedTags = ['cat_p_' . $this->relatedProduct->getId(), 'cat_p'];
+        /** @var ProductInterface $relatedProduct */
+        $relatedProduct = $this->productRepository->get('simple');
+        $this->product = $this->productRepository->get('simple_with_cross');
+        $this->block->setProduct($this->product);
+        $this->prepareBlock();
+        $expectedTags = ['cat_p_' . $relatedProduct->getId(), 'cat_p'];
         $tags = $this->block->getIdentities();
         $this->assertEquals($expectedTags, $tags);
     }
+
+    /**
+     * Test the display of related products in the block
+     *
+     * @dataProvider displayLinkedProductsProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/products_list.php
+     * @param array $data
+     * @return void
+     */
+    public function testDisplayRelatedProducts(array $data): void
+    {
+        $this->updateProducts($data['updateProducts']);
+        $this->linkProducts('simple', $this->existingProducts);
+        $this->product = $this->productRepository->get('simple');
+        $this->block->setProduct($this->product);
+        $items = $this->block->getItems()->getItems();
+
+        $this->assertEquals(
+            $data['expectedProductLinks'],
+            $this->getActualLinks($items),
+            'Expected related products do not match actual related products!'
+        );
+    }
+
+    /**
+     * Test the position of related products in the block
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/products_list.php
+     * @return void
+     */
+    public function testPositionRelatedProducts(): void
+    {
+        $data = $this->getPositionData();
+        $this->linkProducts('simple', $data['productLinks']);
+        $this->product = $this->productRepository->get('simple');
+        $this->block->setProduct($this->product);
+        $items = $this->block->getItems()->getItems();
+
+        $this->assertEquals(
+            $data['expectedProductLinks'],
+            $this->getActualLinks($items),
+            'Expected related products do not match actual related products!'
+        );
+    }
+
+    /**
+     * Test the display of related products in the block on different websites
+     *
+     * @dataProvider multipleWebsitesLinkedProductsProvider
+     * @magentoDataFixture Magento/Catalog/_files/products_with_websites_and_stores.php
+     * @magentoDataFixture Magento/Catalog/_files/products_list.php
+     * @magentoAppIsolation enabled
+     * @param array $data
+     * @return void
+     */
+    public function testMultipleWebsitesRelatedProducts(array $data): void
+    {
+        $this->updateProducts($this->prepareWebsiteIdsProducts());
+        $productLinks = array_replace_recursive($this->existingProducts, $data['productLinks']);
+        $this->linkProducts('simple-1', $productLinks);
+        $this->product = $this->productRepository->get(
+            'simple-1',
+            false,
+            $this->storeManager->getStore($data['storeCode'])->getId()
+        );
+        $this->block->setProduct($this->product);
+        $items = $this->block->getItems()->getItems();
+
+        $this->assertEquals(
+            $data['expectedProductLinks'],
+            $this->getActualLinks($items),
+            'Expected related products do not match actual related products!'
+        );
+    }
 }
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 57ccb48b8df69..f989393d5da63 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
@@ -3,65 +3,44 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Block\Product\ProductList;
 
 /**
- * Test class for \Magento\Catalog\Block\Product\List\Upsell.
+ * Check the correct behavior of up-sell products on the product view page
  *
- * @magentoDataFixture Magento/Catalog/_files/products_upsell.php
+ * @see \Magento\Catalog\Block\Product\ProductList\Upsell
  * @magentoDbIsolation disabled
+ * @magentoAppArea frontend
  */
-class UpsellTest extends \PHPUnit\Framework\TestCase
+class UpsellTest extends AbstractLinksTest
 {
-    /**
-     * @var \Magento\Catalog\Block\Product\ProductList\Upsell
-     */
+    /** @var Upsell */
     protected $block;
 
     /**
-     * @var \Magento\Catalog\Api\Data\ProductInterface
+     * @inheritdoc
      */
-    protected $product;
-
-    /**
-     * @var \Magento\Catalog\Api\Data\ProductInterface
-     */
-    protected $upsellProduct;
-
     protected function setUp()
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea(\Magento\Framework\App\Area::AREA_FRONTEND);
-
-        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-
-        $this->upsellProduct = $productRepository->get('simple');
-        $this->product = $productRepository->get('simple_with_upsell');
-        $objectManager->get(\Magento\Framework\Registry::class)->register('product', $this->product);
+        parent::setUp();
 
-        $this->block = $objectManager->get(\Magento\Framework\View\LayoutInterface::class)
-            ->createBlock(\Magento\Catalog\Block\Product\ProductList\Upsell::class);
-
-        $this->block->setLayout($objectManager->get(\Magento\Framework\View\LayoutInterface::class));
-        $this->block->setTemplate('Magento_Catalog::product/list/items.phtml');
-        $this->block->setType('upsell');
-        $this->block->addChild('addto', \Magento\Catalog\Block\Product\ProductList\Item\Container::class);
-        $this->block->getChildBlock(
-            'addto'
-        )->addChild(
-            'compare',
-            \Magento\Catalog\Block\Product\ProductList\Item\AddTo\Compare::class,
-            ['template' => 'Magento_Catalog::product/list/addto/compare.phtml']
-        );
+        $this->block = $this->layout->createBlock(Upsell::class);
+        $this->linkType = 'upsell';
     }
 
     /**
-     * @magentoAppIsolation enabled
+     * Checks for a up-sell product when block code is generated
+     *
+     * @magentoDataFixture Magento/Catalog/_files/products_upsell.php
+     * @return void
      */
-    public function testAll()
+    public function testAll(): void
     {
+        $this->product = $this->productRepository->get('simple_with_upsell');
+        $this->block->setProduct($this->product);
+        $this->prepareBlock();
         $html = $this->block->toHtml();
         $this->assertNotEmpty($html);
         $this->assertContains('Simple Up Sell', $html);
@@ -69,12 +48,93 @@ public function testAll()
     }
 
     /**
-     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Catalog/_files/products_upsell.php
+     * @return void
      */
-    public function testGetIdentities()
+    public function testGetIdentities(): void
     {
-        $expectedTags = ['cat_p_' . $this->upsellProduct->getId(), 'cat_p'];
+        $upsellProduct = $this->productRepository->get('simple');
+        $this->product = $this->productRepository->get('simple_with_upsell');
+        $this->block->setProduct($this->product);
+        $this->prepareBlock();
+        $expectedTags = ['cat_p_' . $upsellProduct->getId(), 'cat_p'];
         $tags = $this->block->getIdentities();
         $this->assertEquals($expectedTags, $tags);
     }
+
+    /**
+     * Test the display of up-sell products in the block
+     *
+     * @dataProvider displayLinkedProductsProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/products_list.php
+     * @param array $data
+     * @return void
+     */
+    public function testDisplayUpsellProducts(array $data): void
+    {
+        $this->updateProducts($data['updateProducts']);
+        $this->linkProducts('simple', $this->existingProducts);
+        $this->product = $this->productRepository->get('simple');
+        $this->block->setProduct($this->product);
+        $items = $this->block->getItems();
+
+        $this->assertEquals(
+            $data['expectedProductLinks'],
+            $this->getActualLinks($items),
+            'Expected up-sell products do not match actual up-sell products!'
+        );
+    }
+
+    /**
+     * Test the position of up-sell products in the block
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/products_list.php
+     * @return void
+     */
+    public function testPositionUpsellProducts(): void
+    {
+        $data = $this->getPositionData();
+        $this->linkProducts('simple', $data['productLinks']);
+        $this->product = $this->productRepository->get('simple');
+        $this->block->setProduct($this->product);
+        $items = $this->block->getItems();
+
+        $this->assertEquals(
+            $data['expectedProductLinks'],
+            $this->getActualLinks($items),
+            'Expected up-sell products do not match actual up-sell products!'
+        );
+    }
+
+    /**
+     * Test the display of up-sell products in the block on different websites
+     *
+     * @dataProvider multipleWebsitesLinkedProductsProvider
+     * @magentoDataFixture Magento/Catalog/_files/products_with_websites_and_stores.php
+     * @magentoDataFixture Magento/Catalog/_files/products_list.php
+     * @magentoAppIsolation enabled
+     * @param array $data
+     * @return void
+     */
+    public function testMultipleWebsitesUpsellProducts(array $data): void
+    {
+        $this->updateProducts($this->prepareWebsiteIdsProducts());
+        $productLinks = array_replace_recursive($this->existingProducts, $data['productLinks']);
+        $this->linkProducts('simple-1', $productLinks);
+        $this->product = $this->productRepository->get(
+            'simple-1',
+            false,
+            $this->storeManager->getStore($data['storeCode'])->getId()
+        );
+        $this->block->setProduct($this->product);
+        $items = $this->block->getItems();
+
+        $this->assertEquals(
+            $data['expectedProductLinks'],
+            $this->getActualLinks($items),
+            'Expected up-sell products do not match actual up-sell products!'
+        );
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/GalleryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/GalleryTest.php
new file mode 100644
index 0000000000000..9bcdb00eebe7c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/GalleryTest.php
@@ -0,0 +1,357 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Block\Product\View;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/**
+ * Provide tests for displaying images on product page.
+ *
+ * @magentoAppArea frontend
+ */
+class GalleryTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ProductResource
+     */
+    private $productResource;
+
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+    /**
+     * @var Json
+     */
+    private $serializer;
+
+    /**
+     * @var Gallery
+     */
+    private $block;
+
+    /**
+     * @var array
+     */
+    private $imageExpectation = [
+        'thumb' => '/m/a/magento_image.jpg',
+        'img' => '/m/a/magento_image.jpg',
+        'full' => '/m/a/magento_image.jpg',
+        'caption' => 'Image Alt Text',
+        'position' => '1',
+        'isMain' => false,
+        'type' => 'image',
+        'videoUrl' => null,
+    ];
+
+    /**
+     * @var array
+     */
+    private $thumbnailExpectation = [
+        'thumb' => '/m/a/magento_thumbnail.jpg',
+        'img' => '/m/a/magento_thumbnail.jpg',
+        'full' => '/m/a/magento_thumbnail.jpg',
+        'caption' => 'Thumbnail Image',
+        'position' => '2',
+        'isMain' => false,
+        'type' => 'image',
+        'videoUrl' => null,
+    ];
+
+    /**
+     * @var array
+     */
+    private $placeholderExpectation = [
+        'thumb' => '/placeholder/thumbnail.jpg',
+        'img' => '/placeholder/image.jpg',
+        'full' => '/placeholder/image.jpg',
+        'caption' => '',
+        'position' => '0',
+        'isMain' => true,
+        'type' => 'image',
+        'videoUrl' => null,
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->productResource = $this->objectManager->get(ProductResource::class);
+        $this->storeRepository = $this->objectManager->create(StoreRepositoryInterface::class);
+        $this->serializer = $this->objectManager->get(Json::class);
+        $this->block = $this->objectManager->get(LayoutInterface::class)->createBlock(Gallery::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation enabled
+     * @return void
+     */
+    public function testGetGalleryImagesJsonWithoutImages(): void
+    {
+        $this->block->setData('product', $this->getProduct());
+        $result = $this->serializer->unserialize($this->block->getGalleryImagesJson());
+        $this->assertImages(reset($result), $this->placeholderExpectation);
+    }
+
+    /**
+     * @dataProvider galleryDisabledImagesDataProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_with_multiple_images.php
+     * @magentoDbIsolation enabled
+     * @param array $images
+     * @param array $expectation
+     * @return void
+     */
+    public function testGetGalleryImagesJsonWithDisabledImage(array $images, array $expectation): void
+    {
+        $product = $this->getProduct();
+        $this->setGalleryImages($product, $images);
+        $this->block->setData('product', $this->getProduct());
+        $firstImage = $this->serializer->unserialize($this->block->getGalleryImagesJson());
+        $this->assertImages(reset($firstImage), $expectation);
+    }
+
+    /**
+     * @dataProvider galleryDisabledImagesDataProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_with_multiple_images.php
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDbIsolation disabled
+     * @param array $images
+     * @param array $expectation
+     * @return void
+     */
+    public function testGetGalleryImagesJsonOnStoreWithDisabledImage(array $images, array $expectation): void
+    {
+        $secondStoreId = (int)$this->storeRepository->get('fixture_second_store')->getId();
+        $product = $this->getProduct($secondStoreId);
+        $this->setGalleryImages($product, $images);
+        $this->block->setData('product', $this->getProduct($secondStoreId));
+        $firstImage = $this->serializer->unserialize($this->block->getGalleryImagesJson());
+        $this->assertImages(reset($firstImage), $expectation);
+    }
+
+    /**
+     * @return array
+     */
+    public function galleryDisabledImagesDataProvider(): array
+    {
+        return [
+            [
+                'images' => [
+                    '/m/a/magento_image.jpg' => ['disabled' => true],
+                    '/m/a/magento_thumbnail.jpg' => [],
+                ],
+                'expectation' => $this->thumbnailExpectation,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider galleryImagesDataProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_with_multiple_images.php
+     * @magentoDbIsolation enabled
+     * @param array $images
+     * @param array $expectation
+     * @return void
+     */
+    public function testGetGalleryImagesJson(array $images, array $expectation): void
+    {
+        $product = $this->getProduct();
+        $this->setGalleryImages($product, $images);
+        $this->block->setData('product', $this->getProduct());
+        [$firstImage, $secondImage] = $this->serializer->unserialize($this->block->getGalleryImagesJson());
+        [$firstExpectedImage, $secondExpectedImage] = $expectation;
+        $this->assertImages($firstImage, $firstExpectedImage);
+        $this->assertImages($secondImage, $secondExpectedImage);
+    }
+
+    /**
+     * @return array
+     */
+    public function galleryImagesDataProvider(): array
+    {
+        return [
+            'with_main_image' => [
+                'images' => [
+                    '/m/a/magento_image.jpg' => [],
+                    '/m/a/magento_thumbnail.jpg' => ['main' => true],
+                ],
+                'expectation' => [
+                    $this->imageExpectation,
+                    array_merge($this->thumbnailExpectation, ['isMain' => true]),
+                ],
+            ],
+            'without_main_image' => [
+                'images' => [
+                    '/m/a/magento_image.jpg' => [],
+                    '/m/a/magento_thumbnail.jpg' => [],
+                ],
+                'expectation' => [
+                    array_merge($this->imageExpectation, ['isMain' => true]),
+                    $this->thumbnailExpectation,
+                ],
+            ],
+            'with_changed_position' => [
+                'images' => [
+                    '/m/a/magento_image.jpg' => ['position' => '2'],
+                    '/m/a/magento_thumbnail.jpg' => ['position' => '1'],
+                ],
+                'expectation' => [
+                    array_merge($this->thumbnailExpectation, ['position' => '1']),
+                    array_merge($this->imageExpectation, ['position' => '2', 'isMain' => true]),
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider galleryImagesOnStoreViewDataProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_with_multiple_images.php
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDbIsolation disabled
+     * @param array $images
+     * @param array $expectation
+     * @return void
+     */
+    public function testGetGalleryImagesJsonOnStoreView(array $images, array $expectation): void
+    {
+        $secondStoreId = (int)$this->storeRepository->get('fixture_second_store')->getId();
+        $product = $this->getProduct($secondStoreId);
+        $this->setGalleryImages($product, $images);
+        $this->block->setData('product', $this->getProduct($secondStoreId));
+        [$firstImage, $secondImage] = $this->serializer->unserialize($this->block->getGalleryImagesJson());
+        [$firstExpectedImage, $secondExpectedImage] = $expectation;
+        $this->assertImages($firstImage, $firstExpectedImage);
+        $this->assertImages($secondImage, $secondExpectedImage);
+    }
+
+    /**
+     * @return array
+     */
+    public function galleryImagesOnStoreViewDataProvider(): array
+    {
+        return [
+            'with_store_labels' => [
+                'images' => [
+                    '/m/a/magento_image.jpg' => ['label' => 'Some store label'],
+                    '/m/a/magento_thumbnail.jpg' => [],
+                ],
+                'expectation' => [
+                    array_merge($this->imageExpectation, ['isMain' => true, 'caption' => 'Some store label']),
+                    $this->thumbnailExpectation,
+                ],
+            ],
+            'with_changed_position' => [
+                'images' => [
+                    '/m/a/magento_image.jpg' => ['position' => '3'],
+                    '/m/a/magento_thumbnail.jpg' => [],
+                ],
+                'expectation' => [
+                    array_merge($this->thumbnailExpectation, ['position' => '2']),
+                    array_merge($this->imageExpectation, ['position' => '3', 'isMain' => true]),
+                ],
+            ],
+            'with_main_store_image' => [
+                'images' => [
+                    '/m/a/magento_image.jpg' => [],
+                    '/m/a/magento_thumbnail.jpg' => ['main' => true],
+                ],
+                'expectation' => [
+                    $this->imageExpectation,
+                    array_merge($this->thumbnailExpectation, ['isMain' => true]),
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Updates product gallery images and saves product.
+     *
+     * @param ProductInterface $product
+     * @param array $images
+     * @param int|null $storeId
+     * @return void
+     */
+    private function setGalleryImages(ProductInterface $product, array $images, int $storeId = null): void
+    {
+        $product->setImage(null);
+        foreach ($images as $file => $data) {
+            $mediaGalleryData = $product->getData('media_gallery');
+            foreach ($mediaGalleryData['images'] as &$image) {
+                if ($image['file'] == $file) {
+                    foreach ($data as $key => $value) {
+                        $image[$key] = $value;
+                    }
+                }
+            }
+
+            $product->setData('media_gallery', $mediaGalleryData);
+
+            if (!empty($data['main'])) {
+                $product->setImage($file);
+            }
+        }
+
+        if ($storeId) {
+            $product->setStoreId($storeId);
+        }
+
+        $this->productResource->save($product);
+    }
+
+    /**
+     * Returns current product.
+     *
+     * @param int|null $storeId
+     * @return ProductInterface
+     */
+    private function getProduct(?int $storeId = null): ProductInterface
+    {
+        return $this->productRepository->get('simple', false, $storeId, true);
+    }
+
+    /**
+     * Asserts gallery image data.
+     *
+     * @param array $image
+     * @param array $expectedImage
+     * @return void
+     */
+    private function assertImages(array $image, array $expectedImage): void
+    {
+        $this->assertStringEndsWith($expectedImage['thumb'], $image['thumb']);
+        $this->assertStringEndsWith($expectedImage['img'], $image['img']);
+        $this->assertStringEndsWith($expectedImage['full'], $image['full']);
+        $this->assertEquals($expectedImage['caption'], $image['caption']);
+        $this->assertEquals($expectedImage['position'], $image['position']);
+        $this->assertEquals($expectedImage['isMain'], $image['isMain']);
+        $this->assertEquals($expectedImage['type'], $image['type']);
+        $this->assertEquals($expectedImage['videoUrl'], $image['videoUrl']);
+    }
+}
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 01398213b854a..59582f313cf55 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ViewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ViewTest.php
@@ -3,94 +3,273 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Block\Product;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Block\Product\View\Description;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
 /**
- * Test class for \Magento\Catalog\Block\Product\View.
+ * Checks product view block.
  *
+ * @see \Magento\Catalog\Block\Product\View
  * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoDbIsolation enabled
  */
-class ViewTest extends \PHPUnit\Framework\TestCase
+class ViewTest extends TestCase
 {
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var View */
+    private $block;
+
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var Registry */
+    private $registry;
+
+    /** @var LayoutInterface */
+    private $layout;
+
+    /** @var Json */
+    private $json;
+
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
+    /** @var Description */
+    private $descriptionBlock;
+
+    /** @var array */
+    private const SHORT_DESCRIPTION_BLOCK_DATA = [
+        'at_call' => 'getShortDescription',
+        'at_code' => 'short_description',
+        'overview' => 'overview',
+        'at_label' => 'none',
+        'title' => 'Overview',
+        'add_attribute' => 'description',
+    ];
+
     /**
-     * @var \Magento\Catalog\Block\Product\View
+     * @inheritdoc
      */
-    protected $_block;
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->layout = $this->objectManager->get(LayoutInterface::class);
+        $this->block = $this->layout->createBlock(View::class);
+        $this->registry = $this->objectManager->get(Registry::class);
+        $this->json = $this->objectManager->get(Json::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $this->descriptionBlock = $this->layout->createBlock(Description::class);
+    }
 
     /**
-     * @var \Magento\Catalog\Model\Product
+     * @return void
      */
-    protected $_product;
+    public function testSetLayout(): void
+    {
+        $productView = $this->layout->createBlock(View::class);
 
-    protected function setUp()
+        $this->assertInstanceOf(LayoutInterface::class, $productView->getLayout());
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetProduct(): void
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->_block = $objectManager->create(\Magento\Catalog\Block\Product\View::class);
+        $product = $this->productRepository->get('simple');
+        $this->registerProduct($product);
+
+        $this->assertNotEmpty($this->block->getProduct()->getId());
+        $this->assertEquals($product->getId(), $this->block->getProduct()->getId());
 
-        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-        $this->_product = $productRepository->get('simple');
+        $this->registry->unregister('product');
+        $this->block->setProductId($product->getId());
 
-        $objectManager->get(\Magento\Framework\Registry::class)->unregister('product');
-        $objectManager->get(\Magento\Framework\Registry::class)->register('product', $this->_product);
+        $this->assertEquals($product->getId(), $this->block->getProduct()->getId());
     }
 
-    public function testSetLayout()
+    /**
+     * @return void
+     */
+    public function testCanEmailToFriend(): void
+    {
+        $this->assertFalse($this->block->canEmailToFriend());
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetAddToCartUrl(): void
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $product = $this->productRepository->get('simple');
+        $url = $this->block->getAddToCartUrl($product);
 
-        /** @var $layout \Magento\Framework\View\Layout */
-        $layout = $objectManager->get(\Magento\Framework\View\LayoutInterface::class);
+        $this->assertStringMatchesFormat(
+            '%scheckout/cart/add/%sproduct/' . $product->getId() . '/',
+            $url
+        );
+    }
 
-        $productView = $layout->createBlock(\Magento\Catalog\Block\Product\View::class);
+    /**
+     * @return void
+     */
+    public function testGetJsonConfig(): void
+    {
+        $product = $this->productRepository->get('simple');
+        $this->registerProduct($product);
+        $config = $this->json->unserialize($this->block->getJsonConfig());
 
-        $this->assertInstanceOf(\Magento\Framework\View\LayoutInterface::class, $productView->getLayout());
+        $this->assertNotEmpty($config);
+        $this->assertArrayHasKey('productId', $config);
+        $this->assertEquals($product->getId(), $config['productId']);
     }
 
-    public function testGetProduct()
+    /**
+     * @return void
+     */
+    public function testHasOptions(): void
     {
-        $this->assertNotEmpty($this->_block->getProduct()->getId());
-        $this->assertEquals($this->_product->getId(), $this->_block->getProduct()->getId());
-
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $objectManager->get(\Magento\Framework\Registry::class)->unregister('product');
-        $this->_block->setProductId($this->_product->getId());
-        $this->assertEquals($this->_product->getId(), $this->_block->getProduct()->getId());
+        $product = $this->productRepository->get('simple');
+        $this->registerProduct($product);
+
+        $this->assertTrue($this->block->hasOptions());
     }
 
-    public function testCanEmailToFriend()
+    /**
+     * @return void
+     */
+    public function testHasRequiredOptions(): void
     {
-        $this->assertFalse($this->_block->canEmailToFriend());
+        $product = $this->productRepository->get('simple');
+        $this->registerProduct($product);
+
+        $this->assertTrue($this->block->hasRequiredOptions());
+    }
+
+    /**
+     * @return void
+     */
+    public function testStartBundleCustomization(): void
+    {
+        $this->markTestSkipped("Functionality not implemented in Magento 1.x. Implemented in Magento 2");
+
+        $this->assertFalse($this->block->startBundleCustomization());
     }
 
-    public function testGetAddToCartUrl()
+    /**
+     * @magentoAppArea frontend
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     */
+    public function testAddToCartBlockInvisibility(): void
     {
-        $url = $this->_block->getAddToCartUrl($this->_product);
-        $this->assertStringMatchesFormat('%scheckout/cart/add/%sproduct/' . $this->_product->getId() . '/', $url);
+        $outOfStockProduct = $this->productRepository->get('simple-out-of-stock');
+        $this->registerProduct($outOfStockProduct);
+        $this->block->setTemplate('Magento_Catalog::product/view/addtocart.phtml');
+        $output = $this->block->toHtml();
+
+        $this->assertNotContains((string)__('Add to Cart'), $output);
     }
 
-    public function testGetJsonConfig()
+    /**
+     * @magentoAppArea frontend
+     */
+    public function testAddToCartBlockVisibility(): void
     {
-        $config = (array)json_decode($this->_block->getJsonConfig());
-        $this->assertNotEmpty($config);
-        $this->assertArrayHasKey('productId', $config);
-        $this->assertEquals($this->_product->getId(), $config['productId']);
+        $product = $this->productRepository->get('simple');
+        $this->registerProduct($product);
+        $this->block->setTemplate('Magento_Catalog::product/view/addtocart.phtml');
+        $output = $this->block->toHtml();
+
+        $this->assertContains((string)__('Add to Cart'), $output);
     }
 
-    public function testHasOptions()
+    /**
+     * @magentoDbIsolation disabled
+     * @magentoAppArea frontend
+     * @magentoDataFixture Magento/Catalog/_files/product_multistore_different_short_description.php
+     * @return void
+     */
+    public function testProductShortDescription(): void
+    {
+        $product = $this->productRepository->get('simple-different-short-description');
+        $currentStoreId = $this->storeManager->getStore()->getId();
+        $output = $this->renderDescriptionBlock($product);
+
+        $this->assertContains('First store view short description', $output);
+
+        $secondStore = $this->storeManager->getStore('fixturestore');
+        $this->storeManager->setCurrentStore($secondStore->getId());
+
+        try {
+            $product = $this->productRepository->get(
+                'simple-different-short-description',
+                false,
+                $secondStore->getId(),
+                true
+            );
+            $newBlockOutput = $this->renderDescriptionBlock($product, true);
+
+            $this->assertContains('Second store view short description', $newBlockOutput);
+        } finally {
+            $this->storeManager->setCurrentStore($currentStoreId);
+        }
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param bool $refreshBlock
+     * @return string
+     */
+    private function renderDescriptionBlock(ProductInterface $product, bool $refreshBlock = false): string
     {
-        $this->assertTrue($this->_block->hasOptions());
+        $this->registerProduct($product);
+        $descriptionBlock = $this->getDescriptionBlock($refreshBlock);
+        $descriptionBlock->addData(self::SHORT_DESCRIPTION_BLOCK_DATA);
+        $descriptionBlock->setTemplate('Magento_Catalog::product/view/attribute.phtml');
+
+        return $this->descriptionBlock->toHtml();
     }
 
-    public function testHasRequiredOptions()
+    /**
+     * Get description block
+     *
+     * @param bool $refreshBlock
+     * @return Description
+     */
+    private function getDescriptionBlock(bool $refreshBlock): Description
     {
-        $this->assertTrue($this->_block->hasRequiredOptions());
+        if ($refreshBlock) {
+            $this->descriptionBlock = $this->layout->createBlock(Description::class);
+        }
+
+        return $this->descriptionBlock;
     }
 
-    public function testStartBundleCustomization()
+    /**
+     * Register the product
+     *
+     * @param ProductInterface $product
+     * @return void
+     */
+    private function registerProduct(ProductInterface $product): void
     {
-        $this->markTestSkipped("Functionality not implemented in Magento 1.x. Implemented in Magento 2");
-        $this->assertFalse($this->_block->startBundleCustomization());
+        $this->registry->unregister('product');
+        $this->registry->register('product', $product);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/DeleteTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/DeleteTest.php
new file mode 100644
index 0000000000000..8db16fa2c4546
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/DeleteTest.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\Controller\Adminhtml\Category;
+
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Test for class \Magento\Catalog\Controller\Adminhtml\Category\Delete
+ *
+ * @magentoAppArea adminhtml
+ */
+class DeleteTest extends AbstractBackendController
+{
+    /**
+     * @return void
+     */
+    public function testDeleteMissingCategory(): void
+    {
+        $incorrectId = 825852;
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue(['id' => $incorrectId]);
+        $this->dispatch('backend/catalog/category/delete');
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__(sprintf('No such entity with id = %s', $incorrectId))]),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Catalog/_files/category.php
+     */
+    public function testDeleteCategory(): void
+    {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue(['id' => 333]);
+        $this->dispatch('backend/catalog/category/delete');
+        $this->assertSessionMessages($this->equalTo([(string)__('You deleted the category.')]));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/UrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/UrlRewriteTest.php
new file mode 100644
index 0000000000000..90f354d90f17a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/UrlRewriteTest.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\Controller\Adminhtml\Category\Save;
+
+use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUrlRewriteDatabaseMap;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollectionFactory;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+
+/**
+ * Class defines url rewrite creation for category save controller
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ */
+class UrlRewriteTest extends AbstractBackendController
+{
+    /** @var $urlRewriteCollectionFactory */
+    private $urlRewriteCollectionFactory;
+
+    /** @var Json */
+    private $jsonSerializer;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->urlRewriteCollectionFactory = $this->_objectManager->get(UrlRewriteCollectionFactory::class);
+        $this->jsonSerializer = $this->_objectManager->get(Json::class);
+    }
+
+    /**
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
+     * @dataProvider categoryDataProvider
+     * @param array $data
+     * @return void
+     */
+    public function testUrlRewrite(array $data): void
+    {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($data);
+        $this->dispatch('backend/catalog/category/save');
+        $categoryId = $this->jsonSerializer->unserialize($this->getResponse()->getBody())['category']['entity_id'];
+        $this->assertNotNull($categoryId, 'The category was not created');
+        $urlRewriteCollection = $this->urlRewriteCollectionFactory->create();
+        $urlRewriteCollection->addFieldToFilter(UrlRewrite::ENTITY_ID, ['eq' => $categoryId])
+            ->addFieldToFilter(UrlRewrite::ENTITY_TYPE, ['eq' => DataCategoryUrlRewriteDatabaseMap::ENTITY_TYPE]);
+        $this->assertCount(
+            1,
+            $urlRewriteCollection->getItems(),
+            'Wrong count of url rewrites was created'
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function categoryDataProvider(): array
+    {
+        return [
+            'url_rewrite_is_created_during_category_save' => [
+                [
+                    'path' => '1/2',
+                    'name' => 'Custom Name',
+                    'parent' => 2,
+                    'is_active' => '0',
+                    'include_in_menu' => '1',
+                    'display_mode' => 'PRODUCTS',
+                    'is_anchor' => true,
+                    'return_session_messages_only' => true,
+                    'use_config' => [
+                        'available_sort_by' => 1,
+                        'default_sort_by' => 1,
+                        'filter_price_range' => 1,
+                    ],
+                ],
+            ],
+        ];
+    }
+}
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 5e91d8b2092da..e89e5aae92cf5 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
@@ -3,29 +3,62 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Catalog\Controller\Adminhtml;
 
+use Magento\Framework\Acl\Builder;
+use Magento\Backend\App\Area\FrontNameResolver;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Framework\App\Request\Http as HttpRequest;
-use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Catalog\Model\CategoryLayoutUpdateManager;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Store\Model\Store;
-use Magento\Catalog\Model\ResourceModel\Product;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Catalog\Model\Category as CategoryModel;
+use Magento\Catalog\Model\CategoryFactory as CategoryModelFactory;
 
 /**
- * Test for category backend actions
+ * Test for admin category functionality.
  *
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CategoryTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+class CategoryTest extends AbstractBackendController
 {
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product
+     * @var ProductResource
      */
     protected $productResource;
+    /**
+     * @var Builder
+     */
+    private $aclBuilder;
+
+    /**
+     * @var CategoryModelFactory
+     */
+    private $categoryFactory;
+
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+    /**
+     * @var Json
+     */
+    private $json;
 
     /**
      * @inheritDoc
@@ -36,14 +69,19 @@ protected function setUp()
     {
         parent::setUp();
 
-        /** @var Product $productResource */
+        /** @var ProductResource $productResource */
         $this->productResource = Bootstrap::getObjectManager()->get(
-            Product::class
+            ProductResource::class
         );
+        $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
+        $this->categoryFactory = Bootstrap::getObjectManager()->get(CategoryModelFactory::class);
+        $this->categoryRepository = $this->_objectManager->get(CategoryRepositoryInterface::class);
+        $this->storeRepository = $this->_objectManager->get(StoreRepositoryInterface::class);
+        $this->json = $this->_objectManager->get(Json::class);
     }
 
     /**
-     * Test save action
+     * Test save action.
      *
      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      * @magentoDbIsolation enabled
@@ -52,35 +90,24 @@ protected function setUp()
      * @param array $inputData
      * @param array $defaultAttributes
      * @param array $attributesSaved
-     * @param bool $isSuccess
+     * @return void
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function testSaveAction($inputData, $defaultAttributes, $attributesSaved = [], $isSuccess = true)
+    public function testSaveAction(array $inputData, array $defaultAttributes, array $attributesSaved = []): void
     {
-        /** @var $store \Magento\Store\Model\Store */
-        $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
-        $store->load('fixturestore', 'code');
+        $store = $this->storeRepository->get('fixturestore');
         $storeId = $store->getId();
-
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($inputData);
         $this->getRequest()->setParam('store', $storeId);
         $this->getRequest()->setParam('id', 2);
         $this->dispatch('backend/catalog/category/save');
-
-        if ($isSuccess) {
-            $this->assertSessionMessages(
-                $this->equalTo(['You saved the category.']),
-                \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-            );
-        }
-
-        /** @var $category \Magento\Catalog\Model\Category */
-        $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Category::class
+        $this->assertSessionMessages(
+            $this->equalTo(['You saved the category.']),
+            MessageInterface::TYPE_SUCCESS
         );
-        $category->setStoreId($storeId);
-        $category->load(2);
-
+        /** @var $category Category */
+        $category = $this->categoryRepository->get(2, $storeId);
         $errors = [];
         foreach ($attributesSaved as $attribute => $value) {
             $actualValue = $category->getData($attribute);
@@ -108,13 +135,14 @@ public function testSaveAction($inputData, $defaultAttributes, $attributesSaved
      *
      * @magentoDbIsolation enabled
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories.php
-     * @throws NoSuchEntityException
+     * @return void
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function testDefaultValueForCategoryUrlPath()
+    public function testDefaultValueForCategoryUrlPath(): void
     {
-        $repository = $this->_objectManager->get(CategoryRepositoryInterface::class);
         $categoryId = 3;
-        $category = $repository->get($categoryId);
+        $category = $this->categoryRepository->get($categoryId);
         $newUrlPath = 'test_url_path';
         $defaultUrlPath = $category->getData('url_path');
 
@@ -122,21 +150,26 @@ public function testDefaultValueForCategoryUrlPath()
         $category->setStoreId(1);
         $category->setUrlKey($newUrlPath);
         $category->setUrlPath($newUrlPath);
-        $repository->save($category);
+        $this->categoryRepository->save($category);
         $this->assertEquals($newUrlPath, $category->getUrlPath());
 
         // set default url_path and check it
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $postData = $category->getData();
-        $postData['use_default'] = [
-            'available_sort_by' => 1,
-            'default_sort_by' => 1,
-            'url_key' => 1,
-        ];
+        $postData['use_default'] =
+            [
+                'available_sort_by' => 1,
+                'default_sort_by' => 1,
+                'url_key' => 1,
+            ];
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/category/save');
-        $category = $repository->get($categoryId);
-        $this->assertEquals($defaultUrlPath, $category->getData('url_path'));
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You saved the category.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
+        $category = $this->categoryRepository->get($categoryId);
+        $this->assertEquals($defaultUrlPath, $category->getData('url_key'));
     }
 
     /**
@@ -145,8 +178,9 @@ public function testDefaultValueForCategoryUrlPath()
      * @param array $postData
      * @dataProvider categoryCreatedFromProductCreationPageDataProvider
      * @magentoDbIsolation enabled
+     * @return void
      */
-    public function testSaveActionFromProductCreationPage($postData)
+    public function testSaveActionFromProductCreationPage(array $postData): void
     {
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postData);
@@ -159,11 +193,7 @@ public function testSaveActionFromProductCreationPage($postData)
                 $this->stringContains('http://localhost/index.php/backend/catalog/category/edit/')
             );
         } else {
-            $result = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                \Magento\Framework\Json\Helper\Data::class
-            )->jsonDecode(
-                $body
-            );
+            $result = $this->json->unserialize($body);
             $this->assertArrayHasKey('messages', $result);
             $this->assertFalse($result['error']);
             $category = $result['category'];
@@ -182,7 +212,7 @@ public function testSaveActionFromProductCreationPage($postData)
      * @static
      * @return array
      */
-    public static function categoryCreatedFromProductCreationPageDataProvider()
+    public static function categoryCreatedFromProductCreationPageDataProvider(): array
     {
         /* Keep in sync with new-category-dialog.js */
         $postData = [
@@ -201,8 +231,10 @@ public static function categoryCreatedFromProductCreationPageDataProvider()
 
     /**
      * Test SuggestCategories finds any categories.
+     *
+     * @return void
      */
-    public function testSuggestCategoriesActionDefaultCategoryFound()
+    public function testSuggestCategoriesActionDefaultCategoryFound(): void
     {
         $this->getRequest()->setParam('label_part', 'Default');
         $this->dispatch('backend/catalog/category/suggestCategories');
@@ -214,8 +246,10 @@ public function testSuggestCategoriesActionDefaultCategoryFound()
 
     /**
      * Test SuggestCategories properly processes search by label.
+     *
+     * @return void
      */
-    public function testSuggestCategoriesActionNoSuggestions()
+    public function testSuggestCategoriesActionNoSuggestions(): void
     {
         $this->getRequest()->setParam('label_part', strrev('Default'));
         $this->dispatch('backend/catalog/category/suggestCategories');
@@ -228,7 +262,7 @@ public function testSuggestCategoriesActionNoSuggestions()
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @return array
      */
-    public function saveActionDataProvider()
+    public function saveActionDataProvider(): array
     {
         return [
             'default values' => [
@@ -258,7 +292,7 @@ public function saveActionDataProvider()
                         'custom_design_from' => 1,
                         'custom_design_to' => 1,
                         'page_layout' => 1,
-                        'custom_layout_update' => 1,
+                        'custom_layout_update' => null,
                     ],
                 ],
                 [
@@ -304,7 +338,6 @@ public function saveActionDataProvider()
                     'custom_design_from' => '5/21/2015',
                     'custom_design_to' => '5/29/2015',
                     'page_layout' => '',
-                    'custom_layout_update' => '',
                     'use_config' => [
                         'available_sort_by' => 1,
                         'default_sort_by' => 1,
@@ -326,7 +359,6 @@ public function saveActionDataProvider()
                     'description' => true,
                     'meta_keywords' => true,
                     'meta_description' => true,
-                    'custom_layout_update' => true,
                     'custom_design_from' => true,
                     'custom_design_to' => true,
                     'filter_price_range' => false
@@ -346,70 +378,44 @@ public function saveActionDataProvider()
                     'description' => 'Custom Description',
                     'meta_keywords' => 'Custom keywords',
                     'meta_description' => 'Custom meta description',
-                    'custom_layout_update' => null,
                     'custom_design_from' => '2015-05-21 00:00:00',
                     'custom_design_to' => '2015-05-29 00:00:00',
                     'filter_price_range' => null
                 ],
             ],
-            'incorrect datefrom' => [
-                [
-                    'id' => '2',
-                    'entity_id' => '2',
-                    'path' => '1/2',
-                    'name' => 'Custom Name',
-                    'is_active' => '0',
-                    'description' => 'Custom Description',
-                    'meta_title' => 'Custom Title',
-                    'meta_keywords' => 'Custom keywords',
-                    'meta_description' => 'Custom meta description',
-                    'include_in_menu' => '0',
-                    'url_key' => 'default-category',
-                    'display_mode' => 'PRODUCTS',
-                    'landing_page' => '1',
-                    'is_anchor' => true,
-                    'custom_apply_to_products' => '0',
-                    'custom_design' => 'Magento/blank',
-                    'custom_design_from' => '5/29/2015',
-                    'custom_design_to' => '5/21/2015',
-                    'page_layout' => '',
-                    'custom_layout_update' => '',
-                    'use_config' => [
-                        'available_sort_by' => 1,
-                        'default_sort_by' => 1,
-                        'filter_price_range' => 1,
-                    ],
-                ],
-                [
-                    'name' => false,
-                    'default_sort_by' => false,
-                    'display_mode' => false,
-                    'meta_title' => false,
-                    'custom_design' => false,
-                    'page_layout' => false,
-                    'is_active' => false,
-                    'include_in_menu' => false,
-                    'landing_page' => false,
-                    'custom_apply_to_products' => false,
-                    'available_sort_by' => false,
-                    'description' => false,
-                    'meta_keywords' => false,
-                    'meta_description' => false,
-                    'custom_layout_update' => false,
-                    'custom_design_from' => false,
-                    'custom_design_to' => false,
-                    'filter_price_range' => false
-                ],
-                [],
-                false
-            ]
         ];
     }
 
+    /**
+     * @magentoDbIsolation enabled
+     * @return void
+     */
+    public function testIncorrectDateFrom(): void
+    {
+        $data = [
+            'name' => 'Test Category',
+            'attribute_set_id' => '3',
+            'parent_id' => 2,
+            'path' => '1/2',
+            'is_active' => true,
+            'custom_design_from' => '5/29/2015',
+            'custom_design_to' => '5/21/2015',
+        ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($data);
+        $this->dispatch('backend/catalog/category/save');
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('Make sure the To Date is later than or the same as the From Date.')]),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
     /**
      * Test validation.
+     *
+     * @return void
      */
-    public function testSaveActionCategoryWithDangerRequest()
+    public function testSaveActionCategoryWithDangerRequest(): void
     {
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
@@ -428,12 +434,12 @@ public function testSaveActionCategoryWithDangerRequest()
         $this->dispatch('backend/catalog/category/save');
         $this->assertSessionMessages(
             $this->equalTo(['The "Name" attribute value is empty. Set the attribute and try again.']),
-            \Magento\Framework\Message\MessageInterface::TYPE_ERROR
+            MessageInterface::TYPE_ERROR
         );
     }
 
     /**
-     * Test move Action
+     * Test move action.
      *
      * @magentoDataFixture Magento/Catalog/_files/category_tree.php
      * @dataProvider moveActionDataProvider
@@ -444,18 +450,23 @@ public function testSaveActionCategoryWithDangerRequest()
      * @param int $grandChildId
      * @param string $grandChildUrlKey
      * @param boolean $error
+     * @return void
      */
-    public function testMoveAction($parentId, $childId, $childUrlKey, $grandChildId, $grandChildUrlKey, $error)
-    {
+    public function testMoveAction(
+        int $parentId,
+        int $childId,
+        string $childUrlKey,
+        int $grandChildId,
+        string $grandChildUrlKey,
+        bool $error
+    ): void {
         $urlKeys = [
             $childId => $childUrlKey,
             $grandChildId => $grandChildUrlKey,
         ];
         foreach ($urlKeys as $categoryId => $urlKey) {
-            /** @var $category \Magento\Catalog\Model\Category */
-            $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                \Magento\Catalog\Model\Category::class
-            );
+            /** @var $category Category */
+            $category = $this->categoryFactory->create();
             if ($categoryId > 0) {
                 $category->load($categoryId)
                     ->setUrlKey($urlKey)
@@ -467,9 +478,9 @@ public function testMoveAction($parentId, $childId, $childUrlKey, $grandChildId,
             ->setPostValue('pid', $parentId)
             ->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/category/move');
-        $jsonResponse = json_decode($this->getResponse()->getBody());
+        $jsonResponse = $this->json->unserialize($this->getResponse()->getBody());
         $this->assertNotNull($jsonResponse);
-        $this->assertEquals($error, $jsonResponse->error);
+        $this->assertEquals($error, $jsonResponse['error']);
     }
 
     /**
@@ -477,7 +488,7 @@ public function testMoveAction($parentId, $childId, $childUrlKey, $grandChildId,
      *
      * @return array
      */
-    public function moveActionDataProvider()
+    public function moveActionDataProvider(): array
     {
         return [
             [400, 401, 'first_url_key', 402, 'second_url_key', false],
@@ -488,7 +499,7 @@ public function moveActionDataProvider()
     }
 
     /**
-     * Test save action
+     * Test save category with product position.
      *
      * @magentoDataFixture Magento/Catalog/_files/products_in_different_stores.php
      * @magentoDbIsolation disabled
@@ -496,11 +507,9 @@ public function moveActionDataProvider()
      *
      * @param array $postData
      */
-    public function testSaveCategoryWithProductPosition(array $postData)
+    public function testSaveCategoryWithProductPosition(array $postData): void
     {
-        /** @var $store \Magento\Store\Model\Store */
-        $store = Bootstrap::getObjectManager()->create(Store::class);
-        $store->load('fixturestore', 'code');
+        $store = $this->storeRepository->get('fixturestore');
         $storeId = $store->getId();
         $oldCategoryProductsCount = $this->getCategoryProductsCount();
         $this->getRequest()->setParam('store', $storeId);
@@ -508,6 +517,10 @@ public function testSaveCategoryWithProductPosition(array $postData)
         $this->getRequest()->setParam('id', 96377);
         $this->getRequest()->setPostValue($postData);
         $this->dispatch('backend/catalog/category/save');
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You saved the category.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
         $newCategoryProductsCount = $this->getCategoryProductsCount();
         $this->assertEquals(
             $oldCategoryProductsCount,
@@ -522,7 +535,7 @@ public function testSaveCategoryWithProductPosition(array $postData)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @return array
      */
-    public function saveActionWithDifferentWebsitesDataProvider()
+    public function saveActionWithDifferentWebsitesDataProvider(): array
     {
         return [
             'default_values' => [
@@ -536,7 +549,6 @@ public function saveActionWithDifferentWebsitesDataProvider()
                     'path' => '1/2/96377',
                     'level' => '2',
                     'children_count' => '0',
-                    'row_id' => '96377',
                     'name' => 'Category 1',
                     'display_mode' => 'PRODUCTS',
                     'url_key' => 'category-1',
@@ -600,7 +612,7 @@ public function saveActionWithDifferentWebsitesDataProvider()
     }
 
     /**
-     * Get items count from catalog_category_product
+     * Get items count from catalog_category_product.
      *
      * @return int
      */
@@ -614,4 +626,268 @@ private function getCategoryProductsCount(): int
             $this->productResource->getConnection()->fetchAll($oldCategoryProducts)
         );
     }
+
+    /**
+     * Check whether additional authorization is required for the design fields.
+     *
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     * @throws \Throwable
+     * @return void
+     */
+    public function testSaveDesign(): void
+    {
+        /** @var $store \Magento\Store\Model\Store */
+        $store = Bootstrap::getObjectManager()->create(Store::class);
+        $store->load('fixturestore', 'code');
+        $storeId = $store->getId();
+        $requestData = [
+            'id' => '2',
+            'entity_id' => '2',
+            'path' => '1/2',
+            'name' => 'Custom Name',
+            'is_active' => '0',
+            'description' => 'Custom Description',
+            'meta_title' => 'Custom Title',
+            'meta_keywords' => 'Custom keywords',
+            'meta_description' => 'Custom meta description',
+            'include_in_menu' => '0',
+            'url_key' => 'default-test-category',
+            'display_mode' => 'PRODUCTS',
+            'landing_page' => '1',
+            'is_anchor' => true,
+            'store_id' => $storeId,
+            'use_config' => [
+                'available_sort_by' => 1,
+                'default_sort_by' => 1,
+                'filter_price_range' => 1,
+            ],
+        ];
+        $uri = 'backend/catalog/category/save';
+
+        //Trying to update the category's design settings without proper permissions.
+        //Expected list of sessions messages collected throughout the controller calls.
+        $sessionMessages = ['Not allowed to edit the category\'s design attributes'];
+        $this->aclBuilder->getAcl()->deny(null, 'Magento_Catalog::edit_category_design');
+        $requestData['custom_layout_update_file'] = 'test-file';
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($requestData);
+        $this->getRequest()->setParam('store', $requestData['store_id']);
+        $this->getRequest()->setParam('id', $requestData['id']);
+        $this->dispatch($uri);
+        $this->assertSessionMessages(
+            self::equalTo($sessionMessages),
+            MessageInterface::TYPE_ERROR
+        );
+
+        //Trying again with the permissions.
+        $requestData['custom_layout_update_file'] = null;
+        $requestData['page_layout'] = '2columns-left';
+        $this->aclBuilder->getAcl()
+            ->allow(null, ['Magento_Catalog::categories', 'Magento_Catalog::edit_category_design']);
+        $this->getRequest()->setDispatched(false);
+        $this->getRequest()->setPostValue($requestData);
+        $this->getRequest()->setParam('store', $requestData['store_id']);
+        $this->getRequest()->setParam('id', $requestData['id']);
+        $this->dispatch($uri);
+        /** @var CategoryModel $category */
+        $category = $this->categoryFactory->create();
+        $category->load(2);
+        $this->assertEquals('2columns-left', $category->getData('page_layout'));
+        //No new error messages
+        $this->assertSessionMessages(
+            self::equalTo($sessionMessages),
+            MessageInterface::TYPE_ERROR
+        );
+
+        //Trying to save special value without the permissions.
+        $requestData['custom_layout_update_file'] = CategoryModel\Attribute\Backend\LayoutUpdate::VALUE_USE_UPDATE_XML;
+        $requestData['description'] = 'test';
+        $this->aclBuilder->getAcl()->deny(null, ['Magento_Catalog::edit_category_design']);
+        $this->getRequest()->setDispatched(false);
+        $this->getRequest()->setPostValue($requestData);
+        $this->getRequest()->setParam('store', $requestData['store_id']);
+        $this->getRequest()->setParam('id', $requestData['id']);
+        $this->dispatch($uri);
+        /** @var CategoryModel $category */
+        $category = $this->categoryFactory->create();
+        $category->load(2);
+        $this->assertEquals('2columns-left', $category->getData('page_layout'));
+        $this->assertEmpty($category->getData('custom_layout_update_file'));
+        $this->assertEquals('test', $category->getData('description'));
+        //No new error messages
+        $this->assertSessionMessages(
+            self::equalTo($sessionMessages),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * Save design attributes with default values without design permissions.
+     *
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     * @return void
+     * @throws \Throwable
+     */
+    public function testSaveDesignWithDefaults(): void
+    {
+        /** @var $store \Magento\Store\Model\Store */
+        $store = Bootstrap::getObjectManager()->create(Store::class);
+        $store->load('fixturestore', 'code');
+        $storeId = $store->getId();
+        /** @var CategoryModel $category */
+        $category = $this->categoryFactory->create();
+        $category->load(2);
+        $attributes = $category->getAttributes();
+        $attributes['custom_design']->setDefaultValue('1');
+        $attributes['custom_design']->save();
+        $requestData = [
+            'name' => 'Test name',
+            'parent_id' => '2',
+            'is_active' => '0',
+            'description' => 'Custom Description',
+            'meta_title' => 'Custom Title',
+            'meta_keywords' => 'Custom keywords',
+            'meta_description' => 'Custom meta description',
+            'include_in_menu' => '0',
+            'url_key' => 'default-test-category-test',
+            'display_mode' => 'PRODUCTS',
+            'landing_page' => '1',
+            'is_anchor' => true,
+            'store_id' => $storeId,
+            'use_config' => [
+                'available_sort_by' => 1,
+                'default_sort_by' => 1,
+                'filter_price_range' => 1,
+            ],
+            'custom_design' => '1',
+            'custom_apply_to_products' => '0'
+        ];
+        $uri = 'backend/catalog/category/save';
+
+        //Updating the category's design settings without proper permissions.
+        $this->aclBuilder->getAcl()->deny(null, 'Magento_Catalog::edit_category_design');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($requestData);
+        $this->getRequest()->setParam('store', $requestData['store_id']);
+        $this->dispatch($uri);
+
+        //Verifying that category was saved.
+        /** @var Registry $registry */
+        $registry = Bootstrap::getObjectManager()->get(Registry::class);
+        $id = $registry->registry('current_category')->getId();
+        /** @var CategoryModel $category */
+        $category = $this->categoryFactory->create();
+        $category->load($id);
+        $this->assertNotEmpty($category->getId());
+        $this->assertEquals('1', $category->getData('custom_design'));
+    }
+
+    /**
+     * Test custom update files functionality.
+     *
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     * @throws \Throwable
+     * @return void
+     */
+    public function testSaveCustomLayout(): void
+    {
+        $file = 'test_file';
+        /** @var $store \Magento\Store\Model\Store */
+        $store = Bootstrap::getObjectManager()->create(Store::class);
+        /** @var CategoryLayoutUpdateManager $layoutManager */
+        $layoutManager = Bootstrap::getObjectManager()->get(CategoryLayoutUpdateManager::class);
+        $layoutManager->setCategoryFakeFiles(2, [$file]);
+        $store->load('fixturestore', 'code');
+        $storeId = $store->getId();
+        $requestData = [
+            'id' => '2',
+            'entity_id' => '2',
+            'path' => '1/2',
+            'name' => 'Custom Name',
+            'is_active' => '0',
+            'description' => 'Custom Description',
+            'meta_title' => 'Custom Title',
+            'meta_keywords' => 'Custom keywords',
+            'meta_description' => 'Custom meta description',
+            'include_in_menu' => '0',
+            'url_key' => 'default-test-category',
+            'display_mode' => 'PRODUCTS',
+            'landing_page' => '1',
+            'is_anchor' => true,
+            'store_id' => $storeId,
+            'use_config' => [
+                'available_sort_by' => 1,
+                'default_sort_by' => 1,
+                'filter_price_range' => 1,
+            ],
+        ];
+        $uri = 'backend/catalog/category/save';
+
+        //Saving a wrong file
+        $requestData['custom_layout_update_file'] = $file . 'INVALID';
+        $this->getRequest()->setDispatched(false);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($requestData);
+        $this->getRequest()->setParam('store', $requestData['store_id']);
+        $this->getRequest()->setParam('id', $requestData['id']);
+        $this->dispatch($uri);
+
+        //Checking that the value is not saved
+        /** @var CategoryModel $category */
+        $category = $this->categoryFactory->create();
+        $category->load($requestData['entity_id']);
+        $this->assertEmpty($category->getData('custom_layout_update_file'));
+
+        //Saving the correct file
+        $requestData['custom_layout_update_file'] = $file;
+        $this->getRequest()->setDispatched(false);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($requestData);
+        $this->getRequest()->setParam('store', $requestData['store_id']);
+        $this->getRequest()->setParam('id', $requestData['id']);
+        $this->dispatch($uri);
+
+        //Checking that the value is saved
+        /** @var CategoryModel $category */
+        $category = $this->categoryFactory->create();
+        $category->load($requestData['entity_id']);
+        $this->assertEquals($file, $category->getData('custom_layout_update_file'));
+    }
+
+    /**
+     * Verify that the category cannot be saved if the category url matches the admin url.
+     *
+     * @return void
+     * @magentoConfigFixture admin/url/use_custom_path 1
+     * @magentoConfigFixture admin/url/custom_path backend
+     */
+    public function testSaveWithCustomBackendNameAction(): void
+    {
+        /** @var FrontNameResolver $frontNameResolver */
+        $frontNameResolver = Bootstrap::getObjectManager()->create(FrontNameResolver::class);
+        $urlKey = $frontNameResolver->getFrontName();
+        $inputData = [
+            'id' => '2',
+            'url_key' => $urlKey,
+            'use_config' => [
+                'available_sort_by' => 1,
+                'default_sort_by' => 1
+            ]
+        ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($inputData);
+        $this->dispatch('backend/catalog/category/save');
+        $this->assertSessionMessages(
+            $this->equalTo(
+                [
+                    'URL key "backend" matches a reserved endpoint name '
+                    . '(admin, soap, rest, graphql, standard, backend). Use another URL key.'
+                ]
+            ),
+            MessageInterface::TYPE_ERROR
+        );
+    }
 }
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 3ec8c806dcbb1..2f35a5fdafc3a 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
@@ -22,12 +22,15 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
 
     protected function setUp()
     {
-        $this->publisherConsumerController = Bootstrap::getObjectManager()->create(PublisherConsumerController::class, [
-            'consumers' => $this->consumers,
-            'logFilePath' => TESTS_TEMP_DIR . "/MessageQueueTestLog.txt",
-            'maxMessages' => null,
-            'appInitParams' => Bootstrap::getInstance()->getAppInitParams()
-        ]);
+        $this->publisherConsumerController = Bootstrap::getObjectManager()->create(
+            PublisherConsumerController::class,
+            [
+                'consumers' => $this->consumers,
+                'logFilePath' => TESTS_TEMP_DIR . "/MessageQueueTestLog.txt",
+                'maxMessages' => null,
+                'appInitParams' => Bootstrap::getInstance()->getAppInitParams()
+            ]
+        );
 
         try {
             $this->publisherConsumerController->startConsumers();
@@ -124,7 +127,7 @@ public function testSaveActionChangeVisibility($attributes)
 
         $this->publisherConsumerController->waitForAsynchronousResult(
             function () use ($repository) {
-                sleep(3);
+                sleep(10); // Should be refactored in the scope of MC-22947
                 return $repository->get(
                     'simple',
                     false,
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save/InputType/AbstractSaveAttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save/InputType/AbstractSaveAttributeTest.php
new file mode 100644
index 0000000000000..d0f1256f1fdb7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save/InputType/AbstractSaveAttributeTest.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save\InputType;
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeOptionManagementInterface;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Escaper;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Base create and assert attribute data.
+ */
+abstract class AbstractSaveAttributeTest extends AbstractBackendController
+{
+    /**
+     * @var AttributeRepositoryInterface
+     */
+    protected $attributeRepository;
+
+    /**
+     * @var Escaper
+     */
+    protected $escaper;
+
+    /**
+     * @var Json
+     */
+    protected $jsonSerializer;
+
+    /**
+     * @var ProductAttributeOptionManagementInterface
+     */
+    protected $productAttributeOptionManagement;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->attributeRepository = $this->_objectManager->get(AttributeRepositoryInterface::class);
+        $this->escaper = $this->_objectManager->get(Escaper::class);
+        $this->jsonSerializer = $this->_objectManager->get(Json::class);
+        $this->productAttributeOptionManagement = $this->_objectManager->get(
+            ProductAttributeOptionManagementInterface::class
+        );
+    }
+
+    /**
+     * Create attribute via save product attribute controller and assert that attribute
+     * created correctly.
+     *
+     * @param array $attributeData
+     * @param array $checkArray
+     * @return void
+     */
+    protected function createAttributeUsingDataAndAssert(array $attributeData, array $checkArray): void
+    {
+        $attributeCode = $this->getAttributeCodeFromAttributeData($attributeData);
+        if (isset($attributeData['serialized_options_arr'])) {
+            $attributeData['serialized_options'] = $this->serializeOptions($attributeData['serialized_options_arr']);
+        }
+        $this->createAttributeViaController($attributeData);
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You saved the product attribute.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
+        try {
+            $attribute = $this->attributeRepository->get(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode);
+            $this->assertAttributeData($attribute, $attributeData, $checkArray);
+            $this->attributeRepository->delete($attribute);
+        } catch (NoSuchEntityException $e) {
+            $this->fail("Attribute with code {$attributeCode} was not created.");
+        }
+    }
+
+    /**
+     * Create attribute via save product attribute controller and assert that we have error during save process.
+     *
+     * @param array $attributeData
+     * @param string $errorMessage
+     * @return void
+     */
+    protected function createAttributeUsingDataWithErrorAndAssert(array $attributeData, string $errorMessage): void
+    {
+        if (isset($attributeData['serialized_options_arr'])
+            && count($attributeData['serialized_options_arr'])
+        ) {
+            $attributeData['serialized_options'] = $this->serializeOptions($attributeData['serialized_options_arr']);
+        }
+        $this->createAttributeViaController($attributeData);
+        $this->assertSessionMessages(
+            $this->equalTo([$this->escaper->escapeHtml($errorMessage)]),
+            MessageInterface::TYPE_ERROR
+        );
+        $attributeCode = $this->getAttributeCodeFromAttributeData($attributeData);
+        try {
+            $attribute = $this->attributeRepository->get(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode);
+            $this->attributeRepository->delete($attribute);
+        } catch (NoSuchEntityException $e) {
+            //Attribute already deleted.
+        }
+    }
+
+    /**
+     * Assert that options was created.
+     *
+     * @param AttributeInterface $attribute
+     * @param array $optionsData
+     * @return void
+     */
+    protected function assertAttributeOptions(AttributeInterface $attribute, array $optionsData): void
+    {
+        $attributeOptions = $this->productAttributeOptionManagement->getItems($attribute->getAttributeCode());
+        foreach ($optionsData as $optionData) {
+            $valueItemArr = $optionData['option']['value'];
+            $optionLabel = reset($valueItemArr)[1];
+            $optionFounded = false;
+            foreach ($attributeOptions as $attributeOption) {
+                if ($attributeOption->getLabel() === $optionLabel) {
+                    $optionFounded = true;
+                    break;
+                }
+            }
+            $this->assertTrue($optionFounded);
+        }
+    }
+
+    /**
+     * Compare attribute data with data which we use for create attribute.
+     *
+     * @param AttributeInterface|AbstractAttribute $attribute
+     * @param array $attributeData
+     * @param array $checkData
+     * @return void
+     */
+    private function assertAttributeData(
+        AttributeInterface $attribute,
+        array $attributeData,
+        array $checkData
+    ): void {
+        $frontendInput = $checkData['frontend_input'] ?? $attributeData['frontend_input'];
+        $this->assertEquals('Test attribute name', $attribute->getDefaultFrontendLabel());
+        $this->assertEquals($frontendInput, $attribute->getFrontendInput());
+
+        if (isset($attributeData['serialized_options'])) {
+            $this->assertAttributeOptions($attribute, $attributeData['serialized_options_arr']);
+        }
+
+        //Additional asserts
+        foreach ($checkData as $valueKey => $value) {
+            $this->assertEquals($value, $attribute->getDataUsingMethod($valueKey));
+        }
+    }
+
+    /**
+     * Get attribute code from attribute data. If attribute code doesn't exist in
+     * attribute data get attribute using default frontend label.
+     *
+     * @param array $attributeData
+     * @return string
+     */
+    private function getAttributeCodeFromAttributeData(array $attributeData): string
+    {
+        $attributeCode = $attributeData['attribute_code'] ?? null;
+        if (!$attributeCode) {
+            $attributeCode = strtolower(
+                str_replace(' ', '_', $attributeData['frontend_label'][Store::DEFAULT_STORE_ID])
+            );
+        }
+
+        return $attributeCode;
+    }
+
+    /**
+     * Create attribute using catalog/product_attribute/save action.
+     *
+     * @param array $attributeData
+     * @return void
+     */
+    private function createAttributeViaController(array $attributeData): void
+    {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($attributeData);
+        $this->dispatch('backend/catalog/product_attribute/save');
+    }
+
+    /**
+     * Create serialized options string.
+     *
+     * @param array $optionsArr
+     * @return string
+     */
+    private function serializeOptions(array $optionsArr): string
+    {
+        $resultArr = [];
+
+        foreach ($optionsArr as $option) {
+            $resultArr[] = http_build_query($option);
+        }
+
+        return $this->jsonSerializer->serialize($resultArr);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save/InputType/MediaImageTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save/InputType/MediaImageTest.php
new file mode 100644
index 0000000000000..f8adac2872773
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save/InputType/MediaImageTest.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\Controller\Adminhtml\Product\Attribute\Save\InputType;
+
+/**
+ * Test cases related to create attribute with input type media image.
+ *
+ * @magentoDbIsolation enabled
+ */
+class MediaImageTest extends AbstractSaveAttributeTest
+{
+    /**
+     * Test create attribute and compare attribute data and input data.
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Attribute\DataProvider\MediaImage::getAttributeDataWithCheckArray()
+     *
+     * @param array $attributePostData
+     * @param array $checkArray
+     * @return void
+     */
+    public function testCreateAttribute(array $attributePostData, array $checkArray): void
+    {
+        $this->createAttributeUsingDataAndAssert($attributePostData, $checkArray);
+    }
+
+    /**
+     * Test create attribute with error.
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Attribute\DataProvider\MediaImage::getAttributeDataWithErrorMessage()
+     *
+     * @param array $attributePostData
+     * @param string $errorMessage
+     * @return void
+     */
+    public function testCreateAttributeWithError(array $attributePostData, string $errorMessage): void
+    {
+        $this->createAttributeUsingDataWithErrorAndAssert($attributePostData, $errorMessage);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save/InputType/PriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save/InputType/PriceTest.php
new file mode 100644
index 0000000000000..fb71f0a4d9d76
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save/InputType/PriceTest.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\Controller\Adminhtml\Product\Attribute\Save\InputType;
+
+/**
+ * Test cases related to create attribute with input type price.
+ *
+ * @magentoDbIsolation enabled
+ */
+class PriceTest extends AbstractSaveAttributeTest
+{
+    /**
+     * Test create attribute and compare attribute data and input data.
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Attribute\DataProvider\Price::getAttributeDataWithCheckArray()
+     *
+     * @param array $attributePostData
+     * @param array $checkArray
+     * @return void
+     */
+    public function testCreateAttribute(array $attributePostData, array $checkArray): void
+    {
+        $this->createAttributeUsingDataAndAssert($attributePostData, $checkArray);
+    }
+
+    /**
+     * Test create attribute with error.
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Attribute\DataProvider\Price::getAttributeDataWithErrorMessage()
+     *
+     * @param array $attributePostData
+     * @param string $errorMessage
+     * @return void
+     */
+    public function testCreateAttributeWithError(array $attributePostData, string $errorMessage): void
+    {
+        $this->createAttributeUsingDataWithErrorAndAssert($attributePostData, $errorMessage);
+    }
+}
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 e1d3e960593a9..967208ef800ff 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
@@ -136,32 +136,6 @@ public function testAttributeWithoutId()
         $this->assertEquals('You saved the product attribute.', $message->getText());
     }
 
-    /**
-     * @return void
-     */
-    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(
-            'catalog/product_attribute/edit',
-            $this->getResponse()->getHeader('Location')->getFieldValue()
-        );
-        /** @var \Magento\Framework\Message\Collection $messages */
-        $messages = $this->_objectManager->create(\Magento\Framework\Message\ManagerInterface::class)->getMessages();
-        $this->assertEquals(1, $messages->getCountByType('error'));
-        /** @var \Magento\Framework\Message\Error $message */
-        $message = $messages->getItemsByType('error')[0];
-        $this->assertEquals(
-            'Attribute code "_()&&&?" is invalid. 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.',
-            $message->getText()
-        );
-    }
-
     /**
      * @return void
      */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Gallery/UploadTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Gallery/UploadTest.php
new file mode 100644
index 0000000000000..683fbc1a358c1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Gallery/UploadTest.php
@@ -0,0 +1,278 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Adminhtml\Product\Gallery;
+
+use Magento\Catalog\Model\Product\Media\Config;
+use Magento\Framework\App\Filesystem\DirectoryList as AppDirectoryList;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\DirectoryList;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Provide tests for admin product upload image action.
+ *
+ * @magentoAppArea adminhtml
+ */
+class UploadTest extends AbstractBackendController
+{
+    /**
+     * @inheritdoc
+     */
+    protected $resource = 'Magento_Catalog::products';
+
+    /**
+     * @inheritdoc
+     */
+    protected $uri = 'backend/catalog/product_gallery/upload';
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var Json
+     */
+    private $serializer;
+
+    /**
+     * @var WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->httpMethod = HttpRequest::METHOD_POST;
+        $this->filesystem = $this->_objectManager->get(Filesystem::class);
+        $this->serializer = $this->_objectManager->get(Json::class);
+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(AppDirectoryList::MEDIA);
+        $this->config = $this->_objectManager->get(Config::class);
+    }
+
+    /**
+     * Test upload image on admin product page.
+     *
+     * @dataProvider uploadActionDataProvider
+     * @magentoDbIsolation enabled
+     * @param array $file
+     * @param array $expectation
+     * @return void
+     */
+    public function testUploadAction(array $file, array $expectation): void
+    {
+        $this->copyFileToSysTmpDir($file);
+        $this->getRequest()->setMethod($this->httpMethod);
+        $this->dispatch($this->uri);
+        $jsonBody = $this->serializer->unserialize($this->getResponse()->getBody());
+        $this->assertEquals($jsonBody['name'], $expectation['name']);
+        $this->assertEquals($jsonBody['type'], $expectation['type']);
+        $this->assertEquals($jsonBody['file'], $expectation['file']);
+        $this->assertEquals($jsonBody['url'], $expectation['url']);
+        $this->assertArrayNotHasKey('error', $jsonBody);
+        $this->assertArrayNotHasKey('errorcode', $jsonBody);
+        $this->assertFileExists(
+            $this->getFileAbsolutePath($expectation['tmp_media_path'])
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function uploadActionDataProvider(): array
+    {
+        return [
+            'upload_image_with_type_jpg' => [
+                'file' => [
+                    'name' => 'magento_image.jpg',
+                    'type' => 'image/jpeg',
+                    'current_path' => '/../../../../_files',
+                ],
+                'expectation' => [
+                    'name' => 'magento_image.jpg',
+                    'type' => 'image/jpeg',
+                    'file' => '/m/a/magento_image.jpg.tmp',
+                    'url' => 'http://localhost/pub/media/tmp/catalog/product/m/a/magento_image.jpg',
+                    'tmp_media_path' => '/m/a/magento_image.jpg',
+                ],
+            ],
+            'upload_image_with_type_png' => [
+                'file' => [
+                    'name' => 'product_image.png',
+                    'type' => 'image/png',
+                    'current_path' => '/../../../../controllers/_files',
+                ],
+                'expectation' => [
+                    'name' => 'product_image.png',
+                    'type' => 'image/png',
+                    'file' => '/p/r/product_image.png.tmp',
+                    'url' => 'http://localhost/pub/media/tmp/catalog/product/p/r/product_image.png',
+                    'tmp_media_path' => '/p/r/product_image.png',
+                ],
+            ],
+            'upload_image_with_type_gif' => [
+                'file' => [
+                    'name' => 'magento_image.gif',
+                    'type' => 'image/gif',
+                    'current_path' => '/../../../../_files',
+                ],
+                'expectation' => [
+                    'name' => 'magento_image.gif',
+                    'type' => 'image/gif',
+                    'file' => '/m/a/magento_image.gif.tmp',
+                    'url' => 'http://localhost/pub/media/tmp/catalog/product/m/a/magento_image.gif',
+                    'tmp_media_path' => '/m/a/magento_image.gif',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Test upload image on admin product page.
+     *
+     * @dataProvider uploadActionWithErrorsDataProvider
+     * @magentoDbIsolation enabled
+     * @param array $file
+     * @param array $expectation
+     * @return void
+     */
+    public function testUploadActionWithErrors(array $file, array $expectation): void
+    {
+        if (!empty($file['create_file'])) {
+            $this->createFileInSysTmpDir($file['name']);
+        } elseif (!empty($file['copy_file'])) {
+            $this->copyFileToSysTmpDir($file);
+        }
+
+        $this->getRequest()->setMethod($this->httpMethod);
+        $this->dispatch($this->uri);
+        $jsonBody = $this->serializer->unserialize($this->getResponse()->getBody());
+        $this->assertEquals($expectation['message'], $jsonBody['error']);
+        $this->assertEquals($expectation['errorcode'], $jsonBody['errorcode']);
+
+        if (!empty($expectation['tmp_media_path'])) {
+            $this->assertFileNotExists(
+                $this->getFileAbsolutePath($expectation['tmp_media_path'])
+            );
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function uploadActionWithErrorsDataProvider(): array
+    {
+        return [
+            'upload_image_with_invalid_type' => [
+                'file' => [
+                    'create_file' => true,
+                    'name' => 'invalid_file.txt',
+                ],
+                'expectation' => [
+                    'message' => 'Disallowed file type.',
+                    'errorcode' => 0,
+                    'tmp_media_path' => '/i/n/invalid_file.txt',
+                ],
+            ],
+            'upload_empty_image' => [
+                'file' => [
+                    'copy_file' => true,
+                    'name' => 'magento_empty.jpg',
+                    'type' => 'image/jpeg',
+                    'current_path' => '/../../../../_files',
+                ],
+                'expectation' => [
+                    'message' => 'Wrong file size.',
+                    'errorcode' => 0,
+                    'tmp_media_path' => '/m/a/magento_empty.jpg',
+                ],
+            ],
+            'upload_without_image' => [
+                'file' => [],
+                'expectation' => [
+                    'message' => '$_FILES array is empty',
+                    'errorcode' => 0,
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $_FILES = [];
+        $this->mediaDirectory->delete('tmp');
+        parent::tearDown();
+    }
+
+    /**
+     * Copies file to tmp dir.
+     *
+     * @param array $file
+     * @return void
+     */
+    private function copyFileToSysTmpDir(array $file): void
+    {
+        if (!empty($file)) {
+            $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
+            $fixtureDir = realpath(__DIR__ . $file['current_path']);
+            $filePath = $tmpDirectory->getAbsolutePath($file['name']);
+            copy($fixtureDir . DIRECTORY_SEPARATOR . $file['name'], $filePath);
+
+            $_FILES['image'] = [
+                'name' => $file['name'],
+                'type' => $file['type'],
+                'tmp_name' => $filePath,
+            ];
+        }
+    }
+
+    /**
+     * Creates txt file with given name and copies to tmp dir.
+     *
+     * @param string $name
+     * @return void
+     */
+    private function createFileInSysTmpDir(string $name): void
+    {
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
+        $filePath = $tmpDirectory->getAbsolutePath($name);
+        $file = fopen($filePath, "wb");
+        fwrite($file, 'some text');
+
+        $_FILES['image'] = [
+            'name' => $name,
+            'type' => 'text/plain',
+            'tmp_name' => $filePath,
+        ];
+    }
+
+    /**
+     * Returns absolute path to file in media tmp dir.
+     *
+     * @param string $tmpPath
+     * @return string
+     */
+    private function getFileAbsolutePath(string $tmpPath): string
+    {
+        return $this->mediaDirectory->getAbsolutePath($this->config->getBaseTmpMediaPath() . $tmpPath);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/CreateCustomOptionsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/CreateCustomOptionsTest.php
new file mode 100644
index 0000000000000..80f15da647b25
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/CreateCustomOptionsTest.php
@@ -0,0 +1,271 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Adminhtml\Product\Save;
+
+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Base test cases for product custom options with type "field".
+ * Option add via dispatch product controller action save with options data in POST data.
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ */
+class CreateCustomOptionsTest extends AbstractBackendController
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ProductCustomOptionRepositoryInterface
+     */
+    private $optionRepository;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
+        $this->optionRepository = $this->_objectManager->create(ProductCustomOptionRepositoryInterface::class);
+    }
+
+    /**
+     * Test add to product custom option with type "field".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider productWithNewOptionsDataProvider
+     *
+     * @param array $productPostData
+     */
+    public function testSaveCustomOptionWithTypeField(array $productPostData): void
+    {
+        $this->getRequest()->setPostValue($productPostData);
+        $product = $this->productRepository->get('simple');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId());
+        $this->assertSessionMessages(
+            $this->contains('You saved the product.'),
+            MessageInterface::TYPE_SUCCESS
+        );
+        $productOptions = $this->optionRepository->getProductOptions($product);
+        $this->assertCount(2, $productOptions);
+        foreach ($productOptions as $customOption) {
+            $postOptionData = $productPostData['product']['options'][$customOption->getTitle()] ?? null;
+            $this->assertNotNull($postOptionData);
+            $this->assertEquals($postOptionData['title'], $customOption->getTitle());
+            $this->assertEquals($postOptionData['type'], $customOption->getType());
+            $this->assertEquals($postOptionData['is_require'], $customOption->getIsRequire());
+            $this->assertEquals($postOptionData['sku'], $customOption->getSku());
+            $this->assertEquals($postOptionData['price'], $customOption->getPrice());
+            $this->assertEquals($postOptionData['price_type'], $customOption->getPriceType());
+            $maxCharacters = $postOptionData['max_characters'] ?? 0;
+            $this->assertEquals($maxCharacters, $customOption->getMaxCharacters());
+        }
+    }
+
+    /**
+     * Return all data for add option to product for all cases.
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
+     * @return array
+     */
+    public function productWithNewOptionsDataProvider(): array
+    {
+        return [
+            'required_options' => [
+                [
+                    'product' => [
+                        'options' => [
+                            'Test option title 1' => [
+                                'record_id' => 0,
+                                'sort_order' => 1,
+                                'is_require' => 1,
+                                'sku' => 'test-option-title-1',
+                                'max_characters' => 50,
+                                'title' => 'Test option title 1',
+                                'type' => 'field',
+                                'price' => 10,
+                                'price_type' => 'fixed',
+                            ],
+                            'Test option title 2' => [
+                                'record_id' => 1,
+                                'sort_order' => 2,
+                                'is_require' => 1,
+                                'sku' => 'test-option-title-2',
+                                'max_characters' => 50,
+                                'title' => 'Test option title 2',
+                                'type' => 'field',
+                                'price' => 10,
+                                'price_type' => 'fixed',
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            'not_required_options' => [
+                [
+                    'product' => [
+                        'options' => [
+                            'Test option title 1' => [
+                                'record_id' => 0,
+                                'sort_order' => 1,
+                                'is_require' => 0,
+                                'sku' => 'test-option-title-1',
+                                'max_characters' => 50,
+                                'title' => 'Test option title 1',
+                                'type' => 'field',
+                                'price' => 10,
+                                'price_type' => 'fixed',
+                            ],
+                            'Test option title 2' => [
+                                'record_id' => 1,
+                                'sort_order' => 2,
+                                'is_require' => 0,
+                                'sku' => 'test-option-title-2',
+                                'max_characters' => 50,
+                                'title' => 'Test option title 2',
+                                'type' => 'field',
+                                'price' => 10,
+                                'price_type' => 'fixed',
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            'options_with_fixed_price' => [
+                [
+                    'product' => [
+                        'options' => [
+                            'Test option title 1' => [
+                                'record_id' => 0,
+                                'sort_order' => 1,
+                                'is_require' => 1,
+                                'sku' => 'test-option-title-1',
+                                'max_characters' => 50,
+                                'title' => 'Test option title 1',
+                                'type' => 'field',
+                                'price' => 10,
+                                'price_type' => 'fixed',
+                            ],
+                            'Test option title 2' => [
+                                'record_id' => 1,
+                                'sort_order' => 2,
+                                'is_require' => 1,
+                                'sku' => 'test-option-title-2',
+                                'max_characters' => 50,
+                                'title' => 'Test option title 2',
+                                'type' => 'field',
+                                'price' => 10,
+                                'price_type' => 'percent',
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            'options_with_percent_price' => [
+                [
+                    'product' => [
+                        'options' => [
+                            'Test option title 1' => [
+                                'record_id' => 0,
+                                'sort_order' => 1,
+                                'is_require' => 1,
+                                'sku' => 'test-option-title-1',
+                                'max_characters' => 50,
+                                'title' => 'Test option title 1',
+                                'type' => 'field',
+                                'price' => 10,
+                                'price_type' => 'fixed',
+                            ],
+                            'Test option title 2' => [
+                                'record_id' => 1,
+                                'sort_order' => 2,
+                                'is_require' => 1,
+                                'sku' => 'test-option-title-2',
+                                'max_characters' => 50,
+                                'title' => 'Test option title 2',
+                                'type' => 'field',
+                                'price' => 20,
+                                'price_type' => 'percent',
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            'options_with_max_charters_configuration' => [
+                [
+                    'product' => [
+                        'options' => [
+                            'Test option title 1' => [
+                                'record_id' => 0,
+                                'sort_order' => 1,
+                                'is_require' => 1,
+                                'sku' => 'test-option-title-1',
+                                'max_characters' => 30,
+                                'title' => 'Test option title 1',
+                                'type' => 'field',
+                                'price' => 10,
+                                'price_type' => 'fixed',
+                            ],
+                            'Test option title 2' => [
+                                'record_id' => 1,
+                                'sort_order' => 2,
+                                'is_require' => 1,
+                                'sku' => 'test-option-title-2',
+                                'max_characters' => 50,
+                                'title' => 'Test option title 2',
+                                'type' => 'field',
+                                'price' => 10,
+                                'price_type' => 'fixed',
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            'options_without_max_charters_configuration' => [
+                [
+                    'product' => [
+                        'options' => [
+                            'Test option title 1' => [
+                                'record_id' => 0,
+                                'sort_order' => 1,
+                                'is_require' => 1,
+                                'sku' => 'test-option-title-1',
+                                'title' => 'Test option title 1',
+                                'type' => 'field',
+                                'price' => 10,
+                                'price_type' => 'fixed',
+                            ],
+                            'Test option title 2' => [
+                                'record_id' => 1,
+                                'sort_order' => 2,
+                                'is_require' => 1,
+                                'sku' => 'test-option-title-2',
+                                'title' => 'Test option title 2',
+                                'type' => 'field',
+                                'price' => 10,
+                                'price_type' => 'fixed',
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/DeleteCustomOptionsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/DeleteCustomOptionsTest.php
new file mode 100644
index 0000000000000..f1af6e6e41cff
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/DeleteCustomOptionsTest.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\Controller\Adminhtml\Product\Save;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Base test cases for delete product custom option with type "field".
+ * Option deleting via product controller action save.
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ */
+class DeleteCustomOptionsTest extends AbstractBackendController
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ProductCustomOptionRepositoryInterface
+     */
+    private $optionRepository;
+
+    /**
+     * @var ProductCustomOptionInterfaceFactory
+     */
+    private $optionRepositoryFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->productRepository = $this->_objectManager->get(ProductRepositoryInterface::class);
+        $this->optionRepository = $this->_objectManager->get(ProductCustomOptionRepositoryInterface::class);
+        $this->optionRepositoryFactory = $this->_objectManager->get(ProductCustomOptionInterfaceFactory::class);
+    }
+
+    /**
+     * Test delete custom option with type "field".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Field::getDataForCreateOptions
+     *
+     * @param array $optionData
+     * @return void
+     */
+    public function testDeleteCustomOptionWithTypeField(array $optionData): void
+    {
+        $product = $this->productRepository->get('simple');
+        /** @var ProductCustomOptionInterface $option */
+        $option = $this->optionRepositoryFactory->create(['data' => $optionData]);
+        $option->setProductSku($product->getSku());
+        $product->setOptions([$option]);
+        $this->productRepository->save($product);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId());
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You saved the product.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
+        $this->assertCount(0, $this->optionRepository->getProductOptions($product));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/ImagesTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/ImagesTest.php
new file mode 100644
index 0000000000000..697980d75a715
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/ImagesTest.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Adminhtml\Product\Save;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Media\Config;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Provide tests for admin product save action with images.
+ *
+ * @magentoAppArea adminhtml
+ */
+class ImagesTest extends AbstractBackendController
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->config = $this->_objectManager->get(Config::class);
+        $this->mediaDirectory = $this->_objectManager->get(Filesystem::class)->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * Test save product with default image.
+     *
+     * @dataProvider simpleProductImagesDataProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/product_image.php
+     * @magentoDbIsolation enabled
+     * @param array $postData
+     * @param array $expectation
+     * @return void
+     */
+    public function testSaveSimpleProductDefaultImage(array $postData, array $expectation): void
+    {
+        $product = $this->productRepository->get('simple');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($postData);
+        $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId());
+        $this->assertSessionMessages(
+            $this->equalTo(['You saved the product.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+        $this->assertSuccessfulImageSave($expectation);
+    }
+
+    /**
+     * @return array
+     */
+    public function simpleProductImagesDataProvider(): array
+    {
+        return [
+            'simple_product_with_jpg_image' => [
+                'post_data' => [
+                    'product' => [
+                        'media_gallery' => [
+                            'images' => [
+                                'lrwuv5ukisn' => [
+                                    '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',
+                    ],
+                ],
+                'expectation' => [
+                    'media_gallery_image' => [
+                        'position' => '1',
+                        'media_type' => 'image',
+                        'file' => '/m/a/magento_image.jpg',
+                        'label' => '',
+                        'disabled' => '0',
+                    ],
+                    'image' => '/m/a/magento_image.jpg',
+                    'small_image' => '/m/a/magento_image.jpg',
+                    'thumbnail' => '/m/a/magento_image.jpg',
+                    'swatch_image' => '/m/a/magento_image.jpg',
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @param array $expectation
+     * @return void
+     */
+    private function assertSuccessfulImageSave(array $expectation): void
+    {
+        $product = $this->productRepository->get('simple', false, null, true);
+        $galleryImage = reset($product->getData('media_gallery')['images']);
+        $expectedGalleryImage = $expectation['media_gallery_image'];
+        $this->assertEquals($expectedGalleryImage['position'], $galleryImage['position']);
+        $this->assertEquals($expectedGalleryImage['media_type'], $galleryImage['media_type']);
+        $this->assertEquals($expectedGalleryImage['label'], $galleryImage['label']);
+        $this->assertEquals($expectedGalleryImage['disabled'], $galleryImage['disabled']);
+        $this->assertEquals($expectedGalleryImage['file'], $galleryImage['file']);
+        $this->assertEquals($expectation['image'], $product->getData('image'));
+        $this->assertEquals($expectation['small_image'], $product->getData('small_image'));
+        $this->assertEquals($expectation['thumbnail'], $product->getData('thumbnail'));
+        $this->assertEquals($expectation['swatch_image'], $product->getData('swatch_image'));
+        $this->assertFileExists(
+            $this->mediaDirectory->getAbsolutePath($this->config->getBaseMediaPath() . $expectation['image'])
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/LinksTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/LinksTest.php
new file mode 100644
index 0000000000000..665d45921d435
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/LinksTest.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Adminhtml\Product\Save;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Saving product with linked products
+ *
+ * @magentoAppArea adminhtml
+ */
+class LinksTest extends AbstractBackendController
+{
+    /** @var array */
+    private $linkTypes = [
+        'upsell',
+        'crosssell',
+        'related',
+    ];
+
+    /** @var ProductRepositoryInterface $productRepository */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * Test add simple related, up-sells, cross-sells product
+     *
+     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+     * @magentoDbIsolation enabled
+     * @return void
+     */
+    public function testAddRelatedUpSellCrossSellProducts(): void
+    {
+        $postData = $this->getPostData();
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($postData);
+        $this->dispatch('backend/catalog/product/save');
+        $this->assertSessionMessages(
+            $this->equalTo(['You saved the product.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+        $product = $this->productRepository->get('simple');
+        $this->assertEquals(
+            $this->getExpectedLinks($postData['links']),
+            $this->getActualLinks($product),
+            "Expected linked products do not match actual linked products!"
+        );
+    }
+
+    /**
+     * Get post data for the request
+     *
+     * @return array
+     */
+    private function getPostData(): array
+    {
+        return [
+            'product' => [
+                'attribute_set_id' => '4',
+                'status' => '1',
+                'name' => 'Simple Product',
+                'sku' => 'simple',
+                'url_key' => 'simple-product',
+                'type_id' => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+            ],
+            'links' => [
+                'upsell' => [
+                    ['id' => '10'],
+                ],
+                'crosssell' => [
+                    ['id' => '11'],
+                ],
+                'related' => [
+                    ['id' => '12'],
+                ],
+            ]
+        ];
+    }
+
+    /**
+     * Set an array of expected related, up-sells, cross-sells product identifiers
+     *
+     * @param array $links
+     * @return array
+     */
+    private function getExpectedLinks(array $links): array
+    {
+        $expectedLinks = [];
+        foreach ($this->linkTypes as $linkType) {
+            $expectedLinks[$linkType] = [];
+            foreach ($links[$linkType] as $productData) {
+                $expectedLinks[$linkType][] = $productData['id'];
+            }
+        }
+
+        return $expectedLinks;
+    }
+
+    /**
+     * Get an array of received related, up-sells, cross-sells products
+     *
+     * @param ProductInterface|Product $product
+     * @return array
+     */
+    private function getActualLinks(ProductInterface $product): array
+    {
+        $actualLinks = [];
+        foreach ($this->linkTypes as $linkType) {
+            $ids = [];
+            switch ($linkType) {
+                case 'upsell':
+                    $ids = $product->getUpSellProductIds();
+                    break;
+                case 'crosssell':
+                    $ids = $product->getCrossSellProductIds();
+                    break;
+                case 'related':
+                    $ids = $product->getRelatedProductIds();
+                    break;
+            }
+            $actualLinks[$linkType] = $ids;
+        }
+
+        return $actualLinks;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/UpdateCustomOptionsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/UpdateCustomOptionsTest.php
new file mode 100644
index 0000000000000..a45c21444a5d7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/UpdateCustomOptionsTest.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Adminhtml\Product\Save;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Option;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Base test cases for update product custom options with type "field".
+ * Option updating via dispatch product controller action save with updated options data in POST data.
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ */
+class UpdateCustomOptionsTest extends AbstractBackendController
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ProductCustomOptionRepositoryInterface
+     */
+    private $optionRepository;
+
+    /**
+     * @var ProductCustomOptionInterfaceFactory
+     */
+    private $optionRepositoryFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->productRepository = $this->_objectManager->get(ProductRepositoryInterface::class);
+        $this->optionRepository = $this->_objectManager->get(ProductCustomOptionRepositoryInterface::class);
+        $this->optionRepositoryFactory = $this->_objectManager->get(ProductCustomOptionInterfaceFactory::class);
+    }
+
+    /**
+     * Test add to product custom option with type "field".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Field::getDataForUpdateOptions
+     *
+     * @param array $optionData
+     * @param array $updateData
+     * @return void
+     */
+    public function testUpdateCustomOptionWithTypeField(array $optionData, array $updateData): void
+    {
+        $product = $this->productRepository->get('simple');
+        /** @var ProductCustomOptionInterface|Option $option */
+        $option = $this->optionRepositoryFactory->create(['data' => $optionData]);
+        $option->setProductSku($product->getSku());
+        $product->setOptions([$option]);
+        $this->productRepository->save($product);
+        $currentProductOptions = $this->optionRepository->getProductOptions($product);
+        $this->assertCount(1, $currentProductOptions);
+        /** @var ProductCustomOptionInterface $currentOption */
+        $currentOption = reset($currentProductOptions);
+        $postData = [
+            'product' => [
+                'options' => [
+                    [
+                        'option_id' => $currentOption->getOptionId(),
+                        'product_id' => $product->getId(),
+                        'type' => $currentOption->getType(),
+                        'is_require' => $currentOption->getIsRequire(),
+                        'sku' => $currentOption->getSku(),
+                        'max_characters' => $currentOption->getMaxCharacters(),
+                        'title' => $currentOption->getTitle(),
+                        'sort_order' => $currentOption->getSortOrder(),
+                        'price' => $currentOption->getPrice(),
+                        'price_type' => $currentOption->getPriceType(),
+                        'is_use_default' => false,
+                    ],
+                ],
+            ],
+        ];
+
+        foreach ($updateData as $methodKey => $newValue) {
+            $postData = array_replace_recursive(
+                $postData,
+                [
+                    'product' => [
+                        'options' => [
+                            0 => [
+                                $methodKey => $newValue,
+                            ],
+                        ],
+                    ],
+                ]
+            );
+            $this->getRequest()->setPostValue($postData);
+            $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+            $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId());
+            $this->assertSessionMessages(
+                $this->contains('You saved the product.'),
+                MessageInterface::TYPE_SUCCESS
+            );
+            $updatedOptions = $this->optionRepository->getProductOptions($product);
+            $this->assertCount(1, $updatedOptions);
+            /** @var ProductCustomOptionInterface|Option $updatedOption */
+            $updatedOption = reset($updatedOptions);
+            $this->assertEquals($newValue, $updatedOption->getDataUsingMethod($methodKey));
+            $this->assertEquals($option->getOptionId(), $updatedOption->getOptionId());
+            $this->assertNotEquals(
+                $option->getDataUsingMethod($methodKey),
+                $updatedOption->getDataUsingMethod($methodKey)
+            );
+        }
+    }
+}
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
index 8a33543e93439..cfa8b6022963e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/SearchTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/SearchTest.php
@@ -38,7 +38,8 @@ public function testExecuteNonExistingSearchKey() : void
             ->setPostValue('limit', 50);
         $this->dispatch('backend/catalog/product/search');
         $responseBody = $this->getResponse()->getBody();
-        $this->assertContains('{"options":[],"total":0}', $responseBody);
+        $jsonResponse = json_decode($responseBody, true);
+        $this->assertEmpty($jsonResponse['options']);
     }
 
     /**
@@ -57,6 +58,24 @@ public function testExecuteNotVisibleIndividuallyProducts() : void
             ->setPostValue('limit', 50);
         $this->dispatch('backend/catalog/product/search');
         $responseBody = $this->getResponse()->getBody();
-        $this->assertContains('{"options":[],"total":0}', $responseBody);
+        $jsonResponse = json_decode($responseBody, true);
+        $this->assertEquals(1, $jsonResponse['total']);
+        $this->assertCount(1, $jsonResponse['options']);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/multiple_mixed_products.php
+     */
+    public function testExecuteEnabledAndDisabledProducts() : void
+    {
+        $this->getRequest()
+            ->setPostValue('searchKey', 'simple')
+            ->setPostValue('page', 1)
+            ->setPostValue('limit', 50);
+        $this->dispatch('backend/catalog/product/search');
+        $responseBody = $this->getResponse()->getBody();
+        $jsonResponse = json_decode($responseBody, true);
+        $this->assertEquals(6, $jsonResponse['total']);
+        $this->assertCount(6, $jsonResponse['options']);
     }
 }
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 7e034b8b3cb7e..5cb1f862054ba 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
@@ -3,42 +3,146 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
 
-use Magento\Framework\Message\MessageInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Api\AttributeSetRepositoryInterface;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Escaper;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
+use Magento\TestFramework\TestCase\AbstractBackendController;
 
-class DeleteTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+/**
+ * Test for attribute set deleting.
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ */
+class DeleteTest extends AbstractBackendController
 {
     /**
+     * @var GetAttributeSetByName
+     */
+    private $getAttributeSetByName;
+
+    /**
+     * @var ProductInterface|Product
+     */
+    private $product;
+
+    /**
+     * @var AttributeSetRepositoryInterface
+     */
+    private $attributeSetRepository;
+
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->getAttributeSetByName = $this->_objectManager->get(GetAttributeSetByName::class);
+        $this->product = $this->_objectManager->get(ProductInterface::class);
+        $this->attributeSetRepository = $this->_objectManager->get(AttributeSetRepositoryInterface::class);
+        $this->escaper = $this->_objectManager->get(Escaper::class);
+        $this->productRepository = $this->_objectManager->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * Assert that default attribute set is not deleted.
+     *
+     * @return void
+     */
+    public function testDefaultAttributeSetIsNotDeleted(): void
+    {
+        $productDefaultAttrSetId = (int)$this->product->getDefaultAttributeSetId();
+        $this->performDeleteAttributeSetRequest($productDefaultAttrSetId);
+        $expectedSessionMessage = $this->escaper->escapeHtml((string)__('We can\'t delete this set right now.'));
+        $this->assertSessionMessages(
+            $this->equalTo([$expectedSessionMessage]),
+            MessageInterface::TYPE_ERROR
+        );
+        try {
+            $this->attributeSetRepository->get($productDefaultAttrSetId);
+        } catch (NoSuchEntityException $e) {
+            $this->fail(sprintf('Default attribute set was deleted. Message: %s', $e->getMessage()));
+        }
+    }
+
+    /**
+     * Assert that custom attribute set deleting properly.
+     *
      * @magentoDataFixture Magento/Eav/_files/empty_attribute_set.php
+     *
+     * @return void
      */
-    public function testDeleteById()
+    public function testDeleteCustomAttributeSetById(): void
     {
-        $attributeSet = $this->getAttributeSetByName('empty_attribute_set');
-        $this->getRequest()->setParam('id', $attributeSet->getId())->setMethod(HttpRequest::METHOD_POST);
+        $this->deleteAttributeSetByNameAndAssert('empty_attribute_set');
+    }
 
-        $this->dispatch('backend/catalog/product_set/delete/');
+    /**
+     * Assert that product will be deleted if delete attribute set which the product is attached.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_test_attribute_set.php
+     *
+     * @return void
+     */
+    public function testProductIsDeletedAfterDeleteItsAttributeSet(): void
+    {
+        $this->deleteAttributeSetByNameAndAssert('new_attribute_set');
+        $this->expectExceptionObject(
+            new NoSuchEntityException(
+                __('The product that was requested doesn\'t exist. Verify the product and try again.')
+            )
+        );
+        $this->productRepository->get('simple');
+    }
 
-        $this->assertNull($this->getAttributeSetByName('empty_attribute_set'));
+    /**
+     * Perform request to delete attribute set and assert that attribute set is deleted.
+     *
+     * @param string $attributeSetName
+     * @return void
+     */
+    private function deleteAttributeSetByNameAndAssert(string $attributeSetName): void
+    {
+        $attributeSet = $this->getAttributeSetByName->execute($attributeSetName);
+        $this->performDeleteAttributeSetRequest((int)$attributeSet->getAttributeSetId());
         $this->assertSessionMessages(
-            $this->equalTo(['The attribute set has been removed.']),
+            $this->equalTo([(string)__('The attribute set has been removed.')]),
             MessageInterface::TYPE_SUCCESS
         );
-        $this->assertRedirect($this->stringContains('catalog/product_set/index/'));
+        $this->assertNull($this->getAttributeSetByName->execute($attributeSetName));
     }
 
     /**
-     * Retrieve attribute set based on given name.
+     * Perform "catalog/product_set/delete" controller dispatch.
      *
-     * @param string $attributeSetName
-     * @return \Magento\Eav\Model\Entity\Attribute\Set|null
+     * @param int $attributeSetId
+     * @return void
      */
-    protected function getAttributeSetByName($attributeSetName)
+    private function performDeleteAttributeSetRequest(int $attributeSetId): void
     {
-        $attributeSet = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Eav\Model\Entity\Attribute\Set::class
-        )->load($attributeSetName, 'attribute_set_name');
-        return $attributeSet->getId() === null ? null : $attributeSet;
+        $this->getRequest()
+            ->setParam('id', $attributeSetId)
+            ->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 187fddae1ce4f..1edd494dabbe3 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
@@ -7,26 +7,32 @@
 
 namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
 
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Repository;
+use Magento\Developer\Model\Logger\Handler\Syslog;
+use Magento\Eav\Api\AttributeManagementInterface;
 use Magento\Eav\Api\AttributeSetRepositoryInterface;
 use Magento\Eav\Api\Data\AttributeSetInterface;
+use Magento\Eav\Model\Config;
+use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\App\Request\Http as HttpRequest;
-use Magento\Eav\Api\AttributeManagementInterface;
-use Magento\Catalog\Api\Data\ProductInterfaceFactory;
-use Magento\Framework\Api\DataObjectHelper;
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Developer\Model\Logger\Handler\Syslog;
+use Magento\Framework\Logger\Handler\System;
 use Magento\Framework\Logger\Monolog;
-use Magento\Catalog\Model\Product\Attribute\Repository;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\AbstractBackendController;
 
 /**
- * Test save attribute set
+ * Testing for saving an existing or creating a new attribute set.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @magentoAppArea adminhtml
  */
-class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+class SaveTest extends AbstractBackendController
 {
     /**
      * @var string
@@ -63,6 +69,21 @@ class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
      */
     private $attributeRepository;
 
+    /**
+     * @var AttributeSetRepositoryInterface
+     */
+    private $attributeSetRepository;
+
+    /**
+     * @var Config
+     */
+    private $eavConfig;
+
+    /**
+     * @var Json
+     */
+    private $json;
+
     /**
      * @inheritDoc
      */
@@ -80,11 +101,13 @@ public function setUp()
         $this->productRepository = $this->_objectManager->get(ProductRepositoryInterface::class);
         $this->attributeRepository = $this->_objectManager->get(Repository::class);
         $this->dataObjectHelper = $this->_objectManager->get(DataObjectHelper::class);
+        $this->attributeSetRepository = $this->_objectManager->get(AttributeSetRepositoryInterface::class);
+        $this->eavConfig = $this->_objectManager->get(Config::class);
+        $this->json = $this->_objectManager->get(Json::class);
     }
 
     /**
      * @inheritdoc
-     * @throws \Magento\Framework\Exception\FileSystemException
      */
     public function tearDown()
     {
@@ -93,9 +116,68 @@ public function tearDown()
     }
 
     /**
+     * Test that new attribute set based on default attribute set will be successfully created.
+     *
+     * @magentoDbIsolation enabled
+     *
+     * @return void
+     */
+    public function testCreateNewAttributeSetBasedOnDefaultAttributeSet(): void
+    {
+        $this->createAttributeSetBySkeletonAndAssert(
+            'Attribute set name for test',
+            $this->getCatalogProductDefaultAttributeSetId()
+        );
+    }
+
+    /**
+     * Test that new attribute set based on custom attribute set will be successfully created.
+     *
      * @magentoDataFixture Magento/Catalog/_files/attribute_set_with_renamed_group.php
+     *
+     * @magentoDbIsolation enabled
+     *
+     * @return void
+     */
+    public function testCreateNewAttributeSetBasedOnCustomAttributeSet(): void
+    {
+        $existCustomAttributeSet = $this->getAttributeSetByName('attribute_set_test');
+        $this->createAttributeSetBySkeletonAndAssert(
+            'Attribute set name for test',
+            (int)$existCustomAttributeSet->getAttributeSetId()
+        );
+    }
+
+    /**
+     * Test that new attribute set based on custom attribute set will be successfully created.
+     *
+     * @magentoDbIsolation enabled
+     *
+     * @return void
+     */
+    public function testGotErrorDuringCreateAttributeSetWithoutName(): void
+    {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue(
+            [
+                'gotoEdit' => '1',
+                'skeleton_set' => $this->getCatalogProductDefaultAttributeSetId(),
+            ]
+        );
+        $this->dispatch('backend/catalog/product_set/save/');
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('The attribute set name is empty. Enter the name and try again.')]),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * Test that exception throws during save attribute set name process if name of attribute set already exists.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/attribute_set_with_renamed_group.php
+     * @return void
      */
-    public function testAlreadyExistsExceptionProcessingWhenGroupCodeIsDuplicated()
+    public function testAlreadyExistsExceptionProcessingWhenGroupCodeIsDuplicated(): void
     {
         $attributeSet = $this->getAttributeSetByName('attribute_set_test');
         $this->assertNotEmpty($attributeSet, 'Attribute set with name "attribute_set_test" is missed');
@@ -103,7 +185,7 @@ public function testAlreadyExistsExceptionProcessingWhenGroupCodeIsDuplicated()
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(
             'data',
-            json_encode(
+            $this->json->serialize(
                 [
                     'attribute_set_name' => 'attribute_set_test',
                     'groups' => [
@@ -119,44 +201,25 @@ public function testAlreadyExistsExceptionProcessingWhenGroupCodeIsDuplicated()
         );
         $this->dispatch('backend/catalog/product_set/save/id/' . $attributeSet->getAttributeSetId());
 
-        $jsonResponse = json_decode($this->getResponse()->getBody());
+        $jsonResponse = $this->json->unserialize($this->getResponse()->getBody());
         $this->assertNotNull($jsonResponse);
-        $this->assertEquals(1, $jsonResponse->error);
+        $this->assertEquals(1, $jsonResponse['error']);
         $this->assertContains(
-            'Attribute group with same code already exist. Please rename &quot;attribute-group-name&quot; group',
-            $jsonResponse->message
+            (string)__('Attribute group with same code already exist. Please rename &quot;attribute-group-name&quot; group'),
+            $jsonResponse['message']
         );
     }
 
-    /**
-     * @param string $attributeSetName
-     * @return AttributeSetInterface|null
-     */
-    protected function getAttributeSetByName($attributeSetName)
-    {
-        $objectManager = Bootstrap::getObjectManager();
-
-        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-        $searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
-        $searchCriteriaBuilder->addFilter('attribute_set_name', $attributeSetName);
-
-        /** @var AttributeSetRepositoryInterface $attributeSetRepository */
-        $attributeSetRepository = $objectManager->get(AttributeSetRepositoryInterface::class);
-        $result = $attributeSetRepository->getList($searchCriteriaBuilder->create());
-
-        $items = $result->getItems();
-        return $result->getTotalCount() ? array_pop($items) : null;
-    }
-
     /**
      * Test behavior when attribute set was changed to a new set
-     * with deleted attribute from the previous set
+     * with deleted attribute from the previous set.
      *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoDataFixture Magento/Catalog/_files/attribute_set_based_on_default.php
      * @magentoDbIsolation disabled
+     * @return void
      */
-    public function testRemoveAttributeFromAttributeSet()
+    public function testRemoveAttributeFromAttributeSet(): void
     {
         $message = 'Attempt to load value of nonexistent EAV attribute';
         $this->removeSyslog();
@@ -178,7 +241,7 @@ public function testRemoveAttributeFromAttributeSet()
     }
 
     /**
-     * Retrieve system.log file path
+     * Retrieve system.log file path.
      *
      * @return string
      */
@@ -186,7 +249,7 @@ private function getSyslogPath(): string
     {
         if (!$this->systemLogPath) {
             foreach ($this->logger->getHandlers() as $handler) {
-                if ($handler instanceof \Magento\Framework\Logger\Handler\System) {
+                if ($handler instanceof System) {
                     $this->systemLogPath = $handler->getUrl();
                 }
             }
@@ -200,11 +263,103 @@ private function getSyslogPath(): string
      *
      * @return void
      */
-    private function removeSyslog()
+    private function removeSyslog(): void
     {
         $this->syslogHandler->close();
         if (file_exists($this->getSyslogPath())) {
             unlink($this->getSyslogPath());
         }
     }
+
+    /**
+     * Search and return attribute set by name.
+     *
+     * @param string $attributeSetName
+     * @return AttributeSetInterface|null
+     */
+    private function getAttributeSetByName(string $attributeSetName): ?AttributeSetInterface
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteriaBuilder->addFilter('attribute_set_name', $attributeSetName);
+        $result = $this->attributeSetRepository->getList($searchCriteriaBuilder->create());
+
+        $items = $result->getItems();
+
+        return array_pop($items);
+    }
+
+    /**
+     * Create attribute set by skeleton attribute set id and assert that attribute set
+     * created successfully and attributes from skeleton attribute set and created attribute set are equals.
+     *
+     * @param string $attributeSetName
+     * @param int $skeletonAttributeSetId
+     * @return void
+     */
+    private function createAttributeSetBySkeletonAndAssert(
+        string $attributeSetName,
+        int $skeletonAttributeSetId
+    ): void {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue(
+            [
+                'attribute_set_name' => $attributeSetName,
+                'gotoEdit' => '1',
+                'skeleton_set' => $skeletonAttributeSetId,
+            ]
+        );
+        $this->dispatch('backend/catalog/product_set/save/');
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You saved the attribute set.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
+        $createdAttributeSet = $this->getAttributeSetByName($attributeSetName);
+        $existAttributeSet = $this->attributeSetRepository->get($skeletonAttributeSetId);
+
+        $this->assertNotNull($createdAttributeSet);
+        $this->assertEquals($attributeSetName, $createdAttributeSet->getAttributeSetName());
+
+        $this->assertAttributeSetsAttributesAreEquals($createdAttributeSet, $existAttributeSet);
+    }
+
+    /**
+     * Assert that both attribute sets contains identical attributes by attribute ids.
+     *
+     * @param AttributeSetInterface $createdAttributeSet
+     * @param AttributeSetInterface $existAttributeSet
+     * @return void
+     */
+    private function assertAttributeSetsAttributesAreEquals(
+        AttributeSetInterface $createdAttributeSet,
+        AttributeSetInterface $existAttributeSet
+    ): void {
+        $expectedAttributeIds = array_keys(
+            $this->attributeManagement->getAttributes(
+                ProductAttributeInterface::ENTITY_TYPE_CODE,
+                $existAttributeSet->getAttributeSetId()
+            )
+        );
+        sort($expectedAttributeIds);
+        $actualAttributeIds = array_keys(
+            $this->attributeManagement->getAttributes(
+                ProductAttributeInterface::ENTITY_TYPE_CODE,
+                $createdAttributeSet->getAttributeSetId()
+            )
+        );
+        sort($actualAttributeIds);
+        $this->assertSame($expectedAttributeIds, $actualAttributeIds);
+    }
+
+    /**
+     * Retrieve default catalog product attribute set ID.
+     *
+     * @return int
+     */
+    private function getCatalogProductDefaultAttributeSetId(): int
+    {
+        return (int)$this->eavConfig
+            ->getEntityType(ProductAttributeInterface::ENTITY_TYPE_CODE)
+            ->getDefaultAttributeSetId();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/UpdateTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/UpdateTest.php
new file mode 100644
index 0000000000000..765f59b15be83
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/UpdateTest.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Adminhtml\Product\Set;
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Eav\Api\AttributeManagementInterface;
+use Magento\Eav\Api\AttributeSetRepositoryInterface;
+use Magento\Eav\Api\Data\AttributeGroupInterface;
+use Magento\Eav\Api\Data\AttributeSetInterface;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\Collection;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Test update attribute set.
+ */
+class UpdateTest extends AbstractBackendController
+{
+    /**
+     * @var Json
+     */
+    private $json;
+
+    /**
+     * @var AttributeSetRepositoryInterface
+     */
+    private $attributeSetRepository;
+
+    /**
+     * @var AttributeManagementInterface
+     */
+    private $attributeManagement;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $attributeGroupCollectionFactory;
+
+    /**
+     * @var GetAttributeSetByName
+     */
+    private $getAttributeSetByName;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->json = $this->_objectManager->get(Json::class);
+        $this->attributeSetRepository = $this->_objectManager->get(AttributeSetRepositoryInterface::class);
+        $this->attributeManagement = $this->_objectManager->get(AttributeManagementInterface::class);
+        $this->attributeGroupCollectionFactory = $this->_objectManager->get(CollectionFactory::class);
+        $this->getAttributeSetByName = $this->_objectManager->get(GetAttributeSetByName::class);
+    }
+
+    /**
+     * Test that name of attribute set will update/change correctly.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/attribute_set_based_on_default.php
+     *
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     */
+    public function testUpdateAttributeSetName(): void
+    {
+        $attributeSet = $this->getAttributeSetByName->execute('new_attribute_set');
+        $currentAttrSetName = $attributeSet->getAttributeSetName();
+        $this->assertNotNull($attributeSet);
+        $postData = $this->prepareDataToRequest($attributeSet);
+        $updateName = 'New attribute set name';
+        $postData['attribute_set_name'] = $updateName;
+        $this->performRequest((int)$attributeSet->getAttributeSetId(), $postData);
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You saved the attribute set.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
+        $updatedAttributeSet = $this->attributeSetRepository->get((int)$attributeSet->getAttributeSetId());
+        $this->assertEquals($updateName, $updatedAttributeSet->getAttributeSetName());
+        $updatedAttributeSet->setAttributeSetName($currentAttrSetName);
+        $this->attributeSetRepository->save($updatedAttributeSet);
+    }
+
+    /**
+     * Test add new group to custom attribute set.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/attribute_set_based_on_default.php
+     *
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     */
+    public function testUpdateAttributeSetWithNewGroup(): void
+    {
+        $currentAttrSet = $this->getAttributeSetByName->execute('new_attribute_set');
+        $this->assertNotNull($currentAttrSet);
+        $attrSetId = (int)$currentAttrSet->getAttributeSetId();
+        $currentAttrGroups = $this->getAttributeSetGroupCollection($attrSetId)->getItems();
+        $newGroupName = 'Test attribute group name';
+        $newGroupSortOrder = 11;
+        $postData = $this->prepareDataToRequest($currentAttrSet);
+        $postData['groups'][] = [
+            null,
+            $newGroupName,
+            $newGroupSortOrder,
+        ];
+        $this->performRequest($attrSetId, $postData);
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You saved the attribute set.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
+        $updatedAttrGroups = $this->getAttributeSetGroupCollection($attrSetId)->getItems();
+        $diffGroups = array_diff_key($updatedAttrGroups, $currentAttrGroups);
+        $this->assertCount(1, $diffGroups);
+        /** @var AttributeGroupInterface $newGroup */
+        $newGroup = reset($diffGroups);
+        $this->assertEquals($newGroupName, $newGroup->getAttributeGroupName());
+        $this->assertEquals($newGroupSortOrder, $newGroup->getSortOrder());
+    }
+
+    /**
+     * Test delete custom group from custom attribute set.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/attribute_set_based_on_default_with_custom_group.php
+     *
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     */
+    public function testDeleteCustomGroupFromCustomAttributeSet(): void
+    {
+        $testGroupName = 'Test attribute group name';
+        $currentAttrSet = $this->getAttributeSetByName->execute('new_attribute_set');
+        $this->assertNotNull($currentAttrSet);
+        $attrSetId = (int)$currentAttrSet->getAttributeSetId();
+        $currentAttrGroupsCollection = $this->getAttributeSetGroupCollection($attrSetId);
+        $customGroup = $currentAttrGroupsCollection->getItemByColumnValue(
+            AttributeGroupInterface::GROUP_NAME,
+            $testGroupName
+        );
+        $this->assertNotNull($customGroup);
+        $postData = $this->prepareDataToRequest($currentAttrSet);
+        $postData['removeGroups'] = [
+            $customGroup->getAttributeGroupId()
+        ];
+        $this->performRequest($attrSetId, $postData);
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You saved the attribute set.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
+        $updatedAttrGroups = $this->getAttributeSetGroupCollection($attrSetId)->getItems();
+        $diffGroups = array_diff_key($currentAttrGroupsCollection->getItems(), $updatedAttrGroups);
+        $this->assertCount(1, $diffGroups);
+        /** @var AttributeGroupInterface $deletedGroup */
+        $deletedGroup = reset($diffGroups);
+        $this->assertEquals($testGroupName, $deletedGroup->getAttributeGroupName());
+    }
+
+    /**
+     * Process attribute set save request.
+     *
+     * @param int $attributeSetId
+     * @param array $postData
+     * @return void
+     */
+    private function performRequest(int $attributeSetId, array $postData = []): void
+    {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue(
+            'data',
+            $this->json->serialize($postData)
+        );
+        $this->dispatch('backend/catalog/product_set/save/id/' . $attributeSetId);
+    }
+
+    /**
+     * Prepare default data to request from attribute set.
+     *
+     * @param AttributeSetInterface $attributeSet
+     * @return array
+     */
+    private function prepareDataToRequest(AttributeSetInterface $attributeSet): array
+    {
+        $result = [
+            'attribute_set_name' => $attributeSet->getAttributeSetName(),
+            'removeGroups' => [],
+            'not_attributes' => [],
+        ];
+        $groups = $attributes = [];
+        /** @var AttributeGroupInterface $group */
+        foreach ($this->getAttributeSetGroupCollection((int)$attributeSet->getAttributeSetId()) as $group) {
+            $groups[] = [
+                $group->getAttributeGroupId(),
+                $group->getAttributeGroupName(),
+                $group->getSortOrder(),
+            ];
+        }
+        $attributeSetAttributes = $this->attributeManagement->getAttributes(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            $attributeSet->getAttributeSetId()
+        );
+        foreach ($attributeSetAttributes as $attribute) {
+            $attributes[] = [
+                $attribute->getAttributeId(),
+                $attribute->getAttributeGroupId(),
+                $attribute->getSortOrder(),
+            ];
+        }
+        $result['groups'] = $groups;
+        $result['attributes'] = $attributes;
+
+        return $result;
+    }
+
+    /**
+     * Build attribute set groups collection by attribute set id.
+     *
+     * @param int $attributeSetId
+     * @return Collection
+     */
+    private function getAttributeSetGroupCollection(int $attributeSetId): Collection
+    {
+        $groupCollection = $this->attributeGroupCollectionFactory->create();
+        $groupCollection->setAttributeSetFilter($attributeSetId);
+
+        return $groupCollection;
+    }
+}
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 3a28801b1ace1..7ca04863f58a1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
@@ -7,11 +7,17 @@
 
 namespace Magento\Catalog\Controller\Adminhtml;
 
+use Magento\Catalog\Model\Product\Attribute\Backend\LayoutUpdate;
+use Magento\Framework\Acl\Builder;
 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\Catalog\Model\ProductRepository;
+use Magento\Catalog\Model\ProductRepositoryFactory;
 use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\Catalog\Model\ProductLayoutUpdateManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 use Magento\Catalog\Model\Product;
 use Magento\TestFramework\Helper\CacheCleaner;
 
@@ -19,9 +25,37 @@
  * Test class for Product adminhtml actions
  *
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
+    /**
+     * @var Builder
+     */
+    private $aclBuilder;
+
+    /**
+     * @var ProductRepositoryFactory
+     */
+    private $repositoryFactory;
+
+    /**
+     * @var ProductResource
+     */
+    private $resourceModel;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
+        $this->repositoryFactory = Bootstrap::getObjectManager()->get(ProductRepositoryFactory::class);
+        $this->resourceModel = Bootstrap::getObjectManager()->get(ProductResource::class);
+    }
+
     /**
      * Test calling save with invalid product's ID.
      */
@@ -45,7 +79,8 @@ public function testSaveActionWithDangerRequest()
     public function testSaveActionAndNew()
     {
         $this->getRequest()->setPostValue(['back' => 'new']);
-        $repository = $this->_objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
+        /** @var ProductRepository $repository */
+        $repository = $this->repositoryFactory->create();
         $product = $repository->get('simple');
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/catalog/product/save/id/' . $product->getEntityId());
@@ -64,8 +99,9 @@ public function testSaveActionAndNew()
      */
     public function testSaveActionAndDuplicate()
     {
-        $repository = $this->_objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
-        /** @var Product $product */
+        $this->getRequest()->setPostValue(['back' => 'duplicate']);
+        /** @var ProductRepository $repository */
+        $repository = $this->repositoryFactory->create();
         $product = $repository->get('simple');
         $this->assertSaveAndDuplicateAction($product);
         $this->assertRedirect($this->stringStartsWith('http://localhost/index.php/backend/catalog/product/edit/'));
@@ -85,7 +121,8 @@ public function testSaveActionAndDuplicate()
      */
     public function testSaveActionAndDuplicateWithUrlPathAttribute()
     {
-        $repository = $this->_objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
+        /** @var ProductRepository $repository */
+        $repository = $this->repositoryFactory->create();
         /** @var Product $product */
         $product = $repository->get('simple');
 
@@ -151,7 +188,8 @@ public function testIndexAction()
      */
     public function testEditAction()
     {
-        $repository = $this->_objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
+        /** @var ProductRepository $repository */
+        $repository = $this->repositoryFactory->create();
         $product = $repository->get('simple');
         $this->dispatch('backend/catalog/product/edit/id/' . $product->getEntityId());
         $body = $this->getResponse()->getBody();
@@ -370,13 +408,181 @@ public function saveActionTierPriceDataProvider()
      */
     private function getProductData(array $tierPrice)
     {
-        $productRepositoryInterface = $this->_objectManager->get(ProductRepositoryInterface::class);
-        $product = $productRepositoryInterface->get('tier_prices')->getData();
+        /** @var ProductRepository $repo */
+        $repo = $this->repositoryFactory->create();
+        $product = $repo->get('tier_prices')->getData();
         $product['tier_price'] = $tierPrice;
         unset($product['entity_id']);
         return $product;
     }
 
+    /**
+     * Check whether additional authorization is required for the design fields.
+     *
+     * @magentoDbIsolation enabled
+     * @throws \Throwable
+     * @return void
+     */
+    public function testSaveDesign(): void
+    {
+        $requestData = [
+            'product' => [
+                'type' => 'simple',
+                'sku' => 'simple',
+                'store' => '0',
+                'set' => '4',
+                'back' => 'edit',
+                'type_id' => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE,
+                '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' => '[]'
+            ]
+        ];
+        $uri = 'backend/catalog/product/save';
+
+        //Trying to update product's design settings without proper permissions.
+        //Expected list of sessions messages collected throughout the controller calls.
+        $sessionMessages = ['Not allowed to edit the product\'s design attributes'];
+        $this->aclBuilder->getAcl()->deny(null, 'Magento_Catalog::edit_product_design');
+        $requestData['product']['custom_design'] = '1';
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($requestData);
+        $this->dispatch($uri);
+        $this->assertSessionMessages(
+            self::equalTo($sessionMessages),
+            MessageInterface::TYPE_ERROR
+        );
+
+        //Trying again with the permissions.
+        $this->aclBuilder->getAcl()->allow(null, ['Magento_Catalog::products', 'Magento_Catalog::edit_product_design']);
+        $this->getRequest()->setDispatched(false);
+        $this->dispatch($uri);
+        /** @var ProductRepository $repo */
+        $repo = $this->repositoryFactory->create();
+        $product = $repo->get('simple');
+        $this->assertNotEmpty($product->getCustomDesign());
+        $this->assertEquals(1, $product->getCustomDesign());
+        //No new error messages
+        $this->assertSessionMessages(
+            self::equalTo($sessionMessages),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * Save design without the permissions but with default values.
+     *
+     * @magentoDbIsolation enabled
+     * @throws \Throwable
+     * @return void
+     */
+    public function testSaveDesignWithDefaults(): void
+    {
+        $optionsContainerDefault = $this->resourceModel->getAttribute('options_container')->getDefaultValue();
+        $requestData = [
+            'product' => [
+                'type' => 'simple',
+                'sku' => 'simple',
+                'store' => '0',
+                'set' => '4',
+                'back' => 'edit',
+                'product' => [],
+                'type_id' => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE,
+                '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' => '[]',
+                'options_container' => $optionsContainerDefault
+            ]
+        ];
+        $uri = 'backend/catalog/product/save';
+
+        //Updating product's design settings without proper permissions.
+        $this->aclBuilder->getAcl()->deny(null, 'Magento_Catalog::edit_product_design');
+        //Testing that special "No Update" value is treated as no change.
+        $requestData['product']['custom_layout_update_file'] = LayoutUpdate::VALUE_NO_UPDATE;
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($requestData);
+        $this->dispatch($uri);
+
+        //Validating saved entity.
+        /** @var ProductRepository $repo */
+        $repo = $this->repositoryFactory->create();
+        $product = $repo->get('simple');
+        $this->assertNotNull($product->getData('options_container'));
+        $this->assertEquals($optionsContainerDefault, $product->getData('options_container'));
+    }
+
+    /**
+     * Test custom update files functionality.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation disabled
+     * @throws \Throwable
+     * @return void
+     */
+    public function testSaveCustomLayout(): void
+    {
+        $file = 'test_file';
+        /** @var ProductRepository $repo */
+        $repo = $this->repositoryFactory->create();
+        $product = $repo->get('simple');
+        /** @var ProductLayoutUpdateManager $layoutManager */
+        $layoutManager = Bootstrap::getObjectManager()->get(ProductLayoutUpdateManager::class);
+        $layoutManager->setFakeFiles((int)$product->getId(), [$file]);
+        $productData = $product->getData();
+        unset($productData['options']);
+        unset($productData[$product->getIdFieldName()]);
+        $requestData = [
+            'product' => $productData
+        ];
+        $uri = 'backend/catalog/product/save';
+
+        //Saving a wrong file
+        $requestData['product']['custom_layout_update_file'] = $file . 'INVALID';
+        $this->getRequest()->setDispatched(false);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($requestData);
+        $this->getRequest()->setParam('id', $product->getId());
+        $this->dispatch($uri);
+        $this->assertSessionMessages(
+            self::equalTo(['Selected layout update is not available']),
+            MessageInterface::TYPE_ERROR
+        );
+
+        //Checking that the value is not saved
+        /** @var ProductRepository $repo */
+        $repo = $this->repositoryFactory->create();
+        $product = $repo->get('simple');
+        $this->assertEmpty($product->getData('custom_layout_update_file'));
+
+        //Saving the correct file
+        $requestData['product']['custom_layout_update_file'] = $file;
+        $this->getRequest()->setDispatched(false);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($requestData);
+        $this->getRequest()->setParam('id', $product->getId());
+        $this->dispatch($uri);
+
+        //Checking that the value is saved
+        /** @var ProductRepository $repo */
+        $repo = $this->repositoryFactory->create();
+        $product = $repo->get('simple');
+        $this->assertEquals($file, $product->getData('custom_layout_update_file'));
+    }
+
     /**
      * Dispatch Save&Duplicate action and check it
      *
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Category/CategoryUrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Category/CategoryUrlRewriteTest.php
new file mode 100644
index 0000000000000..1b51c65e1e853
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Category/CategoryUrlRewriteTest.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\Controller\Category;
+
+use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Response\Http;
+use Magento\Framework\Registry;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * Checks category availability on storefront by url rewrite
+ *
+ * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
+ * @magentoDbIsolation enabled
+ */
+class CategoryUrlRewriteTest extends AbstractController
+{
+    /** @var Registry */
+    private $registry;
+
+    /** @var ScopeConfigInterface */
+    private $config;
+
+    /** @var string */
+    private $categoryUrlSuffix;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->config = $this->_objectManager->get(ScopeConfigInterface::class);
+        $this->registry = $this->_objectManager->get(Registry::class);
+        $this->categoryUrlSuffix = $this->config->getValue(
+            CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category_tree.php
+     * @dataProvider categoryRewriteProvider
+     * @param int $categoryId
+     * @param string $urlPath
+     * @return void
+     */
+    public function testCategoryUrlRewrite(int $categoryId, string $urlPath): void
+    {
+        $this->dispatch(sprintf($urlPath, $this->categoryUrlSuffix));
+        $currentCategory = $this->registry->registry('current_category');
+        $response = $this->getResponse();
+        $this->assertEquals(
+            Http::STATUS_CODE_200,
+            $response->getHttpResponseCode(),
+            'Response code does not match expected value'
+        );
+        $this->assertNotNull($currentCategory);
+        $this->assertEquals($categoryId, $currentCategory->getId());
+    }
+
+    /**
+     * @return array
+     */
+    public function categoryRewriteProvider(): array
+    {
+        return [
+            [
+                'category_id' => 400,
+                'url_path' => '/category-1%s',
+            ],
+            [
+                'category_id' => 401,
+                'url_path' => '/category-1/category-1-1%s',
+            ],
+            [
+                'category_id' => 402,
+                'url_path' => '/category-1/category-1-1/category-1-1-1%s',
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php
index 87b8d4a117e2d..c18a867a9b76e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php
@@ -3,24 +3,75 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Controller;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\TestFramework\Catalog\Model\CategoryLayoutUpdateManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\Session;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\TestCase\AbstractController;
+
 /**
- * Test class for \Magento\Catalog\Controller\Category.
+ * Responsible for testing category view action on strorefront.
  *
+ * @see \Magento\Catalog\Controller\Category\View
  * @magentoAppArea frontend
  */
-class CategoryTest extends \Magento\TestFramework\TestCase\AbstractController
+class CategoryTest extends AbstractController
 {
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @var LayoutInterface
+     */
+    private $layout;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->registry = $this->objectManager->get(Registry::class);
+        $this->layout = $this->objectManager->get(LayoutInterface::class);
+        $this->session = $this->objectManager->get(Session::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
     public function assert404NotFound()
     {
         parent::assert404NotFound();
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->assertNull($objectManager->get(\Magento\Framework\Registry::class)->registry('current_category'));
+
+        $this->assertNull($this->registry->registry('current_category'));
     }
 
-    public function getViewActionDataProvider()
+    /**
+     * @return array
+     */
+    public function getViewActionDataProvider(): array
     {
         return [
             'category without children' => [
@@ -56,51 +107,96 @@ public function getViewActionDataProvider()
      * @dataProvider getViewActionDataProvider
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_product_ids.php
      * @magentoDbIsolation disabled
+     * @param int $categoryId
+     * @param array $expectedHandles
+     * @param array $expectedContent
+     * @return void
      */
-    public function testViewAction($categoryId, array $expectedHandles, array $expectedContent)
+    public function testViewAction(int $categoryId, array $expectedHandles, array $expectedContent): void
     {
         $this->dispatch("catalog/category/view/id/{$categoryId}");
-
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        /** @var $currentCategory \Magento\Catalog\Model\Category */
-        $currentCategory = $objectManager->get(\Magento\Framework\Registry::class)->registry('current_category');
-        $this->assertInstanceOf(\Magento\Catalog\Model\Category::class, $currentCategory);
+        /** @var $currentCategory Category */
+        $currentCategory = $this->registry->registry('current_category');
+        $this->assertInstanceOf(Category::class, $currentCategory);
         $this->assertEquals($categoryId, $currentCategory->getId(), 'Category in registry.');
 
-        $lastCategoryId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Catalog\Model\Session::class
-        )->getLastVisitedCategoryId();
+        $lastCategoryId = $this->session->getLastVisitedCategoryId();
         $this->assertEquals($categoryId, $lastCategoryId, 'Last visited category.');
 
         /* Layout updates */
-        $handles = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\View\LayoutInterface::class
-        )->getUpdate()->getHandles();
+        $handles = $this->layout->getUpdate()->getHandles();
         foreach ($expectedHandles as $expectedHandleName) {
             $this->assertContains($expectedHandleName, $handles);
         }
 
         $responseBody = $this->getResponse()->getBody();
-
         /* Response content */
         foreach ($expectedContent as $expectedText) {
             $this->assertStringMatchesFormat($expectedText, $responseBody);
         }
     }
 
-    public function testViewActionNoCategoryId()
+    /**
+     * @return void
+     */
+    public function testViewActionNoCategoryId(): void
     {
         $this->dispatch('catalog/category/view/');
 
         $this->assert404NotFound();
     }
 
-    public function testViewActionInactiveCategory()
+    /**
+     * @return void
+     */
+    public function testViewActionNotExistingCategory(): void
     {
         $this->dispatch('catalog/category/view/id/8');
 
         $this->assert404NotFound();
     }
+
+    /**
+     * Checks that disabled category is not available in storefront
+     *
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Catalog/_files/inactive_category.php
+     * @return void
+     */
+    public function testViewActionDisabledCategory(): void
+    {
+        $this->dispatch('catalog/category/view/id/111');
+
+        $this->assert404NotFound();
+    }
+
+    /**
+     * Check that custom layout update files is employed.
+     *
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_product_ids.php
+     * @return void
+     */
+    public function testViewWithCustomUpdate(): void
+    {
+        //Setting a fake file for the category.
+        $file = 'test-file';
+        $categoryId = 5;
+        /** @var CategoryLayoutUpdateManager $layoutManager */
+        $layoutManager = Bootstrap::getObjectManager()->get(CategoryLayoutUpdateManager::class);
+        $layoutManager->setCategoryFakeFiles($categoryId, [$file]);
+        /** @var CategoryRepositoryInterface $categoryRepo */
+        $categoryRepo = Bootstrap::getObjectManager()->create(CategoryRepositoryInterface::class);
+        $category = $categoryRepo->get($categoryId);
+        //Updating the custom attribute.
+        $category->setCustomAttribute('custom_layout_update_file', $file);
+        $categoryRepo->save($category);
+
+        //Viewing the category
+        $this->dispatch("catalog/category/view/id/$categoryId");
+        //Layout handles must contain the file.
+        $handles = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class)
+            ->getUpdate()
+            ->getHandles();
+        $this->assertContains("catalog_category_view_selectable_{$categoryId}_{$file}", $handles);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ProductUrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ProductUrlRewriteTest.php
new file mode 100644
index 0000000000000..d55c85d9b9d00
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ProductUrlRewriteTest.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Product;
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Registry;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Request;
+use Magento\TestFramework\Response;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * Checks product availability on storefront by url rewrite
+ *
+ * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
+ * @magentoDbIsolation enabled
+ */
+class ProductUrlRewriteTest extends AbstractController
+{
+    /** @var ScopeConfigInterface */
+    private $config;
+
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var Registry */
+    private $registry;
+
+    /** @var CategoryRepositoryInterface */
+    private $categoryRepository;
+
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
+    /** @var string */
+    private $urlSuffix;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->config = $this->_objectManager->get(ScopeConfigInterface::class);
+        $this->productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
+        $this->registry = $this->_objectManager->get(Registry::class);
+        $this->categoryRepository = $this->_objectManager->create(CategoryRepositoryInterface::class);
+        $this->storeManager = $this->_objectManager->get(StoreManagerInterface::class);
+        $this->urlSuffix = $this->config->getValue(
+            ProductUrlPathGenerator::XML_PATH_PRODUCT_URL_SUFFIX,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @return void
+     */
+    public function testProductUrlRewrite(): void
+    {
+        $product = $this->productRepository->get('simple2');
+        $url = $this->prepareUrl($product->getUrlKey());
+        $this->dispatch($url);
+
+        $this->assertProductIsVisible($product);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
+     * @return void
+     */
+    public function testCategoryProductUrlRewrite(): void
+    {
+        $category = $this->categoryRepository->get(333);
+        $product = $this->productRepository->get('simple333');
+        $url = $this->prepareUrl($category->getUrlKey(), false) . $this->prepareUrl($product->getUrlKey());
+        $this->dispatch($url);
+
+        $this->assertProductIsVisible($product);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @return void
+     */
+    public function testProductRedirect(): void
+    {
+        $product = $this->productRepository->get('simple2');
+        $oldUrl = $this->prepareUrl($product->getUrlKey());
+        $data = [
+            'url_key' => 'new-url-key',
+            'url_key_create_redirect' => $product->getUrlKey(),
+            'save_rewrites_history' => true,
+        ];
+        $this->updateProduct($product, $data);
+        $this->dispatch($oldUrl);
+
+        $this->assertRedirect($this->stringContains($this->prepareUrl('new-url-key')));
+    }
+
+    /**
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @return void
+     */
+    public function testMultistoreProductUrlRewrite(): void
+    {
+        $currentStore = $this->storeManager->getStore();
+        $product = $this->productRepository->get('simple2');
+        $firstStoreUrl = $this->prepareUrl($product->getUrlKey());
+        $secondStoreId = $this->storeManager->getStore('fixturestore')->getId();
+        $this->storeManager->setCurrentStore($secondStoreId);
+
+        try {
+            $product = $this->updateProduct($product, ['url_key' => 'second-store-url-key']);
+            $this->assertEquals('second-store-url-key', $product->getUrlKey());
+            $secondStoreUrl = $this->prepareUrl($product->getUrlKey());
+
+            $this->dispatch($secondStoreUrl);
+            $this->assertProductIsVisible($product);
+            $this->cleanUpCachedObjects();
+        } finally {
+            $this->storeManager->setCurrentStore($currentStore);
+        }
+
+        $this->dispatch($firstStoreUrl);
+        $this->assertProductIsVisible($product);
+    }
+
+    /**
+     * Update product
+     *
+     * @param ProductInterface $product
+     * @param array $data
+     * @return ProductInterface
+     */
+    private function updateProduct(ProductInterface $product, array $data): ProductInterface
+    {
+        $product->addData($data);
+
+        return $this->productRepository->save($product);
+    }
+
+    /**
+     * Clean up cached objects
+     *
+     * @return void
+     */
+    private function cleanUpCachedObjects(): void
+    {
+        $this->registry->unregister('current_product');
+        $this->registry->unregister('product');
+        $this->_objectManager->removeSharedInstance(Request::class);
+        $this->_objectManager->removeSharedInstance(Response::class);
+        $this->_response = null;
+        $this->_request = null;
+    }
+
+    /**
+     * Prepare url to dispatch
+     *
+     * @param string $urlKey
+     * @param bool $addSuffix
+     * @return string
+     */
+    private function prepareUrl(string $urlKey, bool $addSuffix = true): string
+    {
+        $url = $addSuffix ? '/' . $urlKey . $this->urlSuffix : '/' . $urlKey;
+
+        return $url;
+    }
+
+    /**
+     * Assert that product is available in storefront
+     *
+     * @param ProductInterface $product
+     * @return void
+     */
+    private function assertProductIsVisible(ProductInterface $product): void
+    {
+        $this->assertEquals(
+            Response::STATUS_CODE_200,
+            $this->getResponse()->getHttpResponseCode(),
+            'Wrong response code is returned'
+        );
+        $currentProduct = $this->registry->registry('current_product');
+        $this->assertNotNull($currentProduct);
+        $this->assertEquals(
+            $product->getSku(),
+            $currentProduct->getSku(),
+            'Wrong product is registered'
+        );
+    }
+}
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 92a782deee65a..f45c9934acfc1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ViewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ViewTest.php
@@ -3,18 +3,91 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Controller\Product;
 
+use Magento\Catalog\Api\AttributeSetRepositoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Eav\Model\Entity\Type;
+use Magento\Framework\App\Http;
+use Magento\Framework\Registry;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
+use Magento\TestFramework\Request;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Framework\Logger\Monolog as MagentoMonologLogger;
+use Magento\TestFramework\Response;
+use Magento\TestFramework\TestCase\AbstractController;
+
 /**
- * @magentoDataFixture Magento/Catalog/controllers/_files/products.php
- * @magentoDbIsolation disabled
+ * Integration test for product view front action.
+ *
+ * @magentoAppArea frontend
+ * @magentoDbIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class ViewTest extends \Magento\TestFramework\TestCase\AbstractController
+class ViewTest extends AbstractController
 {
     /**
+     * @var ProductRepositoryInterface $productRepository
+     */
+    private $productRepository;
+
+    /**
+     * @var AttributeSetRepositoryInterface $attributeSetRepository
+     */
+    private $attributeSetRepository;
+
+    /**
+     * @var ProductAttributeRepositoryInterface $attributeSetRepository
+     */
+    private $attributeRepository;
+
+    /**
+     * @var Type $productEntityType
+     */
+    private $productEntityType;
+
+    /** @var Registry */
+    private $registry;
+
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
+    /** @var GetAttributeSetByName */
+    private $getAttributeSetByName;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
+        $this->attributeSetRepository = $this->_objectManager->create(AttributeSetRepositoryInterface::class);
+        $this->attributeRepository = $this->_objectManager->create(ProductAttributeRepositoryInterface::class);
+        $this->productEntityType = $this->_objectManager->create(Type::class)
+            ->loadByCode(Product::ENTITY);
+        $this->registry = $this->_objectManager->get(Registry::class);
+        $this->storeManager = $this->_objectManager->get(StoreManagerInterface::class);
+        $this->getAttributeSetByName = $this->_objectManager->get(GetAttributeSetByName::class);
+    }
+
+    /**
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Catalog/controllers/_files/products.php
      * @magentoConfigFixture current_store catalog/seo/product_canonical_tag 1
+     * @return void
      */
-    public function testViewActionWithCanonicalTag()
+    public function testViewActionWithCanonicalTag(): void
     {
         $this->markTestSkipped(
             'MAGETWO-40724: Canonical url from tests sometimes does not equal canonical url from action'
@@ -26,4 +99,261 @@ public function testViewActionWithCanonicalTag()
             $this->getResponse()->getBody()
         );
     }
+
+    /**
+     * View product with custom attribute when attribute removed from it.
+     *
+     * It tests that after changing product attribute set from Default to Custom
+     * there are no warning messages in log in case Custom not contains attribute from Default.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_country_of_manufacture.php
+     * @magentoDataFixture Magento/Catalog/_files/attribute_set_based_on_default_without_country_of_manufacture.php
+     * @return void
+     */
+    public function testViewActionCustomAttributeSetWithoutCountryOfManufacture(): void
+    {
+        /** @var MockObject|LoggerInterface $logger */
+        $logger = $this->setupLoggerMock();
+        $product = $this->productRepository->get('simple_with_com');
+        $attributeSetCustom = $this->getAttributeSetByName->execute('custom_attribute_set_wout_com');
+        $product->setAttributeSetId($attributeSetCustom->getAttributeSetId());
+        $this->productRepository->save($product);
+
+        /** @var ProductAttributeInterface $attributeCountryOfManufacture */
+        $attributeCountryOfManufacture = $this->attributeRepository->get('country_of_manufacture');
+        $logger->expects($this->never())
+            ->method('warning')
+            ->with(
+                "Attempt to load value of nonexistent EAV attribute",
+                [
+                    'attribute_id' => $attributeCountryOfManufacture->getAttributeId(),
+                    'entity_type' => ProductInterface::class,
+                ]
+            );
+
+        $this->dispatch(sprintf('catalog/product/view/id/%s/', $product->getId()));
+    }
+
+    /**
+     * @magentoDataFixture Magento/Quote/_files/is_not_salable_product.php
+     * @return void
+     */
+    public function testDisabledProductInvisibility(): void
+    {
+        $product = $this->productRepository->get('simple-99');
+        $this->dispatch(sprintf('catalog/product/view/id/%s/', $product->getId()));
+
+        $this->assert404NotFound();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @dataProvider productVisibilityDataProvider
+     * @param int $visibility
+     * @return void
+     */
+    public function testProductVisibility(int $visibility): void
+    {
+        $product = $this->updateProductVisibility('simple2', $visibility);
+        $this->dispatch(sprintf('catalog/product/view/id/%s/', $product->getId()));
+
+        $this->assertProductIsVisible($product);
+    }
+
+    /**
+     * @return array
+     */
+    public function productVisibilityDataProvider(): array
+    {
+        return [
+            'catalog_search' => [Visibility::VISIBILITY_BOTH],
+            'search' => [Visibility::VISIBILITY_IN_SEARCH],
+            'catalog' => [Visibility::VISIBILITY_IN_CATALOG],
+        ];
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/simple_products_not_visible_individually.php
+     */
+    public function testProductNotVisibleIndividually(): void
+    {
+        $product = $this->updateProductVisibility('simple_not_visible_1', Visibility::VISIBILITY_NOT_VISIBLE);
+        $this->dispatch(sprintf('catalog/product/view/id/%s/', $product->getId()));
+
+        $this->assert404NotFound();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_two_websites.php
+     * @magentoDbIsolation disabled
+     * @return void
+     */
+    public function testProductVisibleOnTwoWebsites(): void
+    {
+        $currentStore = $this->storeManager->getStore();
+        $product = $this->productRepository->get('simple-on-two-websites');
+        $secondStoreId = $this->storeManager->getStore('fixture_second_store')->getId();
+        $this->dispatch(sprintf('catalog/product/view/id/%s', $product->getId()));
+        $this->assertProductIsVisible($product);
+        $this->cleanUpCachedObjects();
+
+        try {
+            $this->storeManager->setCurrentStore($secondStoreId);
+            $this->dispatch(sprintf('catalog/product/view/id/%s', $product->getId()));
+            $this->assertProductIsVisible($product);
+        } finally {
+            $this->storeManager->setCurrentStore($currentStore);
+        }
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_two_websites.php
+     * @magentoDbIsolation disabled
+     * @return void
+     */
+    public function testRemoveProductFromOneWebsiteVisibility(): void
+    {
+        $websiteId = $this->storeManager->getWebsite('test')->getId();
+        $currentStore = $this->storeManager->getStore();
+        $secondStoreId = $this->storeManager->getStore('fixture_second_store')->getId();
+        $product = $this->updateProduct('simple-on-two-websites', ['website_ids' => [$websiteId]]);
+        $this->dispatch(sprintf('catalog/product/view/id/%s', $product->getId()));
+        $this->assert404NotFound();
+        $this->cleanUpCachedObjects();
+
+        try {
+            $this->storeManager->setCurrentStore($secondStoreId);
+
+            $this->dispatch(sprintf('catalog/product/view/id/%s', $product->getId()));
+            $this->assertProductIsVisible($product);
+        } finally {
+            $this->storeManager->setCurrentStore($currentStore->getId());
+        }
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_two_websites.php
+     * @magentoDbIsolation disabled
+     * @return void
+     */
+    public function testProductAttributeByStores(): void
+    {
+        $secondStoreId = $this->storeManager->getStore('fixture_second_store')->getId();
+        $product = $this->productRepository->get('simple-on-two-websites');
+        $currentStoreId = $this->storeManager->getStore()->getId();
+
+        try {
+            $this->storeManager->setCurrentStore($secondStoreId);
+            $product = $this->updateProduct($product, ['status' => 2]);
+            $this->dispatch(sprintf('catalog/product/view/id/%s', $product->getId()));
+            $this->assert404NotFound();
+            $this->cleanUpCachedObjects();
+            $this->storeManager->setCurrentStore($currentStoreId);
+            $this->dispatch(sprintf('catalog/product/view/id/%s', $product->getId()));
+            $this->assertProductIsVisible($product);
+        } finally {
+            $this->storeManager->setCurrentStore($currentStoreId);
+        }
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @return void
+     */
+    public function testProductWithoutWebsite(): void
+    {
+        $product = $this->updateProduct('simple2', ['website_ids' => []]);
+        $this->dispatch(sprintf('catalog/product/view/id/%s', $product->getId()));
+
+        $this->assert404NotFound();
+    }
+
+    /**
+     * @param string|ProductInterface $product
+     * @param array $data
+     * @return ProductInterface
+     */
+    public function updateProduct($product, array $data): ProductInterface
+    {
+        $product = is_string($product) ? $this->productRepository->get($product) : $product;
+        $product->addData($data);
+
+        return $this->productRepository->save($product);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function assert404NotFound()
+    {
+        parent::assert404NotFound();
+
+        $this->assertNull($this->registry->registry('current_product'));
+    }
+
+    /**
+     * Assert that product is available in storefront
+     *
+     * @param ProductInterface $product
+     * @return void
+     */
+    private function assertProductIsVisible(ProductInterface $product): void
+    {
+        $this->assertEquals(
+            Response::STATUS_CODE_200,
+            $this->getResponse()->getHttpResponseCode(),
+            'Wrong response code is returned'
+        );
+        $currentProduct = $this->registry->registry('current_product');
+        $this->assertNotNull($currentProduct);
+        $this->assertEquals(
+            $product->getSku(),
+            $currentProduct->getSku(),
+            'Wrong product is registered'
+        );
+    }
+
+    /**
+     * Clean up cached objects.
+     *
+     * @return void
+     */
+    private function cleanUpCachedObjects(): void
+    {
+        $this->_objectManager->removeSharedInstance(Http::class);
+        $this->_objectManager->removeSharedInstance(Request::class);
+        $this->_objectManager->removeSharedInstance(Response::class);
+        $this->_request = null;
+        $this->_response = null;
+    }
+
+    /**
+     * Setup logger mock to check there are no warning messages logged.
+     *
+     * @return MockObject
+     */
+    private function setupLoggerMock(): MockObject
+    {
+        $logger = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->_objectManager->addSharedInstance($logger, MagentoMonologLogger::class);
+
+        return $logger;
+    }
+
+    /**
+     * Update product visibility
+     *
+     * @param string $sku
+     * @param int $visibility
+     * @return ProductInterface
+     */
+    private function updateProductVisibility(string $sku, int $visibility): ProductInterface
+    {
+        $product = $this->productRepository->get($sku);
+        $product->setVisibility($visibility);
+
+        return $this->productRepository->save($product);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/ProductTest.php
index ca9db3f28a91b..20805271f6b5b 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/ProductTest.php
@@ -3,92 +3,114 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 
-/**
- * Test class for \Magento\Catalog\Controller\Product.
- */
 namespace Magento\Catalog\Controller;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Catalog\Model\ProductLayoutUpdateManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Session;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Xpath;
+use Magento\TestFramework\TestCase\AbstractController;
+
 /**
- * @magentoAppIsolation enabled
+ * Checks product view on storefront
+ *
+ * @see \Magento\Catalog\Controller\Product
+ *
+ * @magentoDbIsolation enabled
  */
-class ProductTest extends \Magento\TestFramework\TestCase\AbstractController
+class ProductTest extends AbstractController
 {
+    /** @var Registry */
+    private $registry;
+
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var Session */
+    private $session;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         if (defined('HHVM_VERSION')) {
             $this->markTestSkipped('Randomly fails due to known HHVM bug (DOMText mixed with DOMElement)');
         }
         parent::setUp();
+
+        $this->registry = $this->_objectManager->get(Registry::class);
+        $this->productRepository = $this->_objectManager->get(ProductRepositoryInterface::class);
+        $this->session = $this->_objectManager->get(Session::class);
     }
 
+    /**
+     * @inheritdoc
+     */
     public function assert404NotFound()
     {
         parent::assert404NotFound();
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->assertNull($objectManager->get(\Magento\Framework\Registry::class)->registry('current_product'));
+
+        $this->assertNull($this->registry->registry('current_product'));
     }
 
-    protected function _getProductImageFile()
+    /**
+     * Get product image file
+     *
+     * @return string
+     */
+    protected function getProductImageFile(): string
     {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /**
-         * @var $repository \Magento\Catalog\Model\ProductRepository
-         */
-        $repository = $objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
-        $product = $repository->get('simple_product_1');
+        $product = $this->productRepository->get('simple_product_1');
         $images = $product->getMediaGalleryImages()->getItems();
         $image = reset($images);
+
         return $image['file'];
     }
 
     /**
      * @magentoDataFixture Magento/Catalog/controllers/_files/products.php
      * @magentoAppArea frontend
+     * @return void
      */
-    public function testViewAction()
+    public function testViewAction(): void
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /**
-         * @var $repository \Magento\Catalog\Model\ProductRepository
-         */
-        $repository = $objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
-        $product = $repository->get('simple_product_1');
+        $product = $this->productRepository->get('simple_product_1');
         $this->dispatch(sprintf('catalog/product/view/id/%s', $product->getEntityId()));
+        $currentProduct = $this->registry->registry('current_product');
 
-        /** @var $currentProduct \Magento\Catalog\Model\Product */
-        $currentProduct = $objectManager->get(\Magento\Framework\Registry::class)->registry('current_product');
-        $this->assertInstanceOf(\Magento\Catalog\Model\Product::class, $currentProduct);
+        $this->assertInstanceOf(ProductInterface::class, $currentProduct);
         $this->assertEquals($product->getEntityId(), $currentProduct->getEntityId());
-
-        $lastViewedProductId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Catalog\Model\Session::class
-        )->getLastViewedProductId();
-        $this->assertEquals($product->getEntityId(), $lastViewedProductId);
+        $this->assertEquals($product->getEntityId(), $this->session->getLastViewedProductId());
 
         $responseBody = $this->getResponse()->getBody();
         /* Product info */
-        $this->assertContains('Simple Product 1 Name', $responseBody);
-        $this->assertContains('Simple Product 1 Full Description', $responseBody);
-        $this->assertContains('Simple Product 1 Short Description', $responseBody);
+        $this->assertContains($product->getName(), $responseBody);
+        $this->assertContains($product->getDescription(), $responseBody);
+        $this->assertContains($product->getShortDescription(), $responseBody);
+        $this->assertContains($product->getSku(), $responseBody);
         /* Stock info */
         $this->assertContains('$1,234.56', $responseBody);
         $this->assertContains('In stock', $responseBody);
-        $this->assertContains('Add to Cart', $responseBody);
+        $this->assertContains((string)__('Add to Cart'), $responseBody);
         /* Meta info */
         $this->assertContains('<title>Simple Product 1 Meta Title</title>', $responseBody);
         $this->assertEquals(
             1,
-            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+            Xpath::getElementsCountForXpath(
                 '//meta[@name="keywords" and @content="Simple Product 1 Meta Keyword"]',
                 $responseBody
             )
         );
         $this->assertEquals(
             1,
-            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+            Xpath::getElementsCountForXpath(
                 '//meta[@name="description" and @content="Simple Product 1 Meta Description"]',
                 $responseBody
             )
@@ -97,34 +119,36 @@ public function testViewAction()
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
      */
-    public function testViewActionConfigurable()
+    public function testViewActionConfigurable(): void
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /**
-         * @var $repository \Magento\Catalog\Model\ProductRepository
-         */
-        $repository = $objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
-        $product = $repository->get('simple');
+        $product = $this->productRepository->get('simple');
         $this->dispatch(sprintf('catalog/product/view/id/%s', $product->getEntityId()));
         $html = $this->getResponse()->getBody();
         $this->assertEquals(
             1,
-            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+            Xpath::getElementsCountForXpath(
                 '//*[@id="product-options-wrapper"]',
                 $html
             )
         );
     }
 
-    public function testViewActionNoProductId()
+    /**
+     * @return void
+     */
+    public function testViewActionNoProductId(): void
     {
         $this->dispatch('catalog/product/view/id/');
+
         $this->assert404NotFound();
     }
 
-    public function testViewActionRedirect()
+    /**
+     * @return void
+     */
+    public function testViewActionRedirect(): void
     {
         $this->dispatch('catalog/product/view/?store=default');
 
@@ -133,30 +157,31 @@ public function testViewActionRedirect()
 
     /**
      * @magentoDataFixture Magento/Catalog/controllers/_files/products.php
+     * @return void
      */
-    public function testGalleryAction()
+    public function testGalleryAction(): void
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /**
-         * @var $repository \Magento\Catalog\Model\ProductRepository
-         */
-        $repository = $objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
-        $product = $repository->get('simple_product_1');
+        $product = $this->productRepository->get('simple_product_1');
         $this->dispatch(sprintf('catalog/product/gallery/id/%s', $product->getEntityId()));
 
         $this->assertContains('http://localhost/pub/media/catalog/product/', $this->getResponse()->getBody());
-        $this->assertContains($this->_getProductImageFile(), $this->getResponse()->getBody());
+        $this->assertContains($this->getProductImageFile(), $this->getResponse()->getBody());
     }
 
-    public function testGalleryActionRedirect()
+    /**
+     * @return void
+     */
+    public function testGalleryActionRedirect(): void
     {
         $this->dispatch('catalog/product/gallery/?store=default');
 
         $this->assertRedirect();
     }
 
-    public function testGalleryActionNoProduct()
+    /**
+     * @return void
+     */
+    public function testGalleryActionNoProduct(): void
     {
         $this->dispatch('catalog/product/gallery/id/');
 
@@ -165,13 +190,14 @@ public function testGalleryActionNoProduct()
 
     /**
      * @magentoDataFixture Magento/Catalog/controllers/_files/products.php
+     * @return void
      */
-    public function testImageAction()
+    public function testImageAction(): void
     {
         $this->markTestSkipped("All logic has been cut to avoid possible malicious usage of the method");
         ob_start();
         /* Preceding slash in URL is required in this case */
-        $this->dispatch('/catalog/product/image' . $this->_getProductImageFile());
+        $this->dispatch('/catalog/product/image' . $this->getProductImageFile());
         $imageContent = ob_get_clean();
         /**
          * Check against PNG file signature.
@@ -180,10 +206,44 @@ public function testImageAction()
         $this->assertStringStartsWith(sprintf("%cPNG\r\n%c\n", 137, 26), $imageContent);
     }
 
-    public function testImageActionNoImage()
+    /**
+     * @return void
+     */
+    public function testImageActionNoImage(): void
     {
         $this->dispatch('catalog/product/image/');
 
         $this->assert404NotFound();
     }
+
+    /**
+     * Check that custom layout update files is employed.
+     *
+     * @magentoDataFixture Magento/Catalog/controllers/_files/products.php
+     * @return void
+     */
+    public function testViewWithCustomUpdate(): void
+    {
+        //Setting a fake file for the product.
+        $file = 'test-file';
+        /** @var ProductRepositoryInterface $repository */
+        $repository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+        $sku = 'simple_product_1';
+        $product = $repository->get($sku);
+        $productId = $product->getId();
+        /** @var ProductLayoutUpdateManager $layoutManager */
+        $layoutManager = Bootstrap::getObjectManager()->get(ProductLayoutUpdateManager::class);
+        $layoutManager->setFakeFiles((int)$productId, [$file]);
+        //Updating the custom attribute.
+        $product->setCustomAttribute('custom_layout_update_file', $file);
+        $repository->save($product);
+
+        //Viewing the product
+        $this->dispatch("catalog/product/view/id/$productId");
+        //Layout handles must contain the file.
+        $handles = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class)
+            ->getUpdate()
+            ->getHandles();
+        $this->assertContains("catalog_product_view_selectable_{$sku}_{$file}", $handles);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Attribute/Backend/AbstractLayoutUpdateTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Attribute/Backend/AbstractLayoutUpdateTest.php
new file mode 100644
index 0000000000000..40725d3ee58be
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Attribute/Backend/AbstractLayoutUpdateTest.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Attribute\Backend;
+
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Catalog\Model\Category;
+use Magento\TestFramework\Catalog\Model\CategoryLayoutUpdateManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
+
+/**
+ * Test 'custom layout file' attribute.
+ */
+class AbstractLayoutUpdateTest extends TestCase
+{
+    /**
+     * @var CategoryFactory
+     */
+    private $categoryFactory;
+
+    /**
+     * @var AbstractLayoutUpdate
+     */
+    private $attribute;
+
+    /**
+     * @var Category
+     */
+    private $category;
+    /**
+     * @var CategoryLayoutUpdateManager
+     */
+    private $layoutManager;
+
+    /**
+     * Recreate the category model.
+     *
+     * @return void
+     */
+    private function recreateCategory(): void
+    {
+        $this->category = $this->categoryFactory->create();
+        $this->category->load(2);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $this->categoryFactory = Bootstrap::getObjectManager()->get(CategoryFactory::class);
+        $this->recreateCategory();
+        $this->attribute = $this->category->getAttributes()['custom_layout_update_file']->getBackend();
+        $this->layoutManager = Bootstrap::getObjectManager()->get(CategoryLayoutUpdateManager::class);
+    }
+
+    /**
+     * Check that custom layout update file's values erase the old attribute's value.
+     *
+     * @return void
+     * @throws \Throwable
+     */
+    public function testDependsOnNewUpdate(): void
+    {
+        //New selected file value is set
+        $this->layoutManager->setCategoryFakeFiles(2, ['new']);
+        $this->category->setCustomAttribute('custom_layout_update', 'test');
+        $this->category->setOrigData('custom_layout_update', 'test');
+        $this->category->setCustomAttribute('custom_layout_update_file', 'new');
+        $this->attribute->beforeSave($this->category);
+        $this->assertEmpty($this->category->getCustomAttribute('custom_layout_update')->getValue());
+        $this->assertEquals('new', $this->category->getCustomAttribute('custom_layout_update_file')->getValue());
+        $this->assertEmpty($this->category->getData('custom_layout_update'));
+        $this->assertEquals('new', $this->category->getData('custom_layout_update_file'));
+
+        //Existing update chosen
+        $this->recreateCategory();
+        $this->category->setData('custom_layout_update', 'test');
+        $this->category->setOrigData('custom_layout_update', 'test');
+        $this->category->setData(
+            'custom_layout_update_file',
+            \Magento\Catalog\Model\Category\Attribute\Backend\LayoutUpdate::VALUE_USE_UPDATE_XML
+        );
+        $this->attribute->beforeSave($this->category);
+        $this->assertEquals('test', $this->category->getData('custom_layout_update'));
+        /** @var AbstractBackend $fileAttribute */
+        $fileAttribute = $this->category->getAttributes()['custom_layout_update_file']->getBackend();
+        $fileAttribute->beforeSave($this->category);
+        $this->assertEquals(null, $this->category->getData('custom_layout_update_file'));
+
+        //Removing custom layout update by explicitly selecting the new file (or an empty file).
+        $this->recreateCategory();
+        $this->category->setData('custom_layout_update', 'test');
+        $this->category->setOrigData('custom_layout_update', 'test');
+        $this->category->setData(
+            'custom_layout_update_file',
+            \Magento\Catalog\Model\Category\Attribute\Backend\LayoutUpdate::VALUE_NO_UPDATE
+        );
+        $this->attribute->beforeSave($this->category);
+        $this->assertEmpty($this->category->getData('custom_layout_update'));
+
+        //Empty value doesn't change the old attribute. Any non-string value can be used to represent an empty value.
+        $this->recreateCategory();
+        $this->category->setData('custom_layout_update', 'test');
+        $this->category->setOrigData('custom_layout_update', 'test');
+        $this->category->setData(
+            'custom_layout_update_file',
+            false
+        );
+        $this->attribute->beforeSave($this->category);
+        $this->assertEquals('test', $this->category->getData('custom_layout_update'));
+        $this->assertNull($this->category->getData('custom_layout_update_file'));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php
new file mode 100644
index 0000000000000..7f594d265418f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Attribute\Backend;
+
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Catalog\Model\Category;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
+
+/**
+ * Test 'custom layout' attribute.
+ */
+class CustomlayoutupdateTest extends TestCase
+{
+    /**
+     * @var CategoryFactory
+     */
+    private $categoryFactory;
+
+    /**
+     * @var Customlayoutupdate
+     */
+    private $attribute;
+
+    /**
+     * @var Category
+     */
+    private $category;
+
+    /**
+     * Recreate the category model.
+     *
+     * @return void
+     */
+    private function recreateCategory(): void
+    {
+        $this->category = $this->categoryFactory->create();
+        $this->category->load(2);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $this->categoryFactory = Bootstrap::getObjectManager()->get(CategoryFactory::class);
+        $this->recreateCategory();
+        $this->attribute = $this->category->getAttributes()['custom_layout_update']->getBackend();
+    }
+
+    /**
+     * Test that attribute cannot be modified but only removed completely.
+     *
+     * @return void
+     * @throws \Throwable
+     * @magentoDbIsolation enabled
+     */
+    public function testImmutable(): void
+    {
+        //Value is empty
+        $this->category->setCustomAttribute('custom_layout_update', false);
+        $this->category->setOrigData('custom_layout_update', null);
+        $this->attribute->beforeSave($this->category);
+
+        //New value
+        $this->category->setCustomAttribute('custom_layout_update', 'test');
+        $this->category->setOrigData('custom_layout_update', null);
+        $caughtException = false;
+        try {
+            $this->attribute->beforeSave($this->category);
+        } catch (LocalizedException $exception) {
+            $caughtException = true;
+        }
+        $this->assertTrue($caughtException);
+        $this->category->setCustomAttribute('custom_layout_update', 'testNew');
+        $this->category->setOrigData('custom_layout_update', 'test');
+        $caughtException = false;
+        try {
+            $this->attribute->beforeSave($this->category);
+        } catch (LocalizedException $exception) {
+            $caughtException = true;
+        }
+        $this->assertTrue($caughtException);
+
+        //Removing a value
+        $this->category->setCustomAttribute('custom_layout_update', '');
+        $this->category->setOrigData('custom_layout_update', 'test');
+        $this->attribute->beforeSave($this->category);
+        $this->assertNull($this->category->getCustomAttribute('custom_layout_update')->getValue());
+
+        //Using old stored value
+        //Saving old value 1st
+        $this->recreateCategory();
+        $this->category->setOrigData('custom_layout_update', 'test');
+        $this->category->setData('custom_layout_update', 'test');
+        $this->category->save();
+        $this->recreateCategory();
+        $this->category = $this->categoryFactory->create(['data' => $this->category->getData()]);
+
+        //Trying the same value.
+        $this->category->setData('custom_layout_update', 'test');
+        $this->attribute->beforeSave($this->category);
+        //Trying new value
+        $this->category->setData('custom_layout_update', 'test2');
+        $caughtException = false;
+        try {
+            $this->attribute->beforeSave($this->category);
+        } catch (LocalizedException $exception) {
+            $caughtException = true;
+        }
+        $this->assertTrue($caughtException);
+        //Empty value
+        $this->category->setData('custom_layout_update', null);
+        $this->attribute->beforeSave($this->category);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/DataProviderTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/DataProviderTest.php
index b8e1f07364c28..6d66055cd1548 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/DataProviderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/DataProviderTest.php
@@ -5,11 +5,20 @@
  */
 namespace Magento\Catalog\Model\Category;
 
-use Magento\Catalog\Model\Category\DataProvider;
-use Magento\Eav\Model\Config as EavConfig;
+use Magento\TestFramework\Catalog\Model\CategoryLayoutUpdateManager;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Registry;
+use PHPUnit\Framework\TestCase;
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Catalog\Model\Category\Attribute\Backend\LayoutUpdate;
 
-class DataProviderTest extends \PHPUnit\Framework\TestCase
+/**
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ * @magentoAppArea adminhtml
+ */
+class DataProviderTest extends TestCase
 {
     /**
      * @var DataProvider
@@ -17,18 +26,28 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
     private $dataProvider;
 
     /**
-     * @var \Magento\Eav\Model\Entity\Type
+     * @var Registry
      */
-    private $entityType;
+    private $registry;
 
     /**
-     * {@inheritDoc}
+     * @var CategoryFactory
      */
-    protected function setUp()
+    private $categoryFactory;
+
+    /**
+     * @var CategoryLayoutUpdateManager
+     */
+    private $fakeFiles;
+
+    /**
+     * Create subject instance.
+     *
+     * @return DataProvider
+     */
+    private function createDataProvider(): DataProvider
     {
-        parent::setUp();
-        $objectManager = Bootstrap::getObjectManager();
-        $this->dataProvider = $objectManager->create(
+        return Bootstrap::getObjectManager()->create(
             DataProvider::class,
             [
                 'name' => 'category_form_data_source',
@@ -36,8 +55,19 @@ protected function setUp()
                 'requestFieldName' => 'id'
             ]
         );
+    }
 
-        $this->entityType = $objectManager->create(EavConfig::class)->getEntityType('catalog_category');
+    /**
+     * {@inheritDoc}
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $objectManager = Bootstrap::getObjectManager();
+        $this->dataProvider = $this->createDataProvider();
+        $this->registry = $objectManager->get(Registry::class);
+        $this->categoryFactory = $objectManager->get(CategoryFactory::class);
+        $this->fakeFiles = $objectManager->get(CategoryLayoutUpdateManager::class);
     }
 
     /**
@@ -59,4 +89,136 @@ public function testGetMetaRequiredAttributes()
             }
         }
     }
+
+    /**
+     * Check that deprecated custom layout attribute is hidden.
+     *
+     * @return void
+     */
+    public function testOldCustomLayoutInvisible(): void
+    {
+        //Testing a category without layout xml
+        /** @var Category $category */
+        $category = $this->categoryFactory->create();
+        $category->load(2);
+        $this->registry->register('category', $category);
+
+        $meta = $this->dataProvider->getMeta();
+        $this->assertArrayHasKey('design', $meta);
+        $this->assertArrayHasKey('children', $meta['design']);
+        $this->assertArrayHasKey('custom_layout_update', $meta['design']['children']);
+        $this->assertArrayHasKey('arguments', $meta['design']['children']['custom_layout_update']);
+        $this->assertArrayHasKey('data', $meta['design']['children']['custom_layout_update']['arguments']);
+        $this->assertArrayHasKey(
+            'config',
+            $meta['design']['children']['custom_layout_update']['arguments']['data']
+        );
+        $config = $meta['design']['children']['custom_layout_update']['arguments']['data']['config'];
+        $this->assertTrue($config['visible'] === false);
+    }
+
+    /**
+     * Check that custom layout update file attribute is processed correctly.
+     *
+     * @return void
+     */
+    public function testCustomLayoutFileAttribute(): void
+    {
+        //File has value
+        /** @var Category $category */
+        $category = $this->categoryFactory->create();
+        $id = 2;
+        $category->load($id);
+        $category->setData('custom_layout_update', null);
+        $category->setData('custom_layout_update_file', $file = 'test-file');
+        $this->registry->register('category', $category);
+        $data = $this->dataProvider->getData();
+        $this->assertEquals($file, $data[$id]['custom_layout_update_file']);
+
+        //File has no value, the deprecated attribute does.
+        $this->dataProvider = $this->createDataProvider();
+        $category->setData('custom_layout_update', $deprecated = 'test-deprecated');
+        $category->setData('custom_layout_update_file', null);
+        $data = $this->dataProvider->getData();
+        $this->assertEquals($deprecated, $data[$id]['custom_layout_update']);
+        $this->assertEquals(LayoutUpdate::VALUE_USE_UPDATE_XML, $data[$id]['custom_layout_update_file']);
+    }
+
+    /**
+     * Extract custom layout update file attribute's options from metadata.
+     *
+     * @param array $meta
+     * @return array
+     */
+    private function extractCustomLayoutOptions(array $meta): array
+    {
+        $this->assertArrayHasKey('design', $meta);
+        $this->assertArrayHasKey('children', $meta['design']);
+        $this->assertArrayHasKey('custom_layout_update_file', $meta['design']['children']);
+        $this->assertArrayHasKey('arguments', $meta['design']['children']['custom_layout_update_file']);
+        $this->assertArrayHasKey('data', $meta['design']['children']['custom_layout_update_file']['arguments']);
+        $this->assertArrayHasKey(
+            'config',
+            $meta['design']['children']['custom_layout_update_file']['arguments']['data']
+        );
+        $this->assertArrayHasKey(
+            'options',
+            $meta['design']['children']['custom_layout_update_file']['arguments']['data']['config']
+        );
+
+        return $meta['design']['children']['custom_layout_update_file']['arguments']['data']['config']['options'];
+    }
+
+    /**
+     * Check that proper options are returned for a category.
+     *
+     * @return void
+     */
+    public function testCustomLayoutMeta(): void
+    {
+        //Testing a category without layout xml
+        /** @var Category $category */
+        $category = $this->categoryFactory->create();
+        $category->load(2);
+        $this->fakeFiles->setCategoryFakeFiles((int)$category->getId(), ['test1', 'test2']);
+        $this->registry->register('category', $category);
+
+        $meta = $this->dataProvider->getMeta();
+        $list = $this->extractCustomLayoutOptions($meta);
+        $expectedList = [
+            [
+                'label' => 'No update',
+                'value' => \Magento\Catalog\Model\Attribute\Backend\AbstractLayoutUpdate::VALUE_NO_UPDATE,
+                '__disableTmpl' => true
+            ],
+            ['label' => 'test1', 'value' => 'test1', '__disableTmpl' => true],
+            ['label' => 'test2', 'value' => 'test2', '__disableTmpl' => true]
+        ];
+        sort($expectedList);
+        sort($list);
+        $this->assertEquals($expectedList, $list);
+
+        //Product with old layout xml
+        $category->setCustomAttribute('custom_layout_update', 'test');
+        $this->fakeFiles->setCategoryFakeFiles((int)$category->getId(), ['test3']);
+
+        $meta = $this->dataProvider->getMeta();
+        $expectedList = [
+            [
+                'label' => 'No update',
+                'value' => \Magento\Catalog\Model\Attribute\Backend\AbstractLayoutUpdate::VALUE_NO_UPDATE,
+                '__disableTmpl' => true
+            ],
+            [
+                'label' => 'Use existing',
+                'value' => LayoutUpdate::VALUE_USE_UPDATE_XML,
+                '__disableTmpl' => true
+            ],
+            ['label' => 'test3', 'value' => 'test3', '__disableTmpl' => true],
+        ];
+        $list = $this->extractCustomLayoutOptions($meta);
+        sort($expectedList);
+        sort($list);
+        $this->assertEquals($expectedList, $list);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
index f1e235f8c9bf2..e1e4a87c033d0 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
@@ -7,14 +7,14 @@
 
 namespace Magento\Catalog\Model;
 
-use Magento\Backend\Model\Auth;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
-use Magento\Catalog\Api\Data\CategoryInterface;
-use Magento\Catalog\Api\Data\CategoryInterfaceFactory;
-use Magento\Framework\Acl\Builder;
+use Magento\Catalog\Api\CategoryRepositoryInterfaceFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\TestFramework\Catalog\Model\CategoryLayoutUpdateManager;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
-use Magento\TestFramework\Bootstrap as TestBootstrap;
 
 /**
  * Provide tests for CategoryRepository model.
@@ -22,26 +22,24 @@
 class CategoryRepositoryTest extends TestCase
 {
     /**
-     * Test subject.
-     *
-     * @var CategoryRepositoryInterface
+     * @var CategoryLayoutUpdateManager
      */
-    private $repo;
+    private $layoutManager;
 
     /**
-     * @var Auth
+     * @var CategoryRepositoryInterfaceFactory
      */
-    private $auth;
+    private $repositoryFactory;
 
     /**
-     * @var Builder
+     * @var CollectionFactory
      */
-    private $aclBuilder;
+    private $productCollectionFactory;
 
     /**
-     * @var CategoryInterfaceFactory
+     * @var CategoryCollectionFactory
      */
-    private $categoryFactory;
+    private $categoryCollectionFactory;
 
     /**
      * Sets up common objects.
@@ -50,63 +48,82 @@ class CategoryRepositoryTest extends TestCase
      */
     protected function setUp()
     {
-        $this->repo = Bootstrap::getObjectManager()->create(CategoryRepositoryInterface::class);
-        $this->auth = Bootstrap::getObjectManager()->get(Auth::class);
-        $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
-        $this->categoryFactory = Bootstrap::getObjectManager()->get(CategoryInterfaceFactory::class);
+        $this->repositoryFactory = Bootstrap::getObjectManager()->get(CategoryRepositoryInterfaceFactory::class);
+        $this->layoutManager = Bootstrap::getObjectManager()->get(CategoryLayoutUpdateManager::class);
+        $this->productCollectionFactory = Bootstrap::getObjectManager()->get(CollectionFactory::class);
+        $this->categoryCollectionFactory = Bootstrap::getObjectManager()->create(CategoryCollectionFactory::class);
     }
 
     /**
-     * @inheritDoc
+     * Create subject object.
+     *
+     * @return CategoryRepositoryInterface
      */
-    protected function tearDown()
+    private function createRepo(): CategoryRepositoryInterface
     {
-        parent::tearDown();
-
-        $this->auth->logout();
-        $this->aclBuilder->resetRuntimeAcl();
+        return $this->repositoryFactory->create();
     }
 
     /**
-     * Test authorization when saving category's design settings.
+     * Test that custom layout file attribute is saved.
      *
+     * @return void
+     * @throws \Throwable
      * @magentoDataFixture Magento/Catalog/_files/category.php
-     * @magentoAppArea adminhtml
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
      */
-    public function testSaveDesign()
+    public function testCustomLayout(): void
     {
-        $category = $this->repo->get(333);
-        $this->auth->login(TestBootstrap::ADMIN_NAME, TestBootstrap::ADMIN_PASSWORD);
-
-        //Admin doesn't have access to category's design.
-        $this->aclBuilder->getAcl()->deny(null, 'Magento_Catalog::edit_category_design');
-
-        $category->setCustomAttribute('custom_design', 2);
-        $category = $this->repo->save($category);
-        $customDesignAttribute = $category->getCustomAttribute('custom_design');
-        $this->assertTrue(!$customDesignAttribute || !$customDesignAttribute->getValue());
-
-        //Admin has access to category' design.
-        $this->aclBuilder->getAcl()
-            ->allow(null, ['Magento_Catalog::categories', 'Magento_Catalog::edit_category_design']);
+        //New valid value
+        $repo = $this->createRepo();
+        $category = $repo->get(333);
+        $newFile = 'test';
+        $this->layoutManager->setCategoryFakeFiles(333, [$newFile]);
+        $category->setCustomAttribute('custom_layout_update_file', $newFile);
+        $repo->save($category);
+        $repo = $this->createRepo();
+        $category = $repo->get(333);
+        $this->assertEquals($newFile, $category->getCustomAttribute('custom_layout_update_file')->getValue());
 
-        $category->setCustomAttribute('custom_design', 2);
-        $category = $this->repo->save($category);
-        $this->assertNotEmpty($category->getCustomAttribute('custom_design'));
-        $this->assertEquals(2, $category->getCustomAttribute('custom_design')->getValue());
+        //Setting non-existent value
+        $newFile = 'does not exist';
+        $category->setCustomAttribute('custom_layout_update_file', $newFile);
+        $caughtException = false;
+        try {
+            $repo->save($category);
+        } catch (LocalizedException $exception) {
+            $caughtException = true;
+        }
+        $this->assertTrue($caughtException);
+    }
 
-        //Creating a new one
-        /** @var CategoryInterface $newCategory */
-        $newCategory = $this->categoryFactory->create();
-        $newCategory->setName('new category without design');
-        $newCategory->setParentId($category->getParentId());
-        $newCategory->setIsActive(true);
-        $this->aclBuilder->getAcl()->deny(null, 'Magento_Catalog::edit_category_design');
-        $newCategory->setCustomAttribute('custom_design', 2);
-        $newCategory = $this->repo->save($newCategory);
-        $customDesignAttribute = $newCategory->getCustomAttribute('custom_design');
-        $this->assertTrue(!$customDesignAttribute || !$customDesignAttribute->getValue());
+    /**
+     * Test removal of categories.
+     *
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Catalog/_files/categories.php
+     * @magentoAppArea adminhtml
+     * @return void
+     */
+    public function testCategoryBehaviourAfterDelete(): void
+    {
+        $productCollection = $this->productCollectionFactory->create();
+        $deletedCategories = ['3', '4', '5', '13'];
+        $categoryCollectionIds = $this->categoryCollectionFactory->create()->getAllIds();
+        $this->createRepo()->deleteByIdentifier(3);
+        $this->assertEquals(
+            0,
+            $productCollection->addCategoriesFilter(['in' => $deletedCategories])->getSize(),
+            'The category-products relations was not deleted after category delete'
+        );
+        $newCategoryCollectionIds = $this->categoryCollectionFactory->create()->getAllIds();
+        $difference = array_diff($categoryCollectionIds, $newCategoryCollectionIds);
+        sort($difference);
+        $this->assertEquals(
+            $deletedCategories,
+            $difference,
+            'Wrong categories was deleted'
+        );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
index 1d7936d740b8d..5ec0427093997 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
@@ -3,26 +3,44 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Model\Category as Category;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Catalog\Model\ResourceModel\Category\Tree;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\Eav\Model\Entity\Attribute\Exception as AttributeException;
+use Magento\Framework\Url;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
 /**
  * Test class for \Magento\Catalog\Model\Category.
  * - general behaviour is tested
  *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @see \Magento\Catalog\Model\CategoryTreeTest
  * @magentoDataFixture Magento/Catalog/_files/categories.php
  * @magentoDbIsolation enabled
  * @magentoAppIsolation enabled
  */
-class CategoryTest extends \PHPUnit\Framework\TestCase
+class CategoryTest extends TestCase
 {
     /**
-     * @var \Magento\Store\Model\Store
+     * @var Store
      */
     protected $_store;
 
     /**
-     * @var \Magento\Catalog\Model\Category
+     * @var Category
      */
     protected $_model;
 
@@ -31,50 +49,61 @@ class CategoryTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManager;
 
+    /** @var CategoryRepository */
+    private $categoryResource;
+
+    /** @var CategoryRepositoryInterface */
+    private $categoryRepository;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var $storeManager \Magento\Store\Model\StoreManagerInterface */
-        $storeManager = $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->objectManager = Bootstrap::getObjectManager();
+        /** @var $storeManager StoreManagerInterface */
+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
         $this->_store = $storeManager->getStore();
-        $this->_model = $this->objectManager->create(\Magento\Catalog\Model\Category::class);
+        $this->_model = $this->objectManager->create(Category::class);
+        $this->categoryResource = $this->objectManager->get(CategoryResource::class);
+        $this->categoryRepository = $this->objectManager->get(CategoryRepositoryInterface::class);
     }
 
-    public function testGetUrlInstance()
+    public function testGetUrlInstance(): void
     {
         $instance = $this->_model->getUrlInstance();
-        $this->assertInstanceOf(\Magento\Framework\Url::class, $instance);
+        $this->assertInstanceOf(Url::class, $instance);
         $this->assertSame($instance, $this->_model->getUrlInstance());
     }
 
-    public function testGetTreeModel()
+    public function testGetTreeModel(): void
     {
         $model = $this->_model->getTreeModel();
-        $this->assertInstanceOf(\Magento\Catalog\Model\ResourceModel\Category\Tree::class, $model);
+        $this->assertInstanceOf(Tree::class, $model);
         $this->assertNotSame($model, $this->_model->getTreeModel());
     }
 
-    public function testGetTreeModelInstance()
+    public function testGetTreeModelInstance(): void
     {
         $model = $this->_model->getTreeModelInstance();
-        $this->assertInstanceOf(\Magento\Catalog\Model\ResourceModel\Category\Tree::class, $model);
+        $this->assertInstanceOf(Tree::class, $model);
         $this->assertSame($model, $this->_model->getTreeModelInstance());
     }
 
-    public function testGetDefaultAttributeSetId()
+    public function testGetDefaultAttributeSetId(): void
     {
         /* based on value installed in DB */
         $this->assertEquals(3, $this->_model->getDefaultAttributeSetId());
     }
 
-    public function testGetProductCollection()
+    public function testGetProductCollection(): void
     {
         $collection = $this->_model->getProductCollection();
-        $this->assertInstanceOf(\Magento\Catalog\Model\ResourceModel\Product\Collection::class, $collection);
+        $this->assertInstanceOf(ProductCollection::class, $collection);
         $this->assertEquals($this->_model->getStoreId(), $collection->getStoreId());
     }
 
-    public function testGetAttributes()
+    public function testGetAttributes(): void
     {
         $attributes = $this->_model->getAttributes();
         $this->assertArrayHasKey('name', $attributes);
@@ -85,7 +114,7 @@ public function testGetAttributes()
         $this->assertArrayNotHasKey('custom_design', $attributes);
     }
 
-    public function testGetProductsPosition()
+    public function testGetProductsPosition(): void
     {
         $this->assertEquals([], $this->_model->getProductsPosition());
         $this->_model->unsetData();
@@ -97,23 +126,21 @@ public function testGetProductsPosition()
         $this->assertNotEmpty($this->_model->getProductsPosition());
     }
 
-    public function testGetStoreIds()
+    public function testGetStoreIds(): void
     {
         $this->_model = $this->getCategoryByName('Category 1.1');
         /* id from fixture */
         $this->assertContains(
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                \Magento\Store\Model\StoreManagerInterface::class
-            )->getStore()->getId(),
+            Bootstrap::getObjectManager()->get(StoreManagerInterface::class)->getStore()->getId(),
             $this->_model->getStoreIds()
         );
     }
 
-    public function testSetGetStoreId()
+    public function testSetGetStoreId(): void
     {
         $this->assertEquals(
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                \Magento\Store\Model\StoreManagerInterface::class
+            Bootstrap::getObjectManager()->get(
+                StoreManagerInterface::class
             )->getStore()->getId(),
             $this->_model->getStoreId()
         );
@@ -126,10 +153,10 @@ public function testSetGetStoreId()
      * @magentoAppIsolation enabled
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
      */
-    public function testSetStoreIdWithNonNumericValue()
+    public function testSetStoreIdWithNonNumericValue(): void
     {
-        /** @var $store \Magento\Store\Model\Store */
-        $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+        /** @var $store Store */
+        $store = Bootstrap::getObjectManager()->create(Store::class);
         $store->load('fixturestore');
 
         $this->assertNotEquals($this->_model->getStoreId(), $store->getId());
@@ -139,7 +166,7 @@ public function testSetStoreIdWithNonNumericValue()
         $this->assertEquals($this->_model->getStoreId(), $store->getId());
     }
 
-    public function testGetUrl()
+    public function testGetUrl(): void
     {
         $this->assertStringEndsWith('catalog/category/view/', $this->_model->getUrl());
 
@@ -156,42 +183,42 @@ public function testGetUrl()
         $this->assertStringEndsWith('catalog/category/view/id/1000/', $this->_model->getUrl());
     }
 
-    public function testGetCategoryIdUrl()
+    public function testGetCategoryIdUrl(): void
     {
         $this->assertStringEndsWith('catalog/category/view/', $this->_model->getCategoryIdUrl());
         $this->_model->setUrlKey('test_key');
         $this->assertStringEndsWith('catalog/category/view/s/test_key/', $this->_model->getCategoryIdUrl());
     }
 
-    public function testFormatUrlKey()
+    public function testFormatUrlKey(): void
     {
         $this->assertEquals('test', $this->_model->formatUrlKey('test'));
         $this->assertEquals('test-some-chars-5', $this->_model->formatUrlKey('test-some#-chars^5'));
         $this->assertEquals('test', $this->_model->formatUrlKey('test-????????'));
     }
 
-    public function testGetImageUrl()
+    public function testGetImageUrl(): void
     {
         $this->assertFalse($this->_model->getImageUrl());
         $this->_model->setImage('test.gif');
         $this->assertStringEndsWith('media/catalog/category/test.gif', $this->_model->getImageUrl());
     }
 
-    public function testGetCustomDesignDate()
+    public function testGetCustomDesignDate(): void
     {
         $dates = $this->_model->getCustomDesignDate();
         $this->assertArrayHasKey('from', $dates);
         $this->assertArrayHasKey('to', $dates);
     }
 
-    public function testGetDesignAttributes()
+    public function testGetDesignAttributes(): void
     {
         $attributes = $this->_model->getDesignAttributes();
         $this->assertContains('custom_design_from', array_keys($attributes));
         $this->assertContains('custom_design_to', array_keys($attributes));
     }
 
-    public function testCheckId()
+    public function testCheckId(): void
     {
         $this->_model = $this->getCategoryByName('Category 1.1.1');
         $categoryId = $this->_model->getId();
@@ -199,13 +226,13 @@ public function testCheckId()
         $this->assertFalse($this->_model->checkId(111));
     }
 
-    public function testVerifyIds()
+    public function testVerifyIds(): void
     {
         $ids = $this->_model->verifyIds($this->_model->getParentIds());
         $this->assertNotContains(100, $ids);
     }
 
-    public function testHasChildren()
+    public function testHasChildren(): void
     {
         $this->_model->load(3);
         $this->assertTrue($this->_model->hasChildren());
@@ -213,21 +240,21 @@ public function testHasChildren()
         $this->assertFalse($this->_model->hasChildren());
     }
 
-    public function testGetRequestPath()
+    public function testGetRequestPath(): void
     {
         $this->assertNull($this->_model->getRequestPath());
         $this->_model->setData('request_path', 'test');
         $this->assertEquals('test', $this->_model->getRequestPath());
     }
 
-    public function testGetName()
+    public function testGetName(): void
     {
         $this->assertNull($this->_model->getName());
         $this->_model->setData('name', 'test');
         $this->assertEquals('test', $this->_model->getName());
     }
 
-    public function testGetProductCount()
+    public function testGetProductCount(): void
     {
         $this->_model->load(6);
         $this->assertEquals(0, $this->_model->getProductCount());
@@ -236,14 +263,14 @@ public function testGetProductCount()
         $this->assertEquals(1, $this->_model->getProductCount());
     }
 
-    public function testGetAvailableSortBy()
+    public function testGetAvailableSortBy(): void
     {
         $this->assertEquals([], $this->_model->getAvailableSortBy());
         $this->_model->setData('available_sort_by', 'test,and,test');
         $this->assertEquals(['test', 'and', 'test'], $this->_model->getAvailableSortBy());
     }
 
-    public function testGetAvailableSortByOptions()
+    public function testGetAvailableSortByOptions(): void
     {
         $options = $this->_model->getAvailableSortByOptions();
         $this->assertContains('price', array_keys($options));
@@ -251,25 +278,27 @@ public function testGetAvailableSortByOptions()
         $this->assertContains('name', array_keys($options));
     }
 
-    public function testGetDefaultSortBy()
+    public function testGetDefaultSortBy(): void
     {
         $this->assertEquals('position', $this->_model->getDefaultSortBy());
     }
 
-    public function testValidate()
+    public function testValidate(): void
     {
-        $this->_model->addData([
-            "include_in_menu" => false,
-            "is_active" => false,
-            'name' => 'test',
-        ]);
+        $this->_model->addData(
+            [
+                "include_in_menu" => false,
+                "is_active" => false,
+                'name' => 'test',
+            ]
+        );
         $this->assertNotEmpty($this->_model->validate());
     }
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/category_with_position.php
      */
-    public function testSaveCategoryWithPosition()
+    public function testSaveCategoryWithPosition(): void
     {
         $category = $this->_model->load('444');
         $this->assertEquals('5', $category->getPosition());
@@ -278,10 +307,10 @@ public function testSaveCategoryWithPosition()
     /**
      * @magentoDbIsolation enabled
      */
-    public function testSaveCategoryWithoutImage()
+    public function testSaveCategoryWithoutImage(): void
     {
-        $model = $this->objectManager->create(\Magento\Catalog\Model\Category::class);
-        $repository = $this->objectManager->get(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
+        $model = $this->objectManager->create(Category::class);
+        $repository = $this->objectManager->get(CategoryRepositoryInterface::class);
 
         $model->setName('Test Category 100')
             ->setParentId(2)
@@ -299,7 +328,7 @@ public function testSaveCategoryWithoutImage()
     /**
      * @magentoAppArea adminhtml
      */
-    public function testDeleteChildren()
+    public function testDeleteChildren(): void
     {
         $this->_model->unsetData();
         $this->_model->load(4);
@@ -320,29 +349,101 @@ public function testDeleteChildren()
         $this->assertEquals($this->_model->getId(), null);
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category.php
+     */
+    public function testAddChildCategory(): void
+    {
+        $data = [
+            'name' => 'Child Category',
+            'path' => '1/2/333',
+            'is_active' => '1',
+            'include_in_menu' => '1',
+        ];
+        $this->_model->setData($data);
+        $this->categoryResource->save($this->_model);
+        $parentCategory = $this->categoryRepository->get(333);
+        $this->assertContains($this->_model->getId(), $parentCategory->getChildren());
+    }
+
+    /**
+     * @return void
+     */
+    public function testMissingRequiredAttribute(): void
+    {
+        $data = [
+            'path' => '1/2',
+            'is_active' => '1',
+            'include_in_menu' => '1',
+        ];
+        $this->expectException(AttributeException::class);
+        $this->expectExceptionMessage(
+            (string)__('The "Name" attribute value is empty. Set the attribute and try again.')
+        );
+        $this->_model->setData($data);
+        $this->_model->validate();
+    }
+
+    /**
+     * @dataProvider categoryFieldsProvider
+     * @param array $data
+     */
+    public function testCategoryCreateWithDifferentFields(array $data): void
+    {
+        $requiredData = [
+            'name' => 'Test Category',
+            'attribute_set_id' => '3',
+            'parent_id' => 2,
+        ];
+        $this->_model->setData(array_merge($requiredData, $data));
+        $this->categoryResource->save($this->_model);
+        $category = $this->categoryRepository->get($this->_model->getId());
+        $categoryData = $category->toArray(array_keys($data));
+        $this->assertSame($data, $categoryData);
+    }
+
+    /**
+     * @return array
+     */
+    public function categoryFieldsProvider(): array
+    {
+        return [
+            [
+                'enable_fields' => [
+                    'is_active' => '1',
+                    'include_in_menu' => '1',
+                ],
+                'disable_fields' => [
+                    'is_active' => '0',
+                    'include_in_menu' => '0',
+                ],
+            ],
+        ];
+    }
+
     /**
      * @magentoDataFixture Magento/Store/_files/second_store.php
      * @magentoDataFixture Magento/Catalog/_files/categories.php
      * @magentoDbIsolation disabled
      * @return void
      */
-    public function testCreateSubcategoryWithMultipleStores()
+    public function testCreateSubcategoryWithMultipleStores(): void
     {
         $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);
+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $storeManager->setCurrentStore(Store::ADMIN_CODE);
+        /** @var StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
         $storeId = $storeRepository->get('fixture_second_store')->getId();
-        /** @var \Magento\Catalog\Api\CategoryRepositoryInterface $repository */
-        $repository = $this->objectManager->get(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
+        /** @var CategoryRepositoryInterface $repository */
+        $repository = $this->objectManager->get(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);
+        /** @var Category $childCategory */
+        $childCategory = $this->objectManager->create(Category::class);
         $childCategory->setName('Test Category 100')
             ->setParentId($parentCategoryId)
             ->setLevel(2)
@@ -360,10 +461,10 @@ public function testCreateSubcategoryWithMultipleStores()
 
     protected function getCategoryByName($categoryName)
     {
-        /* @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
-
-        $collection = $this->objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+        /* @var Collection $collection */
+        $collection = $this->objectManager->create(Collection::class);
         $collection->addNameToResult()->load();
+
         return $collection->getItemByColumnValue('name', $categoryName);
     }
 }
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 677135092526c..095fa864ccb41 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
@@ -11,6 +11,8 @@
 use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
 use Magento\Catalog\Model\Indexer\Product\Flat\State;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+use Magento\CatalogSearch\Model\Indexer\Fulltext;
+use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
@@ -35,6 +37,22 @@ class FullTest extends \Magento\TestFramework\Indexer\TestCase
      */
     private $objectManager;
 
+    /**
+     * @inheritdoc
+     */
+    public static function setUpBeforeClass()
+    {
+        /*
+         * Due to insufficient search engine isolation for Elasticsearch, this class must explicitly perform
+         * a fulltext reindex prior to running its tests.
+         *
+         * This should be removed upon completing MC-19455.
+         */
+        $indexRegistry = Bootstrap::getObjectManager()->get(IndexerRegistry::class);
+        $fulltextIndexer = $indexRegistry->get(Fulltext::INDEXER_ID);
+        $fulltextIndexer->reindexAll();
+    }
+
     /**
      * @inheritdoc
      */
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 bbaf453938705..9ae9cc6b6629f 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
@@ -5,8 +5,10 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Flat;
 
+use Magento\Catalog\Model\Product\Attribute\Repository;
+
 /**
- * Class FullTest
+ * Integration tests for \Magento\Catalog\Model\Indexer\Product\Flat\Processor.
  */
 class ProcessorTest extends \Magento\TestFramework\Indexer\TestCase
 {
@@ -64,22 +66,23 @@ public function testSaveAttribute()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoAppArea adminhtml
-     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
      */
     public function testDeleteAttribute()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
-
-        /** @var \Magento\Catalog\Model\ResourceModel\Product $productResource */
-        $productResource = $product->getResource();
-        $productResource->getAttribute('media_gallery')->delete();
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $model */
+        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
+        /** @var Repository $productAttributeRepository */
+        $productAttributeRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(Repository::class);
+        $productAttrubute = $productAttributeRepository->get('flat_attribute');
+        $productAttributeId = $productAttrubute->getAttributeId();
+        $model->load($productAttributeId)->delete();
 
         $this->assertTrue($this->_processor->getIndexer()->isInvalid());
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/_files/attribute_with_option.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/_files/attribute_with_option.php
index 833d1b114a0b5..b4431678b2016 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/_files/attribute_with_option.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/_files/attribute_with_option.php
@@ -20,6 +20,7 @@
         'is_global' => 1,
         'frontend_input' => 'select',
         'is_filterable' => 1,
+        'is_user_defined' => 1,
         'option' => ['value' => ['option_0' => [0 => 'Option Label']]],
         'backend_type' => 'int',
     ]
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AbstractAttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AbstractAttributeTest.php
new file mode 100644
index 0000000000000..d2ab4d69dc45c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AbstractAttributeTest.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Attribute\Save;
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Eav\Model\Entity\Attribute\Exception;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Base class for text product attributes
+ */
+abstract class AbstractAttributeTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    protected $objectManager;
+
+    /** @var AttributeRepositoryInterface */
+    protected $attributeRepository;
+
+    /** @var ProductRepositoryInterface */
+    protected $productRepository;
+
+    /** @var ProductAttributeInterface */
+    protected $attribute;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->attributeRepository = $this->objectManager->create(AttributeRepositoryInterface::class);
+    }
+
+    /**
+     * @dataProvider productProvider
+     * @param $productSku
+     * @return void
+     */
+    public function testSaveAttribute(string $productSku): void
+    {
+        $product = $this->setAttributeValueAndValidate($productSku, $this->getDefaultAttributeValue());
+        $product = $this->productRepository->save($product);
+        $this->assertEquals($this->getDefaultAttributeValue(), $product->getData($this->getAttributeCode()));
+    }
+
+    /**
+     * @dataProvider productProvider
+     * @param string $productSku
+     * @return void
+     */
+    public function testRequiredAttribute(string $productSku): void
+    {
+        $this->expectException(Exception::class);
+        $messageFormat = 'The "%s" attribute value is empty. Set the attribute and try again.';
+        $this->expectExceptionMessage(
+            (string)__(sprintf($messageFormat, $this->getAttribute()->getDefaultFrontendLabel()))
+        );
+        $this->prepareAttribute(['is_required' => true]);
+        $this->unsetAttributeValueAndValidate($productSku);
+    }
+
+    /**
+     * @dataProvider productProvider
+     * @param string $productSku
+     * @return void
+     */
+    public function testDefaultValue(string $productSku): void
+    {
+        $this->prepareAttribute(['default_value' => $this->getDefaultAttributeValue()]);
+        $product = $this->unsetAttributeValueAndValidate($productSku);
+        $product = $this->productRepository->save($product);
+        $this->assertEquals($this->getDefaultAttributeValue(), $product->getData($this->getAttributeCode()));
+    }
+
+    /**
+     * @dataProvider uniqueAttributeValueProvider
+     * @param string $firstSku
+     * @param string $secondSku
+     * @return void
+     */
+    public function testUniqueAttribute(string $firstSku, string $secondSku): void
+    {
+        $this->expectException(Exception::class);
+        $messageFormat = 'The value of the "%s" attribute isn\'t unique. Set a unique value and try again.';
+        $this->expectExceptionMessage(
+            (string)__(sprintf($messageFormat, $this->getAttribute()->getDefaultFrontendLabel()))
+        );
+        $this->prepareAttribute(['is_unique' => 1]);
+        $product = $this->setAttributeValueAndValidate($firstSku, $this->getDefaultAttributeValue());
+        $this->productRepository->save($product);
+        $this->setAttributeValueAndValidate($secondSku, $this->getDefaultAttributeValue());
+    }
+
+    /**
+     * Get attribute
+     *
+     * @return ProductAttributeInterface
+     */
+    protected function getAttribute(): ProductAttributeInterface
+    {
+        if ($this->attribute === null) {
+            $this->attribute = $this->attributeRepository->get(
+                ProductAttributeInterface::ENTITY_TYPE_CODE,
+                $this->getAttributeCode()
+            );
+        }
+
+        return $this->attribute;
+    }
+
+    /**
+     * Set attribute value to product and validate the product
+     *
+     * @param string $attributeValue
+     * @param string $productSku
+     * @return ProductInterface
+     */
+    protected function setAttributeValueAndValidate(string $productSku, string $attributeValue): ProductInterface
+    {
+        $product = $this->productRepository->get($productSku);
+        $product->addData([$this->getAttributeCode() => $attributeValue]);
+        $product->validate();
+
+        return $product;
+    }
+
+    /**
+     * Unset attribute value of the product and validate the product
+     *
+     * @param string $productSku
+     * @return ProductInterface
+     */
+    private function unsetAttributeValueAndValidate(string $productSku): ProductInterface
+    {
+        $product = $this->productRepository->get($productSku);
+        $product->unsetData($this->getAttributeCode());
+        $product->validate();
+
+        return $product;
+    }
+
+    /**
+     * Prepare attribute to test
+     *
+     * @param array $data
+     * @return void
+     */
+    private function prepareAttribute(array $data): void
+    {
+        $attribute = $this->getAttribute();
+        $attribute->addData($data);
+        $this->attributeRepository->save($attribute);
+    }
+
+    /**
+     * Returns attribute code for current test
+     *
+     * @return string
+     */
+    abstract protected function getAttributeCode(): string;
+
+    /**
+     * Get default value for current attribute
+     *
+     * @return string
+     */
+    abstract protected function getDefaultAttributeValue(): string;
+
+    /**
+     * Products provider for tests
+     *
+     * @return array
+     */
+    abstract public function productProvider(): array;
+
+    /**
+     * Provider for unique attribute tests
+     *
+     * @return array
+     */
+    abstract public function uniqueAttributeValueProvider(): array;
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeDateTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeDateTest.php
new file mode 100644
index 0000000000000..d30f32087c815
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeDateTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Attribute\Save;
+
+/**
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture  Magento/Catalog/_files/product_date_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+ */
+class AttributeDateTest extends AbstractAttributeTest
+{
+    /**
+     * @dataProvider productProvider
+     * @param string $productSku
+     */
+    public function testDefaultValue(string $productSku): void
+    {
+        $this->markTestSkipped('Test is blocked by issue MC-28950');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getAttributeCode(): string
+    {
+        return 'date_attribute';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getDefaultAttributeValue(): string
+    {
+        return $this->getAttribute()->getBackend()->formatDate('11/20/19');
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_date_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     * @dataProvider uniqueAttributeValueProvider
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
+     * @inheritdoc
+     */
+    public function testUniqueAttribute(string $firstSku, string $secondSku): void
+    {
+        parent::testUniqueAttribute($firstSku, $secondSku);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function productProvider(): array
+    {
+        return [
+            [
+                'product_sku' => 'simple2',
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function uniqueAttributeValueProvider(): array
+    {
+        return [
+            [
+                'first_product_sku' => 'simple2',
+                'second_product_sku' => 'simple-out-of-stock',
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeDropdownTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeDropdownTest.php
new file mode 100644
index 0000000000000..c1cdd0bab28aa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeDropdownTest.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\Product\Attribute\Save;
+
+/**
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture  Magento/Catalog/_files/dropdown_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+ */
+class AttributeDropdownTest extends AbstractAttributeTest
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getAttributeCode(): string
+    {
+        return 'dropdown_attribute';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getDefaultAttributeValue(): string
+    {
+        return $this->getAttribute()->getSource()->getOptionId('Option 1');
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/dropdown_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     * @dataProvider uniqueAttributeValueProvider
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
+     * @inheritdoc
+     */
+    public function testUniqueAttribute(string $firstSku, string $secondSku): void
+    {
+        parent::testUniqueAttribute($firstSku, $secondSku);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function productProvider(): array
+    {
+        return [
+            [
+                'product_sku' => 'simple2',
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function uniqueAttributeValueProvider(): array
+    {
+        return [
+            [
+                'first_product_sku' => 'simple2',
+                'second_product_sku' => 'simple-out-of-stock',
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeMultiSelectTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeMultiSelectTest.php
new file mode 100644
index 0000000000000..4ee2b83010bdc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeMultiSelectTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Attribute\Save;
+
+/**
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture  Magento/Catalog/_files/multiselect_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+ */
+class AttributeMultiSelectTest extends AbstractAttributeTest
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getAttributeCode(): string
+    {
+        return 'multiselect_attribute';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getDefaultAttributeValue(): string
+    {
+        return $this->getAttribute()->getSource()->getOptionId('Option 1');
+    }
+
+    /**
+     * @inheritdoc
+     * @dataProvider productProvider
+     */
+    public function testDefaultValue(string $productSku): void
+    {
+        $this->markTestSkipped('Test is blocked by issue MC-29019');
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/multiselect_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     * @dataProvider uniqueAttributeValueProvider
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
+     * @inheritdoc
+     */
+    public function testUniqueAttribute(string $firstSku, string $secondSku): void
+    {
+        parent::testUniqueAttribute($firstSku, $secondSku);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function productProvider(): array
+    {
+        return [
+            [
+                'product_sku' => 'simple2',
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function uniqueAttributeValueProvider(): array
+    {
+        return [
+            [
+                'first_product_sku' => 'simple2',
+                'second_product_sku' => 'simple-out-of-stock',
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributePriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributePriceTest.php
new file mode 100644
index 0000000000000..5de9d30f71638
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributePriceTest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Attribute\Save;
+
+use Magento\Eav\Model\Entity\Attribute\Exception;
+
+/**
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture Magento/Catalog/_files/product_decimal_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+ */
+class AttributePriceTest extends AbstractAttributeTest
+{
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_decimal_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     * @dataProvider uniqueAttributeValueProvider
+     * @inheritdoc
+     */
+    public function testUniqueAttribute(string $firstSku, string $secondSku): void
+    {
+        $this->markTestSkipped('Test is blocked by issue MC-29018');
+        parent::testUniqueAttribute($firstSku, $secondSku);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_decimal_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @return void
+     */
+    public function testNegativeValue(): void
+    {
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage((string)__('Please enter a number 0 or greater in this field.'));
+        $this->setAttributeValueAndValidate('simple2', '-1');
+    }
+
+    /**
+     * @dataProvider productProvider
+     * @param string $productSku
+     */
+    public function testDefaultValue(string $productSku): void
+    {
+        // product price attribute does not support default value
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function productProvider(): array
+    {
+        return [
+            [
+                'product_sku' => 'simple2',
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function uniqueAttributeValueProvider(): array
+    {
+        return [
+            [
+                'first_product_sku' => 'simple2',
+                'second_product_sku' => 'simple-out-of-stock',
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getAttributeCode(): string
+    {
+        return 'decimal_attribute';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getDefaultAttributeValue(): string
+    {
+        return '100';
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeTextAreaTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeTextAreaTest.php
new file mode 100644
index 0000000000000..61dbf78962c9e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeTextAreaTest.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\Product\Attribute\Save;
+
+/**
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture  Magento/Catalog/_files/product_text_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+ */
+class AttributeTextAreaTest extends AbstractAttributeTest
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getAttributeCode(): string
+    {
+        return 'text_attribute';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getDefaultAttributeValue(): string
+    {
+        return 'default text area value';
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_text_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     * @dataProvider uniqueAttributeValueProvider
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
+     * @inheritdoc
+     */
+    public function testUniqueAttribute(string $firstSku, string $secondSku): void
+    {
+        parent::testUniqueAttribute($firstSku, $secondSku);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function productProvider(): array
+    {
+        return [
+            [
+                'product_sku' => 'simple2',
+            ]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function uniqueAttributeValueProvider(): array
+    {
+        return [
+            [
+                'first_product_sku' => 'simple2',
+                'second_product_sku' => 'simple-out-of-stock',
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeTextTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeTextTest.php
new file mode 100644
index 0000000000000..4da09bc1eca5a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeTextTest.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\Product\Attribute\Save;
+
+/**
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture Magento/Catalog/_files/product_varchar_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+ */
+class AttributeTextTest extends AbstractAttributeTest
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getAttributeCode(): string
+    {
+        return 'varchar_attribute';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getDefaultAttributeValue(): string
+    {
+        return 'default text value';
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_varchar_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     * @dataProvider uniqueAttributeValueProvider
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
+     * @inheritdoc
+     */
+    public function testUniqueAttribute(string $firstSku, string $secondSku): void
+    {
+        parent::testUniqueAttribute($firstSku, $secondSku);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function productProvider(): array
+    {
+        return [
+            [
+                'product_sku' => 'simple2',
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function uniqueAttributeValueProvider(): array
+    {
+        return [
+            [
+                'first_product_sku' => 'simple2',
+                'second_product_sku' => 'simple-out-of-stock',
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeYesNoTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeYesNoTest.php
new file mode 100644
index 0000000000000..7b966791c7b6e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Save/AttributeYesNoTest.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\Product\Attribute\Save;
+
+/**
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture Magento/Catalog/_files/product_boolean_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+ */
+class AttributeYesNoTest extends AbstractAttributeTest
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getAttributeCode(): string
+    {
+        return 'boolean_attribute';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getDefaultAttributeValue(): string
+    {
+        return '1';
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_boolean_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     * @dataProvider uniqueAttributeValueProvider
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
+     * @inheritdoc
+     */
+    public function testUniqueAttribute(string $firstSku, string $secondSku): void
+    {
+        parent::testUniqueAttribute($firstSku, $secondSku);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function productProvider(): array
+    {
+        return [
+            [
+                'product_sku' => 'simple2',
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function uniqueAttributeValueProvider(): array
+    {
+        return [
+            [
+                'first_product_sku' => 'simple2',
+                'second_product_sku' => 'simple-out-of-stock',
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/SetTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/SetTest.php
new file mode 100644
index 0000000000000..d5a8b694b7718
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/SetTest.php
@@ -0,0 +1,276 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Attribute;
+
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
+use Magento\Eav\Api\AttributeSetRepositoryInterface;
+use Magento\Eav\Api\Data\AttributeGroupInterface;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set as AttributeSetResource;
+use Magento\Framework\Api\AttributeInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Eav\Model\GetAttributeGroupByName;
+use Magento\TestFramework\Eav\Model\ResourceModel\GetEntityIdByAttributeId;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Provides tests for attribute set model saving.
+ *
+ * @magentoDbIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class SetTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var AttributeSetRepositoryInterface
+     */
+    private $setRepository;
+
+    /**
+     * @var ProductAttributeRepositoryInterface
+     */
+    private $attributeRepository;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var AttributeSetResource
+     */
+    private $attributeSetResource;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $attributeCollectionFactory;
+
+    /**
+     * @var int
+     */
+    private $defaultSetId;
+
+    /**
+     * @var GetAttributeGroupByName
+     */
+    private $attributeGroupByName;
+
+    /**
+     * @var GetEntityIdByAttributeId
+     */
+    private $getEntityIdByAttributeId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->setRepository = $this->objectManager->get(AttributeSetRepositoryInterface::class);
+        $this->attributeRepository = $this->objectManager->create(ProductAttributeRepositoryInterface::class);
+        $this->config = $this->objectManager->get(Config::class);
+        $this->defaultSetId = (int)$this->config->getEntityType(Product::ENTITY)->getDefaultAttributeSetId();
+        $this->attributeSetResource = $this->objectManager->get(AttributeSetResource::class);
+        $this->attributeCollectionFactory = $this->objectManager->get(CollectionFactory ::class);
+        $this->attributeGroupByName = $this->objectManager->get(GetAttributeGroupByName::class);
+        $this->getEntityIdByAttributeId = $this->objectManager->get(GetEntityIdByAttributeId::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Eav/_files/attribute_with_options.php
+     * @dataProvider addAttributeToSetDataProvider
+     * @param string $groupName
+     * @param string $attributeCode
+     * @return void
+     */
+    public function testSaveWithGroupsAndAttributes(string $groupName, string $attributeCode): void
+    {
+        $set = $this->setRepository->get($this->defaultSetId);
+        $attributeGroup = $this->getAttributeGroup($groupName);
+        $groupId = $attributeGroup ? $attributeGroup->getAttributeGroupId() : 'ynode-1';
+        $attributeId = (int)$this->attributeRepository->get($attributeCode)->getAttributeId();
+        $additional = [
+            'attributes' => [
+                [$attributeId, $groupId, 1],
+            ],
+            'groups' => [
+                [$groupId, $groupName, 1],
+            ],
+        ];
+        $set->organizeData($this->getAttributeSetData($additional));
+        $this->attributeSetResource->save($set);
+        $groupId = $attributeGroup
+            ? $attributeGroup->getAttributeGroupId()
+            : $this->getAttributeGroup($groupName)->getAttributeGroupId();
+        $this->config->clear();
+        $setInfo = $this->attributeSetResource->getSetInfo([$attributeId], $this->defaultSetId);
+        $expectedInfo = [
+            $attributeId => [$this->defaultSetId => ['group_id' => $groupId, 'group_sort' => '1', 'sort' => '1']],
+        ];
+        $this->assertEquals($expectedInfo, $setInfo);
+    }
+
+    /**
+     * @return array
+     */
+    public function addAttributeToSetDataProvider(): array
+    {
+        return [
+            'add_to_existing_group' => [
+                'group_name' => 'Content',
+                'attribute_code' => 'zzz',
+            ],
+            'add_to_new_group' => [
+                'group_name' => 'Test',
+                'attribute_code' => 'zzz',
+            ],
+            'move_to_existing_group' => [
+                'group_name' => 'Images',
+                'attribute_code' => 'description',
+            ],
+            'move_to_new_group' => [
+                'group_name' => 'Test',
+                'attribute_code' => 'description',
+            ],
+        ];
+    }
+
+    /**
+     * @return void
+     */
+    public function testSaveWithChangedGroupSorting(): void
+    {
+        $set = $this->setRepository->get($this->defaultSetId);
+        $contentGroupId = $this->getAttributeGroup('Content')->getAttributeGroupId();
+        $imagesGroupId = $this->getAttributeGroup('Images')->getAttributeGroupId();
+        $additional = [
+            'groups' => [
+                [$contentGroupId, 'Content', 2],
+                [$imagesGroupId, 'Images', 1]
+            ]
+        ];
+        $set->organizeData($this->getAttributeSetData($additional));
+        $this->attributeSetResource->save($set);
+        $contentGroupSort = $this->getAttributeGroup('Content')->getSortOrder();
+        $imagesGroupSort = $this->getAttributeGroup('Images')->getSortOrder();
+        $this->assertEquals(2, $contentGroupSort);
+        $this->assertEquals(1, $imagesGroupSort);
+    }
+
+    /**
+     * @return void
+     */
+    public function testSaveWithRemovedGroup(): void
+    {
+        $set = $this->setRepository->get($this->defaultSetId);
+        $designGroupId = $this->getAttributeGroup('Design')->getAttributeGroupId();
+        $additional = [
+            'removeGroups' => [$designGroupId],
+        ];
+        $set->organizeData($this->getAttributeSetData($additional));
+        $this->attributeSetResource->save($set);
+        $this->assertNull(
+            $this->getAttributeGroup('Design'),
+            'Group "Design" wan\'t deleted.'
+        );
+        $unusedSetAttributes = $this->getSetExcludedAttributes((int)$set->getAttributeSetId());
+        $designAttributeCodes = ['page_layout', 'options_container', 'custom_layout_update'];
+        $this->assertNotEmpty(
+            array_intersect($designAttributeCodes, $unusedSetAttributes),
+            'Attributes from "Design" group still assigned to attribute set.'
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testSaveWithRemovedAttribute(): void
+    {
+        $set = $this->setRepository->get($this->defaultSetId);
+        $attributeId = (int)$this->attributeRepository->get('meta_description')->getAttributeId();
+        $additional = [
+            'not_attributes' => [$this->getEntityAttributeId($this->defaultSetId, $attributeId)],
+        ];
+        $set->organizeData($this->getAttributeSetData($additional));
+        $this->attributeSetResource->save($set);
+        $this->config->clear();
+        $setInfo = $this->attributeSetResource->getSetInfo([$attributeId], $this->defaultSetId);
+        $this->assertEmpty($setInfo[$attributeId]);
+        $unusedSetAttributes = $this->getSetExcludedAttributes((int)$set->getAttributeSetId());
+        $this->assertNotEmpty(
+            array_intersect(['meta_description'], $unusedSetAttributes),
+            'Attribute still assigned to attribute set.'
+        );
+    }
+
+    /**
+     * Returns attribute set data for saving.
+     *
+     * @param array $additional
+     * @return array
+     */
+    private function getAttributeSetData(array $additional): array
+    {
+        $data = [
+            'attributes' => [],
+            'groups' => [],
+            'not_attributes' => [],
+            'removeGroups' => [],
+            'attribute_set_name' => 'Default',
+        ];
+
+        return array_merge($data, $additional);
+    }
+
+    /**
+     * Returns attribute group by name.
+     *
+     * @param string $groupName
+     * @return AttributeGroupInterface|null
+     */
+    private function getAttributeGroup(string $groupName): ?AttributeGroupInterface
+    {
+        return $this->attributeGroupByName->execute($this->defaultSetId, $groupName);
+    }
+
+    /**
+     * Returns list of unused attributes in attribute set.
+     *
+     * @param int $setId
+     * @return array
+     */
+    private function getSetExcludedAttributes(int $setId): array
+    {
+        $collection = $this->attributeCollectionFactory->create()
+            ->setExcludeSetFilter($setId);
+        $result = $collection->getColumnValues(AttributeInterface::ATTRIBUTE_CODE);
+
+        return $result;
+    }
+
+    /**
+     * Returns entity attribute id.
+     *
+     * @param int $setId
+     * @param int $attributeId
+     * @return int
+     */
+    private function getEntityAttributeId(int $setId, int $attributeId): int
+    {
+        return $this->getEntityIdByAttributeId->execute($setId, $attributeId);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Compare/ListCompareTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Compare/ListCompareTest.php
index 3fa02aebe9170..98b264a8991bc 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Compare/ListCompareTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Compare/ListCompareTest.php
@@ -6,10 +6,6 @@
 
 namespace Magento\Catalog\Model\Product\Compare;
 
-/**
- * @magentoDataFixture Magento/Catalog/_files/product_simple.php
- * @magentoDataFixture Magento/Customer/_files/customer.php
- */
 class ListCompareTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -44,6 +40,10 @@ protected function tearDown()
         $this->_session->setCustomerId(null);
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
     public function testAddProductWithSession()
     {
         $this->_session->setCustomerId(1);
@@ -51,10 +51,33 @@ public function testAddProductWithSession()
         $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create(\Magento\Catalog\Model\Product::class)
             ->load(1);
-        $this->_model->addProduct($product);
+        /** @var $product2 \Magento\Catalog\Model\Product */
+        $product2 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Catalog\Model\Product::class)
+            ->load(6);
+        $products = [$product->getId(), $product2->getId()];
+        $this->_model->addProducts($products);
+
         $this->assertTrue($this->_model->hasItems(1, $this->_visitor->getId()));
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testAddProductWithSessionNeg()
+    {
+        $this->_session->setCustomerId(1);
+        $products = ['none', 99];
+        $this->_model->addProducts($products);
+
+        $this->assertFalse($this->_model->hasItems(1, $this->_visitor->getId()));
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
     public function testAddProductWithoutSession()
     {
         /** @var $product \Magento\Catalog\Model\Product */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/CopierTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/CopierTest.php
new file mode 100644
index 0000000000000..6510e048f0e2d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/CopierTest.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\Model\Product;
+
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests product copier.
+ */
+class CopierTest extends TestCase
+{
+    /**
+     * Tests copying of product.
+     *
+     * Case when url_key is set for store view and has equal value to default store.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_multistore_with_url_key.php
+     * @magentoAppArea adminhtml
+     */
+    public function testProductCopyWithExistingUrlKey()
+    {
+        $productSKU = 'simple_100';
+        /** @var ProductRepository $productRepository */
+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepository::class);
+        $copier = Bootstrap::getObjectManager()->get(Copier::class);
+
+        $product = $productRepository->get($productSKU);
+        $duplicate = $copier->copy($product);
+
+        $duplicateStoreView = $productRepository->getById($duplicate->getId(), false, Store::DISTRO_STORE_ID);
+        $productStoreView = $productRepository->get($productSKU, false, Store::DISTRO_STORE_ID);
+
+        $this->assertNotEquals(
+            $duplicateStoreView->getUrlKey(),
+            $productStoreView->getUrlKey(),
+            'url_key of product duplicate should be different then url_key of the product for the same store view'
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/CreateCustomOptionsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/CreateCustomOptionsTest.php
new file mode 100644
index 0000000000000..2239170cdc84e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/CreateCustomOptionsTest.php
@@ -0,0 +1,929 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterfaceFactory;
+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Validator\Exception as ValidatorException;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test product custom options create.
+ * Testing option types: "Area", "File", "Drop-down", "Radio-Buttons",
+ * "Checkbox", "Multiple Select", "Date", "Date & Time" and "Time".
+ *
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation enabled
+ */
+class CreateCustomOptionsTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * Product repository.
+     *
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ProductCustomOptionRepositoryInterface
+     */
+    private $optionRepository;
+
+    /**
+     * Custom option factory.
+     *
+     * @var ProductCustomOptionInterfaceFactory
+     */
+    private $customOptionFactory;
+
+    /**
+     * @var ProductCustomOptionValuesInterfaceFactory
+     */
+    private $customOptionValueFactory;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->optionRepository = $this->objectManager->get(ProductCustomOptionRepositoryInterface::class);
+        $this->customOptionFactory = $this->objectManager->get(ProductCustomOptionInterfaceFactory::class);
+        $this->customOptionValueFactory = $this->objectManager
+            ->get(ProductCustomOptionValuesInterfaceFactory::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+    }
+
+    /**
+     * Test to save option price by store.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_options.php
+     * @magentoDataFixture Magento/Store/_files/core_second_third_fixturestore.php
+     * @magentoAppArea adminhtml
+     * @magentoAppIsolation disabled
+     * @magentoConfigFixture default_store catalog/price/scope 1
+     * @magentoConfigFixture secondstore_store catalog/price/scope 1
+     */
+    public function testSaveOptionPriceByStore(): void
+    {
+        $secondWebsitePrice = 22.0;
+        $currentStoreId = $this->storeManager->getStore()->getId();
+        $customStoreId = $this->storeManager->getStore('secondstore')->getId();
+        $product = $this->productRepository->get('simple');
+        $option = $product->getOptions()[0];
+        $defaultPrice = $option->getPrice();
+        $option->setPrice($secondWebsitePrice);
+        $product->setStoreId($customStoreId);
+        // set Current store='secondstore' to correctly save product options for 'secondstore'
+        try {
+            $this->storeManager->setCurrentStore($customStoreId);
+            $this->productRepository->save($product);
+        } finally {
+            $this->storeManager->setCurrentStore($currentStoreId);
+        }
+        $product = $this->productRepository->get('simple', false, $currentStoreId, true);
+        $option = $product->getOptions()[0];
+        $this->assertEquals($defaultPrice, $option->getPrice(), 'Price value by default store is wrong');
+        $product = $this->productRepository->get('simple', false, $customStoreId, true);
+        $option = $product->getOptions()[0];
+        $this->assertEquals($secondWebsitePrice, $option->getPrice(), 'Price value by custom store is wrong');
+    }
+
+    /**
+     * Test add to product custom options with text type.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider productCustomOptionsTypeTextDataProvider
+     *
+     * @param array $optionData
+     */
+    public function testCreateOptionsWithTypeText(array $optionData): void
+    {
+        $option = $this->baseCreateCustomOptionAndAssert($optionData);
+        $this->assertEquals($optionData['price'], $option->getPrice());
+        $this->assertEquals($optionData['price_type'], $option->getPriceType());
+        $this->assertEquals($optionData['sku'], $option->getSku());
+        $maxCharacters = $optionData['max_characters'] ?? 0;
+        $this->assertEquals($maxCharacters, $option->getMaxCharacters());
+    }
+
+    /**
+     * Tests removing ineligible characters from file_extension.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider fileExtensionsDataProvider
+     *
+     * @param string $rawExtensions
+     * @param string $expectedExtensions
+     */
+    public function testFileExtensions(string $rawExtensions, string $expectedExtensions): void
+    {
+        $product = $this->productRepository->get('simple');
+        $optionData = [
+            '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,
+        ];
+        $fileOption = $this->customOptionFactory->create(['data' => $optionData]);
+        $product->addOption($fileOption);
+        $this->productRepository->save($product);
+        $product = $this->productRepository->get('simple');
+        $fileOption = $product->getOptions()[0];
+        $actualExtensions = $fileOption->getFileExtension();
+        $this->assertEquals($expectedExtensions, $actualExtensions);
+    }
+
+    /**
+     * Test add to product custom options with select type.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider productCustomOptionsTypeSelectDataProvider
+     *
+     * @param array $optionData
+     * @param array $optionValueData
+     */
+    public function testCreateOptionsWithTypeSelect(array $optionData, array $optionValueData): void
+    {
+        $optionValue = $this->customOptionValueFactory->create(['data' => $optionValueData]);
+        $optionData['values'] = [$optionValue];
+        $option = $this->baseCreateCustomOptionAndAssert($optionData);
+        $optionValues = $option->getValues();
+        $this->assertCount(1, $optionValues);
+        $this->assertNotNull($optionValues);
+        $optionValue = reset($optionValues);
+        $this->assertEquals($optionValueData['title'], $optionValue->getTitle());
+        $this->assertEquals($optionValueData['price'], $optionValue->getPrice());
+        $this->assertEquals($optionValueData['price_type'], $optionValue->getPriceType());
+        $this->assertEquals($optionValueData['sku'], $optionValue->getSku());
+        $this->assertEquals($optionValueData['sort_order'], $optionValue->getSortOrder());
+    }
+
+    /**
+     * Test add to product custom options with date type.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider productCustomOptionsTypeDateDataProvider
+     *
+     * @param array $optionData
+     */
+    public function testCreateOptionsWithTypeDate(array $optionData): void
+    {
+        $option = $this->baseCreateCustomOptionAndAssert($optionData);
+        $this->assertEquals($optionData['price'], $option->getPrice());
+        $this->assertEquals($optionData['price_type'], $option->getPriceType());
+        $this->assertEquals($optionData['sku'], $option->getSku());
+    }
+
+    /**
+     * Check that error throws if we save porduct with custom option without some field.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider productCustomOptionsWithErrorDataProvider
+     *
+     * @param array $optionData
+     * @param \Exception $expectedErrorObject
+     */
+    public function testCreateOptionWithError(array $optionData, \Exception $expectedErrorObject): void
+    {
+        $product = $this->productRepository->get('simple');
+        $createdOption = $this->customOptionFactory->create(['data' => $optionData]);
+        $product->setOptions([$createdOption]);
+        $this->expectExceptionObject($expectedErrorObject);
+        $this->productRepository->save($product);
+    }
+
+    /**
+     * Add option to product with type text data provider.
+     *
+     * @return array
+     */
+    public function productCustomOptionsTypeTextDataProvider(): array
+    {
+        return [
+            'area_field_required_options' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => 'area',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            'area_field_not_required_options' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 0,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => 'area',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            'area_field_options_with_fixed_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => 'area',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            'area_field_options_with_percent_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => 'area',
+                    'price' => 10,
+                    'price_type' => 'percent',
+                ],
+            ],
+            'area_field_options_with_max_charters_configuration' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 30,
+                    'title' => 'Test option title 1',
+                    'type' => 'area',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            'area_field_options_without_max_charters_configuration' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'title' => 'Test option title 1',
+                    'type' => 'area',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Data provider for testFileExtensions.
+     *
+     * @return array
+     */
+    public function fileExtensionsDataProvider(): array
+    {
+        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'],
+            ['', ''],
+        ];
+    }
+
+    /**
+     * Add option to product with type text data provider.
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
+     * @return array
+     */
+    public function productCustomOptionsTypeSelectDataProvider(): array
+    {
+        return [
+            'drop_down_field_required_option' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option 1',
+                    'type' => 'drop_down',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'drop_down_field_not_required_option' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 0,
+                    'title' => 'Test option 1',
+                    'type' => 'drop_down',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'drop_down_field_option_with_fixed_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option 1',
+                    'type' => 'drop_down',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'drop_down_field_option_with_percent_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option 1',
+                    'type' => 'drop_down',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'percent',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'radio_field_required_option' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option 1',
+                    'type' => 'radio',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'radio_field_not_required_option' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 0,
+                    'title' => 'Test option 1',
+                    'type' => 'radio',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'radio_field_option_with_fixed_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option 1',
+                    'type' => 'radio',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'radio_field_option_with_percent_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option 1',
+                    'type' => 'radio',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'percent',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'checkbox_field_required_option' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option 1',
+                    'type' => 'checkbox',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'checkbox_field_not_required_option' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 0,
+                    'title' => 'Test option 1',
+                    'type' => 'checkbox',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'checkbox_field_option_with_fixed_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option 1',
+                    'type' => 'checkbox',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'checkbox_field_option_with_percent_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option 1',
+                    'type' => 'checkbox',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'percent',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'multiple_field_required_option' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option 1',
+                    'type' => 'multiple',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'multiple_field_not_required_option' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 0,
+                    'title' => 'Test option 1',
+                    'type' => 'multiple',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'multiple_field_option_with_fixed_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option 1',
+                    'type' => 'multiple',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+            'multiple_field_option_with_percent_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'title' => 'Test option 1',
+                    'type' => 'multiple',
+                    'price_type' => 'fixed',
+                ],
+                [
+                    'record_id' => 0,
+                    'title' => 'Test option 1 value 1',
+                    'price' => 10,
+                    'price_type' => 'percent',
+                    'sku' => 'test-option-1-value-1',
+                    'sort_order' => 1,
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Add option to product with type text data provider.
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
+     * @return array
+     */
+    public function productCustomOptionsTypeDateDataProvider(): array
+    {
+        return [
+            'date_field_required_options' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'title' => 'Test option title 1',
+                    'type' => 'date',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            'date_field_not_required_options' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 0,
+                    'sku' => 'test-option-title-1',
+                    'title' => 'Test option title 1',
+                    'type' => 'date',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            'date_field_options_with_fixed_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'title' => 'Test option title 1',
+                    'type' => 'date',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            'date_field_options_with_percent_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'title' => 'Test option title 1',
+                    'type' => 'date',
+                    'price' => 10,
+                    'price_type' => 'percent',
+                ],
+            ],
+            'date_time_field_required_options' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'title' => 'Test option title 1',
+                    'type' => 'date_time',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            'date_time_field_not_required_options' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 0,
+                    'sku' => 'test-option-title-1',
+                    'title' => 'Test option title 1',
+                    'type' => 'date_time',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            'date_time_field_options_with_fixed_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'title' => 'Test option title 1',
+                    'type' => 'date_time',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            'date_time_field_options_with_percent_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'title' => 'Test option title 1',
+                    'type' => 'date_time',
+                    'price' => 10,
+                    'price_type' => 'percent',
+                ],
+            ],
+            'time_field_required_options' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'title' => 'Test option title 1',
+                    'type' => 'time',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            'time_field_not_required_options' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 0,
+                    'sku' => 'test-option-title-1',
+                    'title' => 'Test option title 1',
+                    'type' => 'time',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            'time_field_options_with_fixed_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'title' => 'Test option title 1',
+                    'type' => 'time',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+            ],
+            'time_field_options_with_percent_price' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'title' => 'Test option title 1',
+                    'type' => 'time',
+                    'price' => 10,
+                    'price_type' => 'percent',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Add option to product for get option save error data provider.
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
+     * @return array
+     */
+    public function productCustomOptionsWithErrorDataProvider(): array
+    {
+        return [
+            'error_option_without_product_sku' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => 'area',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                ],
+                new CouldNotSaveException(__('The ProductSku is empty. Set the ProductSku and try again.')),
+            ],
+            'error_option_without_type' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'product_sku' => 'simple',
+                ],
+                new ValidatorException(__("Missed values for option required fields\nInvalid option type")),
+            ],
+            'error_option_wrong_price_type' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => 'area',
+                    'price' => 10,
+                    'price_type' => 'test_wrong_price_type',
+                    'product_sku' => 'simple',
+                ],
+                new ValidatorException(__('Invalid option value')),
+            ],
+            'error_option_without_price_type' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => 'area',
+                    'price' => 10,
+                    'product_sku' => 'simple',
+                ],
+                new ValidatorException(__('Invalid option value')),
+            ],
+            'error_option_without_price_value' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => 'Test option title 1',
+                    'type' => 'area',
+                    'price_type' => 'fixed',
+                    'product_sku' => 'simple',
+                ],
+                new ValidatorException(__('Invalid option value')),
+            ],
+            'error_option_without_title' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'type' => 'area',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'product_sku' => 'simple',
+                ],
+                new ValidatorException(__('Missed values for option required fields')),
+            ],
+            'error_option_with_empty_title' => [
+                [
+                    'record_id' => 0,
+                    'sort_order' => 1,
+                    'is_require' => 1,
+                    'sku' => 'test-option-title-1',
+                    'max_characters' => 50,
+                    'title' => '',
+                    'type' => 'area',
+                    'price' => 10,
+                    'price_type' => 'fixed',
+                    'product_sku' => 'simple',
+                ],
+                new ValidatorException(__('Missed values for option required fields')),
+            ],
+        ];
+    }
+
+    /**
+     * Create custom option and save product with created option, check base assertions.
+     *
+     * @param array $optionData
+     * @return ProductCustomOptionInterface
+     */
+    private function baseCreateCustomOptionAndAssert(array $optionData): ProductCustomOptionInterface
+    {
+        $product = $this->productRepository->get('simple');
+        $createdOption = $this->customOptionFactory->create(['data' => $optionData]);
+        $createdOption->setProductSku($product->getSku());
+        $product->setOptions([$createdOption]);
+        $this->productRepository->save($product);
+        $productCustomOptions = $this->optionRepository->getProductOptions($product);
+        $this->assertCount(1, $productCustomOptions);
+        $option = reset($productCustomOptions);
+        $this->assertEquals($optionData['title'], $option->getTitle());
+        $this->assertEquals($optionData['type'], $option->getType());
+        $this->assertEquals($optionData['is_require'], $option->getIsRequire());
+
+        return $option;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/DeleteCustomOptionsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/DeleteCustomOptionsTest.php
new file mode 100644
index 0000000000000..8039d3515e304
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/DeleteCustomOptionsTest.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterfaceFactory;
+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test delete product custom options.
+ * Testing option types: "Area", "File", "Drop-down", "Radio-Buttons",
+ * "Checkbox", "Multiple Select", "Date", "Date & Time" and "Time".
+ *
+ * @magentoDbIsolation enabled
+ */
+class DeleteCustomOptionsTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ProductCustomOptionRepositoryInterface
+     */
+    private $optionRepository;
+
+    /**
+     * @var ProductCustomOptionInterfaceFactory
+     */
+    private $customOptionFactory;
+
+    /**
+     * @var ProductCustomOptionValuesInterfaceFactory
+     */
+    private $customOptionValueFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->optionRepository = $this->objectManager->get(ProductCustomOptionRepositoryInterface::class);
+        $this->customOptionFactory = $this->objectManager->get(ProductCustomOptionInterfaceFactory::class);
+        $this->customOptionValueFactory = $this->objectManager
+            ->get(ProductCustomOptionValuesInterfaceFactory::class);
+
+        parent::setUp();
+    }
+
+    /**
+     * Test delete product custom options with type "area".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Area::getDataForCreateOptions()
+     *
+     * @param array $optionData
+     * @return void
+     */
+    public function testDeleteAreaCustomOption(array $optionData): void
+    {
+        $this->deleteAndAssertNotSelectCustomOptions($optionData);
+    }
+
+    /**
+     * Test delete product custom options with type "file".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\File::getDataForCreateOptions()
+     *
+     * @param array $optionData
+     * @return void
+     */
+    public function testDeleteFileCustomOption(array $optionData): void
+    {
+        $this->deleteAndAssertNotSelectCustomOptions($optionData);
+    }
+
+    /**
+     * Test delete product custom options with type "Date".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Date::getDataForCreateOptions()
+     *
+     * @param array $optionData
+     * @return void
+     */
+    public function testDeleteDateCustomOption(array $optionData): void
+    {
+        $this->deleteAndAssertNotSelectCustomOptions($optionData);
+    }
+
+    /**
+     * Test delete product custom options with type "Date & Time".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\DateTime::getDataForCreateOptions()
+     *
+     * @param array $optionData
+     * @return void
+     */
+    public function testDeleteDateTimeCustomOption(array $optionData): void
+    {
+        $this->deleteAndAssertNotSelectCustomOptions($optionData);
+    }
+
+    /**
+     * Test delete product custom options with type "Time".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Time::getDataForCreateOptions()
+     *
+     * @param array $optionData
+     * @return void
+     */
+    public function testDeleteTimeCustomOption(array $optionData): void
+    {
+        $this->deleteAndAssertNotSelectCustomOptions($optionData);
+    }
+
+    /**
+     * Test delete product custom options with type "Drop-down".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\DropDown::getDataForCreateOptions()
+     *
+     * @param array $optionData
+     * @param array $optionValueData
+     * @return void
+     */
+    public function testDeleteDropDownCustomOption(array $optionData, array $optionValueData): void
+    {
+        $this->deleteAndAssertSelectCustomOptions($optionData, $optionValueData);
+    }
+
+    /**
+     * Test delete product custom options with type "Radio Buttons".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\RadioButtons::getDataForCreateOptions()
+     *
+     * @param array $optionData
+     * @param array $optionValueData
+     * @return void
+     */
+    public function testDeleteRadioButtonsCustomOption(array $optionData, array $optionValueData): void
+    {
+        $this->deleteAndAssertSelectCustomOptions($optionData, $optionValueData);
+    }
+
+    /**
+     * Test delete product custom options with type "Checkbox".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Checkbox::getDataForCreateOptions()
+     *
+     * @param array $optionData
+     * @param array $optionValueData
+     * @return void
+     */
+    public function testDeleteCheckboxCustomOption(array $optionData, array $optionValueData): void
+    {
+        $this->deleteAndAssertSelectCustomOptions($optionData, $optionValueData);
+    }
+
+    /**
+     * Test delete product custom options with type "Multiple Select".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\MultipleSelect::getDataForCreateOptions()
+     *
+     * @param array $optionData
+     * @param array $optionValueData
+     * @return void
+     */
+    public function testDeleteMultipleSelectCustomOption(array $optionData, array $optionValueData): void
+    {
+        $this->deleteAndAssertSelectCustomOptions($optionData, $optionValueData);
+    }
+
+    /**
+     * Delete product custom options which are not from "select" group and assert that option was deleted.
+     *
+     * @param array $optionData
+     * @return void
+     */
+    private function deleteAndAssertNotSelectCustomOptions(array $optionData): void
+    {
+        $product = $this->productRepository->get('simple');
+        $createdOption = $this->customOptionFactory->create(['data' => $optionData]);
+        $createdOption->setProductSku($product->getSku());
+        $product->setOptions([$createdOption]);
+        $this->productRepository->save($product);
+        $this->assertCount(1, $this->optionRepository->getProductOptions($product));
+        $product->setOptions([]);
+        $this->productRepository->save($product);
+        $this->assertCount(0, $this->optionRepository->getProductOptions($product));
+    }
+
+    /**
+     * Delete product custom options which from "select" group and assert that option was deleted.
+     *
+     * @param array $optionData
+     * @param array $optionValueData
+     * @return void
+     */
+    private function deleteAndAssertSelectCustomOptions(array $optionData, array $optionValueData): void
+    {
+        $optionValue = $this->customOptionValueFactory->create(['data' => $optionValueData]);
+        $optionData['values'] = [$optionValue];
+        $this->deleteAndAssertNotSelectCustomOptions($optionData);
+    }
+}
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 7421402455b28..2277470e33b12 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,50 +3,87 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Model\Product\Gallery;
 
-use Magento\Framework\Exception\FileSystemException;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Catalog\Model\ResourceModel\Product\Gallery;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 
 /**
- * Test class for \Magento\Catalog\Model\Product\Gallery\CreateHandler.
+ * Provides tests for media gallery images creation during product save.
  *
  * @magentoDataFixture Magento/Catalog/_files/product_simple.php
  * @magentoDataFixture Magento/Catalog/_files/product_image.php
+ * @magentoDbIsolation enabled
  */
 class CreateHandlerTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Catalog\Model\Product\Gallery\CreateHandler
+     * @var string
      */
-    protected $createHandler;
-
     private $fileName = '/m/a/magento_image.jpg';
 
+    /**
+     * @var string
+     */
     private $fileLabel = 'Magento image';
 
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var CreateHandler
+     */
+    private $createHandler;
+
+    /**
+     * @var Gallery
+     */
+    private $galleryResource;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ProductResource
+     */
+    private $productResource;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->createHandler = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product\Gallery\CreateHandler::class
-        );
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->createHandler = $this->objectManager->create(CreateHandler::class);
+        $this->galleryResource = $this->objectManager->create(Gallery::class);
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->productResource = Bootstrap::getObjectManager()->get(ProductResource::class);
     }
 
     /**
+     * Tests gallery processing on product duplication.
+     *
      * @covers \Magento\Catalog\Model\Product\Gallery\CreateHandler::execute
+     *
+     * @return void
      */
-    public function testExecuteWithImageDuplicate()
+    public function testExecuteWithImageDuplicate(): void
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
-        $product->load(1);
-        $product->setData(
-            'media_gallery',
-            ['images' => ['image' => ['file' => $this->fileName, 'label' => $this->fileLabel]]]
-        );
-        $product->setData('image', $this->fileName);
+        $data = [
+            'media_gallery' => ['images' => ['image' => ['file' => $this->fileName, 'label' => $this->fileLabel]]],
+            'image' => $this->fileName,
+        ];
+        $product = $this->initProduct($data);
         $this->createHandler->execute($product);
         $this->assertStringStartsWith('/m/a/magento_image', $product->getData('media_gallery/images/image/new_file'));
         $this->assertEquals($this->fileLabel, $product->getData('image_label'));
@@ -62,39 +99,29 @@ public function testExecuteWithImageDuplicate()
     }
 
     /**
-     * Check sanity of posted image file name
+     * Check sanity of posted image file name.
      *
      * @param string $imageFileName
-     * @throws FileSystemException
      * @expectedException \Magento\Framework\Exception\FileSystemException
+     * @expectedExceptionMessageRegExp ".+ file doesn't exist."
+     * @expectedExceptionMessageRegExp "/^((?!\.\.\/).)*$/"
      * @dataProvider illegalFilenameDataProvider
+     * @return void
      */
-    public function testExecuteWithIllegalFilename($imageFileName)
+    public function testExecuteWithIllegalFilename(string $imageFileName): void
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
-        $product->load(1);
-        $product->setData(
-            'media_gallery',
-            ['images' => ['image' => ['file' => $imageFileName, 'label' => 'New image']]]
-        );
+        $data = [
+            'media_gallery' => ['images' => ['image' => ['file' => $imageFileName, 'label' => 'New image']]],
+        ];
+        $product = $this->initProduct($data);
         $product->setData('image', $imageFileName);
-
-        try {
-            $this->createHandler->execute($product);
-        } catch (FileSystemException $exception) {
-            $this->assertContains(" file doesn't exist.", $exception->getLogMessage());
-            $this->assertNotContains('../', $exception->getLogMessage());
-            throw $exception;
-        }
+        $this->createHandler->execute($product);
     }
 
     /**
      * @return array
      */
-    public function illegalFilenameDataProvider()
+    public function illegalFilenameDataProvider(): array
     {
         return [
             ['../../../../../.htaccess'],
@@ -103,123 +130,196 @@ public function illegalFilenameDataProvider()
     }
 
     /**
+     * Tests gallery processing with different image roles.
+     *
      * @dataProvider executeDataProvider
-     * @param $image
-     * @param $smallImage
-     * @param $swatchImage
-     * @param $thumbnail
+     * @param string $image
+     * @param string $smallImage
+     * @param string $swatchImage
+     * @param string $thumbnail
+     * @return void
      */
-    public function testExecuteWithImageRoles($image, $smallImage, $swatchImage, $thumbnail)
-    {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
-        $product->load(1);
-        $product->setData(
-            'media_gallery',
-            ['images' => ['image' => ['file' => $this->fileName, 'label' => '']]]
-        );
-        $product->setData('image', $image);
-        $product->setData('small_image', $smallImage);
-        $product->setData('swatch_image', $swatchImage);
-        $product->setData('thumbnail', $thumbnail);
+    public function testExecuteWithImageRoles(
+        string $image,
+        string $smallImage,
+        string $swatchImage,
+        string $thumbnail
+    ): void {
+        $data = [
+            'media_gallery' => ['images' => ['image' => ['file' => $this->fileName, 'label' => '']]],
+            'image' => $image,
+            'small_image' => $smallImage,
+            'swatch_image' => $swatchImage,
+            'thumbnail' => $thumbnail,
+        ];
+        $product = $this->initProduct($data);
         $this->createHandler->execute($product);
-
-        $resource = $product->getResource();
-        $id = $product->getId();
-        $storeId = $product->getStoreId();
-
-        $this->assertStringStartsWith('/m/a/magento_image', $product->getData('media_gallery/images/image/new_file'));
-        $this->assertEquals(
-            $image,
-            $resource->getAttributeRawValue($id, $resource->getAttribute('image'), $storeId)
-        );
-        $this->assertEquals(
-            $smallImage,
-            $resource->getAttributeRawValue($id, $resource->getAttribute('small_image'), $storeId)
-        );
-        $this->assertEquals(
-            $swatchImage,
-            $resource->getAttributeRawValue($id, $resource->getAttribute('swatch_image'), $storeId)
-        );
-        $this->assertEquals(
-            $thumbnail,
-            $resource->getAttributeRawValue($id, $resource->getAttribute('thumbnail'), $storeId)
-        );
+        $this->assertMediaImageRoleAttributes($product, $image, $smallImage, $swatchImage, $thumbnail);
     }
 
     /**
+     * Tests gallery processing without images.
+     *
      * @dataProvider executeDataProvider
-     * @param $image
-     * @param $smallImage
-     * @param $swatchImage
-     * @param $thumbnail
+     * @param string $image
+     * @param string $smallImage
+     * @param string $swatchImage
+     * @param string $thumbnail
+     * @return void
      */
-    public function testExecuteWithoutImages($image, $smallImage, $swatchImage, $thumbnail)
-    {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
-        $product->load(1);
-        $product->setData(
-            'media_gallery',
-            ['images' => ['image' => ['file' => $this->fileName, 'label' => '']]]
-        );
-        $product->setData('image', $image);
-        $product->setData('small_image', $smallImage);
-        $product->setData('swatch_image', $swatchImage);
-        $product->setData('thumbnail', $thumbnail);
+    public function testExecuteWithoutImages(
+        string $image,
+        string $smallImage,
+        string $swatchImage,
+        string $thumbnail
+    ): void {
+        $data = [
+            'media_gallery' => ['images' => ['image' => ['file' => $this->fileName, 'label' => '']]],
+            'image' => $image,
+            'small_image' => $smallImage,
+            'swatch_image' => $swatchImage,
+            'thumbnail' => $thumbnail,
+        ];
+        $product = $this->initProduct($data);
         $this->createHandler->execute($product);
-
         $product->unsetData('image');
         $product->unsetData('small_image');
         $product->unsetData('swatch_image');
         $product->unsetData('thumbnail');
         $this->createHandler->execute($product);
-
-        $resource = $product->getResource();
-        $id = $product->getId();
-        $storeId = $product->getStoreId();
-
-        $this->assertStringStartsWith('/m/a/magento_image', $product->getData('media_gallery/images/image/new_file'));
-        $this->assertEquals(
-            $image,
-            $resource->getAttributeRawValue($id, $resource->getAttribute('image'), $storeId)
-        );
-        $this->assertEquals(
-            $smallImage,
-            $resource->getAttributeRawValue($id, $resource->getAttribute('small_image'), $storeId)
-        );
-        $this->assertEquals(
-            $swatchImage,
-            $resource->getAttributeRawValue($id, $resource->getAttribute('swatch_image'), $storeId)
-        );
-        $this->assertEquals(
-            $thumbnail,
-            $resource->getAttributeRawValue($id, $resource->getAttribute('thumbnail'), $storeId)
-        );
+        $this->assertMediaImageRoleAttributes($product, $image, $smallImage, $swatchImage, $thumbnail);
     }
 
     /**
      * @return array
      */
-    public function executeDataProvider()
+    public function executeDataProvider(): array
     {
         return [
             [
                 'image' => $this->fileName,
                 'small_image' => $this->fileName,
                 'swatch_image' => $this->fileName,
-                'thumbnail' => $this->fileName
+                'thumbnail' => $this->fileName,
             ],
             [
                 'image' => 'no_selection',
                 'small_image' => 'no_selection',
                 'swatch_image' => 'no_selection',
-                'thumbnail' => 'no_selection'
-            ]
+                'thumbnail' => 'no_selection',
+            ],
+        ];
+    }
+
+    /**
+     * Tests gallery processing with variations of additional gallery image fields.
+     *
+     * @dataProvider additionalGalleryFieldsProvider
+     * @param string $mediaField
+     * @param string $value
+     * @param string|null $expectedValue
+     * @return void
+     */
+    public function testExecuteWithAdditionalGalleryFields(
+        string $mediaField,
+        string $value,
+        ?string $expectedValue
+    ): void {
+        $data = [
+            'media_gallery' => ['images' => ['image' => ['file' => $this->fileName, $mediaField => $value]]],
         ];
+        $product = $this->initProduct($data);
+        $this->createHandler->execute($product);
+        $galleryAttributeId = $this->productResource->getAttribute('media_gallery')->getAttributeId();
+        $productImages = $this->galleryResource->loadProductGalleryByAttributeId($product, $galleryAttributeId);
+        $image = reset($productImages);
+        $this->assertEquals($image[$mediaField], $expectedValue);
+    }
+
+    /**
+     * @return array
+     */
+    public function additionalGalleryFieldsProvider(): array
+    {
+        return [
+            ['label', '', null],
+            ['label', 'Some label', 'Some label'],
+            ['disabled', '0', '0'],
+            ['disabled', '1', '1'],
+            ['position', '1', '1'],
+            ['position', '2', '2'],
+        ];
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_image_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/product_image.php
+     * @return void
+     */
+    public function testExecuteWithCustomMediaAttribute(): void
+    {
+        $data = [
+            'media_gallery' => ['images' => ['image' => ['file' => $this->fileName, 'label' => '']]],
+            'image' => 'no_selection',
+            'small_image' => 'no_selection',
+            'swatch_image' => 'no_selection',
+            'thumbnail' => 'no_selection',
+            'image_attribute' => $this->fileName
+        ];
+        $product = $this->initProduct($data);
+        $this->createHandler->execute($product);
+        $mediaAttributeValue = $this->productResource->getAttributeRawValue(
+            $product->getId(),
+            ['image_attribute'],
+            $product->getStoreId()
+        );
+        $this->assertEquals($this->fileName, $mediaAttributeValue);
+    }
+
+    /**
+     * Returns product for testing.
+     *
+     * @param array $data
+     * @return Product
+     */
+    private function initProduct(array $data): Product
+    {
+        $product = $this->productRepository->getById(1);
+        $product->addData($data);
+
+        return $product;
+    }
+
+    /**
+     * Asserts product attributes related to gallery images.
+     *
+     * @param Product $product
+     * @param string $image
+     * @param string $smallImage
+     * @param string $swatchImage
+     * @param string $thumbnail
+     * @return void
+     */
+    private function assertMediaImageRoleAttributes(
+        Product $product,
+        string $image,
+        string $smallImage,
+        string $swatchImage,
+        string $thumbnail
+    ): void {
+        $productsImageData = $this->productResource->getAttributeRawValue(
+            $product->getId(),
+            ['image', 'small_image', 'thumbnail', 'swatch_image'],
+            $product->getStoreId()
+        );
+        $this->assertStringStartsWith(
+            '/m/a/magento_image',
+            $product->getData('media_gallery/images/image/new_file')
+        );
+        $this->assertEquals($image, $productsImageData['image']);
+        $this->assertEquals($smallImage, $productsImageData['small_image']);
+        $this->assertEquals($swatchImage, $productsImageData['swatch_image']);
+        $this->assertEquals($thumbnail, $productsImageData['thumbnail']);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/ReadHandlerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/ReadHandlerTest.php
index 35c995ec552a5..89b91ab57e51a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/ReadHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/ReadHandlerTest.php
@@ -3,75 +3,350 @@
  * 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\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Catalog\Model\ResourceModel\Product\Gallery;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 
 /**
- * Test class for \Magento\Catalog\Model\Product\Gallery\ReadHandler.
+ * Provide tests for loading gallery images on product load.
  *
- * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ReadHandlerTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\TestFramework\ObjectManager
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ReadHandler
+     */
+    private $readHandler;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ProductInterfaceFactory
      */
-    protected $objectManager;
+    private $productFactory;
 
     /**
-     * @var \Magento\Catalog\Model\Product\Gallery\ReadHandler
+     * @var ProductResource
      */
-    protected $readHandler;
+    private $productResource;
 
+    /**
+     * @var Gallery
+     */
+    private $galleryResource;
+
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+    /**
+     * @var string
+     */
+    private $productLinkField;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
-
-        $this->readHandler = $this->objectManager->create(
-            \Magento\Catalog\Model\Product\Gallery\ReadHandler::class
-        );
+        $this->readHandler = $this->objectManager->create(ReadHandler::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productFactory = $this->objectManager->get(ProductInterfaceFactory::class);
+        $this->productResource = $this->objectManager->get(ProductResource::class);
+        $this->galleryResource = $this->objectManager->create(Gallery::class);
+        $this->storeRepository = $this->objectManager->create(StoreRepositoryInterface::class);
+        $this->productLinkField =  $this->objectManager->get(MetadataPool::class)
+            ->getMetadata(ProductInterface::class)
+            ->getLinkField();
     }
 
     /**
-     * @covers \Magento\Catalog\Model\Product\Gallery\ReadHandler::execute
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDbIsolation enabled
+     * @return void
      */
-    public function testExecute()
+    public function testExecuteWithoutImages(): void
     {
-        /** @var \Magento\Catalog\Model\Product $product */
-        $product = $this->objectManager->create(
-            \Magento\Catalog\Model\Product::class
-        );
-
-        /**
-         * @var $entityMetadata \Magento\Framework\EntityManager\EntityMetadata
-         */
-        $entityMetadata = $this->objectManager
-            ->get(MetadataPool::class)
-            ->getMetadata(ProductInterface::class);
-        $productRepository = $this->objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-        $linkFieldId = $productRepository->get('simple')->getData($entityMetadata->getLinkField());
-
-        $product->setData($entityMetadata->getLinkField(), $linkFieldId);
+        $product = $this->getProductInstance();
         $this->readHandler->execute($product);
-
         $data = $product->getData();
-
         $this->assertArrayHasKey('media_gallery', $data);
         $this->assertArrayHasKey('images', $data['media_gallery']);
+        $this->assertCount(0, $data['media_gallery']['images']);
+    }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+     * @magentoDbIsolation enabled
+     * @return void
+     */
+    public function testExecuteWithOneImage(): void
+    {
+        $product = $this->getProductInstance();
+        $this->readHandler->execute($product);
+        $data = $product->getData();
+        $this->assertArrayHasKey('media_gallery', $data);
+        $this->assertArrayHasKey('images', $data['media_gallery']);
         $this->assertCount(1, $data['media_gallery']['images']);
+        $galleryImage = reset($data['media_gallery']['images']);
+        $this->assertEquals('/m/a/magento_image.jpg', $galleryImage['file']);
+        $this->assertEquals(1, $galleryImage['position']);
+        $this->assertEquals('Image Alt Text', $galleryImage['label']);
+        $this->assertEquals(0, $galleryImage['disabled']);
+    }
+
+    /**
+     * @dataProvider executeWithTwoImagesDataProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_with_multiple_images.php
+     * @magentoDbIsolation enabled
+     * @param array $images
+     * @param array $expectation
+     * @return void
+     */
+    public function testExecuteWithTwoImages(array $images, array $expectation): void
+    {
+        $this->setGalleryImages($this->getProduct(), $images);
+        $productInstance = $this->getProductInstance();
+        $this->readHandler->execute($productInstance);
+        $data = $productInstance->getData();
+        $this->assertArrayHasKey('media_gallery', $data);
+        $this->assertArrayHasKey('images', $data['media_gallery']);
+        $this->assertCount(count($expectation), $data['media_gallery']['images']);
+        $imagesToAssert = [];
         foreach ($data['media_gallery']['images'] as $valueId => $imageData) {
-            $this->assertEquals(
-                'Image Alt Text',
-                $imageData['label']
-            );
+            $imagesToAssert[] = [
+                'file' => $imageData['file'],
+                'label' => $imageData['label'],
+                'position' => $imageData['position'],
+                'disabled' => $imageData['disabled'],
+            ];
             $this->assertEquals(
                 $imageData['value_id'],
                 $valueId
             );
         }
+        $this->assertEquals($expectation, $imagesToAssert);
+    }
+
+    /**
+     * @return array
+     */
+    public function executeWithTwoImagesDataProvider(): array
+    {
+        return [
+            'with_two_images' => [
+                'images' => [
+                    '/m/a/magento_image.jpg' => [],
+                    '/m/a/magento_thumbnail.jpg' => [],
+                ],
+                'expectation' => [
+                    [
+                        'file' => '/m/a/magento_image.jpg',
+                        'label' => 'Image Alt Text',
+                        'position' => '1',
+                        'disabled' => '0',
+                    ],
+                    [
+                        'file' => '/m/a/magento_thumbnail.jpg',
+                        'label' => 'Thumbnail Image',
+                        'position' => '2',
+                        'disabled' => '0',
+                    ],
+                ],
+            ],
+            'with_two_images_and_changed_position_and_one_disabled' => [
+                'images' => [
+                    '/m/a/magento_image.jpg' => [
+                        'position' => '2',
+                        'disabled' => '0',
+                    ],
+                    '/m/a/magento_thumbnail.jpg' => [
+                        'position' => '1',
+                        'disabled' => '1',
+                    ],
+                ],
+                'expectation' => [
+                    [
+                        'file' => '/m/a/magento_thumbnail.jpg',
+                        'label' => 'Thumbnail Image',
+                        'position' => '1',
+                        'disabled' => '1',
+                    ],
+                    [
+                        'file' => '/m/a/magento_image.jpg',
+                        'label' => 'Image Alt Text',
+                        'position' => '2',
+                        'disabled' => '0',
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider executeOnStoreViewDataProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDbIsolation disabled
+     * @param string $file
+     * @param string $field
+     * @param string $value
+     * @param array $expectation
+     * @return void
+     */
+    public function testExecuteOnStoreView(string $file, string $field, string $value, array $expectation): void
+    {
+        $product = $this->getProduct();
+        $secondStoreId = (int)$this->storeRepository->get('fixture_second_store')->getId();
+        $this->setGalleryImages($product, [$file => [$field => $value]], (int)$secondStoreId);
+        $productInstance = $this->getProductInstance($secondStoreId);
+        $this->readHandler->execute($productInstance);
+        $data = $productInstance->getData();
+        $this->assertArrayHasKey('media_gallery', $data);
+        $this->assertArrayHasKey('images', $data['media_gallery']);
+        $image = reset($data['media_gallery']['images']);
+        $dataToAssert = [
+            $field => $image[$field],
+            $field . '_default' => $image[$field . '_default'],
+        ];
+        $this->assertEquals($expectation, $dataToAssert);
+    }
+
+    /**
+     * @return array
+     */
+    public function executeOnStoreViewDataProvider(): array
+    {
+        return [
+            'with_store_label' => [
+                'file' => '/m/a/magento_image.jpg',
+                'field' => 'label',
+                'value' => 'Some store label',
+                'expectation' => [
+                    'label' => 'Some store label',
+                    'label_default' => 'Image Alt Text',
+                ],
+            ],
+            'with_store_position' => [
+                'file' => '/m/a/magento_image.jpg',
+                'field' => 'position',
+                'value' => '2',
+                'expectation' => [
+                    'position' => '2',
+                    'position_default' => '1',
+                ],
+            ],
+            'with_store_disabled' => [
+                'file' => '/m/a/magento_image.jpg',
+                'field' => 'disabled',
+                'value' => '1',
+                'expectation' => [
+                    'disabled' => '1',
+                    'disabled_default' => '0',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        parent::tearDown();
+        $this->galleryResource->getConnection()
+            ->delete($this->galleryResource->getTable(Gallery::GALLERY_TABLE));
+        $this->galleryResource->getConnection()
+            ->delete($this->galleryResource->getTable(Gallery::GALLERY_VALUE_TABLE));
+        $this->galleryResource->getConnection()
+            ->delete($this->galleryResource->getTable(Gallery::GALLERY_VALUE_TO_ENTITY_TABLE));
+    }
+
+    /**
+     * Returns product for testing.
+     *
+     * @return ProductInterface
+     */
+    private function getProduct(): ProductInterface
+    {
+        return $this->productRepository->get('simple', false, Store::DEFAULT_STORE_ID);
+    }
+
+    /**
+     * Updates product gallery images and saves product.
+     *
+     * @param ProductInterface $product
+     * @param array $images
+     * @param int|null $storeId
+     * @return void
+     */
+    private function setGalleryImages(ProductInterface $product, array $images, ?int $storeId = null): void
+    {
+        $product->setImage(null);
+        foreach ($images as $file => $data) {
+            $mediaGalleryData = $product->getData('media_gallery');
+            foreach ($mediaGalleryData['images'] as &$image) {
+                if ($image['file'] == $file) {
+                    foreach ($data as $key => $value) {
+                        $image[$key] = $value;
+                    }
+                }
+            }
+
+            $product->setData('media_gallery', $mediaGalleryData);
+            if (!empty($data['main'])) {
+                $product->setImage($file);
+            }
+        }
+
+        if ($storeId) {
+            $product->setStoreId($storeId);
+        }
+
+        $this->productResource->save($product);
+    }
+
+    /**
+     * Returns empty product instance.
+     *
+     * @param int|null $storeId
+     * @return ProductInterface
+     */
+    private function getProductInstance(?int $storeId = null): ProductInterface
+    {
+        /** @var ProductInterface $product */
+        $product = $this->productFactory->create();
+        $product->setData(
+            $this->productLinkField,
+            $this->getProduct()->getData($this->productLinkField)
+        );
+
+        if ($storeId) {
+            $product->setStoreId($storeId);
+        }
+
+        return $product;
     }
 }
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
index 559dd6d1b747d..fcee06187f374 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
@@ -8,18 +8,24 @@
 
 namespace Magento\Catalog\Model\Product\Gallery;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
-use Magento\Framework\Filesystem;
+use Magento\Catalog\Model\Product\Media\Config;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Catalog\Model\ResourceModel\Product\Gallery;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Framework\Filesystem\Directory\WriteInterface;
 
 /**
- * Test for \Magento\Catalog\Model\Product\Gallery\UpdateHandler.
+ * Provides tests for media gallery images update during product save.
  *
- * @magentoDataFixture Magento/Catalog/_files/product_simple.php
- * @magentoDataFixture Magento/Catalog/_files/product_image.php
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class UpdateHandlerTest extends \PHPUnit\Framework\TestCase
 {
@@ -33,68 +39,342 @@ class UpdateHandlerTest extends \PHPUnit\Framework\TestCase
      */
     private $updateHandler;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+    /**
+     * @var Gallery
+     */
+    private $galleryResource;
+
+    /**
+     * @var ProductResource
+     */
+    private $productResource;
+
     /**
      * @var WriteInterface
      */
     private $mediaDirectory;
 
     /**
-     * @var Filesystem
+     * @var Config
      */
-    private $filesystem;
+    private $config;
 
     /**
      * @var string
      */
     private $fileName;
 
+    /**
+     * @var int
+     */
+    private $mediaAttributeId;
+
     /**
      * @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->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->storeRepository = $this->objectManager->create(StoreRepositoryInterface::class);
+        $this->galleryResource = $this->objectManager->create(Gallery::class);
+        $this->productResource = $this->objectManager->create(ProductResource::class);
+        $this->mediaAttributeId = (int)$this->productResource->getAttribute('media_gallery')->getAttributeId();
+        $this->config = $this->objectManager->get(Config::class);
+        $this->mediaDirectory = $this->objectManager->get(Filesystem::class)
+            ->getDirectoryWrite(DirectoryList::MEDIA);
         $this->mediaDirectory->writeFile($this->fileName, 'Test');
     }
 
     /**
+     * Tests updating image with illegal filename during product save.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/product_image.php
+     *
      * @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 = $this->getProduct();
         $product->setData(
             'media_gallery',
             [
                 'images' => [
                     'image' => [
                         'value_id' => '100',
-                        'file' => $filePath,
+                        'file' => '/../..' . DIRECTORY_SEPARATOR . $this->fileName,
                         'label' => 'New image',
                         'removed' => 1,
                     ],
                 ],
             ]
         );
-
         $this->updateHandler->execute($product);
         $this->assertFileExists($this->mediaDirectory->getAbsolutePath($this->fileName));
     }
 
     /**
+     * Tests updating image label, position and disabling during product save.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+     * @magentoDbIsolation enabled
      * @return void
      */
-    protected function tearDown(): void
+    public function testExecuteWithOneImage(): void
     {
+        $product = $this->getProduct();
+        $this->updateProductGalleryImages($product, ['label' => 'New image', 'disabled' => '1']);
+        $this->updateHandler->execute($product);
+        $productImages = $this->galleryResource->loadProductGalleryByAttributeId($product, $this->mediaAttributeId);
+        $updatedImage = reset($productImages);
+        $this->assertTrue(is_array($updatedImage));
+        $this->assertEquals('New image', $updatedImage['label']);
+        $this->assertEquals('New image', $updatedImage['label_default']);
+        $this->assertEquals('1', $updatedImage['disabled']);
+        $this->assertEquals('1', $updatedImage['disabled_default']);
+    }
+
+    /**
+     * Tests updating image roles during product save.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_multiple_images.php
+     * @dataProvider executeWithTwoImagesAndRolesDataProvider
+     * @magentoDbIsolation enabled
+     * @param array $roles
+     * @return void
+     */
+    public function testExecuteWithTwoImagesAndDifferentRoles(array $roles): void
+    {
+        $imageRoles = ['image', 'small_image', 'thumbnail', 'swatch_image'];
+        $product = $this->getProduct();
+        $product->addData($roles);
+        $this->updateHandler->execute($product);
+        $productsImageData = $this->productResource->getAttributeRawValue(
+            $product->getId(),
+            $imageRoles,
+            $product->getStoreId()
+        );
+        $this->assertEquals($roles, $productsImageData);
+    }
+
+    /**
+     * Tests updating image roles during product save on non default store view.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_multiple_images.php
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @dataProvider executeWithTwoImagesAndRolesDataProvider
+     * @magentoDbIsolation enabled
+     * @param array $roles
+     * @return void
+     */
+    public function testExecuteWithTwoImagesAndDifferentRolesOnStoreView(array $roles): void
+    {
+        $secondStoreId = (int)$this->storeRepository->get('fixture_second_store')->getId();
+        $imageRoles = ['image', 'small_image', 'thumbnail', 'swatch_image'];
+        $product = $this->getProduct($secondStoreId);
+        $product->addData($roles);
+        $this->updateHandler->execute($product);
+
+        $storeImages = $this->productResource->getAttributeRawValue(
+            $product->getId(),
+            $imageRoles,
+            $secondStoreId
+        );
+        $this->assertEquals($roles, $storeImages);
+
+        $defaultImages = $this->productResource->getAttributeRawValue(
+            $product->getId(),
+            $imageRoles,
+            Store::DEFAULT_STORE_ID
+        );
+        $this->assertEquals('/m/a/magento_image.jpg', $defaultImages['image']);
+        $this->assertEquals('/m/a/magento_image.jpg', $defaultImages['small_image']);
+        $this->assertEquals('/m/a/magento_thumbnail.jpg', $defaultImages['thumbnail']);
+        $this->assertEquals('/m/a/magento_thumbnail.jpg', $defaultImages['swatch_image']);
+    }
+
+    /**
+     * @return array
+     */
+    public function executeWithTwoImagesAndRolesDataProvider(): array
+    {
+        return [
+            'unassign_all_roles' => [
+                'roles' => [
+                    'image' => 'no_selection',
+                    'small_image' =>'no_selection',
+                    'thumbnail' => 'no_selection',
+                    'swatch_image' => 'no_selection',
+                ],
+            ],
+            'assign_already_used_role' => [
+                'roles' => [
+                    'image' => '/m/a/magento_image.jpg',
+                    'small_image' => '/m/a/magento_thumbnail.jpg',
+                    'thumbnail' => '/m/a/magento_thumbnail.jpg',
+                    'swatch_image' => '/m/a/magento_image.jpg',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Tests updating image position during product save.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_multiple_images.php
+     * @magentoDbIsolation enabled
+     * @return void
+     */
+    public function testExecuteWithTwoImagesAndChangedPosition(): void
+    {
+        $positionMap = [
+            '/m/a/magento_image.jpg' => '2',
+            '/m/a/magento_thumbnail.jpg' => '1',
+        ];
+        $product = $this->getProduct();
+        $images = $product->getData('media_gallery')['images'];
+        foreach ($images as &$image) {
+            $image['position'] = $positionMap[$image['file']];
+        }
+        $product->setData('store_id', Store::DEFAULT_STORE_ID);
+        $product->setData('media_gallery', ['images' => $images]);
+        $this->updateHandler->execute($product);
+        $productImages = $this->galleryResource->loadProductGalleryByAttributeId($product, $this->mediaAttributeId);
+        foreach ($productImages as $updatedImage) {
+            $this->assertEquals($positionMap[$updatedImage['file']], $updatedImage['position']);
+            $this->assertEquals($positionMap[$updatedImage['file']], $updatedImage['position_default']);
+        }
+    }
+
+    /**
+     * Tests image remove during product save.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+     * @magentoDbIsolation enabled
+     * @return void
+     */
+    public function testExecuteWithImageToDelete(): void
+    {
+        $product = $this->getProduct();
+        $image = $product->getImage();
+        $this->updateProductGalleryImages($product, ['removed' => '1']);
+        $this->updateHandler->execute($product);
+        $productImages = $this->galleryResource->loadProductGalleryByAttributeId($product, $this->mediaAttributeId);
+        $this->assertCount(0, $productImages);
+        $this->assertFileNotExists(
+            $this->mediaDirectory->getAbsolutePath($this->config->getBaseMediaPath() . $image)
+        );
+        $defaultImages = $this->productResource->getAttributeRawValue(
+            $product->getId(),
+            ['image', 'small_image', 'thumbnail', 'swatch_image'],
+            Store::DEFAULT_STORE_ID
+        );
+        $this->assertEquals('no_selection', $defaultImages['image']);
+        $this->assertEquals('no_selection', $defaultImages['small_image']);
+        $this->assertEquals('no_selection', $defaultImages['thumbnail']);
+    }
+
+    /**
+     * Tests updating images data during product save on non default store view.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_multiple_images.php
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDbIsolation enabled
+     * @return void
+     */
+    public function testExecuteWithTwoImagesOnStoreView(): void
+    {
+        $secondStoreId = (int)$this->storeRepository->get('fixture_second_store')->getId();
+        $storeImages = [
+            '/m/a/magento_image.jpg' => [
+                'label' => 'Store image',
+                'label_default' => 'Image Alt Text',
+                'disabled' => '1',
+                'disabled_default' => '0',
+                'position' => '2',
+                'position_default' => '1',
+            ],
+            '/m/a/magento_thumbnail.jpg' => [
+                'label' => 'Store thumbnail',
+                'label_default' => 'Thumbnail Image',
+                'disabled' => '0',
+                'disabled_default' => '0',
+                'position' => '1',
+                'position_default' => '2',
+            ],
+        ];
+        $product = $this->getProduct($secondStoreId);
+        $images = $product->getData('media_gallery')['images'];
+        foreach ($images as &$image) {
+            $image['label'] = $storeImages[$image['file']]['label'];
+            $image['disabled'] = $storeImages[$image['file']]['disabled'];
+            $image['position'] = $storeImages[$image['file']]['position'];
+        }
+        $product->setData('media_gallery', ['images' => $images]);
+        $this->updateHandler->execute($product);
+        $productImages = $this->galleryResource->loadProductGalleryByAttributeId($product, $this->mediaAttributeId);
+        foreach ($productImages as $image) {
+            $imageToAssert = [
+                'label' => $image['label'],
+                'label_default' =>$image['label_default'],
+                'disabled' =>$image['disabled'],
+                'disabled_default' => $image['disabled_default'],
+                'position' => $image['position'],
+                'position_default' => $image['position_default'],
+            ];
+            $this->assertEquals($storeImages[$image['file']], $imageToAssert);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        parent::tearDown();
         $this->mediaDirectory->getDriver()->deleteFile($this->mediaDirectory->getAbsolutePath($this->fileName));
+        $this->galleryResource->getConnection()
+            ->delete($this->galleryResource->getTable(Gallery::GALLERY_TABLE));
+        $this->galleryResource->getConnection()
+            ->delete($this->galleryResource->getTable(Gallery::GALLERY_VALUE_TABLE));
+        $this->galleryResource->getConnection()
+            ->delete($this->galleryResource->getTable(Gallery::GALLERY_VALUE_TO_ENTITY_TABLE));
+    }
+
+    /**
+     * Returns current product.
+     *
+     * @param int|null $storeId
+     * @return ProductInterface|Product
+     */
+    private function getProduct(?int $storeId = null): ProductInterface
+    {
+        return $this->productRepository->get('simple', false, $storeId, true);
+    }
+
+    /**
+     * @param ProductInterface|Product $product
+     * @param array $imageData
+     * @return void
+     */
+    private function updateProductGalleryImages(ProductInterface $product, array $imageData): void
+    {
+        $images = $product->getData('media_gallery')['images'];
+        $image = reset($images) ?: [];
+        $product->setData('store_id', Store::DEFAULT_STORE_ID);
+        $product->setData('media_gallery', ['images' => ['image' => array_merge($image, $imageData)]]);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/LinksTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/LinksTest.php
new file mode 100644
index 0000000000000..b8be34f460dcb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/LinksTest.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductLinkInterface;
+use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ProductLink\Link;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Saving product with linked products
+ */
+class LinksTest extends TestCase
+{
+    /** @var array */
+    private $linkTypes = [
+        'upsell',
+        'crosssell',
+        'related',
+    ];
+
+    /** @var array */
+    private $defaultDataFixture = [
+        [
+            'id' => '2',
+            'sku' => 'custom-design-simple-product',
+            'position' => 1,
+        ],
+        [
+            'id' => '10',
+            'sku' => 'simple1',
+            'position' => 2,
+        ],
+    ];
+
+    /** @var array */
+    private $existingProducts = [
+        [
+            'id' => '10',
+            'sku' => 'simple1',
+            'position' => 1,
+        ],
+        [
+            'id' => '11',
+            'sku' => 'simple2',
+            'position' => 2,
+        ],
+        [
+            'id' => '12',
+            'sku' => 'simple3',
+            'position' => 3,
+        ],
+    ];
+
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var ObjectManager */
+    private $objectManager;
+
+    /** @var ProductResource */
+    private $productResource;
+
+    /** @var ProductLinkInterfaceFactory */
+    private $productLinkInterfaceFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->productResource = $this->objectManager->create(ProductResource::class);
+        $this->productLinkInterfaceFactory = $this->objectManager->create(ProductLinkInterfaceFactory::class);
+    }
+
+    /**
+     * Test edit and remove simple related, up-sells, cross-sells products in an existing product
+     *
+     * @dataProvider editDeleteRelatedUpSellCrossSellProductsProvider
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @param array $data
+     * @return void
+     */
+    public function testEditRemoveRelatedUpSellCrossSellProducts(array $data): void
+    {
+        /** @var ProductInterface|Product $product */
+        $product = $this->productRepository->get('simple');
+        $this->setCustomProductLinks($product, $this->getProductData($data['defaultLinks']));
+        $this->productRepository->save($product);
+
+        $productData = $this->getProductData($data['productLinks']);
+        $this->setCustomProductLinks($product, $productData);
+        $this->productResource->save($product);
+
+        $product = $this->productRepository->get('simple');
+        $expectedLinks = isset($data['expectedProductLinks'])
+            ? $this->getProductData($data['expectedProductLinks'])
+            : $productData;
+
+        $this->assertEquals(
+            $expectedLinks,
+            $this->getActualLinks($product),
+            "Expected linked products do not match actual linked products!"
+        );
+    }
+
+    /**
+     * Provide test data for testEditDeleteRelatedUpSellCrossSellProducts().
+     *
+     * @return array
+     */
+    public function editDeleteRelatedUpSellCrossSellProductsProvider(): array
+    {
+        return [
+            'update' => [
+                'data' => [
+                    'defaultLinks' => $this->defaultDataFixture,
+                    'productLinks' => $this->existingProducts,
+                ],
+            ],
+            'delete' => [
+                'data' => [
+                    'defaultLinks' => $this->defaultDataFixture,
+                    'productLinks' => []
+                ],
+            ],
+            'same' => [
+                'data' => [
+                    'defaultLinks' => $this->existingProducts,
+                    'productLinks' => $this->existingProducts,
+                ],
+            ],
+            'change_position' => [
+                'data' => [
+                    'defaultLinks' => $this->existingProducts,
+                    'productLinks' => array_replace_recursive(
+                        $this->existingProducts,
+                        [
+                            ['position' => 4],
+                            ['position' => 5],
+                            ['position' => 6],
+                        ]
+                    ),
+                ],
+            ],
+            'without_position' => [
+                'data' => [
+                    'defaultLinks' => $this->defaultDataFixture,
+                    'productLinks' => array_replace_recursive(
+                        $this->existingProducts,
+                        [
+                            ['position' => null],
+                            ['position' => null],
+                            ['position' => null],
+                        ]
+                    ),
+                    'expectedProductLinks' => array_replace_recursive(
+                        $this->existingProducts,
+                        [
+                            ['position' => 1],
+                            ['position' => 2],
+                            ['position' => 3],
+                        ]
+                    ),
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Create an array of products by link type that will be linked
+     *
+     * @param array $productFixture
+     * @return array
+     */
+    private function getProductData(array $productFixture): array
+    {
+        $productData = [];
+        foreach ($this->linkTypes as $linkType) {
+            $productData[$linkType] = [];
+            foreach ($productFixture as $data) {
+                $productData[$linkType][] = $data;
+            }
+        }
+
+        return $productData;
+    }
+
+    /**
+     * Link related, up-sells, cross-sells products received from the array
+     *
+     * @param ProductInterface|Product $product
+     * @param array $productData
+     * @return void
+     */
+    private function setCustomProductLinks(ProductInterface $product, array $productData): void
+    {
+        $productLinks = [];
+        foreach ($productData as $linkType => $links) {
+            foreach ($links as $data) {
+                /** @var ProductLinkInterface|Link $productLink */
+                $productLink = $this->productLinkInterfaceFactory->create();
+                $productLink->setSku('simple');
+                $productLink->setLinkedProductSku($data['sku']);
+                if (isset($data['position'])) {
+                    $productLink->setPosition($data['position']);
+                }
+                $productLink->setLinkType($linkType);
+                $productLinks[] = $productLink;
+            }
+        }
+        $product->setProductLinks($productLinks);
+    }
+
+    /**
+     * Get an array of received related, up-sells, cross-sells products
+     *
+     * @param ProductInterface|Product $product
+     * @return array
+     */
+    private function getActualLinks(ProductInterface $product): array
+    {
+        $actualLinks = [];
+        foreach ($this->linkTypes as $linkType) {
+            $products = [];
+            $actualLinks[$linkType] = [];
+            switch ($linkType) {
+                case 'upsell':
+                    $products = $product->getUpSellProducts();
+                    break;
+                case 'crosssell':
+                    $products = $product->getCrossSellProducts();
+                    break;
+                case 'related':
+                    $products = $product->getRelatedProducts();
+                    break;
+            }
+            /** @var ProductInterface|Product $productItem */
+            foreach ($products as $productItem) {
+                $actualLinks[$linkType][] = [
+                    'id' => $productItem->getId(),
+                    'sku' => $productItem->getSku(),
+                    'position' => $productItem->getPosition(),
+                ];
+            }
+        }
+
+        return $actualLinks;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/OptionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/OptionTest.php
deleted file mode 100644
index bfb49686447c0..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/OptionTest.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?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\Store\Model\Store;
-use Magento\Store\Model\StoreManagerInterface;
-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;
-
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
-    /**
-     * @inheritdoc
-     */
-    protected function setUp()
-    {
-        $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
-        $this->customOptionFactory = Bootstrap::getObjectManager()->create(ProductCustomOptionInterfaceFactory::class);
-        $this->storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::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]);
-    }
-
-    /**
-     * Test to save option price by store
-     *
-     * @magentoDataFixture Magento/Catalog/_files/product_with_options.php
-     * @magentoDataFixture Magento/Store/_files/core_second_third_fixturestore.php
-     * @magentoConfigFixture default_store catalog/price/scope 1
-     * @magentoConfigFixture secondstore_store catalog/price/scope 1
-     */
-    public function testSaveOptionPriceByStore()
-    {
-        $secondWebsitePrice = 22.0;
-        $defaultStoreId = $this->storeManager->getStore()->getId();
-        $secondStoreId = $this->storeManager->getStore('secondstore')->getId();
-
-        /** @var \Magento\Catalog\Model\Product $product */
-        $product = $this->productRepository->get('simple');
-        $option = $product->getOptions()[0];
-        $defaultPrice = $option->getPrice();
-
-        $option->setPrice($secondWebsitePrice);
-        $product->setStoreId($secondStoreId);
-        // set Current store='secondstore' to correctly save product options for 'secondstore'
-        $this->storeManager->setCurrentStore($secondStoreId);
-        $this->productRepository->save($product);
-        $this->storeManager->setCurrentStore($defaultStoreId);
-
-        $product = $this->productRepository->get('simple', false, Store::DEFAULT_STORE_ID, true);
-        $option = $product->getOptions()[0];
-        $this->assertEquals($defaultPrice, $option->getPrice(), 'Price value by default store is wrong');
-
-        $product = $this->productRepository->get('simple', false, $secondStoreId, true);
-        $option = $product->getOptions()[0];
-        $this->assertEquals($secondWebsitePrice, $option->getPrice(), 'Price value by store_id=1 is wrong');
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UpdateCustomOptionsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UpdateCustomOptionsTest.php
new file mode 100644
index 0000000000000..c07303f03e4f1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UpdateCustomOptionsTest.php
@@ -0,0 +1,465 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface;
+use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterfaceFactory;
+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Option\Value;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test product custom options update.
+ * Testing option types: "Area", "File", "Drop-down", "Radio-Buttons",
+ * "Checkbox", "Multiple Select", "Date", "Date & Time" and "Time".
+ *
+ * @magentoDbIsolation enabled
+ */
+class UpdateCustomOptionsTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ProductCustomOptionRepositoryInterface
+     */
+    private $optionRepository;
+
+    /**
+     * @var ProductCustomOptionInterfaceFactory
+     */
+    private $customOptionFactory;
+
+    /**
+     * @var ProductCustomOptionValuesInterfaceFactory
+     */
+    private $customOptionValueFactory;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var StoreInterface
+     */
+    private $currentStoreId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->optionRepository = $this->objectManager->get(ProductCustomOptionRepositoryInterface::class);
+        $this->customOptionFactory = $this->objectManager->get(ProductCustomOptionInterfaceFactory::class);
+        $this->customOptionValueFactory = $this->objectManager
+            ->get(ProductCustomOptionValuesInterfaceFactory::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $this->currentStoreId = $this->storeManager->getStore()->getId();
+        $adminStoreId = $this->storeManager->getStore('admin')->getId();
+        $this->storeManager->setCurrentStore($adminStoreId);
+
+        parent::setUp();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->storeManager->setCurrentStore($this->currentStoreId);
+
+        parent::tearDown();
+    }
+
+    /**
+     * Test update product custom options with type "area".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Area::getDataForUpdateOptions
+     *
+     * @param array $optionData
+     * @param array $updateData
+     * @return void
+     */
+    public function testUpdateAreaCustomOption(array $optionData, array $updateData): void
+    {
+        $this->updateAndAssertNotSelectCustomOptions($optionData, $updateData);
+    }
+
+    /**
+     * Test update product custom options with type "file".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\File::getDataForUpdateOptions
+     *
+     * @param array $optionData
+     * @param array $updateData
+     * @return void
+     */
+    public function testUpdateFileCustomOption(array $optionData, array $updateData): void
+    {
+        $this->updateAndAssertNotSelectCustomOptions($optionData, $updateData);
+    }
+
+    /**
+     * Test update product custom options with type "Date".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Date::getDataForUpdateOptions
+     *
+     * @param array $optionData
+     * @param array $updateData
+     * @return void
+     */
+    public function testUpdateDateCustomOption(array $optionData, array $updateData): void
+    {
+        $this->updateAndAssertNotSelectCustomOptions($optionData, $updateData);
+    }
+
+    /**
+     * Test update product custom options with type "Date & Time".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\DateTime::getDataForUpdateOptions
+     *
+     * @param array $optionData
+     * @param array $updateData
+     * @return void
+     */
+    public function testUpdateDateTimeCustomOption(array $optionData, array $updateData): void
+    {
+        $this->updateAndAssertNotSelectCustomOptions($optionData, $updateData);
+    }
+
+    /**
+     * Test update product custom options with type "Time".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Time::getDataForUpdateOptions
+     *
+     * @param array $optionData
+     * @param array $updateData
+     * @return void
+     */
+    public function testUpdateTimeCustomOption(array $optionData, array $updateData): void
+    {
+        $this->updateAndAssertNotSelectCustomOptions($optionData, $updateData);
+    }
+
+    /**
+     * Test update product custom options with type "Drop-down".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\DropDown::getDataForUpdateOptions
+     *
+     * @param array $optionData
+     * @param array $optionValueData
+     * @param array $updateOptionData
+     * @param array $updateOptionValueData
+     * @return void
+     */
+    public function testUpdateDropDownCustomOption(
+        array $optionData,
+        array $optionValueData,
+        array $updateOptionData,
+        array $updateOptionValueData
+    ): void {
+        $this->updateAndAssertSelectCustomOptions(
+            $optionData,
+            $optionValueData,
+            $updateOptionData,
+            $updateOptionValueData
+        );
+    }
+
+    /**
+     * Test update product custom options with type "Radio Buttons".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\RadioButtons::getDataForUpdateOptions
+     *
+     * @param array $optionData
+     * @param array $optionValueData
+     * @param array $updateOptionData
+     * @param array $updateOptionValueData
+     * @return void
+     */
+    public function testUpdateRadioButtonsCustomOption(
+        array $optionData,
+        array $optionValueData,
+        array $updateOptionData,
+        array $updateOptionValueData
+    ): void {
+        $this->updateAndAssertSelectCustomOptions(
+            $optionData,
+            $optionValueData,
+            $updateOptionData,
+            $updateOptionValueData
+        );
+    }
+
+    /**
+     * Test update product custom options with type "Checkbox".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\Checkbox::getDataForUpdateOptions
+     *
+     * @param array $optionData
+     * @param array $optionValueData
+     * @param array $updateOptionData
+     * @param array $updateOptionValueData
+     * @return void
+     */
+    public function testUpdateCheckboxCustomOption(
+        array $optionData,
+        array $optionValueData,
+        array $updateOptionData,
+        array $updateOptionValueData
+    ): void {
+        $this->updateAndAssertSelectCustomOptions(
+            $optionData,
+            $optionValueData,
+            $updateOptionData,
+            $updateOptionValueData
+        );
+    }
+
+    /**
+     * Test update product custom options with type "Multiple Select".
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     *
+     * @dataProvider \Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\MultipleSelect::getDataForUpdateOptions
+     *
+     * @param array $optionData
+     * @param array $optionValueData
+     * @param array $updateOptionData
+     * @param array $updateOptionValueData
+     * @return void
+     */
+    public function testUpdateMultipleSelectCustomOption(
+        array $optionData,
+        array $optionValueData,
+        array $updateOptionData,
+        array $updateOptionValueData
+    ): void {
+        $this->updateAndAssertSelectCustomOptions(
+            $optionData,
+            $optionValueData,
+            $updateOptionData,
+            $updateOptionValueData
+        );
+    }
+
+    /**
+     * Update product custom options which are not from "select" group and assert updated data.
+     *
+     * @param array $optionData
+     * @param array $updateData
+     * @return void
+     */
+    private function updateAndAssertNotSelectCustomOptions(array $optionData, array $updateData): void
+    {
+        $productSku = 'simple';
+        $createdOption = $this->createCustomOption($optionData, $productSku);
+        $updatedOption = $this->updateOptionWithValues($updateData, $productSku);
+
+        foreach ($updateData as $methodKey => $newValue) {
+            $this->assertEquals($newValue, $updatedOption->getDataUsingMethod($methodKey));
+            $this->assertNotEquals(
+                $createdOption->getDataUsingMethod($methodKey),
+                $updatedOption->getDataUsingMethod($methodKey)
+            );
+        }
+
+        $this->assertEquals($createdOption->getOptionId(), $updatedOption->getOptionId());
+    }
+
+    /**
+     * Update product custom options which from "select" group and assert updated data.
+     *
+     * @param array $optionData
+     * @param array $optionValueData
+     * @param array $updateOptionData
+     * @param array $updateOptionValueData
+     * @return void
+     */
+    private function updateAndAssertSelectCustomOptions(
+        array $optionData,
+        array $optionValueData,
+        array $updateOptionData,
+        array $updateOptionValueData
+    ): void {
+        $productSku = 'simple';
+        $createdOption = $this->createCustomOptionWithValue($optionData, $optionValueData, $productSku);
+        $createdOptionValue = $this->getOptionValue($createdOption);
+        $updatedOption = $this->updateOptionAndValueWithValues($updateOptionData, $updateOptionValueData, $productSku);
+        $updatedOptionValue = $this->getOptionValue($updatedOption);
+
+        foreach ($updateOptionData as $methodKey => $newValue) {
+            $this->assertEquals($newValue, $updatedOption->getDataUsingMethod($methodKey));
+            $this->assertNotEquals(
+                $createdOption->getDataUsingMethod($methodKey),
+                $updatedOption->getDataUsingMethod($methodKey)
+            );
+        }
+
+        foreach ($updateOptionValueData as $methodKey => $newValue) {
+            $methodName = str_replace('_', '', ucwords($methodKey, '_'));
+            $this->assertEquals($newValue, $updatedOptionValue->{'get' . $methodName}());
+            $this->assertNotEquals(
+                $createdOptionValue->getDataUsingMethod($methodKey),
+                $updatedOptionValue->getDataUsingMethod($methodKey)
+            );
+        }
+
+        $this->assertEquals($createdOption->getOptionId(), $updatedOption->getOptionId());
+    }
+
+    /**
+     * Create custom option and save product with created option.
+     *
+     * @param array $optionData
+     * @param string $productSku
+     * @return ProductCustomOptionInterface|Option
+     */
+    private function createCustomOption(array $optionData, string $productSku): ProductCustomOptionInterface
+    {
+        $product = $this->productRepository->get($productSku);
+        $createdOption = $this->customOptionFactory->create(['data' => $optionData]);
+        $createdOption->setProductSku($product->getSku());
+        $product->setOptions([$createdOption]);
+        $this->productRepository->save($product);
+        $productCustomOptions = $this->optionRepository->getProductOptions($product);
+        $option = reset($productCustomOptions);
+
+        return $option;
+    }
+
+    /**
+     * Create custom option from select group and save product with created option.
+     *
+     * @param array $optionData
+     * @param array $optionValueData
+     * @param string $productSku
+     * @return ProductCustomOptionInterface|Option
+     */
+    private function createCustomOptionWithValue(
+        array $optionData,
+        array $optionValueData,
+        string $productSku
+    ): ProductCustomOptionInterface {
+        $optionValue = $this->customOptionValueFactory->create(['data' => $optionValueData]);
+        $optionData['values'] = [$optionValue];
+
+        return $this->createCustomOption($optionData, $productSku);
+    }
+
+    /**
+     * Update product option with values.
+     *
+     * @param array $updateData
+     * @param string $productSku
+     * @return ProductCustomOptionInterface|Option
+     */
+    private function updateOptionWithValues(array $updateData, string $productSku): ProductCustomOptionInterface
+    {
+        $product = $this->productRepository->get($productSku);
+        $currentOption = $this->getProductOptionByProductSku($product->getSku());
+        $currentOption->setProductSku($product->getSku());
+        foreach ($updateData as $methodKey => $newValue) {
+            $currentOption->setDataUsingMethod($methodKey, $newValue);
+        }
+        $product->setOptions([$currentOption]);
+        $this->productRepository->save($product);
+
+        return $this->getProductOptionByProductSku($product->getSku());
+    }
+
+    /**
+     * Update product option with values.
+     *
+     * @param array $optionUpdateData
+     * @param array $optionValueUpdateData
+     * @param string $productSku
+     * @return ProductCustomOptionInterface|Option
+     */
+    private function updateOptionAndValueWithValues(
+        array $optionUpdateData,
+        array $optionValueUpdateData,
+        string $productSku
+    ): ProductCustomOptionInterface {
+        $product = $this->productRepository->get($productSku);
+        $currentOption = $this->getProductOptionByProductSku($product->getSku());
+        $currentOption->setProductSku($product->getSku());
+        $optionValue = $this->getOptionValue($currentOption);
+        foreach ($optionUpdateData as $methodKey => $newValue) {
+            $currentOption->setDataUsingMethod($methodKey, $newValue);
+        }
+        foreach ($optionValueUpdateData as $methodKey => $newValue) {
+            $optionValue->setDataUsingMethod($methodKey, $newValue);
+        }
+        $currentOption->setValues([$optionValue]);
+        $product->setOptions([$currentOption]);
+        $this->productRepository->save($product);
+
+        return $this->getProductOptionByProductSku($product->getSku());
+    }
+
+    /**
+     * Get product option by product sku.
+     *
+     * @param string $productSku
+     * @return ProductCustomOptionInterface|Option
+     */
+    private function getProductOptionByProductSku(string $productSku): ProductCustomOptionInterface
+    {
+        $product = $this->productRepository->get($productSku);
+        $currentOptions = $this->optionRepository->getProductOptions($product);
+
+        return reset($currentOptions);
+    }
+
+    /**
+     * Return custom option value.
+     *
+     * @param ProductCustomOptionInterface $customOption
+     * @return ProductCustomOptionValuesInterface|Value
+     */
+    private function getOptionValue(ProductCustomOptionInterface $customOption): ProductCustomOptionValuesInterface
+    {
+        $optionValues = $customOption->getValues();
+
+        return reset($optionValues);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UpdateProductWebsiteTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UpdateProductWebsiteTest.php
new file mode 100644
index 0000000000000..646e661419292
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UpdateProductWebsiteTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Website\Link;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Checks product websites attribute save behaviour
+ *
+ * @magentoDbIsolation enabled
+ */
+class UpdateProductWebsiteTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var  Link */
+    private $productWebsiteLink;
+
+    /** @var WebsiteRepositoryInterface */
+    private $websiteRepository;
+
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productWebsiteLink = $this->objectManager->get(Link::class);
+        $this->websiteRepository = $this->objectManager->get(WebsiteRepositoryInterface::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/website.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @return void
+     */
+    public function testAssignProductToWebsite(): void
+    {
+        $defaultWebsiteId = $this->websiteRepository->get('base')->getId();
+        $secondWebsiteId = $this->websiteRepository->get('test')->getId();
+        $product = $this->updateProductWebsites('simple2', [$defaultWebsiteId, $secondWebsiteId]);
+        $this->assertEquals(
+            [$defaultWebsiteId, $secondWebsiteId],
+            $this->productWebsiteLink->getWebsiteIdsByProductId($product->getId())
+        );
+    }
+
+    /**
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Catalog/_files/product_two_websites.php
+     * @return void
+     */
+    public function testUnassignProductFromWebsite(): void
+    {
+        $secondWebsiteId = $this->websiteRepository->get('test')->getId();
+        $product = $this->updateProductWebsites('simple-on-two-websites', [$secondWebsiteId]);
+        $this->assertEquals([$secondWebsiteId], $this->productWebsiteLink->getWebsiteIdsByProductId($product->getId()));
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @return void
+     */
+    public function testAssignNonExistingWebsite(): void
+    {
+        $messageFormat = 'The website with id %s that was requested wasn\'t found. Verify the website and try again.';
+        $nonExistingWebsiteId = 921564;
+        $this->expectException(NoSuchEntityException::class);
+        $this->expectExceptionMessage((string)__(sprintf($messageFormat, $nonExistingWebsiteId)));
+        $this->updateProductWebsites('simple2', [$nonExistingWebsiteId]);
+    }
+
+    /**
+     * Update product websites attribute
+     *
+     * @param string $productSku
+     * @param array $websiteIds
+     * @return ProductInterface
+     */
+    private function updateProductWebsites(string $productSku, array $websiteIds): ProductInterface
+    {
+        $product = $this->productRepository->get($productSku);
+        $product->setWebsiteIds($websiteIds);
+
+        return $this->productRepository->save($product);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UrlTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UrlTest.php
index e0860897fcc24..ff2979150954e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UrlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UrlTest.php
@@ -87,6 +87,9 @@ public function getUrlsWithSecondStoreProvider()
         ];
     }
 
+    /**
+     * @magentoDbIsolation disabled
+     */
     public function testGetProductUrl()
     {
         $repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
@@ -121,6 +124,7 @@ public function testGetUrlPath()
     }
 
     /**
+     * @magentoDbIsolation disabled
      * @magentoAppArea frontend
      */
     public function testGetUrl()
@@ -142,6 +146,7 @@ public function testGetUrl()
      * Check that rearranging product url rewrites do not influence on whether to use category in product links
      *
      * @magentoConfigFixture current_store catalog/seo/product_use_categories 0
+     * @magentoDbIsolation disabled
      */
     public function testGetProductUrlWithRearrangedUrlRewrites()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductHydratorTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductHydratorTest.php
new file mode 100644
index 0000000000000..9481702183327
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductHydratorTest.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Model;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\HydratorInterface;
+use Magento\Framework\EntityManager\HydratorPool;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test Product Hydrator
+ */
+class ProductHydratorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Bootstrap
+     */
+    private $objectManager;
+
+    /**
+     * @var HydratorPool
+     */
+    private $hydratorPool;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->hydratorPool = $this->objectManager->create(HydratorPool::class);
+    }
+
+    /**
+     * Test that Hydrator correctly populates entity with data
+     */
+    public function testProductHydrator()
+    {
+        $addAttributes = [
+            'sku' => 'product_updated',
+            'name' => 'Product (Updated)',
+            'type_id' => 'simple',
+            'status' => 1,
+        ];
+
+        /** @var Product $product */
+        $product = $this->objectManager->create(Product::class);
+        $product->setId(42)
+            ->setSku('product')
+            ->setName('Product')
+            ->setPrice(10)
+            ->setQty(123);
+        $product->lockAttribute('sku');
+        $product->lockAttribute('type_id');
+        $product->lockAttribute('price');
+
+        /** @var HydratorInterface $hydrator */
+        $hydrator = $this->hydratorPool->getHydrator(ProductInterface::class);
+        $hydrator->hydrate($product, $addAttributes);
+
+        $expected = [
+            'entity_id' => 42,
+            'sku' => 'product_updated',
+            'name' => 'Product (Updated)',
+            'type_id' => 'simple',
+            'status' => 1,
+            'price' => 10,
+            'qty' => 123,
+        ];
+        $this->assertEquals($expected, $product->getData());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductLink/ProductLinkQueryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductLink/ProductLinkQueryTest.php
new file mode 100644
index 0000000000000..8509174e127e7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductLink/ProductLinkQueryTest.php
@@ -0,0 +1,145 @@
+<?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\Model\ProductLink\Data\ListCriteria;
+use Magento\Catalog\Model\ProductLink\Data\ListCriteriaInterface;
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test links query.
+ */
+class ProductLinkQueryTest extends TestCase
+{
+    /**
+     * @var ProductLinkQuery
+     */
+    private $query;
+
+    /**
+     * @var ProductRepository
+     */
+    private $productRepo;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $criteriaBuilder;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $objectManager = Bootstrap::getObjectManager();
+        $this->query = $objectManager->get(ProductLinkQuery::class);
+        $this->productRepo = $objectManager->get(ProductRepository::class);
+        $this->criteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+    }
+
+    /**
+     * Generate search criteria.
+     *
+     * @param \Magento\Catalog\Model\Product[] $products
+     * @return ListCriteriaInterface[]
+     */
+    private function generateCriteriaList(array $products): array
+    {
+        $typesList = ['related', 'crosssell', 'upsell'];
+        /** @var ListCriteriaInterface[] $criteriaList */
+        $criteriaList = [];
+        foreach ($products as $product) {
+            $sku = $product->getSku();
+            $typesFilter = [$typesList[rand(0, 2)], $typesList[rand(0, 2)]];
+            //Not always providing product entity or the default criteria implementation for testing purposes.
+            //Getting 1 list with types filter and one without.
+            $criteriaList[] = new ListCriteria($sku, $typesFilter, $product);
+            $criteria = new class implements ListCriteriaInterface
+            {
+                /**
+                 * @var string
+                 */
+                public $sku;
+
+                /**
+                 * @inheritDoc
+                 */
+                public function getBelongsToProductSku(): string
+                {
+                    return $this->sku;
+                }
+
+                /**
+                 * @inheritDoc
+                 */
+                public function getLinkTypes(): ?array
+                {
+                    return null;
+                }
+            };
+            $criteria->sku = $sku;
+            $criteriaList[] = $criteria;
+        }
+
+        return $criteriaList;
+    }
+
+    /**
+     * Test getting links for a list of products.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/multiple_related_products.php
+     * @return void
+     * @throws \Throwable
+     */
+    public function testSearch(): void
+    {
+        //Finding root products
+        $list = $this->productRepo->getList(
+            $this->criteriaBuilder->addFilter('sku', 'simple-related-%', 'like')->create()
+        );
+        //Creating criteria
+        $criteriaList = $this->generateCriteriaList($list->getItems());
+        $this->assertNotEmpty($criteriaList);
+        //Searching
+        $result = $this->query->search($criteriaList);
+        //Checking results
+        $this->assertCount(count($criteriaList), $result);
+        foreach ($criteriaList as $index => $criteria) {
+            //No errors, links must be found
+            $this->assertNull($result[$index]->getError());
+            if (!$criteria->getLinkTypes()) {
+                //If there were no types filter the list cannot be empty
+                $this->assertNotEmpty($result[$index]->getResult());
+            }
+            foreach ($result[$index]->getResult() as $link) {
+                //Links must belong to requested products.
+                $this->assertEquals($criteria->getBelongsToProductSku(), $link->getSku());
+                if ($criteria->getLinkTypes()) {
+                    //If link filter was set no other link types must be returned
+                    $this->assertContains($link->getLinkType(), $criteria->getLinkTypes());
+                }
+                //Type must be accurate
+                $this->assertEquals(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE, $link->getLinkedProductType());
+                //Determining whether the product is supposed to be linked by SKU
+                preg_match('/^simple\-related\-(\d+)$/i', $criteria->getBelongsToProductSku(), $productIndex);
+                $this->assertNotEmpty($productIndex);
+                $this->assertFalse(empty($productIndex[1]));
+                $productIndex = (int)$productIndex[1];
+                $this->assertRegExp('/^related\-product\-' .$productIndex .'\-\d+$/i', $link->getLinkedProductSku());
+                //Position must be set
+                $this->assertGreaterThan(0, $link->getPosition());
+            }
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
index fa2a0e5cb34b7..fb07d08faca58 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
@@ -11,6 +11,8 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\TestFramework\Catalog\Model\ProductLayoutUpdateManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Bootstrap as TestBootstrap;
 use Magento\Framework\Acl\Builder;
@@ -46,15 +48,10 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
      */
     private $productResource;
 
-    /*
-     * @var Auth
-     */
-    private $auth;
-
     /**
-     * @var Builder
+     * @var ProductLayoutUpdateManager
      */
-    private $aclBuilder;
+    private $layoutManager;
 
     /**
      * Sets up common objects
@@ -63,21 +60,19 @@ protected function setUp()
     {
         $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
         $this->searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
-        $this->auth = Bootstrap::getObjectManager()->get(Auth::class);
-        $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
         $this->productFactory = Bootstrap::getObjectManager()->get(ProductFactory::class);
         $this->productResource = Bootstrap::getObjectManager()->get(ProductResource::class);
+        $this->layoutManager = Bootstrap::getObjectManager()->get(ProductLayoutUpdateManager::class);
     }
 
     /**
-     * @inheritDoc
+     * Create new subject instance.
+     *
+     * @return ProductRepositoryInterface
      */
-    protected function tearDown()
+    private function createRepo(): ProductRepositoryInterface
     {
-        parent::tearDown();
-
-        $this->auth->logout();
-        $this->aclBuilder->resetRuntimeAcl();
+        return Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
     }
 
     /**
@@ -206,30 +201,36 @@ public function testUpdateProductSku()
     }
 
     /**
-     * Test authorization when saving product's design settings.
+     * Test that custom layout file attribute is saved.
      *
+     * @return void
+     * @throws \Throwable
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
-     * @magentoAppArea adminhtml
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
      */
-    public function testSaveDesign()
+    public function testCustomLayout(): void
     {
-        $product = $this->productRepository->get('simple');
-        $this->auth->login(TestBootstrap::ADMIN_NAME, TestBootstrap::ADMIN_PASSWORD);
-
-        //Admin doesn't have access to product's design.
-        $this->aclBuilder->getAcl()->deny(null, 'Magento_Catalog::edit_product_design');
-
-        $product->setCustomAttribute('custom_design', 2);
-        $product = $this->productRepository->save($product);
-        $this->assertEmpty($product->getCustomAttribute('custom_design'));
-
-        //Admin has access to products' design.
-        $this->aclBuilder->getAcl()
-            ->allow(null, ['Magento_Catalog::products','Magento_Catalog::edit_product_design']);
-
-        $product->setCustomAttribute('custom_design', 2);
-        $product = $this->productRepository->save($product);
-        $this->assertNotEmpty($product->getCustomAttribute('custom_design'));
-        $this->assertEquals(2, $product->getCustomAttribute('custom_design')->getValue());
+        //New valid value
+        $repo = $this->createRepo();
+        $product = $repo->get('simple');
+        $newFile = 'test';
+        $this->layoutManager->setFakeFiles((int)$product->getId(), [$newFile]);
+        $product->setCustomAttribute('custom_layout_update_file', $newFile);
+        $repo->save($product);
+        $repo = $this->createRepo();
+        $product = $repo->get('simple');
+        $this->assertEquals($newFile, $product->getCustomAttribute('custom_layout_update_file')->getValue());
+
+        //Setting non-existent value
+        $newFile = 'does not exist';
+        $product->setCustomAttribute('custom_layout_update_file', $newFile);
+        $caughtException = false;
+        try {
+            $repo->save($product);
+        } catch (LocalizedException $exception) {
+            $caughtException = true;
+        }
+        $this->assertTrue($caughtException);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
index 349853c8a3935..498c3167ed734 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Eav;
 
+/**
+ * Test for \Magento\Catalog\Model\ResourceModel\Eav\Attribute.
+ */
 class AttributeTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -19,6 +22,11 @@ protected function setUp()
         );
     }
 
+    /**
+     * Test Create -> Read -> Update -> Delete attribute operations.
+     *
+     * @return void
+     */
     public function testCRUD()
     {
         $this->_model->setAttributeCode(
@@ -31,7 +39,7 @@ public function testCRUD()
             )->getId()
         )->setFrontendLabel(
             'test'
-        );
+        )->setIsUserDefined(1);
         $crud = new \Magento\TestFramework\Entity($this->_model, ['frontend_label' => uniqid()]);
         $crud->testCrud();
     }
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 de0e881474cf0..86dcf9d96d086 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
@@ -277,15 +277,57 @@ public function testAddAttributeToFilterAffectsGetSize(): void
     }
 
     /**
-     * Add tier price attribute filter to collection
+     * Add tier price attribute filter to collection with different condition types.
      *
+     * @param mixed $condition
      * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/few_simple_products.php
      * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/product_simple.php
+     *
+     * @dataProvider addAttributeTierPriceToFilterDataProvider
+     */
+    public function testAddAttributeTierPriceToFilter($condition): void
+    {
+        $this->collection->addAttributeToFilter('tier_price', $condition);
+        $this->assertEquals(1, $this->collection->getSize());
+    }
+
+    /**
+     * @return array
+     */
+    public function addAttributeTierPriceToFilterDataProvider(): array
+    {
+        return [
+            'condition is array' => [['eq' => 8]],
+            'condition is string' => ['8'],
+            'condition is int' => [8],
+            'condition is null' => [null]
+        ];
+    }
+
+    /**
+     * Add is_saleable attribute filter to collection with different condition types.
+     *
+     * @param mixed $condition
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/product_simple.php
+     *
+     * @dataProvider addAttributeIsSaleableToFilterDataProvider
      */
-    public function testAddAttributeTierPriceToFilter(): void
+    public function testAddAttributeIsSaleableToFilter($condition): void
     {
-        $this->assertEquals(11, $this->collection->getSize());
-        $this->collection->addAttributeToFilter('tier_price', ['gt' => 0]);
+        $this->collection->addAttributeToFilter('is_saleable', $condition);
         $this->assertEquals(1, $this->collection->getSize());
     }
+
+    /**
+     * @return array
+     */
+    public function addAttributeIsSaleableToFilterDataProvider(): array
+    {
+        return [
+            'condition is array' => [['eq' => 1]],
+            'condition is string' => ['1'],
+            'condition is int' => [1],
+            'condition is null' => [null]
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
index e218c508b7d3e..f560854fa75f6 100755
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php
@@ -6,7 +6,12 @@
 namespace Magento\Catalog\Model\ResourceModel;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Action;
+use Magento\Eav\Api\Data\AttributeSetInterface;
+use Magento\Eav\Model\AttributeSetRepository;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -164,4 +169,33 @@ public function testUpdateStoreSpecificSpecialPrice()
         $product = $this->productRepository->get('simple', false, 0, true);
         $this->assertEquals(5.99, $product->getSpecialPrice());
     }
+
+    /**
+     * Checks that product has no attribute values for attributes not assigned to the product's attribute set.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/attribute_set_with_image_attribute.php
+     */
+    public function testChangeAttributeSet()
+    {
+        $attributeCode = 'funny_image';
+        /** @var GetAttributeSetByName $attributeSetModel */
+        $attributeSetModel = $this->objectManager->get(GetAttributeSetByName::class);
+        $attributeSet = $attributeSetModel->execute('attribute_set_with_media_attribute');
+
+        $product = $this->productRepository->get('simple', true, 1, true);
+        $product->setAttributeSetId($attributeSet->getAttributeSetId());
+        $this->productRepository->save($product);
+        $product->setData($attributeCode, 'test');
+        $this->model->saveAttribute($product, $attributeCode);
+
+        $product = $this->productRepository->get('simple', true, 1, true);
+        $this->assertEquals('test', $product->getData($attributeCode));
+
+        $product->setAttributeSetId($product->getDefaultAttributeSetId());
+        $this->productRepository->save($product);
+
+        $attribute = $this->model->getAttributeRawValue($product->getId(), $attributeCode, 1);
+        $this->assertEmpty($attribute);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AbstractEavTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AbstractEavTest.php
new file mode 100644
index 0000000000000..3375a4e8e4094
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AbstractEavTest.php
@@ -0,0 +1,306 @@
+<?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;
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav\CompositeConfigProcessor;
+use Magento\Eav\Model\Entity\Type;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Phrase;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Ui\DataProvider\Mapper\FormElement;
+use Magento\Ui\DataProvider\Mapper\MetaProperties;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Base class for eav modifier tests.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+abstract class AbstractEavTest extends TestCase
+{
+    /**
+     * @var Eav
+     */
+    protected $eavModifier;
+
+    /**
+     * @var LocatorInterface|PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $locatorMock;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @var ProductAttributeRepositoryInterface
+     */
+    protected $attributeRepository;
+
+    /**
+     * @var int
+     */
+    protected $defaultSetId;
+
+    /**
+     * @var MetaProperties
+     */
+    private $metaPropertiesMapper;
+
+    /**
+     * @var CompositeConfigProcessor
+     */
+    private $compositeConfigProcessor;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var ProductInterfaceFactory
+     */
+    private $productFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $mappings = [
+            'text' => 'input',
+            'hidden' => 'input',
+            'boolean' => 'checkbox',
+            'media_image' => 'image',
+            'price' => 'input',
+            'weight' => 'input',
+            'gallery' => 'image'
+        ];
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->locatorMock = $this->createMock(LocatorInterface::class);
+        $this->locatorMock->expects($this->any())->method('getStore')->willReturn(
+            $this->objectManager->get(StoreInterface::class)
+        );
+        $this->metaPropertiesMapper = $this->objectManager->create(MetaProperties::class, ['mappings' => []]);
+        $this->compositeConfigProcessor = $this->objectManager->create(
+            CompositeConfigProcessor::class,
+            ['eavWysiwygDataProcessors' => []]
+        );
+        $this->eavModifier = $this->objectManager->create(
+            Eav::class,
+            [
+                'locator' => $this->locatorMock,
+                'formElementMapper' => $this->objectManager->create(FormElement::class, ['mappings' => $mappings]),
+                'metaPropertiesMapper' => $this->metaPropertiesMapper,
+                'wysiwygConfigProcessor' => $this->compositeConfigProcessor,
+            ]
+        );
+        $this->attributeRepository = $this->objectManager->create(ProductAttributeRepositoryInterface::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productFactory = $this->objectManager->get(ProductInterfaceFactory::class);
+        $this->defaultSetId = (int)$this->objectManager->create(Type::class)
+            ->loadByCode(ProductAttributeInterface::ENTITY_TYPE_CODE)
+            ->getDefaultAttributeSetId();
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param array $expectedMeta
+     * @return void
+     */
+    protected function callModifyMetaAndAssert(ProductInterface $product, array $expectedMeta): void
+    {
+        $this->locatorMock->expects($this->any())->method('getProduct')->willReturn($product);
+        $actualMeta = $this->eavModifier->modifyMeta([]);
+        $this->prepareDataForComparison($actualMeta, $expectedMeta);
+        $this->assertEquals($expectedMeta, $actualMeta);
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param array $expectedData
+     * @return void
+     */
+    protected function callModifyDataAndAssert(ProductInterface $product, array $expectedData): void
+    {
+        $this->locatorMock->expects($this->any())->method('getProduct')->willReturn($product);
+        $actualData = $this->eavModifier->modifyData([]);
+        $this->prepareDataForComparison($actualData, $expectedData);
+        $this->assertEquals($expectedData, $actualData);
+    }
+
+    /**
+     * Prepare data for comparison to avoid false positive failures.
+     *
+     * Make sure that $data contains all the data contained in $expectedData,
+     * ignore all fields not declared in $expectedData
+     *
+     * @param array &$data
+     * @param array $expectedData
+     * @return void
+     */
+    protected function prepareDataForComparison(array &$data, array $expectedData): void
+    {
+        foreach ($data as $key => &$item) {
+            if (!isset($expectedData[$key])) {
+                unset($data[$key]);
+                continue;
+            }
+            if ($item instanceof Phrase) {
+                $item = (string)$item;
+            } elseif (is_array($item)) {
+                $this->prepareDataForComparison($item, $expectedData[$key]);
+            } elseif ($key === 'price_id' || $key === 'sortOrder') {
+                $data[$key] = '__placeholder__';
+            }
+        }
+    }
+
+    /**
+     * Updates attribute default value.
+     *
+     * @param string $attributeCode
+     * @param string $defaultValue
+     * @return void
+     */
+    protected function setAttributeDefaultValue(string $attributeCode, string $defaultValue): void
+    {
+        $attribute = $this->attributeRepository->get($attributeCode);
+        $attribute->setDefaultValue($defaultValue);
+        $this->attributeRepository->save($attribute);
+    }
+
+    /**
+     * Returns attribute options list.
+     *
+     * @param string $attributeCode
+     * @return array
+     */
+    protected function getAttributeOptions(string $attributeCode): array
+    {
+        $attribute = $this->attributeRepository->get($attributeCode);
+
+        return $attribute->usesSource() ? $attribute->getSource()->getAllOptions() : [];
+    }
+
+    /**
+     * Returns attribute option value by id.
+     *
+     * @param string $attributeCode
+     * @param string $label
+     * @return int|null
+     */
+    protected function getOptionValueByLabel(string $attributeCode, string $label): ?int
+    {
+        $result = null;
+        foreach ($this->getAttributeOptions($attributeCode) as $option) {
+            if ($option['label'] == $label) {
+                $result = (int)$option['value'];
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns product for testing.
+     *
+     * @return ProductInterface
+     */
+    protected function getProduct(): ProductInterface
+    {
+        return $this->productRepository->get('simple', false, Store::DEFAULT_STORE_ID);
+    }
+
+    /**
+     * Returns new product object.
+     *
+     * @return ProductInterface
+     */
+    protected function getNewProduct(): ProductInterface
+    {
+        $product = $this->productFactory->create();
+        $product->setAttributeSetId($this->defaultSetId);
+
+        return $product;
+    }
+
+    /**
+     * Updates product.
+     *
+     * @param ProductInterface $product
+     * @param array $attributeData
+     * @return void
+     */
+    protected function saveProduct(ProductInterface $product, array $attributeData): void
+    {
+        $product->addData($attributeData);
+        $this->productRepository->save($product);
+    }
+
+    /**
+     * Adds additional array nesting to expected meta.
+     *
+     * @param array $attributeMeta
+     * @param string $groupCode
+     * @param string $attributeCode
+     * @return array
+     */
+    protected function addMetaNesting(array $attributeMeta, string $groupCode, string $attributeCode): array
+    {
+        return [
+            $groupCode => [
+                'arguments' => ['data' => ['config' => ['dataScope' => 'data.product']]],
+                'children' => [
+                    'container_' . $attributeCode => [
+                        'children' => [$attributeCode => ['arguments' => ['data' => ['config' => $attributeMeta]]]],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Adds additional array nesting to expected data.
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function addDataNesting(array $data): array
+    {
+        return [1 => ['product' => $data]];
+    }
+
+    /**
+     * Returns attribute codes from product meta data array.
+     *
+     * @param array $actualMeta
+     * @return array
+     */
+    protected function getUsedAttributes(array $actualMeta): array
+    {
+        $usedAttributes = [];
+        foreach ($actualMeta as $group) {
+            foreach (array_keys($group['children']) as $field) {
+                $usedAttributes[] = str_replace('container_', '', $field);
+            }
+        }
+
+        return $usedAttributes;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/AttributeSetGroupsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/AttributeSetGroupsTest.php
new file mode 100644
index 0000000000000..4890d179c7d95
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/AttributeSetGroupsTest.php
@@ -0,0 +1,36 @@
+<?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 Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractEavTest;
+
+/**
+ * Tests for eav product form modifier for attribute set groups.
+ */
+class AttributeSetGroupsTest extends AbstractEavTest
+{
+    /**
+     * Check that custom group for custom attribute set not added to product form modifier meta data.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_test_attribute_set.php
+     *
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     */
+    public function testGroupDoesNotAddToProductFormMeta(): void
+    {
+        $this->locatorMock->expects($this->any())->method('getProduct')->willReturn($this->getProduct());
+        $meta = $this->eavModifier->modifyMeta([]);
+        $this->assertArrayNotHasKey(
+            'test-attribute-group-name',
+            $meta,
+            'Attribute set group without attributes appear on product page in admin panel'
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/BooleanAttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/BooleanAttributeTest.php
new file mode 100644
index 0000000000000..16ad3d3ad4564
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/BooleanAttributeTest.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\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractEavTest;
+
+/**
+ * Provides tests for product form eav modifier with custom boolean attribute.
+ *
+ * @magentoDbIsolation enabled
+ */
+class BooleanAttributeTest extends AbstractEavTest
+{
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_boolean_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
+     */
+    public function testModifyMeta(): void
+    {
+        $this->callModifyMetaAndAssert(
+            $this->getProduct(),
+            $this->addMetaNesting($this->getAttributeMeta(), 'product-details', 'boolean_attribute')
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_boolean_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
+     */
+    public function testModifyData(): void
+    {
+        $product = $this->getProduct();
+        $attributeData = ['boolean_attribute' => 1];
+        $this->saveProduct($product, $attributeData);
+        $expectedData = $this->addDataNesting($attributeData);
+        $this->callModifyDataAndAssert($product, $expectedData);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_boolean_attribute.php
+     * @return void
+     */
+    public function testModifyMetaNewProduct(): void
+    {
+        $this->setAttributeDefaultValue('boolean_attribute', '0');
+        $attributesMeta = array_merge($this->getAttributeMeta(), ['default' => '0']);
+        $expectedMeta = $this->addMetaNesting(
+            $attributesMeta,
+            'product-details',
+            'boolean_attribute'
+        );
+        $this->callModifyMetaAndAssert($this->getNewProduct(), $expectedMeta);
+    }
+
+    /**
+     * @return array
+     */
+    private function getAttributeMeta(): array
+    {
+        return [
+            'dataType' => 'boolean',
+            'formElement' => 'checkbox',
+            'visible' => '1',
+            'required' => '0',
+            'label' => 'Boolean Attribute',
+            'code' => 'boolean_attribute',
+            'source' => 'product-details',
+            'scopeLabel' => '[STORE VIEW]',
+            'globalScope' => false,
+            'sortOrder' => '__placeholder__',
+            'componentType' => 'field',
+            'prefer' => 'toggle',
+            'valueMap' => [
+                'true' => '1',
+                'false' => '0',
+            ]
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/DateAttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/DateAttributeTest.php
new file mode 100644
index 0000000000000..feac956ddf549
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/DateAttributeTest.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\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractEavTest;
+
+/**
+ * Provides tests for product form eav modifier with custom date attribute.
+ *
+ * @magentoDbIsolation enabled
+ */
+class DateAttributeTest extends AbstractEavTest
+{
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_date_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
+     */
+    public function testModifyMeta(): void
+    {
+        $this->callModifyMetaAndAssert(
+            $this->getProduct(),
+            $this->addMetaNesting($this->getAttributeMeta(), 'product-details', 'date_attribute')
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_date_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
+     */
+    public function testModifyData(): void
+    {
+        $product = $this->getProduct();
+        $attributeData = ['date_attribute' => '01/01/2010'];
+        $this->saveProduct($product, $attributeData);
+        $expectedData = $this->addDataNesting($attributeData);
+        $this->callModifyDataAndAssert($product, $expectedData);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_date_attribute.php
+     * @return void
+     */
+    public function testModifyMetaNewProduct(): void
+    {
+        $this->setAttributeDefaultValue('date_attribute', '01/01/2000');
+        $attributesMeta = array_merge($this->getAttributeMeta(), ['default' => '2000-01-01 00:00:00']);
+        $expectedMeta = $this->addMetaNesting(
+            $attributesMeta,
+            'product-details',
+            'date_attribute'
+        );
+        $this->callModifyMetaAndAssert($this->getNewProduct(), $expectedMeta);
+    }
+
+    /**
+     * @return array
+     */
+    private function getAttributeMeta(): array
+    {
+        return [
+            'dataType' => 'date',
+            'formElement' => 'date',
+            'visible' => '1',
+            'required' => '0',
+            'label' => 'Date Attribute',
+            'code' => 'date_attribute',
+            'source' => 'product-details',
+            'scopeLabel' => '[GLOBAL]',
+            'globalScope' => true,
+            'sortOrder' => '__placeholder__',
+            'componentType' => 'field'
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/DecimalAttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/DecimalAttributeTest.php
new file mode 100644
index 0000000000000..901613498e53a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/DecimalAttributeTest.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\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractEavTest;
+
+/**
+ * Provides tests for product form eav modifier with custom decimal attribute.
+ *
+ * @magentoDataFixture Magento/Catalog/_files/product_decimal_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoDbIsolation enabled
+ */
+class DecimalAttributeTest extends AbstractEavTest
+{
+    /**
+     * @return void
+     */
+    public function testModifyMeta(): void
+    {
+        $this->callModifyMetaAndAssert(
+            $this->getProduct(),
+            $this->addMetaNesting($this->getAttributeMeta(), 'product-details', 'decimal_attribute')
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testModifyData(): void
+    {
+        $product = $this->getProduct();
+        $attributeData = ['decimal_attribute' => '10.00'];
+        $this->saveProduct($product, $attributeData);
+        $expectedData = $this->addDataNesting($attributeData);
+        $this->callModifyDataAndAssert($product, $expectedData);
+    }
+
+    /**
+     * @return array
+     */
+    private function getAttributeMeta(): array
+    {
+        return [
+            'dataType' => 'price',
+            'formElement' => 'input',
+            'visible' => '1',
+            'required' => '0',
+            'label' => 'Decimal Attribute',
+            'code' => 'decimal_attribute',
+            'source' => 'product-details',
+            'scopeLabel' => '[GLOBAL]',
+            'globalScope' => true,
+            'sortOrder' => '__placeholder__',
+            'componentType' => 'field',
+            'validation' => [
+                'validate-zero-or-greater' => true,
+            ],
+            'addbefore' => '$'
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/DefaultAttributesTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/DefaultAttributesTest.php
new file mode 100644
index 0000000000000..fbf752cc9e239
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/DefaultAttributesTest.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\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractEavTest;
+
+/**
+ * Provides tests for product form data provider eav modifier for default attributes (sku, price, status, name).
+ *
+ * @magentoDbIsolation enabled
+ */
+class DefaultAttributesTest extends AbstractEavTest
+{
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
+     */
+    public function testModifyMeta(): void
+    {
+        $expectedMeta = include __DIR__ . '/../_files/eav_expected_meta_output.php';
+        $this->callModifyMetaAndAssert($this->getProduct(), $expectedMeta);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_admin_store.php
+     * @return void
+     */
+    public function testModifyData(): void
+    {
+        $expectedData = include __DIR__ . '/../_files/eav_expected_data_output.php';
+        $this->callModifyDataAndAssert($this->getProduct(), $expectedData);
+    }
+
+    /**
+     * @return void
+     */
+    public function testModifyMetaNewProduct(): void
+    {
+        $expectedMeta = include __DIR__ . '/../_files/eav_expected_meta_output_w_default.php';
+        $this->callModifyMetaAndAssert($this->getNewProduct(), $expectedMeta);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/ImageAttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/ImageAttributeTest.php
new file mode 100644
index 0000000000000..75a20145fdcda
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/ImageAttributeTest.php
@@ -0,0 +1,41 @@
+<?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 Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractEavTest;
+
+/**
+ * Provides tests for product form eav modifier with custom image attribute.
+ *
+ * @magentoDbIsolation enabled
+ */
+class ImageAttributeTest extends AbstractEavTest
+{
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_image_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
+     */
+    public function testModifyMeta(): void
+    {
+        $this->locatorMock->expects($this->any())->method('getProduct')->willReturn($this->getProduct());
+        $actualMeta = $this->eavModifier->modifyMeta([]);
+        $this->assertArrayNotHasKey('image_attribute', $this->getUsedAttributes($actualMeta));
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_image_attribute.php
+     * @return void
+     */
+    public function testModifyMetaNewProduct(): void
+    {
+        $this->locatorMock->expects($this->any())->method('getProduct')->willReturn($this->getNewProduct());
+        $actualMeta = $this->eavModifier->modifyMeta([]);
+        $this->assertArrayNotHasKey('image_attribute', $this->getUsedAttributes($actualMeta));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/MultiselectAttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/MultiselectAttributeTest.php
new file mode 100644
index 0000000000000..eefb49dcf6239
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/MultiselectAttributeTest.php
@@ -0,0 +1,65 @@
+<?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 Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractEavTest;
+
+/**
+ * Provides tests for product form eav modifier with custom multiselect attribute.
+ *
+ * @magentoDataFixture Magento/Catalog/_files/multiselect_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoDbIsolation enabled
+ */
+class MultiselectAttributeTest extends AbstractEavTest
+{
+    /**
+     * @return void
+     */
+    public function testModifyMeta(): void
+    {
+        $this->callModifyMetaAndAssert(
+            $this->getProduct(),
+            $this->addMetaNesting($this->getAttributeMeta(), 'product-details', 'multiselect_attribute')
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testModifyData(): void
+    {
+        $product = $this->getProduct();
+        $optionValue = $this->getOptionValueByLabel('multiselect_attribute', 'Option 3');
+        $attributeData = ['multiselect_attribute' => $optionValue];
+        $this->saveProduct($product, $attributeData);
+        $expectedData = $this->addDataNesting($attributeData);
+        $this->callModifyDataAndAssert($product, $expectedData);
+    }
+
+    /**
+     * @return array
+     */
+    private function getAttributeMeta(): array
+    {
+        return [
+            'dataType' => 'multiselect',
+            'formElement' => 'multiselect',
+            'visible' => '1',
+            'required' => '0',
+            'label' => 'Multiselect Attribute',
+            'code' => 'multiselect_attribute',
+            'source' => 'product-details',
+            'scopeLabel' => '[GLOBAL]',
+            'globalScope' => true,
+            'sortOrder' => '__placeholder__',
+            'options' => $this->getAttributeOptions('multiselect_attribute'),
+            'componentType' => 'field',
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/SelectAttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/SelectAttributeTest.php
new file mode 100644
index 0000000000000..493608a43b77b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/SelectAttributeTest.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\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractEavTest;
+
+/**
+ * Provides tests for product form eav modifier with custom select attribute.
+ *
+ * @magentoDataFixture Magento/Catalog/_files/dropdown_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoDbIsolation enabled
+ */
+class SelectAttributeTest extends AbstractEavTest
+{
+    /**
+     * @return void
+     */
+    public function testModifyMeta(): void
+    {
+        $this->callModifyMetaAndAssert(
+            $this->getProduct(),
+            $this->addMetaNesting($this->getAttributeMeta(), 'product-details', 'dropdown_attribute')
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testModifyData(): void
+    {
+        $product = $this->getProduct();
+        $attributeData = [
+            'dropdown_attribute' => $this->getOptionValueByLabel('dropdown_attribute', 'Option 3')
+        ];
+        $this->saveProduct($product, $attributeData);
+        $expectedData = $this->addDataNesting($attributeData);
+        $this->callModifyDataAndAssert($product, $expectedData);
+    }
+
+    /**
+     * @return array
+     */
+    private function getAttributeMeta(): array
+    {
+        return [
+            'dataType' => 'select',
+            'formElement' => 'select',
+            'visible' => '1',
+            'required' => '0',
+            'label' => 'Drop-Down Attribute',
+            'code' => 'dropdown_attribute',
+            'source' => 'product-details',
+            'scopeLabel' => '[STORE VIEW]',
+            'globalScope' => false,
+            'sortOrder' => '__placeholder__',
+            'options' => $this->getAttributeOptions('dropdown_attribute'),
+            'componentType' => 'field',
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/VarcharAttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/VarcharAttributeTest.php
new file mode 100644
index 0000000000000..dfa40d138d640
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/VarcharAttributeTest.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\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractEavTest;
+
+/**
+ * Provides tests for product form eav modifier with custom text attribute.
+ *
+ * @magentoDbIsolation enabled
+ */
+class VarcharAttributeTest extends AbstractEavTest
+{
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_varchar_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
+     */
+    public function testModifyMeta(): void
+    {
+        $this->callModifyMetaAndAssert(
+            $this->getProduct(),
+            $this->addMetaNesting($this->getAttributeMeta(), 'product-details', 'varchar_attribute')
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_varchar_attribute.php
+     * @return void
+     */
+    public function testModifyMetaNewProduct(): void
+    {
+        $this->setAttributeDefaultValue('varchar_attribute', 'test');
+        $attributesMeta = array_merge($this->getAttributeMeta(), ['default' => 'test']);
+        $expectedMeta = $this->addMetaNesting(
+            $attributesMeta,
+            'product-details',
+            'varchar_attribute'
+        );
+        $this->callModifyMetaAndAssert($this->getNewProduct(), $expectedMeta);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_varchar_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
+     */
+    public function testModifyData(): void
+    {
+        $product = $this->getProduct();
+        $attributeData = ['varchar_attribute' => 'Test message'];
+        $this->saveProduct($product, $attributeData);
+        $expectedData = $this->addDataNesting($attributeData);
+        $this->callModifyDataAndAssert($product, $expectedData);
+    }
+
+    /**
+     * @return array
+     */
+    private function getAttributeMeta(): array
+    {
+        return [
+            'dataType' => 'text',
+            'formElement' => 'input',
+            'visible' => '1',
+            'required' => '0',
+            'label' => 'Varchar Attribute',
+            'code' => 'varchar_attribute',
+            'source' => 'product-details',
+            'scopeLabel' => '[GLOBAL]',
+            'globalScope' => true,
+            'sortOrder' => '__placeholder__',
+            'componentType' => 'field'
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/EavTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/EavTest.php
index 6dd3436041b33..83c6e99df629e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/EavTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/EavTest.php
@@ -3,124 +3,218 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Eav\Api\AttributeSetRepositoryInterface;
+use Magento\Eav\Model\AttributeSetRepository;
+use Magento\TestFramework\Eav\Model\GetAttributeGroupByName;
+use Magento\TestFramework\Eav\Model\ResourceModel\GetEntityIdByAttributeId;
+
 /**
+ * Provides tests for eav modifier used in products admin form data provider.
+ *
  * @magentoDbIsolation enabled
- * @magentoAppIsolation enabled
- * @magentoAppArea adminhtml
  */
-class EavTest extends \PHPUnit\Framework\TestCase
+class EavTest extends AbstractEavTest
 {
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var GetAttributeGroupByName
      */
-    protected $objectManager;
+    private $attributeGroupByName;
 
     /**
-     * @var \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav
+     * @var GetEntityIdByAttributeId
      */
-    protected $eavModifier;
+    private $getEntityIdByAttributeId;
 
     /**
-     * @var \Magento\Catalog\Model\Locator\LocatorInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var AttributeSetRepository
      */
-    protected $locatorMock;
+    private $setRepository;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $mappings = [
-            "text" => "input",
-            "hidden" => "input",
-            "boolean" => "checkbox",
-            "media_image" => "image",
-            "price" => "input",
-            "weight" => "input",
-            "gallery" => "image"
-        ];
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->locatorMock = $this->createMock(\Magento\Catalog\Model\Locator\LocatorInterface::class);
-        $store = $this->objectManager->get(\Magento\Store\Api\Data\StoreInterface::class);
-        $this->locatorMock->expects($this->any())->method('getStore')->willReturn($store);
-        $this->eavModifier = $this->objectManager->create(
-            \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav::class,
-            [
-                'locator' => $this->locatorMock,
-                'formElementMapper' => $this->objectManager->create(
-                    \Magento\Ui\DataProvider\Mapper\FormElement::class,
-                    ['mappings' => $mappings]
-                )
-            ]
-        );
         parent::setUp();
+        $this->attributeGroupByName = $this->objectManager->get(GetAttributeGroupByName::class);
+        $this->getEntityIdByAttributeId = $this->objectManager->get(GetEntityIdByAttributeId::class);
+        $this->setRepository = $this->objectManager->get(AttributeSetRepositoryInterface::class);
     }
 
     /**
+     * @magentoDataFixture Magento/Catalog/_files/product_text_attribute.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @dataProvider modifyMetaWithAttributeProvider
+     * @param string $groupName
+     * @param string $groupCode
+     * @param string $attributeCode
+     * @param array $attributeMeta
+     * @return void
      */
-    public function testModifyMeta()
-    {
-        /** @var \Magento\Catalog\Model\Product $product */
-        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
-        $product->load(1);
-        $this->locatorMock->expects($this->any())->method('getProduct')->willReturn($product);
-        $expectedMeta = include __DIR__ . '/_files/eav_expected_meta_output.php';
+    public function testModifyMetaWithAttributeInGroups(
+        string $groupName,
+        string $groupCode,
+        string $attributeCode,
+        array $attributeMeta
+    ): void {
+        $attributeGroup = $this->attributeGroupByName->execute($this->defaultSetId, $groupName);
+        $groupId = $attributeGroup ? $attributeGroup->getAttributeGroupId() : 'ynode-1';
+        $data = [
+            'attributes' => [
+                [$this->attributeRepository->get($attributeCode)->getAttributeId(), $groupId, 1],
+            ],
+            'groups' => [
+                [$groupId, $groupName, 1],
+            ],
+        ];
+        $this->prepareAttributeSet($data);
+        $this->locatorMock->expects($this->any())->method('getProduct')->willReturn($this->getProduct());
         $actualMeta = $this->eavModifier->modifyMeta([]);
+        $expectedMeta = $this->addMetaNesting($attributeMeta, $groupCode, $attributeCode);
         $this->prepareDataForComparison($actualMeta, $expectedMeta);
         $this->assertEquals($expectedMeta, $actualMeta);
     }
 
-    public function testModifyMetaNewProduct()
+    /**
+     * @return array
+     */
+    public function modifyMetaWithAttributeProvider(): array
+    {
+        $textAttributeMeta = [
+            'dataType' => 'textarea',
+            'formElement' => 'textarea',
+            'visible' => '1',
+            'required' => '0',
+            'label' => 'Text Attribute',
+            'code' => 'text_attribute',
+            'source' => 'content',
+            'scopeLabel' => '[GLOBAL]',
+            'globalScope' => true,
+            'sortOrder' => '__placeholder__',
+            'componentType' => 'field',
+        ];
+        $urlKeyAttributeMeta = [
+            'dataType' => 'text',
+            'formElement' => 'input',
+            'visible' => '1',
+            'required' => '0',
+            'label' => 'URL Key',
+            'code' => 'url_key',
+            'source' => 'image-management',
+            'scopeLabel' => '[STORE VIEW]',
+            'globalScope' => false,
+            'sortOrder' =>  '__placeholder__',
+            'componentType' => 'field',
+        ];
+
+        return [
+            'new_attribute_in_existing_group' => [
+                'group_name' => 'Content',
+                'group_code' => 'content',
+                'attribute_code' => 'text_attribute',
+                'attribute_meta' => $textAttributeMeta,
+            ],
+            'new_attribute_in_new_group' => [
+                'group_name' => 'Test',
+                'group_code' => 'test',
+                'attribute_code' => 'text_attribute',
+                'attribute_meta' => array_merge($textAttributeMeta, ['source' => 'test']),
+            ],
+            'old_attribute_moved_to_existing_group' => [
+                'group_name' => 'Images',
+                'group_code' => 'image-management',
+                'attribute_code' => 'url_key',
+                'attribute_meta' => $urlKeyAttributeMeta,
+            ],
+            'old_attribute_moved_to_new_group' => [
+                'group_name' => 'Test',
+                'group_code' => 'test',
+                'attribute_code' => 'url_key',
+                'attribute_meta' => array_merge($urlKeyAttributeMeta, ['source' => 'test']),
+            ],
+        ];
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
+     */
+    public function testModifyMetaWithChangedGroupSorting(): void
+    {
+        $contentGroupId = $this->attributeGroupByName->execute($this->defaultSetId, 'Content')
+            ->getAttributeGroupId();
+        $imagesGroupId = $this->attributeGroupByName->execute($this->defaultSetId, 'Images')
+            ->getAttributeGroupId();
+        $additional = ['groups' => [[$contentGroupId, 'Content', 2], [$imagesGroupId, 'Images', 1]]];
+        $this->prepareAttributeSet($additional);
+        $this->locatorMock->expects($this->any())->method('getProduct')->willReturn($this->getProduct());
+        $actualMeta = $this->eavModifier->modifyMeta([]);
+        $groupCodes = ['image-management', 'content'];
+        $groups = array_filter(
+            array_keys($actualMeta),
+            function ($group) use ($groupCodes) {
+                return in_array($group, $groupCodes);
+            }
+        );
+        $this->assertEquals($groupCodes, $groups);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
+     */
+    public function testModifyMetaWithRemovedGroup(): void
     {
-        /** @var \Magento\Catalog\Model\Product $product */
-        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
-        $product->setAttributeSetId(4);
-        $this->locatorMock->expects($this->any())->method('getProduct')->willReturn($product);
-        $expectedMeta = include __DIR__ . '/_files/eav_expected_meta_output_w_default.php';
+        $designAttributes = ['page_layout', 'options_container', 'custom_layout_update'];
+        $designGroupId =$this->attributeGroupByName->execute($this->defaultSetId, 'Design')
+            ->getAttributeGroupId();
+        $additional = ['removeGroups' => [$designGroupId]];
+        $this->prepareAttributeSet($additional);
+        $this->locatorMock->expects($this->any())->method('getProduct')->willReturn($this->getProduct());
         $actualMeta = $this->eavModifier->modifyMeta([]);
-        $this->prepareDataForComparison($actualMeta, $expectedMeta);
-        $this->assertEquals($expectedMeta, $actualMeta);
+        $this->assertArrayNotHasKey('design', $actualMeta, 'Group "Design" still visible.');
+        $this->assertEmpty(
+            array_intersect($designAttributes, $this->getUsedAttributes($actualMeta)),
+            'Attributes from "Design" group still visible.'
+        );
     }
 
     /**
-     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_admin_store.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
      */
-    public function testModifyData()
+    public function testModifyMetaWithRemovedAttribute(): void
     {
-        /** @var \Magento\Catalog\Model\Product $product */
-        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
-        $product->load(1);
-        $this->locatorMock->expects($this->any())->method('getProduct')->willReturn($product);
-        $expectedData = include __DIR__ . '/_files/eav_expected_data_output.php';
-        $actualData = $this->eavModifier->modifyData([]);
-        $this->prepareDataForComparison($actualData, $expectedData);
-        $this->assertEquals($expectedData, $actualData);
+        $attributeId = (int)$this->attributeRepository->get('meta_description')->getAttributeId();
+        $entityAttributeId = $this->getEntityIdByAttributeId->execute($this->defaultSetId, $attributeId);
+        $additional = ['not_attributes' => [$entityAttributeId]];
+        $this->prepareAttributeSet($additional);
+        $this->locatorMock->expects($this->any())->method('getProduct')->willReturn($this->getProduct());
+        $actualMeta = $this->eavModifier->modifyMeta([]);
+        $this->assertArrayNotHasKey('meta_description', $this->getUsedAttributes($actualMeta));
     }
 
     /**
-     * Prepare data for comparison to avoid false positive failures.
-     *
-     * Make sure that $data contains all the data contained in $expectedData,
-     * ignore all fields not declared in $expectedData
+     * Updates default attribute set.
      *
-     * @param array &$data
-     * @param array $expectedData
+     * @param array $additional
      * @return void
      */
-    private function prepareDataForComparison(array &$data, array $expectedData)
+    private function prepareAttributeSet(array $additional): void
     {
-        foreach ($data as $key => &$item) {
-            if (!isset($expectedData[$key])) {
-                unset($data[$key]);
-                continue;
-            }
-            if ($item instanceof \Magento\Framework\Phrase) {
-                $item = (string)$item;
-            } elseif (is_array($item)) {
-                $this->prepareDataForComparison($item, $expectedData[$key]);
-            } elseif ($key === 'price_id' || $key === 'sortOrder') {
-                $data[$key] = '__placeholder__';
-            }
-        }
+        $set = $this->setRepository->get($this->defaultSetId);
+        $data = [
+            'attributes' => [],
+            'groups' => [],
+            'not_attributes' => [],
+            'removeGroups' => [],
+            'attribute_set_name' => 'Default',
+        ];
+        $set->organizeData(array_merge($data, $additional));
+        $this->setRepository->save($set);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdateTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdateTest.php
new file mode 100644
index 0000000000000..ebfbd06d7edad
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdateTest.php
@@ -0,0 +1,187 @@
+<?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;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\TestFramework\Catalog\Model\ProductLayoutUpdateManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Magento\Catalog\Model\Product\Attribute\Backend\LayoutUpdate as LayoutUpdateAttribute;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav as EavModifier;
+
+/**
+ * Test the modifier.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class LayoutUpdateTest extends TestCase
+{
+    /**
+     * @var LayoutUpdate
+     */
+    private $modifier;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $repo;
+
+    /**
+     * @var MockObject
+     */
+    private $locator;
+
+    /**
+     * @var EavModifier
+     */
+    private $eavModifier;
+
+    /**
+     * @var ProductLayoutUpdateManager
+     */
+    private $fakeFiles;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $this->locator = $this->getMockForAbstractClass(LocatorInterface::class);
+        $store = Bootstrap::getObjectManager()->create(StoreInterface::class);
+        $this->locator->method('getStore')->willReturn($store);
+        $this->modifier = Bootstrap::getObjectManager()->create(LayoutUpdate::class, ['locator' => $this->locator]);
+        $this->repo = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+        $this->eavModifier = Bootstrap::getObjectManager()->create(
+            EavModifier::class,
+            [
+                'locator' => $this->locator,
+                'formElementMapper' => Bootstrap::getObjectManager()->create(
+                    \Magento\Ui\DataProvider\Mapper\FormElement::class,
+                    [
+                        'mappings' => [
+                            "text" => "input",
+                            "hidden" => "input",
+                            "boolean" => "checkbox",
+                            "media_image" => "image",
+                            "price" => "input",
+                            "weight" => "input",
+                            "gallery" => "image"
+                        ]
+                    ]
+                )
+            ]
+        );
+        $this->fakeFiles = Bootstrap::getObjectManager()->get(ProductLayoutUpdateManager::class);
+    }
+
+    /**
+     * Test that data is being modified accordingly.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
+     * @throws \Throwable
+     */
+    public function testModifyData(): void
+    {
+        $product = $this->repo->get('simple');
+        $this->locator->method('getProduct')->willReturn($product);
+        $product->setCustomAttribute('custom_layout_update', 'something');
+
+        $data = $this->modifier->modifyData([$product->getId() => ['product' => []]]);
+        $this->assertEquals(
+            LayoutUpdateAttribute::VALUE_USE_UPDATE_XML,
+            $data[$product->getId()]['product']['custom_layout_update_file']
+        );
+    }
+
+    /**
+     * Extract options meta.
+     *
+     * @param array $meta
+     * @return array
+     */
+    private function extractCustomLayoutOptions(array $meta): array
+    {
+        $this->assertArrayHasKey('design', $meta);
+        $this->assertArrayHasKey('children', $meta['design']);
+        $this->assertArrayHasKey('container_custom_layout_update_file', $meta['design']['children']);
+        $this->assertArrayHasKey('children', $meta['design']['children']['container_custom_layout_update_file']);
+        $this->assertArrayHasKey(
+            'custom_layout_update_file',
+            $meta['design']['children']['container_custom_layout_update_file']['children']
+        );
+        $fieldMeta = $meta['design']['children']['container_custom_layout_update_file']['children'];
+        $fieldMeta = $fieldMeta['custom_layout_update_file'];
+        $this->assertArrayHasKey('arguments', $fieldMeta);
+        $this->assertArrayHasKey('data', $fieldMeta['arguments']);
+        $this->assertArrayHasKey('config', $fieldMeta['arguments']['data']);
+        $this->assertArrayHasKey('options', $fieldMeta['arguments']['data']['config']);
+
+        return $fieldMeta['arguments']['data']['config']['options'];
+    }
+
+    /**
+     * Check that entity specific options are returned.
+     *
+     * @return void
+     * @throws \Throwable
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testEntitySpecificData(): void
+    {
+        //Testing a category without layout xml
+        $product = $this->repo->get('simple');
+        $this->locator->method('getProduct')->willReturn($product);
+        $this->fakeFiles->setFakeFiles((int)$product->getId(), ['testOne', 'test_two']);
+
+        $meta = $this->eavModifier->modifyMeta([]);
+        $list = $this->extractCustomLayoutOptions($meta);
+        $expectedList = [
+            [
+                'label' => 'No update',
+                'value' => \Magento\Catalog\Model\Attribute\Backend\AbstractLayoutUpdate::VALUE_NO_UPDATE,
+                '__disableTmpl' => true
+            ],
+            ['label' => 'testOne', 'value' => 'testOne', '__disableTmpl' => true],
+            ['label' => 'test_two', 'value' => 'test_two', '__disableTmpl' => true]
+        ];
+        sort($expectedList);
+        sort($list);
+        $this->assertEquals($expectedList, $list);
+
+        //Product with old layout xml
+        $product->setCustomAttribute('custom_layout_update', 'test');
+        $this->fakeFiles->setFakeFiles((int)$product->getId(), ['test3']);
+
+        $meta = $this->eavModifier->modifyMeta([]);
+        $list = $this->extractCustomLayoutOptions($meta);
+        $expectedList = [
+            [
+                'label' => 'No update',
+                'value' => \Magento\Catalog\Model\Attribute\Backend\AbstractLayoutUpdate::VALUE_NO_UPDATE,
+                '__disableTmpl' => true
+            ],
+            [
+                'label' => 'Use existing',
+                'value' => LayoutUpdateAttribute::VALUE_USE_UPDATE_XML,
+                '__disableTmpl' => true
+            ],
+            ['label' => 'test3', 'value' => 'test3', '__disableTmpl' => true],
+        ];
+        sort($expectedList);
+        sort($list);
+        $this->assertEquals($expectedList, $list);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/_files/eav_expected_meta_output.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/_files/eav_expected_meta_output.php
index fa0a664738c1d..f6f4cc0e15159 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/_files/eav_expected_meta_output.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/_files/eav_expected_meta_output.php
@@ -40,9 +40,6 @@
                                     "globalScope" => false,
                                     "code" => "status",
                                     "sortOrder" => "__placeholder__",
-                                    "service" => [
-                                        "template" => "ui/form/element/helper/service"
-                                    ],
                                     "componentType" => "field"
                                 ],
                             ],
@@ -66,9 +63,6 @@
                                     "globalScope" => false,
                                     "code" => "name",
                                     "sortOrder" => "__placeholder__",
-                                    "service" => [
-                                        "template" => "ui/form/element/helper/service"
-                                    ],
                                     "componentType" => "field",
                                     "validation" => [
                                         "required-entry" => true
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_with_custom_group.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_with_custom_group.php
new file mode 100644
index 0000000000000..ccca2b7e4dbce
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_with_custom_group.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Eav\Api\AttributeSetRepositoryInterface;
+use Magento\Eav\Api\Data\AttributeGroupInterface;
+use Magento\Eav\Api\Data\AttributeSetInterfaceFactory;
+use Magento\Eav\Model\Entity\Attribute\GroupFactory;
+use Magento\Eav\Model\Entity\Type;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var AttributeSetRepositoryInterface $attributeSetRepository */
+$attributeSetRepository = $objectManager->get(AttributeSetRepositoryInterface::class);
+/** @var AttributeSetInterfaceFactory $attributeSetFactory */
+$attributeSetFactory = $objectManager->get(AttributeSetInterfaceFactory::class);
+/** @var Type $entityType */
+$entityType = $objectManager->create(Type::class)->loadByCode(ProductAttributeInterface::ENTITY_TYPE_CODE);
+$attributeSet = $attributeSetFactory->create(
+    [
+        'data' => [
+            'id' => null,
+            'attribute_set_name' => 'new_attribute_set',
+            'entity_type_id' => $entityType->getId(),
+            'sort_order' => 300,
+        ],
+    ]
+);
+$attributeSet->isObjectNew(true);
+$attributeSet->setHasDataChanges(true);
+$attributeSet->validate();
+$attributeSetRepository->save($attributeSet);
+$attributeSet->initFromSkeleton($entityType->getDefaultAttributeSetId());
+/** @var AttributeGroupInterface $newGroup */
+$newGroup = $objectManager->get(GroupFactory::class)->create();
+$newGroup->setId(null)
+    ->setAttributeGroupName('Test attribute group name')
+    ->setAttributeSetId($attributeSet->getAttributeSetId())
+    ->setSortOrder(11)
+    ->setAttributes([]);
+/** @var AttributeGroupInterface[] $groups */
+$groups = $attributeSet->getGroups();
+array_push($groups, $newGroup);
+$attributeSet->setGroups($groups);
+$attributeSetRepository->save($attributeSet);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_with_custom_group_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_with_custom_group_rollback.php
new file mode 100644
index 0000000000000..f8628ea2d6ddb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_with_custom_group_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\Eav\Api\AttributeSetRepositoryInterface;
+use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var GetAttributeSetByName $getAttributeSetByName */
+$getAttributeSetByName = $objectManager->get(GetAttributeSetByName::class);
+/** @var AttributeSetRepositoryInterface $attributeSetRepository */
+$attributeSetRepository = $objectManager->get(AttributeSetRepositoryInterface::class);
+$attributeSet = $getAttributeSetByName->execute('new_attribute_set');
+
+if ($attributeSet) {
+    $attributeSetRepository->delete($attributeSet);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_without_country_of_manufacture.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_without_country_of_manufacture.php
new file mode 100644
index 0000000000000..6939031140523
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_without_country_of_manufacture.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Group;
+use Magento\Eav\Model\Entity\Attribute\Set;
+use Magento\Eav\Model\Entity\Type;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+/** @var ProductAttributeInterface $attributeCountryOfManufacture */
+$attributeCountryOfManufacture = $attributeRepository->get('country_of_manufacture');
+
+/** @var Magento\Eav\Model\Entity\Attribute\Set $attributeSet */
+$attributeSet = $objectManager->create(Set::class);
+/** @var Type $entityType */
+$entityType = $objectManager->create(Type::class)
+    ->loadByCode(Magento\Catalog\Model\Product::ENTITY);
+$data = [
+    'attribute_set_name' => 'custom_attribute_set_wout_com',
+    'entity_type_id' => $entityType->getId(),
+    'sort_order' => 300,
+];
+
+$attributeSet->setData($data);
+$attributeSet->validate();
+$attributeSet->save();
+$attributeSet->initFromSkeleton($entityType->getDefaultAttributeSetId());
+/** @var Group $group */
+foreach ($attributeSet->getGroups() as $group) {
+    $groupAttributes = $group->getAttributes();
+    $newAttributes = array_filter(
+        $groupAttributes,
+        function ($attribute) use ($attributeCountryOfManufacture) {
+            /** @var ProductAttributeInterface $attribute */
+            return (int)$attribute->getAttributeId() !== (int)$attributeCountryOfManufacture->getAttributeId();
+        }
+    );
+    if (count($newAttributes) < count($groupAttributes)) {
+        $group->setAttributes($newAttributes);
+        break;
+    }
+}
+$attributeSet->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_without_country_of_manufacture_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_without_country_of_manufacture_rollback.php
new file mode 100644
index 0000000000000..7b4719e151303
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_without_country_of_manufacture_rollback.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Eav\Model\AttributeSetSearchResults;
+use Magento\Eav\Model\Entity\Attribute\Set;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SortOrderBuilder;
+use Magento\Framework\Data\Collection;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\AttributeSetRepositoryInterface;
+use Magento\Eav\Model\Entity\Type;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var AttributeSetRepositoryInterface $attributeSetRepository */
+$attributeSetRepository = $objectManager->create(AttributeSetRepositoryInterface::class);
+/** @var Type $entityType */
+$entityType = $objectManager->create(Type::class)
+    ->loadByCode(Magento\Catalog\Model\Product::ENTITY);
+$sortOrderBuilder = $objectManager->create(SortOrderBuilder::class);
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteriaBuilder->addFilter('attribute_set_name', 'custom_attribute_set_wout_com');
+$searchCriteriaBuilder->addFilter('entity_type_id', $entityType->getId());
+$attributeSetIdSortOrder = $sortOrderBuilder
+    ->setField('attribute_set_id')
+    ->setDirection(Collection::SORT_ORDER_DESC)
+    ->create();
+$searchCriteriaBuilder->addSortOrder($attributeSetIdSortOrder);
+$searchCriteriaBuilder->setPageSize(1);
+$searchCriteriaBuilder->setCurrentPage(1);
+
+/** @var AttributeSetSearchResults $searchResult */
+$searchResult = $attributeSetRepository->getList($searchCriteriaBuilder->create());
+$items = $searchResult->getItems();
+
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    if (count($items) > 0) {
+        /** @var Set $attributeSet */
+        $attributeSet = reset($items);
+        $attributeSetRepository->deleteById($attributeSet->getId());
+    }
+} catch (\Exception $e) {
+    // In case of test run with DB isolation there is already no object in database
+    // since rollback fixtures called after transaction rollback.
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_image_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_image_attribute_rollback.php
index 6dc8b60739f1f..626eb32a17051 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_image_attribute_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_with_image_attribute_rollback.php
@@ -17,9 +17,10 @@
 $attributeCollection->setCodeFilter('funny_image');
 $attributeCollection->setEntityTypeFilter($entityType->getId());
 $attributeCollection->setPageSize(1);
-$attributeCollection->load();
-$attribute = $attributeCollection->fetchItem();
-$attribute->delete();
+$attribute = $attributeCollection->getFirstItem();
+if ($attribute->getId()) {
+    $attribute->delete();
+}
 
 // remove attribute set
 
@@ -31,8 +32,9 @@
 $attributeSetCollection->addFilter('entity_type_id', $entityType->getId());
 $attributeSetCollection->setOrder('attribute_set_id'); // descending is default value
 $attributeSetCollection->setPageSize(1);
-$attributeSetCollection->load();
 
 /** @var \Magento\Eav\Model\Entity\Attribute\Set $attributeSet */
-$attributeSet = $attributeSetCollection->fetchItem();
-$attributeSet->delete();
+$attributeSet = $attributeSetCollection->getFirstItem();
+if ($attributeSet->getId()) {
+    $attributeSet->delete();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_image.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_image.php
new file mode 100644
index 0000000000000..934abffcb9c5b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_image.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require_once 'catalog_category_image.php';
+
+/** @var $category \Magento\Catalog\Model\Category */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$categoryParent = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$categoryParent->setName('Parent Image Category')
+    ->setPath('1/2')
+    ->setLevel(2)
+    ->setImage($filePath)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->save();
+
+$categoryChild = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$categoryChild->setName('Child Image Category')
+    ->setPath($categoryParent->getPath())
+    ->setLevel(3)
+    ->setImage($filePath)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(2)
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_image_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_image_rollback.php
new file mode 100644
index 0000000000000..baea438e9340c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_image_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @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\Product\Collection $collection */
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+$collection
+    ->addAttributeToFilter('name', ['in' => ['Parent Image Category', 'Child Image Category']])
+    ->load()
+    ->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
index a5ab961932461..25bb55ffbc32c 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
@@ -64,6 +64,7 @@
     ->setIsActive(true)
     ->setIsAnchor(true)
     ->setPosition(1)
+    ->setDescription('Category 1.1 description.')
     ->save();
 
 $category = $objectManager->create(\Magento\Catalog\Model\Category::class);
@@ -79,6 +80,7 @@
     ->setPosition(1)
     ->setCustomUseParentSettings(0)
     ->setCustomDesign('Magento/blank')
+    ->setDescription('This is the description for Category 1.1.1')
     ->save();
 
 $category = $objectManager->create(\Magento\Catalog\Model\Category::class);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_disabled.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_disabled.php
new file mode 100644
index 0000000000000..26f4565d70b37
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_disabled.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+include __DIR__ . '/categories.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+// Adding 4th level ensures an edge case for which 3 levels of categories would not be enough
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(59)
+    ->setName('Category 1.1.1.1')
+    ->setParentId(5)
+    ->setPath('1/2/3/4/5/59')
+    ->setLevel(5)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->setCustomUseParentSettings(0)
+    ->setCustomDesign('Magento/blank')
+    ->setDescription('This is the description for Category 1.1.1.1')
+    ->save();
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+
+// Category 1.1.1
+$category->load(4);
+$category->setIsActive(false);
+$category->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_disabled_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_disabled_rollback.php
new file mode 100644
index 0000000000000..cc42bd6a09753
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_disabled_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+include __DIR__ . '/categories_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);
+
+/** @var Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+foreach ($collection->addAttributeToFilter('level', ['in' => [59]]) 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/category_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
index 37398abdb8f7d..29b4a05c4dcbe 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
@@ -9,5 +9,6 @@
     ->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
 $attribute->setAttributeCode('test_attribute_code_666')
     ->setEntityTypeId(3)
-    ->setIsGlobal(1);
+    ->setIsGlobal(1)
+    ->setIsUserDefined(1);
 $attribute->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_different_price_products.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_different_price_products.php
new file mode 100644
index 0000000000000..2e87e1e820f86
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_different_price_products.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterfaceFactory;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+$categoryFactory = $objectManager->get(CategoryInterfaceFactory::class);
+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$categoryRepository = $objectManager->get(CategoryRepositoryInterface::class);
+$currentStoreId = $storeManager->getStore()->getId();
+
+$storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
+$category = $categoryFactory->create();
+$category->isObjectNew(true);
+$category->setName('Category 999')
+    ->setParentId(2)
+    ->setLevel(2)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1);
+$category = $categoryRepository->save($category);
+$storeManager->setCurrentStore($currentStoreId);
+
+$product = $productFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setStoreId(Store::DEFAULT_STORE_ID)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product With Price 10')
+    ->setSku('simple1000')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setStockData(['use_config_manage_stock' => 0])
+    ->setCategoryIds([$category->getId()])
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED);
+$productRepository->save($product);
+
+$product = $productFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setStoreId(Store::DEFAULT_STORE_ID)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product With Price 20')
+    ->setSku('simple1001')
+    ->setPrice(20)
+    ->setWeight(1)
+    ->setStockData(['use_config_manage_stock' => 0])
+    ->setCategoryIds([$category->getId()])
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_different_price_products_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_different_price_products_rollback.php
new file mode 100644
index 0000000000000..4658a5b9bc8af
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_different_price_products_rollback.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$categoryCollectionFactory = $objectManager->get(CollectionFactory::class);
+$categoryRepository = $objectManager->get(CategoryRepositoryInterface::class);
+try {
+    $productRepository->deleteById('simple1000');
+} catch (NoSuchEntityException $e) {
+    //Already deleted.
+}
+
+try {
+    $productRepository->deleteById('simple1001');
+} catch (NoSuchEntityException $e) {
+    //Already deleted.
+}
+
+try {
+    $categoryCollection = $categoryCollectionFactory->create();
+    $category = $categoryCollection
+        ->addAttributeToFilter(CategoryInterface::KEY_NAME, 'Category 999')
+        ->setPageSize(1)
+        ->getFirstItem();
+    $categoryRepository->delete($category);
+} catch (NoSuchEntityException $e) {
+    //Already deleted.
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_two_products.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_two_products.php
new file mode 100644
index 0000000000000..31557fbe9a748
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_two_products.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\CategoryLinkManagementInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/category_product.php';
+require __DIR__ . '/second_product_simple.php';
+
+$categoryLinkManagement = Bootstrap::getObjectManager()->create(CategoryLinkManagementInterface::class);
+$categoryLinkManagement->assignProductToCategories('simple2', [333]);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_two_products_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_two_products_rollback.php
new file mode 100644
index 0000000000000..7500a92d1614c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_two_products_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__ . '/category_product_rollback.php';
+require __DIR__ . '/second_product_simple_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/inactive_category.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/inactive_category.php
new file mode 100644
index 0000000000000..e604d4e9f061b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/inactive_category.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+use Magento\TestFramework\Helper\Bootstrap as Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var CategoryResource $categoryResource */
+$categoryResource = $objectManager->create(CategoryResource::class);
+/** @var Category $category */
+$category = $objectManager->get(CategoryFactory::class)->create();
+$category->isObjectNew(true);
+$data = [
+    'entity_id' => 111,
+    'path' => '1/2/111',
+    'name' => 'Test Category',
+    'attribute_set_id' => $category->getDefaultAttributeSetId(),
+    'parent_id' => 2,
+    'is_active' => false,
+    'include_in_menu' => true,
+];
+$category->setData($data);
+$categoryResource->save($category);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/inactive_category_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/inactive_category_rollback.php
new file mode 100644
index 0000000000000..706a0bd9d05b0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/inactive_category_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+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);
+/** @var CategoryRepositoryInterface $categoryRepository */
+$categoryRepository = $objectManager->get(CategoryRepositoryInterface::class);
+
+try {
+    $category = $categoryRepository->get(111);
+    $categoryRepository->delete($category);
+} catch (NoSuchEntityException $e) {
+    //category already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image.gif b/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image.gif
new file mode 100755
index 0000000000000..82bccf7ba2fa6
Binary files /dev/null and b/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image.gif differ
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_related_products.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_related_products.php
new file mode 100644
index 0000000000000..afd8d76a92b13
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_related_products.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\Data\ProductLinkInterface;
+use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
+
+/** @var ProductFactory $factory */
+$factory = Bootstrap::getObjectManager()->get(ProductFactory::class);
+/** @var ProductLinkInterfaceFactory $linkFactory */
+$linkFactory = Bootstrap::getObjectManager()->get(ProductLinkInterfaceFactory::class);
+
+$rootProductCount = 10;
+$rootSku = 'simple-related-';
+$simpleProducts = [];
+for ($i =1; $i <= $rootProductCount; $i++) {
+    /** @var Product $product */
+    $product = $factory->create();
+    $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+        ->setAttributeSetId(4)
+        ->setName('Simple Related Product #' .$i)
+        ->setSku($rootSku .$i)
+        ->setPrice(10)
+        ->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, 'manage_stock' => 1])
+        ->save();
+    $simpleProducts[$i] = $product;
+}
+
+$linkTypes = ['crosssell', 'related', 'upsell'];
+$linkedMaxCount = 10;
+foreach ($simpleProducts as $simpleI => $product) {
+    $linkedCount = rand(1, $linkedMaxCount);
+    $links = [];
+    for ($i = 0; $i < $linkedCount; $i++) {
+        /** @var Product $linkedProduct */
+        $linkedProduct = $factory->create();
+        $linkedSku = 'related-product-' .$simpleI .'-' .$i;
+        $linkedProduct->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+            ->setAttributeSetId(4)
+            ->setName('Related product #' .$simpleI .'-' .$i)
+            ->setSku($linkedSku)
+            ->setPrice(10)
+            ->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, 'manage_stock' => 1])
+            ->save();
+        /** @var ProductLinkInterface $link */
+        $link = $linkFactory->create();
+        $link->setSku($product->getSku());
+        $link->setLinkedProductSku($linkedSku);
+        $link->setPosition($i + 1);
+        $link->setLinkType($linkTypes[rand(0, count($linkTypes) - 1)]);
+        $links[] = $link;
+    }
+    $product->setProductLinks($links);
+    $product->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_related_products_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_related_products_rollback.php
new file mode 100644
index 0000000000000..2e728efc103c2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_related_products_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\Catalog\Model\ProductRepository;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$rootSku = 'simple-related-%';
+$linkedSku = 'related-product-%';
+/** @var ProductRepository $repo */
+$repo = Bootstrap::getObjectManager()->get(ProductRepository::class);
+/** @var SearchCriteriaBuilder $criteriaBuilder */
+$criteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
+$listToDelete = $repo->getList($criteriaBuilder->addFilter('sku', $rootSku, 'like')->create());
+foreach ($listToDelete->getItems() as $item) {
+    try {
+        $repo->delete($item);
+    } catch (\Throwable $exception) {
+        //Could be deleted before
+    }
+}
+$listToDelete = $repo->getList($criteriaBuilder->addFilter('sku', $linkedSku, 'like')->create());
+foreach ($listToDelete->getItems() as $item) {
+    try {
+        $repo->delete($item);
+    } catch (\Throwable $exception) {
+        //Could be deleted before
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_attribute.php
index b5187d5d80768..b59675c5a28ae 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_attribute.php
@@ -10,5 +10,6 @@
 $attribute->setAttributeCode('test_attribute_code_333')
     ->setEntityTypeId(4)
     ->setIsGlobal(1)
-    ->setPrice(95);
+    ->setPrice(95)
+    ->setIsUserDefined(1);
 $attribute->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_boolean_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_boolean_attribute.php
new file mode 100644
index 0000000000000..34dccc2284445
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_boolean_attribute.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\Setup\CategorySetup;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Eav\Model\Entity\Attribute\Source\Boolean;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var AttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(AttributeRepositoryInterface::class);
+/** @var Attribute $attribute */
+$attribute = $objectManager->create(Attribute::class);
+/** @var $installer CategorySetup */
+$installer = $objectManager->create(CategorySetup::class);
+
+$attribute->setData(
+    [
+        'attribute_code'                => 'boolean_attribute',
+        'entity_type_id'                => CategorySetup::CATALOG_PRODUCT_ENTITY_TYPE_ID,
+        'is_global'                     => 0,
+        'is_user_defined'               => 1,
+        'frontend_input'                => 'boolean',
+        'is_unique'                     => 0,
+        'is_required'                   => 0,
+        'is_searchable'                 => 1,
+        'is_visible_in_advanced_search' => 1,
+        'is_comparable'                 => 0,
+        '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'              => 0,
+        'frontend_label'                => ['Boolean Attribute'],
+        'backend_type'                  => 'int',
+        'source_model'                  => Boolean::class
+    ]
+);
+
+$attributeRepository->save($attribute);
+
+/* Assign attribute to attribute set */
+$installer->addAttributeToGroup('catalog_product', 'Default', 'Attributes', $attribute->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_boolean_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_boolean_attribute_rollback.php
new file mode 100644
index 0000000000000..c234eb91c84a6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_boolean_attribute_rollback.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+
+$objectManager = Bootstrap::getObjectManager();
+
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var Attribute $attribute */
+$attribute = $objectManager->create(Attribute::class);
+$attribute->load('boolean_attribute', 'attribute_code');
+$attribute->delete();
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_date_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_date_attribute.php
new file mode 100644
index 0000000000000..43ea543a5909e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_date_attribute.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$installer = $objectManager->create(CategorySetup::class);
+$attribute = $objectManager->create(AttributeFactory::class)->create();
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+$entityType = $installer->getEntityTypeId(ProductAttributeInterface::ENTITY_TYPE_CODE);
+if (!$attribute->loadByCode($entityType, 'date_attribute')->getAttributeId()) {
+    $attribute->setData(
+        [
+            'attribute_code' => 'date_attribute',
+            'entity_type_id' => $entityType,
+            'is_global' => 1,
+            'is_user_defined' => 1,
+            'frontend_input' => 'date',
+            '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' => 1,
+            'used_for_sort_by' => 0,
+            'frontend_label' => ['Date Attribute'],
+            'backend_type' => 'datetime',
+        ]
+    );
+    $attributeRepository->save($attribute);
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup(
+        ProductAttributeInterface::ENTITY_TYPE_CODE,
+        'Default',
+        'General',
+        $attribute->getId()
+    );
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_date_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_date_attribute_rollback.php
new file mode 100644
index 0000000000000..b20da89be0136
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_date_attribute_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\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Registry;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+
+try {
+    $attributeRepository->deleteById('date_attribute');
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_decimal_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_decimal_attribute.php
new file mode 100644
index 0000000000000..949475607d773
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_decimal_attribute.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$installer = $objectManager->create(CategorySetup::class);
+$attribute = $objectManager->create(AttributeFactory::class)->create();
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+$entityType = $installer->getEntityTypeId(ProductAttributeInterface::ENTITY_TYPE_CODE);
+if (!$attribute->loadByCode($entityType, 'decimal_attribute')->getAttributeId()) {
+    $attribute->setData(
+        [
+            'attribute_code' => 'decimal_attribute',
+            'entity_type_id' => $entityType,
+            'is_global' => 1,
+            'is_user_defined' => 1,
+            'frontend_input' => 'price',
+            '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' => 1,
+            'used_for_sort_by' => 0,
+            'frontend_label' => ['Decimal Attribute'],
+            'backend_type' => 'decimal',
+            'backend_model' => Price::class,
+        ]
+    );
+    $attributeRepository->save($attribute);
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup(
+        ProductAttributeInterface::ENTITY_TYPE_CODE,
+        'Default',
+        'General',
+        $attribute->getId()
+    );
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_decimal_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_decimal_attribute_rollback.php
new file mode 100644
index 0000000000000..de187379bc99a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_decimal_attribute_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\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Registry;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+
+try {
+    $attributeRepository->deleteById('decimal_attribute');
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_dropdown_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_dropdown_attribute.php
new file mode 100644
index 0000000000000..ae0c1d3613380
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_dropdown_attribute.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var $attribute Attribute */
+$attribute = $objectManager->create(Attribute::class);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+/** @var $installer CategorySetup */
+$installer = $objectManager->create(CategorySetup::class);
+$entityTypeId = $installer->getEntityTypeId(ProductAttributeInterface::ENTITY_TYPE_CODE);
+
+if (!$attribute->loadByCode($entityTypeId, 'dropdown_attribute')->getId()) {
+    $attribute->setData(
+        [
+            'attribute_code'                => 'dropdown_attribute',
+            'entity_type_id'                => $entityTypeId,
+            'is_global'                     => 0,
+            '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'           => 1,
+            'used_in_product_listing'       => 1,
+            'used_for_sort_by'              => 0,
+            'frontend_label'                => ['Drop-Down Attribute'],
+            'backend_type'                  => 'int',
+            'option'                        => [
+                'value' => [
+                    'option_1' => ['Option 1'],
+                    'option_2' => ['Option 2'],
+                    'option_3' => ['Option 3'],
+                ],
+                'order' => [
+                    'option_1' => 1,
+                    'option_2' => 2,
+                    'option_3' => 3,
+                ],
+            ],
+        ]
+    );
+    $attributeRepository->save($attribute);
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup(
+        ProductAttributeInterface::ENTITY_TYPE_CODE,
+        'Default',
+        'Attributes',
+        $attribute->getId()
+    );
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_dropdown_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_dropdown_attribute_rollback.php
new file mode 100644
index 0000000000000..b48acc0ca0ac6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_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);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Registry;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+
+try {
+    $attributeRepository->deleteById('dropdown_attribute');
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_image_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_image_attribute.php
new file mode 100644
index 0000000000000..d8f0299f2a876
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_image_attribute.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$installer = $objectManager->create(CategorySetup::class);
+$attribute = $objectManager->create(AttributeFactory::class)->create();
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+$entityType = $installer->getEntityTypeId(ProductAttributeInterface::ENTITY_TYPE_CODE);
+if (!$attribute->loadByCode($entityType, 'image_attribute')->getAttributeId()) {
+    $attribute->setData(
+        [
+            'attribute_code' => 'image_attribute',
+            'entity_type_id' => $entityType,
+            'is_global' => 1,
+            'is_user_defined' => 1,
+            'frontend_input' => 'media_image',
+            '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' => 1,
+            'used_for_sort_by' => 0,
+            'frontend_label' => ['Image Attribute'],
+            'backend_type' => 'varchar',
+        ]
+    );
+    $attributeRepository->save($attribute);
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup(
+        ProductAttributeInterface::ENTITY_TYPE_CODE,
+        'Default',
+        'General',
+        $attribute->getId()
+    );
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_image_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_image_attribute_rollback.php
new file mode 100644
index 0000000000000..c9d28686741b8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_image_attribute_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\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Registry;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+
+try {
+    $attributeRepository->deleteById('image_attribute');
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_multistore_different_short_description.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_multistore_different_short_description.php
new file mode 100644
index 0000000000000..4f0d1ce6d47ff
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_multistore_different_short_description.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\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../Store/_files/core_fixturestore.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->get(ProductFactory::class);
+
+$currentStoreId = $storeManager->getStore()->getId();
+$secondStoreId = $storeManager->getStore('fixturestore')->getId();
+
+$product = $productFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([$storeManager->getWebsite(true)->getId()])
+    ->setName('Simple Product One')
+    ->setSku('simple-different-short-description')
+    ->setPrice(10)
+    ->setWeight(18)
+    ->setStockData(['use_config_manage_stock' => 0])
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setShortDescription('First store view short description')
+    ->setStatus(Status::STATUS_ENABLED);
+$productRepository->save($product);
+
+try {
+    $storeManager->setCurrentStore($secondStoreId);
+    $product = $productRepository->get('simple-different-short-description', false, $secondStoreId);
+    $product->setShortDescription('Second store view short description');
+    $productRepository->save($product);
+} finally {
+    $storeManager->setCurrentStore($currentStoreId);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_multistore_different_short_description_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_multistore_different_short_description_rollback.php
new file mode 100644
index 0000000000000..4191b9ff00acc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_multistore_different_short_description_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\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+
+try {
+    $product = $productRepository->get('simple-different-short-description');
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+    //already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../Store/_files/core_fixturestore_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore_with_url_key.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore_with_url_key.php
new file mode 100644
index 0000000000000..82a1cd4b98e35
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore_with_url_key.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\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\Store\Model\Store;
+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)
+    ->setStoreId(Store::DEFAULT_STORE_ID)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product 100')
+    ->setSku('simple_100')
+    ->setUrlKey('url-key')
+    ->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);
+
+$product->setStoreId(Store::DISTRO_STORE_ID)
+    ->setName('StoreTitle')
+    ->setUrlKey('url-key');
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore_with_url_key_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore_with_url_key_rollback.php
new file mode 100644
index 0000000000000..7130a7c4a5612
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore_with_url_key_rollback.php
@@ -0,0 +1,22 @@
+<?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\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+try {
+    $productRepository->deleteById('simple_100');
+} catch (NoSuchEntityException $e) {
+    //Entity already deleted
+}
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
index 6630c0d69e34f..a0e4369b986e4 100644
--- 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
@@ -20,7 +20,7 @@
 $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
     ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setWebsiteIds([1])
-    ->setName('Simple Product')
+    ->setName('Simple Product Out Of Stock')
     ->setSku('simple-out-of-stock')
     ->setPrice(10)
     ->setWeight(1)
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_tax_none.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_tax_none.php
new file mode 100644
index 0000000000000..35bf3705493ed
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_tax_none.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\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductInterfaceFactory $productFactory */
+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $productFactory->create();
+$product->setTypeId('simple')
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Simple Product Tax None')
+    ->setSku('simple-product-tax-none')
+    ->setPrice(205)
+    ->setWeight(1)
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(
+        [
+            'use_config_manage_stock' => 1,
+            'qty' => 100,
+            'is_in_stock' => 1
+        ]
+    );
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_tax_none_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_tax_none_rollback.php
new file mode 100644
index 0000000000000..ceffb1c87d970
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_tax_none_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\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var \Magento\Framework\Registry $registry */
+$registry =$objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    /** @var ProductInterface $product */
+    $product = $productRepository->get('simple-product-tax-none', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+    // isolation on
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_country_of_manufacture.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_country_of_manufacture.php
new file mode 100644
index 0000000000000..fd09b8bd1f0f2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_country_of_manufacture.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+Bootstrap::getInstance()->reinitialize();
+
+/** @var \Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productFactory = $objectManager->create(ProductInterfaceFactory::class);
+/** @var $product \Magento\Catalog\Model\Product */
+
+$product = $productFactory->create();
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Simple Product With Country Of Manufacture')
+    ->setSku('simple_with_com')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setCountryOfManufacture('AO')
+    ->setShortDescription('Short description')
+    ->setTaxClassId(0)
+    ->setDescription('Description')
+    ->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'            => 0,
+            'is_in_stock'               => 1,
+        ]
+    );
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_country_of_manufacture_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_country_of_manufacture_rollback.php
new file mode 100644
index 0000000000000..ffeb7eb143410
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_country_of_manufacture_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\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Registry;
+
+/** @var \Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    /** @var Product $product */
+    $product = $productRepository->get('simple_with_com');
+    $productRepository->delete($product);
+} catch (\Exception $e) {
+    // In case of test run with DB isolation there is already no object in database
+    // since rollback fixtures called after transaction rollback.
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_file_option.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_file_option.php
new file mode 100644
index 0000000000000..1cd36e7f4726f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_file_option.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\CategoryLinkManagementInterface;
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
+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\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var CategoryLinkManagementInterface $categoryLinkManagement */
+$categoryLinkManagement = $objectManager->create(CategoryLinkManagementInterface::class);
+
+/** @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_with_custom_file_option')
+    ->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)
+    ->setStockData(
+        [
+            'use_config_manage_stock' => 1,
+            'qty' => 100,
+            'is_qty_decimal' => 0,
+            'is_in_stock' => 1,
+        ]
+    )
+    ->setCanSaveCustomOptions(true)
+    ->setHasOptions(true);
+
+$option = [
+    'title' => 'file option',
+    'type' => 'file',
+    'is_require' => true,
+    'sort_order' => 1,
+    'price' => 30.0,
+    'price_type' => 'percent',
+    'sku' => 'sku3',
+    'file_extension' => 'jpg, png, gif',
+    'image_size_x' => 100,
+    'image_size_y' => 100,
+];
+
+$customOptions = [];
+
+/** @var ProductCustomOptionInterfaceFactory $customOptionFactory */
+$customOptionFactory = $objectManager->create(ProductCustomOptionInterfaceFactory::class);
+/** @var ProductCustomOptionInterface $customOption */
+$customOption = $customOptionFactory->create(['data' => $option]);
+$customOption->setProductSku($product->getSku());
+$customOptions[] = $customOption;
+
+$product->setOptions($customOptions);
+
+/** @var ProductRepositoryInterface $productRepositoryFactory */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$productRepository->save($product);
+
+$categoryLinkManagement->assignProductToCategories(
+    $product->getSku(),
+    [2]
+);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_file_option_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_file_option_rollback.php
new file mode 100644
index 0000000000000..87321b2a080c0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_file_option_rollback.php
@@ -0,0 +1,31 @@
+<?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\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()
+    ->get(ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple_with_custom_file_option', 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_date_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_date_attribute.php
new file mode 100644
index 0000000000000..28a89ff883c4f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_date_attribute.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+include __DIR__ . '/product_date_attribute.php';
+
+$attribute->setData('is_used_for_promo_rules', 1);
+
+/** @var \Magento\Catalog\Model\ProductFactory $productFactory */
+$productFactory = $objectManager->get(Magento\Catalog\Model\ProductFactory::class);
+$product = $productFactory->create();
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Simple Product with date')
+    ->setSku('simple_with_date')
+    ->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])
+    ->setDateAttribute(date('Y-m-d'))
+    ->setUrlKey('simple_with_date')
+    ->save();
+
+$product2 = $productFactory->create();
+$product2->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Simple Product with date -1')
+    ->setSku('simple_with_date2')
+    ->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])
+    ->setDateAttribute(date('Y-m-d', strtotime(date('Y-m-d') . '-1 day')))
+    ->setUrlKey('simple_with_date2')
+    ->save();
+
+$product3 = $productFactory->create();
+$product3->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Simple Product with date +1')
+    ->setSku('simple_with_date3')
+    ->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])
+    ->setDateAttribute(date('Y-m-d', strtotime(date('Y-m-d') . '+1 day')))
+    ->setUrlKey('simple_with_date3')
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_date_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_date_attribute_rollback.php
new file mode 100644
index 0000000000000..da61eb1d2332b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_date_attribute_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\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_date', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+
+try {
+    $product = $productRepository->get('simple_with_date2', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+
+try {
+    $product = $productRepository->get('simple_with_date3', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+include __DIR__ . '/product_date_attribute_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php
index 93c7ba61c6f49..67288bec86ad5 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php
@@ -106,6 +106,15 @@
                 'sort_order' => 2,
             ],
         ],
+    ],
+    [
+        'title' => 'date option',
+        'type' => 'date',
+        'price' => 80.0,
+        'price_type' => 'fixed',
+        'sku' => 'date option sku',
+        'is_require' => false,
+        'sort_order' => 6
     ]
 ];
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_system_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_system_attribute.php
new file mode 100644
index 0000000000000..1e7429cc831f5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_system_attribute.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+// phpcs:ignore Magento2.Security.IncludeFile
+require __DIR__ . '/product_attribute.php';
+/** @var $attributeRepository \Magento\Catalog\Model\Product\Attribute\Repository */
+$attributeRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Model\Product\Attribute\Repository::class);
+/** @var $attribute \Magento\Eav\Api\Data\AttributeInterface */
+$attribute = $attributeRepository->get('test_attribute_code_333');
+
+$attributeRepository->save($attribute->setIsUserDefined(0));
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_system_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_system_attribute_rollback.php
new file mode 100644
index 0000000000000..0f997ff4b4941
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_system_attribute_rollback.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/** @var $attributeRepository \Magento\Catalog\Model\Product\Attribute\Repository */
+$attributeRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Model\Product\Attribute\Repository::class);
+
+try {
+    /** @var $attribute \Magento\Eav\Api\Data\AttributeInterface */
+    $attribute = $attributeRepository->get('test_attribute_code_333');
+    $attributeRepository->save($attribute->setIsUserDefined(1));
+    // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
+} catch (NoSuchEntityException $e) {
+}
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $attribute = $attributeRepository->get('test_attribute_code_333');
+    if ($attribute->getId()) {
+        $attribute->delete();
+    }
+    // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
+} catch (\Exception $e) {
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_two_websites.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_two_websites.php
new file mode 100644
index 0000000000000..d7150d7ec41b1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_two_websites.php
@@ -0,0 +1,40 @@
+<?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\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../Store/_files/second_website_with_two_stores.php';
+
+$objectManager =  Bootstrap::getObjectManager();
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->create(ProductFactory::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->create(WebsiteRepositoryInterface::class);
+$websiteId = $websiteRepository->get('test')->getId();
+$defaultWebsiteId = $websiteRepository->get('base')->getId();
+
+$product = $productFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([$defaultWebsiteId, $websiteId])
+    ->setName('Simple Product on two websites')
+    ->setSku('simple-on-two-websites')
+    ->setPrice(10)
+    ->setDescription('Description')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(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/Catalog/_files/product_two_websites_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_two_websites_rollback.php
new file mode 100644
index 0000000000000..09cafb990a910
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_two_websites_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\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+
+try {
+    $productRepository->deleteById('simple-on-two-websites');
+} catch (NoSuchEntityException $e) {
+    //product already deleted
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../Store/_files/second_website_with_two_stores_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_varchar_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_varchar_attribute.php
new file mode 100644
index 0000000000000..d23acfcdd196e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_varchar_attribute.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$installer = $objectManager->create(CategorySetup::class);
+$attribute = $objectManager->create(AttributeFactory::class)->create();
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+$entityType = $installer->getEntityTypeId(ProductAttributeInterface::ENTITY_TYPE_CODE);
+if (!$attribute->loadByCode($entityType, 'varchar_attribute')->getAttributeId()) {
+    $attribute->setData(
+        [
+            'attribute_code' => 'varchar_attribute',
+            'entity_type_id' => $entityType,
+            'is_global' => 1,
+            'is_user_defined' => 1,
+            'frontend_input' => 'text',
+            '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' => 1,
+            'used_for_sort_by' => 0,
+            'frontend_label' => ['Varchar Attribute'],
+            'backend_type' => 'varchar',
+        ]
+    );
+    $attribute->save();
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup(
+        ProductAttributeInterface::ENTITY_TYPE_CODE,
+        'Default',
+        'General',
+        $attribute->getId()
+    );
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_varchar_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_varchar_attribute_rollback.php
new file mode 100644
index 0000000000000..c238803a77108
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_varchar_attribute_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\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Registry;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+
+try {
+    $attributeRepository->deleteById('varchar_attribute');
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_image_without_types.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_image_without_types.php
new file mode 100644
index 0000000000000..4176e14209edb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_image_without_types.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\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+
+require __DIR__ . '/product_image.php';
+require __DIR__ . '/product_simple.php';
+
+$objectManager = Bootstrap::getObjectManager();
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$product = $productRepository->get('simple');
+$imageData = [
+    'file' => '/m/a/magento_image.jpg',
+    'position' => 1,
+    'label' => 'Image Alt Text',
+    'disabled' => 0,
+    'media_type' => 'image'
+];
+
+/** @var $product Product */
+$product->setStoreId(0)
+    ->setData('media_gallery', ['images' => [$imageData]])
+    ->setCanSaveCustomOptions(true)
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_image_without_types_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_image_without_types_rollback.php
new file mode 100644
index 0000000000000..2033f092b3979
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_image_without_types_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__ . '/product_simple_rollback.php';
+require __DIR__ . '/product_image_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_test_attribute_set.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_test_attribute_set.php
new file mode 100644
index 0000000000000..0616a22b1deee
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_test_attribute_set.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/attribute_set_based_on_default_with_custom_group.php';
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->get(ProductFactory::class);
+/** @var GetAttributeSetByName $attributeSet */
+$attributeSet = $objectManager->get(GetAttributeSetByName::class);
+$customAttributeSet = $attributeSet->execute('new_attribute_set');
+$product = $productFactory->create();
+$product
+    ->setTypeId('simple')
+    ->setAttributeSetId($customAttributeSet->getAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setStoreId(Store::DEFAULT_STORE_ID)
+    ->setName('Simple Product')
+    ->setSku('simple')
+    ->setPrice(10)
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 22, 'is_in_stock' => 1])
+    ->setQty(22);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_test_attribute_set_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_test_attribute_set_rollback.php
new file mode 100644
index 0000000000000..1ec341cd4fd58
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_test_attribute_set_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\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogInventory\Model\StockRegistryStorage;
+use Magento\Framework\Exception\NoSuchEntityException;
+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);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var StockRegistryStorage $stockRegistryStorage */
+$stockRegistryStorage = $objectManager->get(StockRegistryStorage::class);
+try {
+    $product = $productRepository->get('simple');
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+    //Product already deleted.
+}
+$stockRegistryStorage->clean();
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/attribute_set_based_on_default_with_custom_group_rollback.php';
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 8df969a31019c..489666517419f 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_upsell.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_upsell.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+require __DIR__ . '/products_upsell_rollback.php';
+
 /** @var $product \Magento\Catalog\Model\Product */
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
 $product->setTypeId(
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 a9c25dec58547..633eef3371a21 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
@@ -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 */
 $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
 
@@ -25,3 +28,8 @@
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
+
+/** @var StockRegistryStorage $stockRegistryStorage */
+$stockRegistryStorage = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(StockRegistryStorage::class);
+$stockRegistryStorage->clean();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_boolean_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_boolean_attribute.php
new file mode 100644
index 0000000000000..65c8c5a251881
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_boolean_attribute.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\CacheCleaner;
+
+require_once __DIR__ . '/products_for_search.php';
+require_once __DIR__ . '/product_boolean_attribute.php';
+
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+$yesIds = [101, 102, 104];
+$noIds = [103, 105];
+
+foreach ($yesIds as $id) {
+    $product = $productRepository->getById($id);
+    $product->setBooleanAttribute(1);
+    $productRepository->save($product);
+}
+foreach ($noIds as $id) {
+    $product = $productRepository->getById($id);
+    $product->setBooleanAttribute(0);
+    $productRepository->save($product);
+}
+CacheCleaner::cleanAll();
+/** @var \Magento\Indexer\Model\Indexer\Collection $indexerCollection */
+$indexerCollection = $objectManager->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_boolean_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_boolean_attribute_rollback.php
new file mode 100644
index 0000000000000..8a70aead1f36d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_boolean_attribute_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require_once __DIR__ . '/products_for_search_rollback.php';
+require_once __DIR__ . '/product_boolean_attribute_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/two_simple_products_with_tier_price.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/two_simple_products_with_tier_price.php
new file mode 100644
index 0000000000000..6272cab188db6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/two_simple_products_with_tier_price.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @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 $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')
+    ->setPrice(100)
+    ->setWeight(1)
+    ->setTierPrice([0 => ['website_id' => 0, 'cust_group' => 1, 'price_qty' => 5, 'price' => 95]])
+    ->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)
+    ->setCanSaveCustomOptions(true)
+    ->setStockData(
+        [
+            'qty' => 10,
+            'is_in_stock' => 1,
+            'manage_stock' => 1,
+        ]
+    );
+$productRepository->save($product);
+$product->unsetData()->setOrigData();
+
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Second Simple Product')
+    ->setSku('second_simple')
+    ->setPrice(200)
+    ->setWeight(1)
+    ->setTierPrice(
+        [
+            0 => [
+                'website_id' => 0,
+                'cust_group' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
+                'price_qty' => 10,
+                'price' => 3,
+                'percentage_value' => 3,
+            ],
+        ]
+    )
+    ->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)
+    ->setCanSaveCustomOptions(true)
+    ->setStockData(
+        [
+            'qty' => 10,
+            'is_in_stock' => 1,
+            'manage_stock' => 1,
+        ]
+    );
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/two_simple_products_with_tier_price_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/two_simple_products_with_tier_price_rollback.php
new file mode 100644
index 0000000000000..d5c3caf35536a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/two_simple_products_with_tier_price_rollback.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+foreach (['simple', 'second_simple'] as $sku) {
+    try {
+        $product = $productRepository->get($sku, false, null, true);
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+        //Product already removed
+    }
+}
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 183ba86ca7572..4753d947e9d3c 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
@@ -8,6 +8,10 @@
 
 namespace Magento\CatalogImportExport\Model\Export;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Observer\SwitchPriceAttributeScopeOnConfigChange;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+
 /**
  * @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_reindex_schedule.php
  * @magentoAppIsolation enabled
@@ -32,6 +36,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     protected $fileSystem;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * Stock item attributes which must be exported
      *
@@ -69,6 +78,7 @@ protected function setUp()
         $this->model = $this->objectManager->create(
             \Magento\CatalogImportExport\Model\Export\Product::class
         );
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
     }
 
     /**
@@ -404,6 +414,33 @@ public function testExportWithCustomOptions(): void
         self::assertSame($expectedData, $customOptionData);
     }
 
+    /**
+     * Check that no duplicate entities when multiple custom options used
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_options.php
+     */
+    public function testExportWithMultipleOptions()
+    {
+        $expectedCount = 1;
+        $resultsFilename = 'export_results.csv';
+        $this->model->setWriter(
+            $this->objectManager->create(
+                \Magento\ImportExport\Model\Export\Adapter\Csv::class
+            )
+        );
+        $exportData = $this->model->export();
+
+        $varDirectory = $this->objectManager->get(\Magento\Framework\Filesystem::class)
+            ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR);
+        $varDirectory->writeFile($resultsFilename, $exportData);
+        /** @var \Magento\Framework\File\Csv $csv */
+        $csv = $this->objectManager->get(\Magento\Framework\File\Csv::class);
+        $data = $csv->getData($varDirectory->getAbsolutePath($resultsFilename));
+        $actualCount = count($data) - 1;
+
+        $this->assertSame($expectedCount, $actualCount);
+    }
+
     /**
      * @param string $exportedCustomOption
      * @return array
@@ -432,4 +469,70 @@ function ($input) {
 
         return $optionItems;
     }
+
+    /**
+     * @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 disabled
+     * @magentoAppArea adminhtml
+     */
+    public function testExportProductWithTwoWebsites()
+    {
+        $globalStoreCode = 'admin';
+        $secondStoreCode = 'fixture_second_store';
+
+        $expectedData = [
+            $globalStoreCode => 10.0,
+            $secondStoreCode => 9.99
+        ];
+
+        /** @var \Magento\Store\Model\Store $store */
+        $store = $this->objectManager->create(\Magento\Store\Model\Store::class);
+        $reinitiableConfig = $this->objectManager->get(ReinitableConfigInterface::class);
+        $observer = $this->objectManager->get(\Magento\Framework\Event\Observer::class);
+        $switchPriceScope = $this->objectManager->get(SwitchPriceAttributeScopeOnConfigChange::class);
+        /** @var \Magento\Catalog\Model\Product\Action $productAction */
+        $productAction = $this->objectManager->create(\Magento\Catalog\Model\Product\Action::class);
+        /** @var \Magento\Framework\File\Csv $csv */
+        $csv = $this->objectManager->get(\Magento\Framework\File\Csv::class);
+        /** @var $varDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
+        $varDirectory = $this->objectManager->get(\Magento\Framework\Filesystem::class)
+            ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR);
+        $secondStore = $store->load($secondStoreCode);
+
+        $this->model->setWriter(
+            $this->objectManager->create(
+                \Magento\ImportExport\Model\Export\Adapter\Csv::class
+            )
+        );
+
+        $reinitiableConfig->setValue('catalog/price/scope', \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE);
+        $switchPriceScope->execute($observer);
+
+        $product = $this->productRepository->get('simple');
+        $productId = $product->getId();
+        $productAction->updateWebsites([$productId], [$secondStore->getWebsiteId()], 'add');
+        $product->setStoreId($secondStore->getId());
+        $product->setPrice('9.99');
+        $product->getResource()->save($product);
+
+        $exportData = $this->model->export();
+
+        $varDirectory->writeFile('test_product_with_two_websites.csv', $exportData);
+        $data = $csv->getData($varDirectory->getAbsolutePath('test_product_with_two_websites.csv'));
+
+        $columnNumber = array_search('price', $data[0]);
+        $this->assertNotFalse($columnNumber);
+
+        $pricesData = [
+            $globalStoreCode => (float)$data[1][$columnNumber],
+            $secondStoreCode => (float)$data[2][$columnNumber],
+        ];
+
+        self::assertSame($expectedData, $pricesData);
+
+        $reinitiableConfig->setValue('catalog/price/scope', \Magento\Store\Model\Store::PRICE_SCOPE_GLOBAL);
+        $switchPriceScope->execute($observer);
+    }
 }
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 553242f0daec6..c47a4f340f983 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 /**
  * Test class for \Magento\CatalogImportExport\Model\Import\Product
  *
  * The "CouplingBetweenObjects" warning is caused by tremendous complexity of the original class
- *
  */
 namespace Magento\CatalogImportExport\Model\Import;
 
@@ -16,18 +16,23 @@
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
 use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Registry;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\Source\Csv;
 use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection;
 use Psr\Log\LoggerInterface;
+use Magento\TestFramework\Helper\Bootstrap as BootstrapHelper;
 
 /**
  * Class ProductTest
@@ -98,7 +103,7 @@ protected function tearDown()
             try {
                 $product = $productRepository->get($productSku, false, null, true);
                 $productRepository->delete($product);
-                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
+                // phpcs:disable Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
             } catch (NoSuchEntityException $e) {
                 // nothing to delete
             }
@@ -311,7 +316,6 @@ public function testStockState()
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @magentoAppIsolation enabled
-
      *
      * @return void
      */
@@ -383,14 +387,14 @@ public function testSaveCustomOptions(string $importFile, string $sku, int $expe
     public function testSaveCustomOptionsWithMultipleStoreViews()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
-        $storeManager = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class);
+        /** @var StoreManagerInterface $storeManager */
+        $storeManager = $objectManager->get(StoreManagerInterface::class);
         $storeCodes = [
             'admin',
             'default',
             'secondstore',
         ];
-        /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+        /** @var StoreManagerInterface $storeManager */
         $importFile = 'product_with_custom_options_and_multiple_store_views.csv';
         $sku = 'simple';
         $pathToFile = __DIR__ . '/_files/' . $importFile;
@@ -846,6 +850,37 @@ public function testSaveMediaImage()
         $this->assertEquals('Additional Image Label Two', $additionalImageTwoItem->getLabel());
     }
 
+    /**
+     * Tests that "hide_from_product_page" attribute is hidden after importing product images.
+     *
+     * @magentoDataFixture mediaImportImageFixture
+     * @magentoAppIsolation enabled
+     */
+    public function testSaveHiddenImages()
+    {
+        $this->importDataForMediaTest('import_media_hidden_images.csv');
+        $product = $this->getProductBySku('simple_new');
+        $images = $product->getMediaGalleryEntries();
+
+        $hiddenImages = array_filter(
+            $images,
+            static function (DataObject $image) {
+                return (int)$image->getDisabled() === 1;
+            }
+        );
+
+        $this->assertCount(3, $hiddenImages);
+
+        $imageItem = array_shift($hiddenImages);
+        $this->assertEquals('/m/a/magento_image.jpg', $imageItem->getFile());
+
+        $imageItem = array_shift($hiddenImages);
+        $this->assertEquals('/m/a/magento_thumbnail.jpg', $imageItem->getFile());
+
+        $imageItem = array_shift($hiddenImages);
+        $this->assertEquals('/m/a/magento_additional_image_two.jpg', $imageItem->getFile());
+    }
+
     /**
      * Test that new images should be added after the existing ones.
      *
@@ -917,15 +952,15 @@ public function testSaveMediaImageError()
      */
     public static function mediaImportImageFixture()
     {
-        /** @var \Magento\Framework\Filesystem\Directory\Write $mediaDirectory */
-        $mediaDirectory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        /** @var \Magento\Framework\Filesystem\Directory\Write $varDirectory */
+        $varDirectory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             \Magento\Framework\Filesystem::class
         )->getDirectoryWrite(
-            DirectoryList::MEDIA
+            DirectoryList::VAR_DIR
         );
 
-        $mediaDirectory->create('import');
-        $dirPath = $mediaDirectory->getAbsolutePath('import');
+        $varDirectory->create('import' . DIRECTORY_SEPARATOR . 'images');
+        $dirPath = $varDirectory->getAbsolutePath('import' . DIRECTORY_SEPARATOR . 'images');
 
         $items = [
             [
@@ -968,13 +1003,15 @@ public static function mediaImportImageFixture()
      */
     public static function mediaImportImageFixtureRollback()
     {
-        /** @var \Magento\Framework\Filesystem\Directory\Write $mediaDirectory */
-        $mediaDirectory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $fileSystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             \Magento\Framework\Filesystem::class
-        )->getDirectoryWrite(
-            DirectoryList::MEDIA
         );
-        $mediaDirectory->delete('import');
+        /** @var \Magento\Framework\Filesystem\Directory\Write $mediaDirectory */
+        $mediaDirectory = $fileSystem->getDirectoryWrite(DirectoryList::MEDIA);
+
+        /** @var \Magento\Framework\Filesystem\Directory\Write $varDirectory */
+        $varDirectory = $fileSystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+        $varDirectory->delete('import');
         $mediaDirectory->delete('catalog');
     }
 
@@ -983,13 +1020,13 @@ public static function mediaImportImageFixtureRollback()
      */
     public static function mediaImportImageFixtureError()
     {
-        /** @var \Magento\Framework\Filesystem\Directory\Write $mediaDirectory */
-        $mediaDirectory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        /** @var \Magento\Framework\Filesystem\Directory\Write $varDirectory */
+        $varDirectory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             \Magento\Framework\Filesystem::class
         )->getDirectoryWrite(
-            DirectoryList::MEDIA
+            DirectoryList::VAR_DIR
         );
-        $dirPath = $mediaDirectory->getAbsolutePath('import');
+        $dirPath = $varDirectory->getAbsolutePath('import' . DIRECTORY_SEPARATOR . 'images');
         $items = [
             [
                 'source' => __DIR__ . '/_files/magento_additional_image_error.jpg',
@@ -1151,7 +1188,7 @@ public function testProductsWithMultipleStores()
         $product->load($id);
         $this->assertEquals('1', $product->getHasOptions());
 
-        $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->setCurrentStore('fixturestore');
+        $objectManager->get(StoreManagerInterface::class)->setCurrentStore('fixturestore');
 
         /** @var \Magento\Catalog\Model\Product $simpleProduct */
         $simpleProduct = $objectManager->create(\Magento\Catalog\Model\Product::class);
@@ -1540,6 +1577,49 @@ public function testValidateUrlKeysMultipleStores()
         $this->assertTrue($errors->getErrorsCount() == 0);
     }
 
+    /**
+     * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_with_product_links_data.php
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     */
+    public function testProductLinksWithEmptyValue()
+    {
+        // import data from CSV file
+        $pathToFile = __DIR__ . '/_files/products_to_import_with_product_links_with_empty_value.csv';
+        $filesystem = BootstrapHelper::getObjectManager()->create(Filesystem::class);
+
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            Csv::class,
+            [
+                'file' => $pathToFile,
+                'directory' => $directory
+            ]
+        );
+        $errors = $this->_model->setSource(
+            $source
+        )->setParameters(
+            [
+                'behavior' => Import::BEHAVIOR_APPEND,
+                'entity' => 'catalog_product'
+            ]
+        )->validateData();
+
+        $this->assertTrue($errors->getErrorsCount() == 0);
+        $this->_model->importData();
+
+        $objectManager = BootstrapHelper::getObjectManager();
+        $resource = $objectManager->get(ProductResource::class);
+        $productId = $resource->getIdBySku('simple');
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = BootstrapHelper::getObjectManager()->create(Product::class);
+        $product->load($productId);
+
+        $this->assertEmpty($product->getCrossSellProducts());
+        $this->assertEmpty($product->getUpSellProducts());
+    }
+
     /**
      * @magentoAppArea adminhtml
      * @magentoDbIsolation enabled
@@ -2133,8 +2213,13 @@ private function importDataForMediaTest(string $fileName, int $expectedErrors =
         $uploader = $this->_model->getUploader();
 
         $mediaPath = $appParams[DirectoryList::MEDIA][DirectoryList::PATH];
-        $destDir = $directory->getRelativePath($mediaPath . '/catalog/product');
-        $tmpDir = $directory->getRelativePath($mediaPath . '/import');
+        $varPath = $appParams[DirectoryList::VAR_DIR][DirectoryList::PATH];
+        $destDir = $directory->getRelativePath(
+            $mediaPath . DIRECTORY_SEPARATOR . 'catalog' . DIRECTORY_SEPARATOR . 'product'
+        );
+        $tmpDir = $directory->getRelativePath(
+            $varPath . DIRECTORY_SEPARATOR . 'import' . DIRECTORY_SEPARATOR . 'images'
+        );
 
         $directory->create($destDir);
         $this->assertTrue($uploader->setDestDir($destDir));
@@ -2162,13 +2247,20 @@ function ($output, $error) {
      * Load product by given product sku
      *
      * @param string $sku
+     * @param mixed $store
      * @return \Magento\Catalog\Model\Product
      */
-    private function getProductBySku($sku)
+    private function getProductBySku($sku, $store = null)
     {
         $resource = $this->objectManager->get(\Magento\Catalog\Model\ResourceModel\Product::class);
         $productId = $resource->getIdBySku($sku);
         $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
+        if ($store) {
+            /** @var StoreManagerInterface $storeManager */
+            $storeManager = $this->objectManager->get(StoreManagerInterface::class);
+            $store = $storeManager->getStore($store);
+            $product->setStoreId($store->getId());
+        }
         $product->load($productId);
 
         return $product;
@@ -2499,6 +2591,8 @@ public function testImportImageForNonDefaultStore()
      */
     public function testProductsWithMultipleStoresWhenMediaIsDisabled(): void
     {
+        $this->loginAdminUserWithUsername(\Magento\TestFramework\Bootstrap::ADMIN_NAME);
+
         $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
@@ -2581,4 +2675,162 @@ private function importFile(string $fileName): void
 
         $this->_model->importData();
     }
+
+    /**
+     * Hide product images via hide_from_product_page attribute during import CSV.
+     *
+     * @magentoDataFixture mediaImportImageFixture
+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+     *
+     * @return void
+     */
+    public function testImagesAreHiddenAfterImport(): void
+    {
+        $expectedActiveImages = [
+            [
+                'file' => '/m/a/magento_additional_image_one.jpg',
+                'label' => 'Additional Image Label One',
+                'disabled' => '0',
+            ],
+            [
+                'file' => '/m/a/magento_additional_image_two.jpg',
+                'label' => 'Additional Image Label Two',
+                'disabled' => '0',
+            ],
+        ];
+
+        $expectedHiddenImage = [
+            'file' => '/m/a/magento_image.jpg',
+            'label' => 'Image Alt Text',
+            'disabled' => '1',
+        ];
+        $expectedAllProductImages = array_merge(
+            [$expectedHiddenImage],
+            $expectedActiveImages
+        );
+
+        $this->importDataForMediaTest('hide_from_product_page_images.csv');
+        $actualAllProductImages = [];
+        $product = $this->getProductBySku('simple');
+
+        // Check that new images were imported and existing image is disabled after import
+        $productMediaData = $product->getData('media_gallery');
+
+        $this->assertNotEmpty($productMediaData['images']);
+        $allProductImages = $productMediaData['images'];
+        $this->assertCount(3, $allProductImages, 'Images were imported incorrectly');
+
+        foreach ($allProductImages as $image) {
+            $actualAllProductImages[] = [
+                'file' => $image['file'],
+                'label' => $image['label'],
+                'disabled' => $image['disabled'],
+            ];
+        }
+
+        $this->assertEquals(
+            $expectedAllProductImages,
+            $actualAllProductImages,
+            'Images are incorrect after import'
+        );
+
+        // Check that on storefront only enabled images are shown
+        $actualActiveImages = $product->getMediaGalleryImages();
+        $this->assertSame(
+            $expectedActiveImages,
+            $actualActiveImages->toArray(['file', 'label', 'disabled'])['items'],
+            'Hidden image is present on frontend after import'
+        );
+    }
+
+    /**
+     * Set the current admin session user based on a username
+     *
+     * @param string $username
+     */
+    private function loginAdminUserWithUsername(string $username)
+    {
+        $user = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\User\Model\User::class
+        )->loadByUsername($username);
+
+        /** @var $session \Magento\Backend\Model\Auth\Session */
+        $session = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Backend\Model\Auth\Session::class
+        );
+        $session->setUser($user);
+    }
+
+    /**
+     * Checking product images after Add/Update import failure
+     *
+     * @magentoDataFixture mediaImportImageFixture
+     * @magentoDataFixture Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images.php
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     *
+     * @return void
+     */
+    public function testProductBaseImageAfterImport()
+    {
+        $this->importDataForMediaTest('import_media.csv');
+
+        $this->testImportWithNonExistingImage();
+
+        /** @var $productAfterImport \Magento\Catalog\Model\Product */
+        $productAfterImport = $this->getProductBySku('simple_new');
+        $this->assertNotEquals('/no/exists/image/magento_image.jpg', $productAfterImport->getData('image'));
+    }
+
+    /**
+     * Tests that images are hidden only for a store view in "store_view_code".
+     *
+     * @magentoDataFixture mediaImportImageFixture
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+     */
+    public function testHideImageForStoreView()
+    {
+        $expectedImageFile = '/m/a/magento_image.jpg';
+        $secondStoreCode = 'fixturestore';
+        $productSku = 'simple';
+        $this->importDataForMediaTest('import_hide_image_for_storeview.csv');
+        $product = $this->getProductBySku($productSku);
+        $imageItems = $product->getMediaGalleryImages()->getItems();
+        $this->assertCount(1, $imageItems);
+        $imageItem = array_shift($imageItems);
+        $this->assertEquals($expectedImageFile, $imageItem->getFile());
+        $product = $this->getProductBySku($productSku, $secondStoreCode);
+        $imageItems = $product->getMediaGalleryImages()->getItems();
+        $this->assertCount(0, $imageItems);
+    }
+
+    /**
+     * Test that images labels are updated only for a store view in "store_view_code".
+     *
+     * @magentoDataFixture mediaImportImageFixture
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+     */
+    public function testChangeImageLabelForStoreView()
+    {
+        $expectedImageFile = '/m/a/magento_image.jpg';
+        $expectedLabelForDefaultStoreView = 'Image Alt Text';
+        $expectedLabelForSecondStoreView = 'Magento Logo';
+        $secondStoreCode = 'fixturestore';
+        $productSku = 'simple';
+        $this->importDataForMediaTest('import_change_image_label_for_storeview.csv');
+        $product = $this->getProductBySku($productSku);
+        $imageItems = $product->getMediaGalleryImages()->getItems();
+        $this->assertCount(1, $imageItems);
+        $imageItem = array_shift($imageItems);
+        $this->assertEquals($expectedImageFile, $imageItem->getFile());
+        $this->assertEquals($expectedLabelForDefaultStoreView, $imageItem->getLabel());
+        $product = $this->getProductBySku($productSku, $secondStoreCode);
+        $imageItems = $product->getMediaGalleryImages()->getItems();
+        $this->assertCount(1, $imageItems);
+        $imageItem = array_shift($imageItems);
+        $this->assertEquals($expectedImageFile, $imageItem->getFile());
+        $this->assertEquals($expectedLabelForSecondStoreView, $imageItem->getLabel());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php
index f61aa7578d4a3..d1d87b6916eb6 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php
@@ -16,6 +16,10 @@
  */
 class UploaderTest extends \Magento\TestFramework\Indexer\TestCase
 {
+    /**
+     * Random string appended to downloaded image name
+     */
+    const RANDOM_STRING = 'BRV8TAuR2AT88OH0';
     /**
      * @var \Magento\Framework\ObjectManagerInterface
      */
@@ -30,6 +34,10 @@ class UploaderTest extends \Magento\TestFramework\Indexer\TestCase
      * @var \Magento\CatalogImportExport\Model\Import\Uploader
      */
     private $uploader;
+    /**
+     * @var \Magento\Framework\Filesystem\File\ReadInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $fileReader;
 
     /**
      * @inheritdoc
@@ -37,7 +45,18 @@ class UploaderTest extends \Magento\TestFramework\Indexer\TestCase
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->uploader = $this->objectManager->create(\Magento\CatalogImportExport\Model\Import\Uploader::class);
+        $this->fileReader = $this->getMockForAbstractClass(\Magento\Framework\Filesystem\File\ReadInterface::class);
+        $fileReadFactory = $this->createMock(\Magento\Framework\Filesystem\File\ReadFactory::class);
+        $fileReadFactory->method('create')->willReturn($this->fileReader);
+        $random = $this->createMock(\Magento\Framework\Math\Random::class);
+        $random->method('getRandomString')->willReturn(self::RANDOM_STRING);
+        $this->uploader = $this->objectManager->create(
+            \Magento\CatalogImportExport\Model\Import\Uploader::class,
+            [
+                'random' => $random,
+                'readFactory' => $fileReadFactory
+            ]
+        );
 
         $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
 
@@ -60,19 +79,60 @@ protected function setUp()
         parent::setUp();
     }
 
+    /**
+     * Tests move with external url
+     *
+     * @magentoAppIsolation enabled
+     * @return void
+     */
+    public function testMoveWithExternalURL(): void
+    {
+        $fileName = 'http://magento.com/static/images/random_image.jpg';
+        $this->fileReader->method('readAll')->willReturn(file_get_contents($this->getTestImagePath()));
+        $this->uploader->move($fileName);
+        $destFilePath = $this->uploader->getTmpDir() . '/' . 'random_image_' . self::RANDOM_STRING . '.jpg';
+        $this->assertTrue($this->directory->isExist($destFilePath));
+    }
+
     /**
      * @magentoAppIsolation enabled
      * @return void
      */
     public function testMoveWithValidFile(): void
     {
-        $fileName = 'magento_additional_image_one.jpg';
+        $testImagePath = $this->getTestImagePath();
+        $fileName = basename($testImagePath);
         $filePath = $this->directory->getAbsolutePath($this->uploader->getTmpDir() . '/' . $fileName);
-        copy(__DIR__ . '/_files/' . $fileName, $filePath);
+        //phpcs:ignore
+        copy($testImagePath, $filePath);
         $this->uploader->move($fileName);
         $this->assertTrue($this->directory->isExist($this->uploader->getTmpDir() . '/' . $fileName));
     }
 
+    /**
+     * Check validation against temporary directory.
+     *
+     * @magentoAppIsolation enabled
+     * @return void
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testMoveWithFileOutsideTemp(): void
+    {
+        $tmpDir = $this->uploader->getTmpDir();
+        $newTmpDir = $tmpDir . '/test1';
+        if (!$this->directory->create($newTmpDir)) {
+            throw new \RuntimeException('Failed to create temp dir');
+        }
+        $this->uploader->setTmpDir($newTmpDir);
+        $testImagePath = $this->getTestImagePath();
+        $fileName = basename($testImagePath);
+        $filePath = $this->directory->getAbsolutePath($tmpDir . '/' . $fileName);
+        //phpcs:ignore
+        copy($testImagePath, $filePath);
+        $this->uploader->move('../' . $fileName);
+        $this->assertTrue($this->directory->isExist($tmpDir . '/' . $fileName));
+    }
+
     /**
      * @magentoAppIsolation enabled
      * @return void
@@ -83,8 +143,19 @@ public function testMoveWithInvalidFile(): void
     {
         $fileName = 'media_import_image.php';
         $filePath = $this->directory->getAbsolutePath($this->uploader->getTmpDir() . '/' . $fileName);
+        //phpcs:ignore
         copy(__DIR__ . '/_files/' . $fileName, $filePath);
         $this->uploader->move($fileName);
         $this->assertFalse($this->directory->isExist($this->uploader->getTmpDir() . '/' . $fileName));
     }
+
+    /**
+     * Get the full path to the test image
+     *
+     * @return string
+     */
+    private function getTestImagePath(): string
+    {
+        return __DIR__ . '/_files/magento_additional_image_one.jpg';
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/hide_from_product_page_images.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/hide_from_product_page_images.csv
new file mode 100644
index 0000000000000..5902723ae5024
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/hide_from_product_page_images.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_label1,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
+simple,,Default,simple,,base,Simple Product,,,,1,Taxable Goods,"Catalog, Search",10,,,,,meta title,meta keyword,meta description,magento_additional_image_one.jpg,Additional Image Label One,magento_additional_image_one.jpg,Small Additional Image Label One,magento_additional_image_one.jpg,Thumbnail Label,magento_additional_image_one.jpg,Additional Image Label One,,,,,Block after Info Column,,,,,,,,,,,,,"has_options=1,quantity_and_stock_status=In Stock,required_options=1",100,0,1,0,0,1,1,1,10000,1,1,1,1,1,0,1,1,0,0,0,1,,,,"magento_additional_image_one.jpg,magento_additional_image_two.jpg","Additional Image Label One,Additional Image Label Two",/m/a/magento_image.jpg,,,,,,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_change_image_label_for_storeview.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_change_image_label_for_storeview.csv
new file mode 100644
index 0000000000000..95321df2b6b01
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_change_image_label_for_storeview.csv
@@ -0,0 +1,2 @@
+"sku","store_view_code","base_image", "base_image_label"
+"simple","fixturestore","/m/a/magento_image.jpg", "Magento Logo"
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_hide_image_for_storeview.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_hide_image_for_storeview.csv
new file mode 100644
index 0000000000000..8400dc17d2a29
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_hide_image_for_storeview.csv
@@ -0,0 +1,2 @@
+"sku","store_view_code","hide_from_product_page"
+"simple","fixturestore","/m/a/magento_image.jpg"
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_hidden_images.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_hidden_images.csv
new file mode 100644
index 0000000000000..1c1bebee57578
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_hidden_images.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_label1,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,magento_image.jpg,Image Label,magento_small_image.jpg,Small Image Label,magento_thumbnail.jpg,Thumbnail Label,magento_image.jpg,Image Label,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",100,0,1,0,0,1,1,1,10000,1,1,1,1,1,0,1,1,0,0,0,1,,,,"magento_additional_image_one.jpg, magento_additional_image_two.jpg","Additional Image Label One,Additional Image Label Two","magento_image.jpg,magento_thumbnail.jpg,magento_additional_image_two.jpg",,,,,,,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images.php
index 04b3092c8fa8a..0ee59aedd8979 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images.php
@@ -4,16 +4,23 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\Filesystem\Directory\Write $mediaDirectory */
-$mediaDirectory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+/** @var \Magento\Framework\Filesystem $fileSystem */
+$fileSystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
     \Magento\Framework\Filesystem::class
-)->getDirectoryWrite(
+);
+/** @var \Magento\Framework\Filesystem\Directory\Write $mediaDirectory */
+$mediaDirectory = $fileSystem->getDirectoryWrite(
     \Magento\Framework\App\Filesystem\DirectoryList::MEDIA
 );
+/** @var \Magento\Framework\Filesystem\Directory\Write $varDirectory */
+$varDirectory = $fileSystem->getDirectoryWrite(
+    \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR
+);
 
 $path = 'catalog' . DIRECTORY_SEPARATOR . 'product';
+$varImagesPath = 'import' . DIRECTORY_SEPARATOR . 'images';
 // Is required for using importDataForMediaTest method.
-$mediaDirectory->create('import');
+$varDirectory->create($varImagesPath);
 $mediaDirectory->create($path);
 $dirPath = $mediaDirectory->getAbsolutePath($path);
 
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images_rollback.php
index 5c1db3ca045a6..a984cbf2e3529 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images_rollback.php
@@ -4,11 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\Filesystem\Directory\Write $mediaDirectory */
-$mediaDirectory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+/** @var \Magento\Framework\Filesystem $fileSystem */
+$fileSystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
     \Magento\Framework\Filesystem::class
-)->getDirectoryWrite(
+);
+/** @var \Magento\Framework\Filesystem\Directory\Write $mediaDirectory */
+$mediaDirectory = $fileSystem->getDirectoryWrite(
     \Magento\Framework\App\Filesystem\DirectoryList::MEDIA
 );
-$mediaDirectory->delete('import');
+/** @var \Magento\Framework\Filesystem\Directory\Write $varDirectory */
+$varDirectory = $fileSystem->getDirectoryWrite(
+    \Magento\Framework\App\Filesystem\DirectoryList::VAR_DIR
+);
+$varDirectory->delete('import');
 $mediaDirectory->delete('catalog');
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_product_links_with_empty_value.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_product_links_with_empty_value.csv
new file mode 100644
index 0000000000000..fbbf6e2fb33f2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_product_links_with_empty_value.csv
@@ -0,0 +1,2 @@
+sku,crosssell_skus,crosssell_position,upsell_skus,upsell_position
+simple,__EMPTY__VALUE__,__EMPTY__VALUE__,__EMPTY__VALUE__,__EMPTY__VALUE__
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Block/Adminhtml/Form/Field/CustomergroupTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Block/Adminhtml/Form/Field/CustomergroupTest.php
index 527828a92dea8..b7be72e9ff827 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Block/Adminhtml/Form/Field/CustomergroupTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Block/Adminhtml/Form/Field/CustomergroupTest.php
@@ -22,11 +22,12 @@ protected function setUp()
 
     public function testToHtml()
     {
-        $this->_block->setClass('customer_group_select');
+        $this->_block->setClass('customer_group_select admin__control-select');
         $this->_block->setId('123');
         $this->_block->setTitle('Customer Group');
         $this->_block->setInputName('groups[item_options]');
-        $expectedResult = '<select name="groups[item_options]" id="123" class="customer_group_select" '
+        $expectedResult = '<select name="groups[item_options]" id="123" '
+            . 'class="customer_group_select admin__control-select" '
             . 'title="Customer Group" ><option value="32000" >ALL GROUPS</option><option value="0" >NOT LOGGED IN'
             . '</option><option value="1" >General</option><option value="2" >Wholesale</option><option value="3" >'
             . 'Retailer</option></select>';
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/FullTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/FullTest.php
index 00c13619ff2c1..6bf1f5fbf0be2 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/FullTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Indexer/Stock/Action/FullTest.php
@@ -5,42 +5,24 @@
  */
 namespace Magento\CatalogInventory\Model\Indexer\Stock\Action;
 
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Framework\ObjectManagerInterface;
-use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
-use Magento\Catalog\Model\CategoryFactory;
-use Magento\Catalog\Block\Product\ListProduct;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-use Magento\Catalog\Model\Product;
-use PHPUnit\Framework\TestCase;
-
 /**
  * Full reindex Test
  */
-class FullTest extends TestCase
+class FullTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @var Processor
+     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
      */
     protected $_processor;
 
-    /**
-     * @inheritdoc
-     */
     protected function setUp()
     {
-        $this->objectManager = Bootstrap::getObjectManager();
-        $this->_processor = $this->objectManager->get(Processor::class);
+        $this->_processor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class
+        );
     }
 
     /**
-     * Reindex all
-     *
      * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
@@ -49,9 +31,13 @@ public function testReindexAll()
     {
         $this->_processor->reindexAll();
 
-        $categoryFactory = $this->objectManager->get(CategoryFactory::class);
-        /** @var ListProduct $listProduct */
-        $listProduct = $this->objectManager->get(ListProduct::class);
+        $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Catalog\Model\CategoryFactory::class
+        );
+        /** @var \Magento\Catalog\Block\Product\ListProduct $listProduct */
+        $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Catalog\Block\Product\ListProduct::class
+        );
 
         $category = $categoryFactory->create()->load(2);
         $layer = $listProduct->getLayer();
@@ -75,37 +61,4 @@ public function testReindexAll()
             $this->assertEquals(100, $product->getQty());
         }
     }
-
-    /**
-     * Reindex with disabled product
-     *
-     * @return void
-     * @magentoDbIsolation disabled
-     * @magentoAppIsolation enabled
-     * @magentoDataFixture Magento/Catalog/_files/products_with_layered_navigation_attribute.php
-     */
-    public function testReindexAllWithDisabledProduct(): void
-    {
-        $productCollectionFactory = $this->objectManager->get(CollectionFactory::class);
-        $productCollection = $productCollectionFactory
-            ->create()
-            ->addAttributeToSelect('*')
-            ->addAttributeToFilter('sku', ['eq' => 'simple3'])
-            ->addAttributeToSort('created_at', 'DESC')
-            ->joinField(
-                'stock_status',
-                'cataloginventory_stock_status',
-                'stock_status',
-                'product_id=entity_id',
-                '{{table}}.stock_id=1',
-                'left'
-            )->load();
-
-        $this->assertCount(1, $productCollection);
-
-        /** @var Product $product */
-        foreach ($productCollection as $product) {
-            $this->assertEquals(1, $product->getData('stock_status'));
-        }
-    }
 }
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
index c2c316ecf45c4..d503c9678dfd6 100644
--- 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
@@ -7,38 +7,71 @@
 
 namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Action;
 
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ProductRepository as ProductRepository;
+use Magento\CatalogSearch\Model\Indexer\Fulltext;
+use Magento\Framework\Api\Search\Document as SearchDocument;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\Search\AdapterInterface as AdapterInterface;
+use Magento\Framework\Search\Request\Builder as SearchRequestBuilder;
+use Magento\Framework\Search\Request\Config as SearchRequestConfig;
+use Magento\Search\Model\AdapterFactory as AdapterFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
 class DataProviderTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @inheritdoc
+     */
+    public static function setUpBeforeClass()
+    {
+        /*
+         * Due to insufficient search engine isolation for Elasticsearch, this class must explicitly perform
+         * a fulltext reindex prior to running its tests.
+         *
+         * This should be removed upon completing MC-19455.
+         */
+        $indexRegistry = Bootstrap::getObjectManager()->get(IndexerRegistry::class);
+        $fulltextIndexer = $indexRegistry->get(Fulltext::INDEXER_ID);
+        $fulltextIndexer->reindexAll();
+    }
+
     /**
      * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search.php
      * @magentoDbIsolation disabled
      */
     public function testSearchProductByAttribute()
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var ObjectManager $objectManager */
+        $objectManager = Bootstrap::getObjectManager();
+
+        /** @var SearchRequestConfig $config */
+        $config = $objectManager->create(SearchRequestConfig::class);
 
-        $config = $objectManager->create(\Magento\Framework\Search\Request\Config::class);
-        /** @var \Magento\Framework\Search\Request\Builder $requestBuilder */
+        /** @var SearchRequestBuilder $requestBuilder */
         $requestBuilder = $objectManager->create(
-            \Magento\Framework\Search\Request\Builder::class,
+            SearchRequestBuilder::class,
             ['config' => $config]
         );
+
         $requestBuilder->bind('search_term', 'VALUE1');
         $requestBuilder->setRequestName('quick_search_container');
         $queryRequest = $requestBuilder->create();
-        /** @var \Magento\Framework\Search\Adapter\Mysql\Adapter $adapter */
-        $adapterFactory = $objectManager->create(\Magento\Search\Model\AdapterFactory::class);
+
+        /** @var AdapterInterface $adapter */
+        $adapterFactory = $objectManager->create(AdapterFactory::class);
         $adapter = $adapterFactory->create();
         $queryResponse = $adapter->query($queryRequest);
         $actualIds = [];
+
         foreach ($queryResponse as $document) {
-            /** @var \Magento\Framework\Api\Search\Document $document */
+            /** @var SearchDocument $document */
             $actualIds[] = $document->getId();
         }
 
-        /** @var \Magento\Catalog\Model\Product $product */
-        $product = $objectManager->create(\Magento\Catalog\Model\ProductRepository::class)->get('simple');
+        /** @var Product $product */
+        $product = $objectManager->create(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/ResourceModel/Advanced/CollectionTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Advanced/CollectionTest.php
index 87fda534be6d9..3eea0aa117452 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Advanced/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Advanced/CollectionTest.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\CatalogSearch\Model\ResourceModel\Advanced;
 
+use Magento\CatalogSearch\Model\Indexer\Fulltext;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * Test class for \Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection.
  * @magentoDbIsolation disabled
@@ -21,6 +25,9 @@ protected function setUp()
         $advanced = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create(\Magento\CatalogSearch\Model\Search\ItemCollectionProvider::class);
         $this->advancedCollection = $advanced->getCollection();
+        $indexerRegistry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(IndexerRegistry::class);
+        $indexerRegistry->get(Fulltext::INDEXER_ID)->reindexAll();
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Fulltext/CollectionTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Fulltext/CollectionTest.php
index ae4fbc8d0d98e..8863834078214 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Fulltext/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Fulltext/CollectionTest.php
@@ -29,6 +29,9 @@ public function testLoadWithFilterSearch($request, $filters, $expectedCount)
         foreach ($filters as $field => $value) {
             $fulltextCollection->addFieldToFilter($field, $value);
         }
+        if ($request == 'quick_search_container' && isset($filters['search_term'])) {
+            $fulltextCollection->addSearchFilter($filters['search_term']);
+        }
         $fulltextCollection->loadWithFilter();
         $items = $fulltextCollection->getItems();
         $this->assertCount($expectedCount, $items);
@@ -47,6 +50,9 @@ public function testLoadWithFilterQuickSearch($filters, $expectedCount)
         foreach ($filters as $field => $value) {
             $fulltextCollection->addFieldToFilter($field, $value);
         }
+        if (isset($filters['search_term'])) {
+            $fulltextCollection->addSearchFilter($filters['search_term']);
+        }
         $fulltextCollection->loadWithFilter();
         $items = $fulltextCollection->getItems();
         $this->assertCount($expectedCount, $items);
@@ -85,7 +91,7 @@ public function testSearchResultsAreTheSameForSameRequests()
             /** @var  \Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection $fulltextCollection */
             $fulltextCollection = $searchLayer->getProductCollection();
 
-            $fulltextCollection->addFieldToFilter('search_term', 'shorts');
+            $fulltextCollection->addSearchFilter('shorts');
             $fulltextCollection->setOrder('relevance');
             $fulltextCollection->load();
             $items = $fulltextCollection->getItems();
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/AbstractUrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/AbstractUrlRewriteTest.php
new file mode 100644
index 0000000000000..251a79f46e38c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/AbstractUrlRewriteTest.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection;
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollectionFactory;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Base class for url rewrites tests logic
+ *
+ * @magentoDbIsolation enabled
+ * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
+ */
+abstract class AbstractUrlRewriteTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    protected $objectManager;
+
+    /** @var StoreRepositoryInterface */
+    protected $storeRepository;
+
+    /** @var ScopeConfigInterface */
+    protected $config;
+
+    /** @var UrlRewriteCollectionFactory */
+    protected $urlRewriteCollectionFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->storeRepository = $this->objectManager->create(StoreRepositoryInterface::class);
+        $this->config = $this->objectManager->get(ScopeConfigInterface::class);
+        $this->urlRewriteCollectionFactory = $this->objectManager->get(UrlRewriteCollectionFactory::class);
+    }
+
+    /**
+     * Retrieve all rewrite ids
+     *
+     * @return array
+     */
+    protected function getAllRewriteIds(): array
+    {
+        $urlRewriteCollection = $this->urlRewriteCollectionFactory->create();
+
+        return $urlRewriteCollection->getAllIds();
+    }
+
+    /**
+     * Check that actual data contains of expected values
+     *
+     * @param UrlRewriteCollection $collection
+     * @param array $expectedData
+     * @return void
+     */
+    protected function assertRewrites(UrlRewriteCollection $collection, array $expectedData): void
+    {
+        $collectionItems = $collection->toArray()['items'];
+        $this->assertTrue(count($collectionItems) === count($expectedData));
+        foreach ($expectedData as $expectedItem) {
+            $found = false;
+            foreach ($collectionItems as $item) {
+                $found = array_intersect_assoc($item, $expectedItem) == $expectedItem;
+                if ($found) {
+                    break;
+                }
+            }
+            $this->assertTrue($found, 'The actual data does not contains of expected values');
+        }
+    }
+
+    /**
+     * Get category url rewrites collection
+     *
+     * @param string|array $entityId
+     * @return UrlRewriteCollection
+     */
+    protected function getEntityRewriteCollection($entityId): UrlRewriteCollection
+    {
+        $condition = is_array($entityId) ? ['in' => $entityId] : $entityId;
+        $entityRewriteCollection = $this->urlRewriteCollectionFactory->create();
+        $entityRewriteCollection->addFieldToFilter(UrlRewrite::ENTITY_ID, $condition)
+            ->addFieldToFilter(UrlRewrite::ENTITY_TYPE, ['eq' => $this->getEntityType()]);
+
+        return $entityRewriteCollection;
+    }
+
+    /**
+     * Prepare expected data
+     *
+     * @param array $expectedData
+     * @param int|null $id
+     * @return array
+     */
+    protected function prepareData(array $expectedData, ?int $id = null): array
+    {
+        $newData = [];
+        foreach ($expectedData as $key => $expectedItem) {
+            $newData[$key] = str_replace(['%suffix%', '%id%'], [$this->getUrlSuffix(), $id], $expectedItem);
+        }
+
+        return $newData;
+    }
+
+    /**
+     * Get entity type
+     *
+     * @return string
+     */
+    abstract protected function getEntityType(): string;
+
+    /**
+     * Get config value for url suffix
+     *
+     * @return string
+     */
+    abstract protected function getUrlSuffix(): string;
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
index 1c2ee602c3bd4..b6fa2fac2ca80 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
@@ -98,12 +98,6 @@ public function testGenerateUrlRewritesWithoutSaveHistory()
                 'catalog/product/view/id/' . $productForTest . '/category/4',
                 1,
                 0
-            ],
-            [
-                '/simple-product-two.html',
-                'catalog/product/view/id/' . $productForTest . '/category/2',
-                1,
-                0
             ]
         ];
 
@@ -187,12 +181,6 @@ public function testGenerateUrlRewritesWithSaveHistory()
                 1,
                 0
             ],
-            [
-                '/simple-product-two.html',
-                'catalog/product/view/id/' . $productForTest . '/category/2',
-                1,
-                0
-            ],
             [
                 'category-1/simple-product-two.html',
                 'new-url/simple-product-two.html',
@@ -329,6 +317,8 @@ public function testGenerateUrlRewritesWithoutGenerateProductRewrites()
      * @magentoAppIsolation enabled
      *
      * @return void
+     * @throws NoSuchEntityException
+     * @throws \Magento\Framework\Exception\StateException
      */
     public function testRemoveCatalogUrlRewrites()
     {
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteTest.php
new file mode 100644
index 0000000000000..1431148c5f868
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteTest.php
@@ -0,0 +1,409 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Model;
+
+use Magento\Catalog\Api\CategoryLinkManagementInterface;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUrlRewriteDatabaseMap;
+use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
+use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
+use Magento\Store\Model\ScopeInterface;
+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
+use Magento\UrlRewrite\Model\OptionProvider;
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+
+/**
+ * Class for category url rewrites tests
+ *
+ * @magentoDbIsolation enabled
+ * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CategoryUrlRewriteTest extends AbstractUrlRewriteTest
+{
+    /** @var CategoryRepositoryInterface */
+    private $categoryRepository;
+
+    /** @var CategoryResource */
+    private $categoryResource;
+
+    /** @var CategoryLinkManagementInterface */
+    private $categoryLinkManagement;
+
+    /** @var CategoryFactory */
+    private $categoryFactory;
+
+    /** @var string */
+    private $suffix;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->categoryRepository = $this->objectManager->create(CategoryRepositoryInterface::class);
+        $this->categoryResource = $this->objectManager->get(CategoryResource::class);
+        $this->categoryLinkManagement = $this->objectManager->create(CategoryLinkManagementInterface::class);
+        $this->categoryFactory = $this->objectManager->get(CategoryFactory::class);
+        $this->suffix = $this->config->getValue(
+            CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category_with_position.php
+     * @dataProvider categoryProvider
+     * @param array $data
+     * @return void
+     */
+    public function testUrlRewriteOnCategorySave(array $data): void
+    {
+        $categoryModel = $this->saveCategory($data['data']);
+        $this->assertNotNull($categoryModel->getId(), 'The category was not created');
+        $urlRewriteCollection = $this->getEntityRewriteCollection($categoryModel->getId());
+        $this->assertRewrites(
+            $urlRewriteCollection,
+            $this->prepareData($data['expected_data'], (int)$categoryModel->getId())
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function categoryProvider(): array
+    {
+        return [
+            'without_url_key' => [
+                [
+                    'data' => [
+                        'name' => 'Test Category',
+                        'attribute_set_id' => '3',
+                        'parent_id' => 2,
+                        'path' => '1/2',
+                        'is_active' => true,
+                    ],
+                    'expected_data' => [
+                        [
+                            'request_path' => 'test-category%suffix%',
+                            'target_path' => 'catalog/category/view/id/%id%',
+                        ],
+                    ],
+                ],
+            ],
+            'subcategory_without_url_key' => [
+                [
+                    'data' => [
+                        'name' => 'Test Sub Category',
+                        'attribute_set_id' => '3',
+                        'parent_id' => 444,
+                        'path' => '1/2/444',
+                        'is_active' => true,
+                    ],
+                    'expected_data' => [
+                        [
+                            'request_path' => 'category-1/test-sub-category%suffix%',
+                            'target_path' => 'catalog/category/view/id/%id%',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category_tree.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @dataProvider productRewriteProvider
+     * @param array $data
+     * @return void
+     */
+    public function testCategoryProductUrlRewrite(array $data): void
+    {
+        $category = $this->categoryRepository->get(402);
+        $this->categoryLinkManagement->assignProductToCategories('simple2', [$category->getId()]);
+        $productRewriteCollection = $this->getCategoryProductRewriteCollection(
+            array_keys($category->getParentCategories())
+        );
+        $this->assertRewrites($productRewriteCollection, $this->prepareData($data));
+    }
+
+    /**
+     * @return array
+     */
+    public function productRewriteProvider(): array
+    {
+        return [
+            [
+                [
+                    [
+                        'request_path' => 'category-1/category-1-1/category-1-1-1/simple-product2%suffix%',
+                        'target_path' => 'catalog/product/view/id/6/category/402',
+                    ],
+                    [
+                        'request_path' => 'category-1/simple-product2%suffix%',
+                        'target_path' => 'catalog/product/view/id/6/category/400',
+                    ],
+                    [
+                        'request_path' => 'category-1/category-1-1/simple-product2%suffix%',
+                        'target_path' => 'catalog/product/view/id/6/category/401',
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_products.php
+     * @magentoAppIsolation enabled
+     * @dataProvider existingUrlProvider
+     * @param array $data
+     * @return void
+     */
+    public function testUrlRewriteOnCategorySaveWithExistingUrlKey(array $data): void
+    {
+        $this->expectException(UrlAlreadyExistsException::class);
+        $this->expectExceptionMessage((string)__('URL key for specified store already exists.'));
+        $this->saveCategory($data);
+    }
+
+    /**
+     * @return array
+     */
+    public function existingUrlProvider(): array
+    {
+        return [
+            'with_specified_existing_product_url_key' => [
+                'data' => [
+                    'name' => 'Test Category',
+                    'attribute_set_id' => '3',
+                    'parent_id' => 2,
+                    'path' => '1/2',
+                    'is_active' => true,
+                    'url_key' => 'simple-product',
+                ],
+            ],
+            'with_autogenerated_existing_product_url_key' => [
+                'data' => [
+                    'name' => 'Simple Product',
+                    'attribute_set_id' => '3',
+                    'parent_id' => 2,
+                    'path' => '1/2',
+                    'is_active' => true,
+                ],
+            ],
+            'with_specified_existing_category_url_key' => [
+                'data' => [
+                    'name' => 'Test Category',
+                    'attribute_set_id' => '3',
+                    'parent_id' => 2,
+                    'path' => '1/2',
+                    'is_active' => true,
+                    'url_key' => 'category-1',
+                ],
+            ],
+            'with_autogenerated_existing_category_url_key' => [
+                'data' => [
+                    'name' => 'Category 1',
+                    'attribute_set_id' => '3',
+                    'parent_id' => 2,
+                    'path' => '1/2',
+                    'is_active' => true,
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
+     * @magentoDataFixture Magento/Catalog/_files/catalog_category_with_slash.php
+     * @dataProvider categoryMoveProvider
+     * @param array $data
+     * @return void
+     */
+    public function testUrlRewriteOnCategoryMove(array $data): void
+    {
+        $categoryId = $data['data']['id'];
+        $category = $this->categoryRepository->get($categoryId);
+        $category->move($data['data']['pid'], $data['data']['aid']);
+        $productRewriteCollection = $this->getCategoryProductRewriteCollection(
+            array_keys($category->getParentCategories())
+        );
+        $categoryRewriteCollection = $this->getEntityRewriteCollection($categoryId);
+        $this->assertRewrites($categoryRewriteCollection, $this->prepareData($data['expected_data']['category']));
+        $this->assertRewrites($productRewriteCollection, $this->prepareData($data['expected_data']['product']));
+    }
+
+    /**
+     * @return array
+     */
+    public function categoryMoveProvider(): array
+    {
+        return [
+            'append_category' => [
+                [
+                    'data' => [
+                        'id' => '333',
+                        'pid' => '3331',
+                        'aid' => '0',
+                    ],
+                    'expected_data' => [
+                        'category' => [
+                            [
+                                'request_path' => 'category-1.html',
+                                'target_path' => 'category-with-slash-symbol/category-1%suffix%',
+                                'redirect_type' => OptionProvider::PERMANENT,
+                            ],
+                            [
+                                'request_path' => 'category-with-slash-symbol/category-1%suffix%',
+                                'target_path' => 'catalog/category/view/id/333',
+                            ],
+                        ],
+                        'product' => [
+                            [
+                                'request_path' => 'category-with-slash-symbol/simple-product-three%suffix%',
+                                'target_path' => 'catalog/product/view/id/333/category/3331',
+                            ],
+                            [
+                                'request_path' => 'category-with-slash-symbol/category-1/simple-product-three%suffix%',
+                                'target_path' => 'catalog/product/view/id/333/category/333',
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category.php
+     * @return void
+     */
+    public function testUrlRewritesAfterCategoryDelete(): void
+    {
+        $categoryId = 333;
+        $categoryItemIds = $this->getEntityRewriteCollection($categoryId)->getAllIds();
+        $this->categoryRepository->deleteByIdentifier($categoryId);
+        $this->assertEmpty(
+            array_intersect($this->getAllRewriteIds(), $categoryItemIds),
+            'Not all expected category url rewrites were deleted'
+        );
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_product_ids.php
+     * @return void
+     */
+    public function testUrlRewritesAfterCategoryWithProductsDelete(): void
+    {
+        $category = $this->categoryRepository->get(3);
+        $childIds = explode(',', $category->getAllChildren());
+        $productRewriteIds = $this->getCategoryProductRewriteCollection($childIds)->getAllIds();
+        $categoryItemIds = $this->getEntityRewriteCollection($childIds)->getAllIds();
+        $this->categoryRepository->deleteByIdentifier($category->getId());
+        $allIds = $this->getAllRewriteIds();
+        $this->assertEmpty(
+            array_intersect($allIds, $categoryItemIds),
+            'Not all expected category url rewrites were deleted'
+        );
+        $this->assertEmpty(
+            array_intersect($allIds, $productRewriteIds),
+            'Not all expected category-product url rewrites were deleted'
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/Catalog/_files/category.php
+     * @return void
+     */
+    public function testCategoryUrlRewritePerStoreViews(): void
+    {
+        $urlSuffix = $this->config->getValue(
+            CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
+            ScopeInterface::SCOPE_STORE
+        );
+        $urlKeySecondStore = 'url-key-for-second-store';
+        $secondStoreId = $this->storeRepository->get('fixture_second_store')->getId();
+        $categoryId = 333;
+        $category = $this->categoryRepository->get($categoryId);
+        $urlKeyFirstStore = $category->getUrlKey();
+        $this->saveCategory(
+            ['store_id' => $secondStoreId, 'url_key' => $urlKeySecondStore],
+            $category
+        );
+        $urlRewriteItems = $this->getEntityRewriteCollection($categoryId)->getItems();
+        $this->assertTrue(count($urlRewriteItems) == 2);
+        foreach ($urlRewriteItems as $item) {
+            $item->getData('store_id') == $secondStoreId
+                ? $this->assertEquals($urlKeySecondStore . $urlSuffix, $item->getRequestPath())
+                : $this->assertEquals($urlKeyFirstStore . $urlSuffix, $item->getRequestPath());
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getUrlSuffix(): string
+    {
+        return $this->suffix;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getEntityType(): string
+    {
+        return DataCategoryUrlRewriteDatabaseMap::ENTITY_TYPE;
+    }
+
+    /**
+     * Save product with data using resource model directly
+     *
+     * @param array $data
+     * @param CategoryInterface|null $category
+     * @return CategoryInterface
+     */
+    private function saveCategory(array $data, $category = null): CategoryInterface
+    {
+        $category = $category ?: $this->categoryFactory->create();
+        $category->addData($data);
+        $this->categoryResource->save($category);
+
+        return $category;
+    }
+
+    /**
+     * Get products url rewrites collection referred to categories
+     *
+     * @param string|array $categoryId
+     * @return UrlRewriteCollection
+     */
+    private function getCategoryProductRewriteCollection($categoryId): UrlRewriteCollection
+    {
+        $condition = is_array($categoryId) ? ['in' => $categoryId] : $categoryId;
+        $productRewriteCollection = $this->urlRewriteCollectionFactory->create();
+        $productRewriteCollection
+            ->join(
+                ['p' => $this->categoryResource->getTable(Product::TABLE_NAME)],
+                'main_table.url_rewrite_id = p.url_rewrite_id',
+                'category_id'
+            )
+            ->addFieldToFilter('category_id', $condition)
+            ->addFieldToFilter(UrlRewrite::ENTITY_TYPE, ['eq' => DataProductUrlRewriteDatabaseMap::ENTITY_TYPE]);
+
+        return $productRewriteCollection;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteTest.php
new file mode 100644
index 0000000000000..f8fe68c2e0a2d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteTest.php
@@ -0,0 +1,302 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Model;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
+use Magento\Store\Model\ScopeInterface;
+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
+use Magento\UrlRewrite\Model\OptionProvider;
+
+/**
+ * Class for product url rewrites tests
+ *
+ * @magentoDbIsolation enabled
+ * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
+ */
+class ProductUrlRewriteTest extends AbstractUrlRewriteTest
+{
+    /** @var ProductFactory */
+    private $productFactory;
+
+    /** @var string */
+    private $suffix;
+
+    /** @var ProductResource */
+    private $productResource;
+
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->productResource = $this->objectManager->create(ProductResource::class);
+        $this->productFactory = $this->objectManager->get(ProductFactory::class);
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->suffix = $this->config->getValue(
+            ProductUrlPathGenerator::XML_PATH_PRODUCT_URL_SUFFIX,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * @dataProvider productDataProvider
+     * @param array $data
+     * @return void
+     */
+    public function testUrlRewriteOnProductSave(array $data): void
+    {
+        $product = $this->saveProduct($data['data']);
+        $this->assertNotNull($product->getId(), 'The product was not created');
+        $productUrlRewriteCollection = $this->getEntityRewriteCollection($product->getId());
+        $this->assertRewrites(
+            $productUrlRewriteCollection,
+            $this->prepareData($data['expected_data'], (int)$product->getId())
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function productDataProvider(): array
+    {
+        return [
+            'without_url_key' => [
+                [
+                    'data' => [
+                        'type_id' => Type::TYPE_SIMPLE,
+                        'visibility' => Visibility::VISIBILITY_BOTH,
+                        'attribute_set_id' => 4,
+                        'sku' => 'test-product',
+                        'name' => 'test product',
+                        'price' => 150,
+                    ],
+                    'expected_data' => [
+                        [
+                            'request_path' => 'test-product%suffix%',
+                            'target_path' => 'catalog/product/view/id/%id%',
+                        ],
+                    ],
+                ],
+            ],
+            'with_url_key' => [
+                [
+                    'data' => [
+                        'type_id' => Type::TYPE_SIMPLE,
+                        'attribute_set_id' => 4,
+                        'sku' => 'test-product',
+                        'visibility' => Visibility::VISIBILITY_BOTH,
+                        'name' => 'test product',
+                        'price' => 150,
+                        'url_key' => 'test-product-url-key',
+                    ],
+                    'expected_data' => [
+                        [
+                            'request_path' => 'test-product-url-key%suffix%',
+                            'target_path' => 'catalog/product/view/id/%id%',
+                        ],
+                    ],
+                ],
+            ],
+            'with_invisible_product' => [
+                [
+                    'data' => [
+                        'type_id' => Type::TYPE_SIMPLE,
+                        'attribute_set_id' => 4,
+                        'sku' => 'test-product',
+                        'visibility' => Visibility::VISIBILITY_NOT_VISIBLE,
+                        'name' => 'test product',
+                        'price' => 150,
+                        'url_key' => 'test-product-url-key',
+                    ],
+                    'expected_data' => [],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_simple.php
+     * @dataProvider productEditProvider
+     * @param array $expectedData
+     * @return void
+     */
+    public function testUrlRewriteOnProductEdit(array $expectedData): void
+    {
+        $product = $this->productRepository->get('simple');
+        $data = [
+            'url_key' => 'new-url-key',
+            'url_key_create_redirect' => $product->getUrlKey(),
+            'save_rewrites_history' => true,
+        ];
+        $product = $this->saveProduct($data, $product);
+        $productRewriteCollection = $this->getEntityRewriteCollection($product->getId());
+        $this->assertRewrites(
+            $productRewriteCollection,
+            $this->prepareData($expectedData, (int)$product->getId())
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function productEditProvider(): array
+    {
+        return [
+            [
+                'expected_data' => [
+                    [
+                        'request_path' => 'new-url-key%suffix%',
+                        'target_path' => 'catalog/product/view/id/%id%',
+                    ],
+                    [
+                        'request_path' => 'simple-product%suffix%',
+                        'target_path' => 'new-url-key%suffix%',
+                        'redirect_type' => OptionProvider::PERMANENT,
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/category_with_products.php
+     * @dataProvider existingUrlKeyProvider
+     * @param array $data
+     * @return void
+     */
+    public function testUrlRewriteOnProductSaveWithExistingUrlKey(array $data): void
+    {
+        $this->expectException(UrlAlreadyExistsException::class);
+        $this->expectExceptionMessage((string)__('URL key for specified store already exists.'));
+        $this->saveProduct($data);
+    }
+
+    /**
+     * @return array
+     */
+    public function existingUrlKeyProvider(): array
+    {
+        return [
+            [
+                'with_specified_existing_product_url_key' => [
+                    'type_id' => Type::TYPE_SIMPLE,
+                    'attribute_set_id' => 4,
+                    'sku' => 'test-simple-product',
+                    'name' => 'test-simple-product',
+                    'price' => 150,
+                    'url_key' => 'simple-product',
+                ],
+                'with_autogenerated_existing_product_url_key' => [
+                    'type_id' => Type::TYPE_SIMPLE,
+                    'attribute_set_id' => 4,
+                    'sku' => 'test-simple-product',
+                    'name' => 'simple product',
+                    'price' => 150,
+                ],
+                'with_specified_existing_category_url_key' => [
+                    'type_id' => Type::TYPE_SIMPLE,
+                    'attribute_set_id' => 4,
+                    'sku' => 'test-simple-product',
+                    'name' => 'test-simple-product',
+                    'price' => 150,
+                    'url_key' => 'category-1',
+                ],
+                'with_autogenerated_existing_category_url_key' => [
+                    'type_id' => Type::TYPE_SIMPLE,
+                    'attribute_set_id' => 4,
+                    'sku' => 'test-simple-product',
+                    'name' => 'category 1',
+                    'price' => 150,
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     */
+    public function testUrlRewritesAfterProductDelete(): void
+    {
+        $product = $this->productRepository->get('simple2');
+        $rewriteIds = $this->getEntityRewriteCollection($product->getId())->getAllIds();
+        $this->productRepository->delete($product);
+        $this->assertEmpty(
+            array_intersect($this->getAllRewriteIds(), $rewriteIds),
+            'Not all expected category url rewrites were deleted'
+        );
+    }
+
+    /**
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @return void
+     */
+    public function testProductUrlRewritePerStoreViews(): void
+    {
+        $urlKeySecondStore = 'url-key-for-second-store';
+        $secondStoreId = $this->storeRepository->get('fixture_second_store')->getId();
+        $product = $this->productRepository->get('simple2');
+        $urlKeyFirstStore = $product->getUrlKey();
+        $product = $this->saveProduct(
+            ['store_id' => $secondStoreId, 'url_key' => $urlKeySecondStore],
+            $product
+        );
+        $urlRewriteItems = $this->getEntityRewriteCollection($product->getId())->getItems();
+        $this->assertTrue(count($urlRewriteItems) == 2);
+        foreach ($urlRewriteItems as $item) {
+            $item->getData('store_id') == $secondStoreId
+                ? $this->assertEquals($urlKeySecondStore . $this->suffix, $item->getRequestPath())
+                : $this->assertEquals($urlKeyFirstStore . $this->suffix, $item->getRequestPath());
+        }
+    }
+
+    /**
+     * Save product with data using resource model directly
+     *
+     * @param array $data
+     * @param ProductInterface|null $product
+     * @return ProductInterface
+     */
+    protected function saveProduct(array $data, $product = null): ProductInterface
+    {
+        $product = $product ?: $this->productFactory->create();
+        $product->addData($data);
+        $this->productResource->save($product);
+
+        return $product;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getUrlSuffix(): string
+    {
+        return $this->suffix;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getEntityType(): string
+    {
+        return DataProductUrlRewriteDatabaseMap::ENTITY_TYPE;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/AttributesTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/AttributesTest.php
index 0cd3ad644197b..8ca84c4b066fe 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/AttributesTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/AttributesTest.php
@@ -51,8 +51,8 @@ public function testGetAttributesMeta()
         $urlKeyData = $meta['search_engine_optimization']['children']['url_key']['arguments']['data']['config'];
         $this->assertEquals('text', $urlKeyData['dataType']);
         $this->assertEquals('input', $urlKeyData['formElement']);
-        $this->assertEquals('1', $urlKeyData['visible']);
-        $this->assertEquals('0', $urlKeyData['required']);
+        $this->assertEquals(true, $urlKeyData['visible']);
+        $this->assertEquals(false, $urlKeyData['required']);
         $this->assertEquals('[STORE VIEW]', $urlKeyData['scopeLabel']);
     }
 }
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 2695948e78314..85cd5331a29c4 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php
@@ -172,4 +172,29 @@ public function createCollectionForSkuDataProvider()
                 . '`attribute`:`sku`,`operator`:`!^[^]`,`value`:`virtual`^]^]', 'product-with-xss']
         ];
     }
+
+    /**
+     * Check that collection returns correct result if use date attribute.
+     *
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_date_attribute.php
+     * @return void
+     */
+    public function testProductListWithDateAttribute()
+    {
+        $encodedConditions = '^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,'
+            . '`aggregator`:`all`,`value`:`1`,`new_child`:``^],'
+            . '`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,'
+            . '`attribute`:`date_attribute`,`operator`:`==`,`value`:`' . date('Y-m-d') . '`^]^]';
+        $this->block->setData('conditions_encoded', $encodedConditions);
+
+        // Load products collection filtered using specified conditions and perform assertions
+        $productCollection = $this->block->createCollection();
+        $productCollection->load();
+        $this->assertEquals(
+            1,
+            $productCollection->count(),
+            "Product collection was not filtered according to the widget condition."
+        );
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php
index 4682453012952..e0e390e89c97c 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\Data\ProductTierPriceInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\Api\FilterBuilder;
@@ -17,7 +18,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
- * Class SessionTest
+ * Checkout Session model test.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -54,6 +55,35 @@ protected function setUp()
         $this->checkoutSession = $this->objectManager->create(Session::class);
     }
 
+    /**
+     * Tests that quote items and totals are correct when product becomes unavailable.
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @magentoAppIsolation enabled
+     */
+    public function testGetQuoteWithUnavailableProduct()
+    {
+        $reservedOrderId = 'test01';
+        $quoteGrandTotal = 10;
+
+        $quote = $this->getQuote($reservedOrderId);
+        $this->assertEquals(1, $quote->getItemsCount());
+        $this->assertCount(1, $quote->getItems());
+        $this->assertEquals($quoteGrandTotal, $quote->getShippingAddress()->getBaseGrandTotal());
+
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple');
+        $product->setStatus(Status::STATUS_DISABLED);
+        $productRepository->save($product);
+        $this->checkoutSession->setQuoteId($quote->getId());
+        $quote = $this->checkoutSession->getQuote();
+
+        $this->assertEquals(0, $quote->getItemsCount());
+        $this->assertEmpty($quote->getItems());
+        $this->assertEquals(0, $quote->getShippingAddress()->getBaseGrandTotal());
+    }
+
     /**
      * Test covers case when quote is not yet initialized and customer data is set to checkout session model.
      *
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/ValidatorFileMock.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/ValidatorFileMock.php
index 440f437e74e7c..9b5650b1826c3 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/ValidatorFileMock.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/ValidatorFileMock.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Checkout\_files;
 
 use Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile;
@@ -14,27 +16,29 @@ class ValidatorFileMock extends \PHPUnit\Framework\TestCase
 {
     /**
      * Returns mock.
-     *
+     * @param array|null $fileData
      * @return ValidatorFile|\PHPUnit_Framework_MockObject_MockObject
      */
-    public function getInstance()
+    public function getInstance($fileData = null)
     {
-        $userValue = [
-            'type' => 'image/jpeg',
-            'title' => "test.jpg",
-            'quote_path' => "custom_options/quote/s/t/4624d2.jpg",
-            'order_path' => "custom_options/order/s/t/89d25b4624d2.jpg",
-            "fullpath" => "pub/media/custom_options/quote/s/t/e47389d25b4624d2.jpg",
-            "size"=> "71901",
-            "width" => 5,
-            "height" => 5,
-            "secret_key" => "10839ec1631b77e5e473",
-        ];
+        if (empty($fileData)) {
+            $fileData = [
+                'type' => 'image/jpeg',
+                'title' => "test.jpg",
+                'quote_path' => "custom_options/quote/s/t/4624d2.jpg",
+                'order_path' => "custom_options/order/s/t/89d25b4624d2.jpg",
+                "fullpath" => "pub/media/custom_options/quote/s/t/e47389d25b4624d2.jpg",
+                "size" => "71901",
+                "width" => 5,
+                "height" => 5,
+                "secret_key" => "10839ec1631b77e5e473",
+            ];
+        }
         $instance = $this->getMockBuilder(ValidatorFile::class)
             ->disableOriginalConstructor()
             ->getMock();
         $instance->method('SetProduct')->willReturnSelf();
-        $instance->method('validate')->willReturn($userValue);
+        $instance->method('validate')->willReturn($fileData);
 
         return $instance;
     }
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store_rollback.php
index e3e1513cb6144..0ae87725529b8 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote_customer_not_default_store_rollback.php
@@ -6,3 +6,6 @@
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
 $quote->load('test_order_1_not_default_store', 'reserved_order_id')->delete();
+
+require __DIR__ . '/../../../Magento/Customer/_files/customer_rollback.php';
+require __DIR__ . '/../../../Magento/Store/_files/second_store_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_downloadable_product_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_downloadable_product_rollback.php
new file mode 100644
index 0000000000000..4048c672037b2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_downloadable_product_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreLine
+require __DIR__ . '/../../../Magento/Downloadable/_files/product_downloadable_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/PageDesignTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/PageDesignTest.php
new file mode 100644
index 0000000000000..8bc7a89280559
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/PageDesignTest.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Controller\Adminhtml;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\GetPageByIdentifierInterface;
+use Magento\Cms\Model\Page;
+use Magento\Cms\Model\PageFactory;
+use Magento\Framework\Acl\Builder;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Test the saving CMS pages design via admin area interface.
+ *
+ * @magentoAppArea adminhtml
+ */
+class PageDesignTest extends AbstractBackendController
+{
+    /**
+     * @var string
+     */
+    protected $resource = 'Magento_Cms::save';
+
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/cms/page/save';
+
+    /**
+     * @var string
+     */
+    protected $httpMethod = HttpRequest::METHOD_POST;
+
+    /**
+     * @var Builder
+     */
+    private $aclBuilder;
+
+    /**
+     * @var GetPageByIdentifierInterface
+     */
+    private $pageRetriever;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var string[]
+     */
+    private $pagesToDelete = [];
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
+        $this->pageRetriever = Bootstrap::getObjectManager()->get(GetPageByIdentifierInterface::class);
+        $this->scopeConfig = Bootstrap::getObjectManager()->get(ScopeConfigInterface::class);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        foreach ($this->pagesToDelete as $identifier) {
+            $page = $this->pageRetriever->execute($identifier);
+            $page->delete();
+        }
+        $this->pagesToDelete = [];
+    }
+
+    /**
+     * Check whether additional authorization is required for the design fields.
+     *
+     * @magentoDbIsolation disabled
+     * @return void
+     */
+    public function testSaveDesign(): void
+    {
+        //Expected list of sessions messages collected throughout the controller calls.
+        $sessionMessages = ['You are not allowed to change CMS pages design settings'];
+        //Test page data.
+        $id = 'test-page' .rand(1111, 9999);
+        $requestData = [
+            PageInterface::IDENTIFIER => $id,
+            PageInterface::TITLE => 'Page title',
+            PageInterface::CUSTOM_THEME => '1',
+            PageInterface::PAGE_LAYOUT => 'empty'
+        ];
+
+        //Creating a new page with design properties without the required permissions.
+        $this->aclBuilder->getAcl()->deny(null, 'Magento_Cms::save_design');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($requestData);
+        $this->dispatch($this->uri);
+        $this->assertSessionMessages(
+            self::equalTo($sessionMessages),
+            MessageInterface::TYPE_ERROR
+        );
+
+        //Trying again with the permissions.
+        $this->aclBuilder->getAcl()->allow(null, ['Magento_Cms::save', 'Magento_Cms::save_design']);
+        $this->getRequest()->setDispatched(false);
+        $this->dispatch($this->uri);
+        /** @var Page $page */
+        $page = Bootstrap::getObjectManager()->create(PageInterface::class);
+        $page->load($id, PageInterface::IDENTIFIER);
+        $this->assertNotEmpty($page->getId());
+        $this->assertEquals(1, $page->getCustomTheme());
+        $requestData['page_id'] = $page->getId();
+        $this->getRequest()->setPostValue($requestData);
+
+        //Updating the page without the permissions but not touching design settings.
+        $this->aclBuilder->getAcl()->deny(null, 'Magento_Cms::save_design');
+        $this->getRequest()->setDispatched(false);
+        $this->dispatch($this->uri);
+        $this->assertSessionMessages(self::equalTo($sessionMessages), MessageInterface::TYPE_ERROR);
+
+        //Updating design settings without the permissions.
+        $requestData[PageInterface::CUSTOM_THEME] = '2';
+        $this->getRequest()->setPostValue($requestData);
+        $this->getRequest()->setDispatched(false);
+        $this->dispatch($this->uri);
+        $sessionMessages[] = $sessionMessages[0];
+        $this->assertSessionMessages(
+            self::equalTo($sessionMessages),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
+    /**
+     * Check that default design values are accepted without the permissions.
+     *
+     * @magentoDbIsolation disabled
+     * @return void
+     */
+    public function testSaveDesignWithDefaults(): void
+    {
+        //Test page data.
+        $id = 'test-page' .rand(1111, 9999);
+        $defaultLayout = $this->scopeConfig->getValue('web/default_layouts/default_cms_layout');
+        $requestData = [
+            PageInterface::IDENTIFIER => $id,
+            PageInterface::TITLE => 'Page title',
+            PageInterface::PAGE_LAYOUT => $defaultLayout
+        ];
+        //Creating a new page with design properties without the required permissions but with default values.
+        $this->aclBuilder->getAcl()->deny(null, 'Magento_Cms::save_design');
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($requestData);
+        $this->dispatch($this->uri);
+
+        //Validating saved page
+        /** @var Page $page */
+        $page = Bootstrap::getObjectManager()->create(PageInterface::class);
+        $page->load($id, PageInterface::IDENTIFIER);
+        $this->assertNotEmpty($page->getId());
+        $this->assertNotNull($page->getPageLayout());
+        $this->assertEquals($defaultLayout, $page->getPageLayout());
+    }
+
+    /**
+     * Test that custom layout update fields are dealt with properly.
+     *
+     * @magentoDataFixture Magento/Cms/_files/pages_with_layout_xml.php
+     * @throws \Throwable
+     * @return void
+     */
+    public function testSaveLayoutXml(): void
+    {
+        $page = $this->pageRetriever->execute('test_custom_layout_page_1', 0);
+        $requestData = [
+            Page::PAGE_ID => $page->getId(),
+            PageInterface::IDENTIFIER => 'test_custom_layout_page_1',
+            PageInterface::TITLE => 'Page title',
+            PageInterface::CUSTOM_LAYOUT_UPDATE_XML => $page->getCustomLayoutUpdateXml(),
+            PageInterface::LAYOUT_UPDATE_XML => $page->getLayoutUpdateXml(),
+            'layout_update_selected' => '_existing_'
+        ];
+
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($requestData);
+        $this->dispatch($this->uri);
+        $this->getRequest()->setDispatched(false);
+
+        $updated = $this->pageRetriever->execute('test_custom_layout_page_1', 0);
+        $this->assertEquals($updated->getCustomLayoutUpdateXml(), $page->getCustomLayoutUpdateXml());
+        $this->assertEquals($updated->getLayoutUpdateXml(), $page->getLayoutUpdateXml());
+
+        $requestData = [
+            Page::PAGE_ID => $page->getId(),
+            PageInterface::IDENTIFIER => 'test_custom_layout_page_1',
+            PageInterface::TITLE => 'Page title',
+            PageInterface::CUSTOM_LAYOUT_UPDATE_XML => $page->getCustomLayoutUpdateXml(),
+            PageInterface::LAYOUT_UPDATE_XML => $page->getLayoutUpdateXml(),
+            'layout_update_selected' => '_no_update_'
+        ];
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue($requestData);
+        $this->dispatch($this->uri);
+        $this->getRequest()->setDispatched(false);
+
+        $updated = $this->pageRetriever->execute('test_custom_layout_page_1', 0);
+        $this->assertEmpty($updated->getCustomLayoutUpdateXml());
+        $this->assertEmpty($updated->getLayoutUpdateXml());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
index 8a0c715cfaf75..4600cd28fd3fc 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
@@ -9,6 +9,10 @@
  */
 namespace Magento\Cms\Controller;
 
+use Magento\Cms\Api\GetPageByIdentifierInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
 class PageTest extends \Magento\TestFramework\TestCase\AbstractController
 {
     public function testViewAction()
@@ -62,4 +66,23 @@ public static function cmsPageWithSystemRouteFixture()
             ->setPageLayout('1column')
             ->save();
     }
+
+    /**
+     * Check that custom handles are applied when rendering a page.
+     *
+     * @return void
+     * @throws \Throwable
+     * @magentoDataFixture Magento/Cms/_files/pages_with_layout_xml.php
+     */
+    public function testCustomHandles(): void
+    {
+        /** @var GetPageByIdentifierInterface $pageFinder */
+        $pageFinder = Bootstrap::getObjectManager()->get(GetPageByIdentifierInterface::class);
+        $page = $pageFinder->execute('test_custom_layout_page_3', 0);
+        $this->dispatch('/cms/page/view/page_id/' .$page->getId());
+        /** @var LayoutInterface $layout */
+        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
+        $handles = $layout->getUpdate()->getHandles();
+        $this->assertContains('cms_page_view_selectable_test_custom_layout_page_3_test_selected', $handles);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Page/CustomLayoutManagerTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Page/CustomLayoutManagerTest.php
new file mode 100644
index 0000000000000..e741b95ff4371
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Page/CustomLayoutManagerTest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Page;
+
+use Magento\Cms\Model\Page;
+use Magento\Cms\Model\PageFactory;
+use Magento\Cms\Model\Page\CustomLayout\Data\CustomLayoutSelected;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\View\Result\PageFactory as PageResultFactory;
+use Magento\Framework\View\Model\Layout\MergeFactory;
+use Magento\Framework\View\Model\Layout\Merge;
+
+/**
+ * Test the manager.
+ */
+class CustomLayoutManagerTest extends TestCase
+{
+    /**
+     * @var CustomLayoutRepositoryInterface
+     */
+    private $repo;
+
+    /**
+     * @var CustomLayoutManagerInterface
+     */
+    private $manager;
+
+    /**
+     * @var PageFactory
+     */
+    private $pageFactory;
+
+    /**
+     * @var PageResultFactory
+     */
+    private $resultFactory;
+
+    /**
+     * @var IdentityMap
+     */
+    private $identityMap;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->resultFactory = $objectManager->get(PageResultFactory::class);
+        //Mocking available list of files for the page.
+        $handles = [
+            'cms_page_view_selectable_page100_select1',
+            'cms_page_view_selectable_page100_select2'
+        ];
+        $processor = $this->getMockBuilder(Merge::class)->disableOriginalConstructor()->getMock();
+        $processor->method('getAvailableHandles')->willReturn($handles);
+        $processorFactory = $this->getMockBuilder(MergeFactory::class)->disableOriginalConstructor()->getMock();
+        $processorFactory->method('create')->willReturn($processor);
+
+        $this->manager = $objectManager->create(
+            CustomLayoutManagerInterface::class,
+            ['layoutProcessorFactory' => $processorFactory]
+        );
+        $this->repo = $objectManager->create(
+            CustomLayoutRepositoryInterface::class,
+            ['manager' => $this->manager]
+        );
+        $this->pageFactory = $objectManager->get(PageFactory::class);
+        $this->identityMap = $objectManager->get(IdentityMap::class);
+    }
+
+    /**
+     * Test updating a page's custom layout.
+     *
+     * @magentoDataFixture Magento/Cms/_files/pages.php
+     * @throws \Throwable
+     * @return void
+     */
+    public function testCustomLayoutUpdate(): void
+    {
+        /** @var Page $page */
+        $page = $this->pageFactory->create(['customLayoutRepository' => $this->repo]);
+        $page->load('page100', 'identifier');
+        $pageId = (int)$page->getId();
+        $this->identityMap->add($page);
+        //Set file ID
+        $this->repo->save(new CustomLayoutSelected($pageId, 'select2'));
+
+        //Test handles
+        $result = $this->resultFactory->create();
+        $this->manager->applyUpdate($result, $this->repo->getFor($pageId));
+        $this->identityMap->remove((int)$page->getId());
+        $this->assertContains('___selectable_page100_select2', $result->getLayout()->getUpdate()->getHandles());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Page/CustomLayoutRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Page/CustomLayoutRepositoryTest.php
new file mode 100644
index 0000000000000..e3422cd81638b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Page/CustomLayoutRepositoryTest.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Page;
+
+use Magento\Cms\Model\Page;
+use Magento\Cms\Model\PageFactory;
+use Magento\Cms\Model\Page\CustomLayout\Data\CustomLayoutSelected;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\View\Model\Layout\Merge;
+use Magento\Framework\View\Model\Layout\MergeFactory;
+use Magento\TestFramework\Cms\Model\CustomLayoutManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test the repository.
+ */
+class CustomLayoutRepositoryTest extends TestCase
+{
+    /**
+     * @var CustomLayoutRepositoryInterface
+     */
+    private $repo;
+
+    /**
+     * @var PageFactory
+     */
+    private $pageFactory;
+
+    /**
+     * @var CustomLayoutManager
+     */
+    private $fakeManager;
+
+    /**
+     * @var IdentityMap
+     */
+    private $identityMap;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->fakeManager = $objectManager->get(CustomLayoutManager::class);
+        $this->repo = $objectManager->create(CustomLayoutRepositoryInterface::class, ['manager' => $this->fakeManager]);
+        $this->pageFactory = $objectManager->get(PageFactory::class);
+        $this->identityMap = $objectManager->get(IdentityMap::class);
+    }
+
+    /**
+     * Create page instance.
+     *
+     * @param string $id
+     * @return Page
+     */
+    private function createPage(string $id): Page
+    {
+        $page = $this->pageFactory->create(['customLayoutRepository' => $this->repo]);
+        $page->load($id, 'identifier');
+        $this->identityMap->add($page);
+
+        return $page;
+    }
+
+    /**
+     * Test updating a page's custom layout.
+     *
+     * @magentoDataFixture Magento/Cms/_files/pages.php
+     * @return void
+     */
+    public function testCustomLayout(): void
+    {
+        $page = $this->createPage('page100');
+        $pageId = (int)$page->getId();
+        $this->fakeManager->fakeAvailableFiles($pageId, ['select1', 'select2']);
+
+        //Invalid file ID
+        $exceptionRaised = null;
+        try {
+            $this->repo->save(new CustomLayoutSelected($pageId, 'some_file'));
+        } catch (\Throwable $exception) {
+            $exceptionRaised = $exception;
+        }
+        $this->assertNotEmpty($exceptionRaised);
+        $this->assertInstanceOf(\InvalidArgumentException::class, $exceptionRaised);
+
+        //Set file ID
+        $this->repo->save(new CustomLayoutSelected($pageId, 'select2'));
+
+        //Test saved
+        $saved = $this->repo->getFor($pageId);
+        $this->assertEquals('select2', $saved->getLayoutFileId());
+
+        //Removing custom file
+        $this->repo->deleteFor($pageId);
+
+        //Test saved
+        $notFound = false;
+        try {
+            $this->repo->getFor($pageId);
+        } catch (NoSuchEntityException $exception) {
+            $notFound = true;
+        }
+        $this->assertTrue($notFound);
+    }
+
+    /**
+     * Test that layout updates are saved with save method.
+     *
+     * @magentoDataFixture Magento/Cms/_files/pages.php
+     * @return void
+     */
+    public function testSaved(): void
+    {
+        $page = $this->createPage('page100');
+        $this->fakeManager->fakeAvailableFiles((int)$page->getId(), ['select1', 'select2']);
+
+        //Special no-update instruction
+        $page->setData('layout_update_selected', '_no_update_');
+        $page->save();
+        $this->assertNull($page->getData('layout_update_selected'));
+
+        //Existing file update
+        $page->setData('layout_update_selected', 'select1');
+        $page->save();
+        /** @var Page $page */
+        $page = $this->pageFactory->create();
+        $page->load('page100', 'identifier');
+        $this->assertEquals('select1', $page->getData('layout_update_selected'));
+        $this->assertEquals('select1', $this->repo->getFor((int)$page->getId())->getLayoutFileId());
+
+        //Invalid file
+        $caught = null;
+        $page->setData('layout_update_selected', 'nonExisting');
+        try {
+            $page->save();
+        } catch (\Throwable $exception) {
+            $caught = $exception;
+        }
+        $this->assertInstanceOf(LocalizedException::class, $caught);
+        $this->assertEquals($caught->getMessage(), 'Invalid Custom Layout Update selected');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Page/DataProviderTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Page/DataProviderTest.php
new file mode 100644
index 0000000000000..2028f5d8a04b6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Page/DataProviderTest.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Page;
+
+use Magento\Cms\Api\GetPageByIdentifierInterface;
+use Magento\TestFramework\Cms\Model\CustomLayoutManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\Cms\Model\Page as PageModel;
+use Magento\Framework\App\Request\Http as HttpRequest;
+
+/**
+ * Test pages data provider.
+ *
+ * @magentoAppArea adminhtml
+ */
+class DataProviderTest extends TestCase
+{
+    /**
+     * @var DataProvider
+     */
+    private $provider;
+
+    /**
+     * @var GetPageByIdentifierInterface
+     */
+    private $repo;
+
+    /**
+     * @var CustomLayoutManager
+     */
+    private $filesFaker;
+
+    /**
+     * @var HttpRequest
+     */
+    private $request;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->repo = $objectManager->get(GetPageByIdentifierInterface::class);
+        $this->filesFaker = $objectManager->get(CustomLayoutManager::class);
+        $this->request = $objectManager->get(HttpRequest::class);
+        $this->provider = $objectManager->create(
+            DataProvider::class,
+            [
+                'name' => 'test',
+                'primaryFieldName' => 'page_id',
+                'requestFieldName' => 'page_id',
+                'customLayoutManager' => $this->filesFaker
+            ]
+        );
+    }
+
+    /**
+     * Check that custom layout date is handled properly.
+     *
+     * @magentoDataFixture Magento/Cms/_files/pages_with_layout_xml.php
+     * @throws \Throwable
+     * @return void
+     */
+    public function testCustomLayoutData(): void
+    {
+        $data = $this->provider->getData();
+        $page1Data = null;
+        $page2Data = null;
+        $page3Data = null;
+        foreach ($data as $pageData) {
+            if ($pageData[PageModel::IDENTIFIER] === 'test_custom_layout_page_1') {
+                $page1Data = $pageData;
+            } elseif ($pageData[PageModel::IDENTIFIER] === 'test_custom_layout_page_2') {
+                $page2Data = $pageData;
+            } elseif ($pageData[PageModel::IDENTIFIER] === 'test_custom_layout_page_3') {
+                $page3Data = $pageData;
+            }
+        }
+        $this->assertNotEmpty($page1Data);
+        $this->assertNotEmpty($page2Data);
+        $this->assertEquals('_existing_', $page1Data['layout_update_selected']);
+        $this->assertEquals(null, $page2Data['layout_update_selected']);
+        $this->assertEquals('test_selected', $page3Data['layout_update_selected']);
+    }
+
+    /**
+     * Check that proper meta for custom layout field is returned.
+     *
+     * @return void
+     * @throws \Throwable
+     * @magentoDataFixture Magento/Cms/_files/pages_with_layout_xml.php
+     */
+    public function testCustomLayoutMeta(): void
+    {
+        //Testing a page without layout xml
+        $page = $this->repo->execute('test_custom_layout_page_3', 0);
+        $this->filesFaker->fakeAvailableFiles((int)$page->getId(), ['test1', 'test2']);
+        $this->request->setParam('page_id', $page->getId());
+
+        $meta = $this->provider->getMeta();
+        $this->assertArrayHasKey('design', $meta);
+        $this->assertArrayHasKey('children', $meta['design']);
+        $this->assertArrayHasKey('custom_layout_update_select', $meta['design']['children']);
+        $this->assertArrayHasKey('arguments', $meta['design']['children']['custom_layout_update_select']);
+        $this->assertArrayHasKey('data', $meta['design']['children']['custom_layout_update_select']['arguments']);
+        $this->assertArrayHasKey(
+            'options',
+            $meta['design']['children']['custom_layout_update_select']['arguments']['data']
+        );
+        $expectedList = [
+            ['label' => 'No update', 'value' => '_no_update_'],
+            ['label' => 'test1', 'value' => 'test1'],
+            ['label' => 'test2', 'value' => 'test2']
+        ];
+        $metaList = $meta['design']['children']['custom_layout_update_select']['arguments']['data']['options'];
+        sort($expectedList);
+        sort($metaList);
+        $this->assertEquals($expectedList, $metaList);
+
+        //Page with old layout xml
+        $page = $this->repo->execute('test_custom_layout_page_1', 0);
+        $this->filesFaker->fakeAvailableFiles((int)$page->getId(), ['test3']);
+        $this->request->setParam('page_id', $page->getId());
+
+        $meta = $this->provider->getMeta();
+        $this->assertArrayHasKey('design', $meta);
+        $this->assertArrayHasKey('children', $meta['design']);
+        $this->assertArrayHasKey('custom_layout_update_select', $meta['design']['children']);
+        $this->assertArrayHasKey('arguments', $meta['design']['children']['custom_layout_update_select']);
+        $this->assertArrayHasKey('data', $meta['design']['children']['custom_layout_update_select']['arguments']);
+        $this->assertArrayHasKey(
+            'options',
+            $meta['design']['children']['custom_layout_update_select']['arguments']['data']
+        );
+        $expectedList = [
+            ['label' => 'No update', 'value' => '_no_update_'],
+            ['label' => 'Use existing layout update XML', 'value' => '_existing_'],
+            ['label' => 'test3', 'value' => 'test3'],
+        ];
+        $metaList = $meta['design']['children']['custom_layout_update_select']['arguments']['data']['options'];
+        sort($expectedList);
+        sort($metaList);
+        $this->assertEquals($expectedList, $metaList);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php
index cd4674f95d722..5e7e0c962fcde 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php
@@ -3,96 +3,81 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Cms\Model;
 
-use Magento\Backend\Model\Auth;
+use Magento\Cms\Api\GetPageByIdentifierInterface;
 use Magento\Cms\Api\PageRepositoryInterface;
-use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
-use Magento\TestFramework\Bootstrap as TestBootstrap;
-use Magento\Framework\Acl\Builder;
 
 /**
- * Test class for page repository.
+ * Test page repo.
  */
 class PageRepositoryTest extends TestCase
 {
     /**
-     * Test subject.
-     *
      * @var PageRepositoryInterface
      */
     private $repo;
 
     /**
-     * @var Auth
-     */
-    private $auth;
-
-    /**
-     * @var SearchCriteriaBuilder
+     * @var GetPageByIdentifierInterface
      */
-    private $criteriaBuilder;
+    private $retriever;
 
     /**
-     * @var Builder
-     */
-    private $aclBuilder;
-
-    /**
-     * Sets up common objects.
-     *
      * @inheritDoc
      */
     protected function setUp()
     {
-        $this->repo = Bootstrap::getObjectManager()->create(PageRepositoryInterface::class);
-        $this->auth = Bootstrap::getObjectManager()->get(Auth::class);
-        $this->criteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
-        $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
+        $this->repo = Bootstrap::getObjectManager()->get(PageRepositoryInterface::class);
+        $this->retriever = Bootstrap::getObjectManager()->get(GetPageByIdentifierInterface::class);
     }
 
     /**
-     * @inheritDoc
-     */
-    protected function tearDown()
-    {
-        parent::tearDown();
-
-        $this->auth->logout();
-    }
-
-    /**
-     * Test authorization when saving page's design settings.
+     * Test that the field is deprecated.
      *
-     * @magentoDataFixture Magento/Cms/_files/pages.php
-     * @magentoAppArea adminhtml
-     * @magentoDbIsolation enabled
-     * @magentoAppIsolation enabled
+     * @throws \Throwable
+     * @magentoDataFixture Magento/Cms/_files/pages_with_layout_xml.php
+     * @return void
      */
-    public function testSaveDesign()
+    public function testSaveUpdateXml(): void
     {
-        $pages = $this->repo->getList(
-            $this->criteriaBuilder->addFilter('identifier', 'page_design_blank')->create()
-        )->getItems();
-        $page = array_pop($pages);
-        $this->auth->login(TestBootstrap::ADMIN_NAME, TestBootstrap::ADMIN_PASSWORD);
+        $page = $this->retriever->execute('test_custom_layout_page_1', 0);
+        $page->setTitle($page->getTitle() .'TEST');
 
-        //Admin doesn't have access to page's design.
-        $this->aclBuilder->getAcl()->deny(null, 'Magento_Cms::save_design');
-
-        $page->setCustomTheme('test');
+        //Is successfully saved without changes to the custom layout xml.
         $page = $this->repo->save($page);
-        $this->assertNotEquals('test', $page->getCustomTheme());
 
-        //Admin has access to page' design.
-        $this->aclBuilder->getAcl()->allow(null, ['Magento_Cms::save', 'Magento_Cms::save_design']);
+        //New value is not accepted.
+        $page->setCustomLayoutUpdateXml('<container name="new_container_for_save_update_xml" />');
+        $forbidden = false;
+        try {
+            $page = $this->repo->save($page);
+        } catch (CouldNotSaveException $exception) {
+            $forbidden = true;
+        }
+        $this->assertTrue($forbidden);
+
+        //New value is not accepted.
+        $page->setLayoutUpdateXml('<container name="new_container_for_save_update_xml2" />');
+        $forbidden = false;
+        try {
+            $page = $this->repo->save($page);
+        } catch (CouldNotSaveException $exception) {
+            $forbidden = true;
+        }
+        $this->assertTrue($forbidden);
 
-        $page->setCustomTheme('test');
+        //Can be removed
+        $page->setCustomLayoutUpdateXml(null);
+        $page->setLayoutUpdateXml(null);
         $page = $this->repo->save($page);
-        $this->assertEquals('test', $page->getCustomTheme());
+        $this->assertEmpty($page->getCustomLayoutUpdateXml());
+        $this->assertEmpty($page->getLayoutUpdateXml());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/pages_with_layout_xml.php b/dev/tests/integration/testsuite/Magento/Cms/_files/pages_with_layout_xml.php
new file mode 100644
index 0000000000000..9734ed3abaeed
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/pages_with_layout_xml.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Cms\Model\Page as PageModel;
+use Magento\Cms\Model\PageFactory as PageModelFactory;
+use Magento\TestFramework\Cms\Model\CustomLayoutManager;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$pageFactory = $objectManager->get(PageModelFactory::class);
+/** @var CustomLayoutManager $fakeManager */
+$fakeManager = $objectManager->get(CustomLayoutManager::class);
+$layoutRepo = $objectManager->create(PageModel\CustomLayoutRepositoryInterface::class, ['manager' => $fakeManager]);
+
+/** @var PageModel $page */
+$page = $pageFactory->create(['customLayoutRepository' => $layoutRepo]);
+$page->setIdentifier('test_custom_layout_page_1');
+$page->setTitle('Test Page');
+$page->setCustomLayoutUpdateXml('<container />');
+$page->setLayoutUpdateXml('<container />');
+$page->setIsActive(true);
+$page->setStoreId(0);
+$page->save();
+/** @var PageModel $page2 */
+$page2 = $pageFactory->create(['customLayoutRepository' => $layoutRepo]);
+$page2->setIdentifier('test_custom_layout_page_2');
+$page2->setTitle('Test Page 2');
+$page->setIsActive(true);
+$page->setStoreId(0);
+$page2->save();
+/** @var PageModel $page3 */
+$page3 = $pageFactory->create(['customLayoutRepository' => $layoutRepo]);
+$page3->setIdentifier('test_custom_layout_page_3');
+$page3->setTitle('Test Page 3');
+$page3->setStores([0]);
+$page3->setIsActive(1);
+$page3->setContent('<h1>Test Page</h1>');
+$page3->setPageLayout('1column');
+$page3->save();
+$fakeManager->fakeAvailableFiles((int)$page3->getId(), ['test_selected']);
+$page3->setData('layout_update_selected', 'test_selected');
+$page3->save();
diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/pages_with_layout_xml_rollback.php b/dev/tests/integration/testsuite/Magento/Cms/_files/pages_with_layout_xml_rollback.php
new file mode 100644
index 0000000000000..3217b94d7392b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/pages_with_layout_xml_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\Cms\Model\Page as PageModel;
+use Magento\Cms\Model\PageFactory as PageModelFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$pageFactory = $objectManager->get(PageModelFactory::class);
+/** @var PageModel $page */
+$page = $pageFactory->create();
+$page->load('test_custom_layout_page_1', PageModel::IDENTIFIER);
+if ($page->getId()) {
+    $page->delete();
+}
+/** @var PageModel $page2 */
+$page2 = $pageFactory->create();
+$page2->load('test_custom_layout_page_2', PageModel::IDENTIFIER);
+if ($page2->getId()) {
+    $page2->delete();
+}
+/** @var PageModel $page3 */
+$page3 = $pageFactory->create();
+$page3->load('test_custom_layout_page_3', PageModel::IDENTIFIER);
+if ($page3->getId()) {
+    $page3->delete();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml
index f473af1bce37c..5b482e2a61ed0 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Structure/Reader/_files/config.xml
@@ -13,7 +13,7 @@
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                 <field id="merchant_country" type="select" translate="label comment" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Merchant Country</label>
-                    <comment>If not specified, Default Country from General Config will be used</comment>
+                    <comment>If not specified, Default Country from General Config will be used.</comment>
                     <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Country</frontend_model>
                     <source_model>Magento\Paypal\Model\System\Config\Source\MerchantCountry</source_model>
                     <backend_model>Magento\Paypal\Model\System\Config\Backend\MerchantCountry</backend_model>
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 78fa4733a2562..0d2043434d359 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
@@ -254,6 +254,33 @@ public function testGetUsedProducts()
         }
     }
 
+    /**
+     * Tests the $requiredAttributes parameter; uses meta_description as an example of an attribute that is not
+     * included in default attribute select.
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable_with_metadescription.php
+     */
+    public function testGetUsedProductsWithRequiredAttributes()
+    {
+        $requiredAttributeIds = [86];
+        $products = $this->model->getUsedProducts($this->product, $requiredAttributeIds);
+        foreach ($products as $product) {
+            self::assertNotNull($product->getData('meta_description'));
+        }
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable_with_metadescription.php
+     */
+    public function testGetUsedProductsWithoutRequiredAttributes()
+    {
+        $products = $this->model->getUsedProducts($this->product);
+        foreach ($products as $product) {
+            self::assertNull($product->getData('meta_description'));
+        }
+    }
+
     /**
      * Test getUsedProducts returns array with same indexes regardless collections was cache or not.
      *
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_metadescription.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_metadescription.php
new file mode 100644
index 0000000000000..d0afeeaf19fe8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_metadescription.php
@@ -0,0 +1,145 @@
+<?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\ConfigurableProduct\Helper\Product\Options\Factory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize();
+
+require __DIR__ . '/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');
+$associatedProductIds = [];
+$productIds = [10, 20];
+array_shift($options); //remove the first option which is empty
+
+foreach ($options as $option) {
+    /** @var $product Product */
+    $product = Bootstrap::getObjectManager()->create(Product::class);
+    $productId = array_shift($productIds);
+    $product->setTypeId(Type::TYPE_SIMPLE)
+        ->setId($productId)
+        ->setAttributeSetId($attributeSetId)
+        ->setWebsiteIds([1])
+        ->setName('Configurable Option' . $option->getLabel())
+        ->setSku('simple_' . $productId)
+        ->setPrice($productId)
+        ->setTestConfigurable($option->getValue())
+        ->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE)
+        ->setStatus(Status::STATUS_ENABLED)
+        ->setMetaDescription('meta_description' . $productId)
+        ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+
+    $product = $productRepository->save($product);
+
+    /** @var \Magento\CatalogInventory\Model\Stock\Item $stockItem */
+    $stockItem = Bootstrap::getObjectManager()->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();
+}
+
+/** @var $product Product */
+$product = 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 = $product->getExtensionAttributes();
+$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
+$extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
+
+$product->setExtensionAttributes($extensionConfigurableAttributes);
+
+// Remove any previously created product with the same id.
+/** @var \Magento\Framework\Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+try {
+    $productToDelete = $productRepository->getById(1);
+    $productRepository->delete($productToDelete);
+
+    /** @var \Magento\Quote\Model\ResourceModel\Quote\Item $itemResource */
+    $itemResource = Bootstrap::getObjectManager()->get(\Magento\Quote\Model\ResourceModel\Quote\Item::class);
+    $itemResource->getConnection()->delete(
+        $itemResource->getMainTable(),
+        'product_id = ' . $productToDelete->getId()
+    );
+} catch (\Exception $e) {
+    // Nothing to remove
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+$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->save($product);
+
+/** @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/ConfigurableProduct/_files/product_configurable_with_metadescription_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_metadescription_rollback.php
new file mode 100644
index 0000000000000..21953dea6f587
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_metadescription_rollback.php
@@ -0,0 +1,39 @@
+<?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);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+foreach (['simple_10', 'simple_20', '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
+    }
+}
+
+require __DIR__ . '/configurable_attribute_rollback.php';
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CspTest.php b/dev/tests/integration/testsuite/Magento/Csp/CspTest.php
new file mode 100644
index 0000000000000..e66c6af36e42c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Csp/CspTest.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp;
+
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * Test CSP being rendered when Magento processes an HTTP request.
+ */
+class CspTest extends AbstractController
+{
+    /**
+     * Search the whole response for a string.
+     *
+     * @param \Magento\Framework\App\ResponseInterface|\Magento\Framework\App\Response\Http $response
+     * @param string $search
+     * @return bool
+     */
+    private function searchInResponse($response, string $search): bool
+    {
+        if (mb_stripos(mb_strtolower($response->getBody()), mb_strtolower($search)) !== false) {
+            return true;
+        }
+
+        foreach ($response->getHeaders() as $header) {
+            if (mb_stripos(mb_strtolower($header->toString()), mb_strtolower($search)) !== false) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check that configured policies are rendered on frontend.
+     *
+     * @magentoAppArea frontend
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/policy_id default-src
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/hosts/example http://magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/hosts/example2 http://devdocs.magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/script_src/policy_id script-src
+     * @magentoConfigFixture default_store csp/policies/storefront/script_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/script_src/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/script_src/inline 1
+     * @magentoConfigFixture default_store csp/policies/admin/font_src/policy_id font-src
+     * @magentoConfigFixture default_store csp/policies/admin/font_src/none 0
+     * @magentoConfigFixture default_store csp/policies/admin/font_src/self 1
+     * @return void
+     */
+    public function testStorefrontPolicies(): void
+    {
+        $this->dispatch('/');
+        $response = $this->getResponse();
+
+        $this->assertTrue($this->searchInResponse($response, 'Content-Security-Policy'));
+        $this->assertTrue($this->searchInResponse($response, 'default-src'));
+        $this->assertTrue($this->searchInResponse($response, 'http://magento.com'));
+        $this->assertTrue($this->searchInResponse($response, 'http://devdocs.magento.com'));
+        $this->assertTrue($this->searchInResponse($response, '\'self\''));
+        $this->assertFalse($this->searchInResponse($response, '\'none\''));
+        $this->assertTrue($this->searchInResponse($response, 'script-src'));
+        $this->assertTrue($this->searchInResponse($response, '\'unsafe-inline\''));
+        $this->assertFalse($this->searchInResponse($response, 'font-src'));
+        //Policies configured in cps_whitelist.xml files
+        $this->assertTrue($this->searchInResponse($response, 'object-src'));
+        $this->assertTrue($this->searchInResponse($response, 'media-src'));
+    }
+
+    /**
+     * Check that configured policies are rendered on backend.
+     *
+     * @magentoAppArea adminhtml
+     * @magentoConfigFixture default_store csp/policies/admin/default_src/policy_id default-src
+     * @magentoConfigFixture default_store csp/policies/admin/default_src/none 0
+     * @magentoConfigFixture default_store csp/policies/admin/default_src/hosts/example http://magento.com
+     * @magentoConfigFixture default_store csp/policies/admin/default_src/hosts/example2 http://devdocs.magento.com
+     * @magentoConfigFixture default_store csp/policies/admin/default_src/self 1
+     * @magentoConfigFixture default_store csp/policies/admin/script_src/policy_id script-src
+     * @magentoConfigFixture default_store csp/policies/admin/script_src/none 0
+     * @magentoConfigFixture default_store csp/policies/admin/default_src/self 1
+     * @magentoConfigFixture default_store csp/policies/admin/default_src/inline 1
+     * @magentoConfigFixture default_store csp/policies/storefront/font_src/policy_id font-src
+     * @magentoConfigFixture default_store csp/policies/storefront/font_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/font_src/self 1
+     * @return void
+     */
+    public function testAdminPolicies(): void
+    {
+        $this->dispatch('backend/');
+        $response = $this->getResponse();
+
+        $this->assertTrue($this->searchInResponse($response, 'Content-Security-Policy'));
+        $this->assertTrue($this->searchInResponse($response, 'default-src'));
+        $this->assertTrue($this->searchInResponse($response, 'http://magento.com'));
+        $this->assertTrue($this->searchInResponse($response, 'http://devdocs.magento.com'));
+        $this->assertTrue($this->searchInResponse($response, '\'self\''));
+        $this->assertFalse($this->searchInResponse($response, '\'none\''));
+        $this->assertTrue($this->searchInResponse($response, 'script-src'));
+        $this->assertTrue($this->searchInResponse($response, '\'unsafe-inline\''));
+        $this->assertFalse($this->searchInResponse($response, 'font-src'));
+    }
+
+    /**
+     * Check that CSP mode is considered when rendering policies.
+     *
+     * @magentoAppArea frontend
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/policy_id default-src
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/hosts/example http://magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/hosts/example2 http://devdocs.magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/self 1
+     * @magentoConfigFixture default_store csp/mode/storefront/report_only 1
+     * @magentoConfigFixture default_store csp/mode/storefront/report_uri /cspEndpoint/
+     * @magentoConfigFixture default_store csp/mode/admin/report_only 0
+     * @return void
+     */
+    public function testReportOnlyMode(): void
+    {
+        $this->dispatch('/');
+        $response = $this->getResponse();
+
+        $this->assertTrue($this->searchInResponse($response, 'Content-Security-Policy-Report-Only'));
+        $this->assertTrue($this->searchInResponse($response, '/cspEndpoint/'));
+        $this->assertTrue($this->searchInResponse($response, 'default-src'));
+        $this->assertTrue($this->searchInResponse($response, 'http://magento.com'));
+        $this->assertTrue($this->searchInResponse($response, 'http://devdocs.magento.com'));
+        $this->assertTrue($this->searchInResponse($response, '\'self\''));
+    }
+
+    /**
+     * Check that CSP reporting options are rendered for 'restrict' mode as well.
+     *
+     * @magentoAppArea frontend
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/policy_id default-src
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/hosts/example http://magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/hosts/example2 http://devdocs.magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/self 1
+     * @magentoConfigFixture default_store csp/mode/storefront/report_only 0
+     * @magentoConfigFixture default_store csp/mode/storefront/report_uri /cspEndpoint/
+     * @magentoConfigFixture default_store csp/mode/admin/report_only 0
+     * @return void
+     */
+    public function testRestrictMode(): void
+    {
+        $this->dispatch('/');
+        $response = $this->getResponse();
+
+        $this->assertFalse($this->searchInResponse($response, 'Content-Security-Policy-Report-Only'));
+        $this->assertTrue($this->searchInResponse($response, 'Content-Security-Policy'));
+        $this->assertTrue($this->searchInResponse($response, '/cspEndpoint/'));
+        $this->assertTrue($this->searchInResponse($response, 'default-src'));
+        $this->assertTrue($this->searchInResponse($response, 'http://magento.com'));
+        $this->assertTrue($this->searchInResponse($response, 'http://devdocs.magento.com'));
+        $this->assertTrue($this->searchInResponse($response, '\'self\''));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ConfigCollectorTest.php b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ConfigCollectorTest.php
new file mode 100644
index 0000000000000..6d8876012df1e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ConfigCollectorTest.php
@@ -0,0 +1,186 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+use Magento\Csp\Model\Policy\FetchPolicy;
+use Magento\Csp\Model\Policy\FlagPolicy;
+use Magento\Csp\Model\Policy\PluginTypesPolicy;
+use Magento\Csp\Model\Policy\SandboxPolicy;
+use PHPUnit\Framework\TestCase;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test collecting policies from Magento config.
+ */
+class ConfigCollectorTest extends TestCase
+{
+    /**
+     * @var ConfigCollector
+     */
+    private $collector;
+
+    /**
+     * @inheritDoc
+     */
+    public function setUp()
+    {
+        $this->collector = Bootstrap::getObjectManager()->get(ConfigCollector::class);
+    }
+
+    /**
+     * Create expected policy objects.
+     *
+     * @return PolicyInterface[]
+     */
+    private function getExpectedPolicies(): array
+    {
+        return [
+            'child-src' => new FetchPolicy(
+                'child-src',
+                false,
+                ['http://magento.com', 'http://devdocs.magento.com'],
+                ['http'],
+                true,
+                true,
+                false,
+                [],
+                [],
+                true
+            ),
+            'child-src2' => new FetchPolicy('child-src', false, [], [], false, false, true),
+            'connect-src' => new FetchPolicy('connect-src'),
+            'default-src' => new FetchPolicy(
+                'default-src',
+                false,
+                ['http://magento.com', 'http://devdocs.magento.com'],
+                [],
+                true
+            ),
+            'font-src' => new FetchPolicy('font-src', false, [], [], true),
+            'frame-src' => new FetchPolicy('frame-src', false, [], [], true, false, false, [], [], true),
+            'img-src' => new FetchPolicy('img-src', false, [], [], true),
+            'manifest-src' => new FetchPolicy('manifest-src', false, [], [], true),
+            'media-src' => new FetchPolicy('media-src', false, [], [], true),
+            'object-src' => new FetchPolicy('object-src', false, [], [], true),
+            'script-src' => new FetchPolicy('script-src', false, [], [], true, false, false, [], [], false, true),
+            'style-src' => new FetchPolicy('style-src', false, [], [], true),
+            'base-uri' => new FetchPolicy('base-uri', false, [], [], true),
+            'plugin-types' => new PluginTypesPolicy(
+                ['application/x-shockwave-flash', 'application/x-java-applet']
+            ),
+            'sandbox' => new SandboxPolicy(true, true, true, true, false, false, true, true, true, true, true),
+            'form-action' => new FetchPolicy('form-action', false, [], [], true),
+            'frame-ancestors' => new FetchPolicy('frame-ancestors', false, [], [], true),
+            'block-all-mixed-content' => new FlagPolicy('block-all-mixed-content'),
+            'upgrade-insecure-requests' => new FlagPolicy('upgrade-insecure-requests')
+        ];
+    }
+
+    /**
+     * Test initiating policies from config.
+     *
+     * @magentoAppArea frontend
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/policy_id default-src
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/hosts/example http://magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/hosts/example2 http://devdocs.magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/default_src/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/child_src/policy_id child-src
+     * @magentoConfigFixture default_store csp/policies/storefront/child_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/child_src/hosts/example http://magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/child_src/hosts/example2 http://devdocs.magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/child_src/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/child_src/inline 1
+     * @magentoConfigFixture default_store csp/policies/storefront/child_src/schemes/scheme1 http
+     * @magentoConfigFixture default_store csp/policies/storefront/child_src/dynamic 1
+     * @magentoConfigFixture default_store csp/policies/storefront/child_src2/policy_id child-src
+     * @magentoConfigFixture default_store csp/policies/storefront/child_src2/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/child_src2/eval 1
+     * @magentoConfigFixture default_store csp/policies/storefront/connect_src/policy_id connect-src
+     * @magentoConfigFixture default_store csp/policies/storefront/connect_src/none 1
+     * @magentoConfigFixture default_store csp/policies/storefront/font_src/policy_id font-src
+     * @magentoConfigFixture default_store csp/policies/storefront/font_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/font_src/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/frame_src/policy_id frame-src
+     * @magentoConfigFixture default_store csp/policies/storefront/frame_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/frame_src/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/frame_src/dynamic 1
+     * @magentoConfigFixture default_store csp/policies/storefront/img_src/policy_id img-src
+     * @magentoConfigFixture default_store csp/policies/storefront/img_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/img_src/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/manifest_src/policy_id manifest-src
+     * @magentoConfigFixture default_store csp/policies/storefront/manifest_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/manifest_src/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/media_src/policy_id media-src
+     * @magentoConfigFixture default_store csp/policies/storefront/media_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/media_src/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/object_src/policy_id object-src
+     * @magentoConfigFixture default_store csp/policies/storefront/object_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/object_src/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/script_src/policy_id script-src
+     * @magentoConfigFixture default_store csp/policies/storefront/script_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/script_src/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/script_src/event_handlers 1
+     * @magentoConfigFixture default_store csp/policies/storefront/base_uri/policy_id base-uri
+     * @magentoConfigFixture default_store csp/policies/storefront/base_uri/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/base_uri/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/style_src/policy_id style-src
+     * @magentoConfigFixture default_store csp/policies/storefront/style_src/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/style_src/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/form_action/policy_id form-action
+     * @magentoConfigFixture default_store csp/policies/storefront/form_action/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/form_action/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/frame_ancestors/policy_id frame-ancestors
+     * @magentoConfigFixture default_store csp/policies/storefront/frame_ancestors/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/frame_ancestors/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/plugin_types/policy_id plugin-types
+     * @magentoConfigFixture default_store csp/policies/storefront/plugin_types/types/fl application/x-shockwave-flash
+     * @magentoConfigFixture default_store csp/policies/storefront/plugin_types/types/applet application/x-java-applet
+     * @magentoConfigFixture default_store csp/policies/storefront/sandbox/policy_id sandbox
+     * @magentoConfigFixture default_store csp/policies/storefront/sandbox/forms 1
+     * @magentoConfigFixture default_store csp/policies/storefront/sandbox/modals 1
+     * @magentoConfigFixture default_store csp/policies/storefront/sandbox/orientation 1
+     * @magentoConfigFixture default_store csp/policies/storefront/sandbox/pointer 1
+     * @magentoConfigFixture default_store csp/policies/storefront/sandbox/popup 0
+     * @magentoConfigFixture default_store csp/policies/storefront/sandbox/popups_to_escape 0
+     * @magentoConfigFixture default_store csp/policies/storefront/sandbox/presentation 1
+     * @magentoConfigFixture default_store csp/policies/storefront/sandbox/same_origin 1
+     * @magentoConfigFixture default_store csp/policies/storefront/sandbox/scripts 1
+     * @magentoConfigFixture default_store csp/policies/storefront/sandbox/navigation 1
+     * @magentoConfigFixture default_store csp/policies/storefront/sandbox/navigation_by_user 1
+     * @magentoConfigFixture default_store csp/policies/storefront/mixed_content/policy_id block-all-mixed-content
+     * @magentoConfigFixture default_store csp/policies/storefront/upgrade/policy_id upgrade-insecure-requests
+     * @return void
+     */
+    public function testCollecting(): void
+    {
+        $policies = $this->collector->collect([new FlagPolicy('upgrade-insecure-requests')]);
+        $checked = [];
+        $expectedPolicies = $this->getExpectedPolicies();
+
+        //Policies were collected
+        $this->assertNotEmpty($policies);
+        //Default policies are being kept
+        /** @var PolicyInterface $defaultPolicy */
+        $defaultPolicy = array_shift($policies);
+        $this->assertEquals('upgrade-insecure-requests', $defaultPolicy->getId());
+        //Comparing collected with configured
+        /** @var PolicyInterface $policy */
+        foreach ($policies as $policy) {
+            $id = $policy->getId();
+            if ($id === 'child-src' && $policy->isEvalAllowed()) {
+                $id = 'child-src2';
+            }
+            $this->assertEquals($expectedPolicies[$id], $policy);
+            $checked[] = $id;
+        }
+        $expectedIds = array_keys($expectedPolicies);
+        $this->assertEquals(sort($expectedIds), sort($checked));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/CspWhitelistXmlCollectorTest.php b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/CspWhitelistXmlCollectorTest.php
new file mode 100644
index 0000000000000..bbaabba9dd268
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/CspWhitelistXmlCollectorTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector;
+
+use Magento\Csp\Model\Policy\FetchPolicy;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test collecting csp_whitelist configurations.
+ */
+class CspWhitelistXmlCollectorTest extends TestCase
+{
+    /**
+     * @var CspWhitelistXmlCollector
+     */
+    private $collector;
+
+    /**
+     * @inheritDoc
+     */
+    public function setUp()
+    {
+        $this->collector = Bootstrap::getObjectManager()->get(CspWhitelistXmlCollector::class);
+    }
+
+    /**
+     * Test collecting configurations from multiple XML files.
+     *
+     * @return void
+     */
+    public function testCollecting(): void
+    {
+        $policies = $this->collector->collect([]);
+
+        $mediaSrcChecked = false;
+        $objectSrcChecked = false;
+        $this->assertNotEmpty($policies);
+        /** @var FetchPolicy $policy */
+        foreach ($policies as $policy) {
+            $this->assertFalse($policy->isNoneAllowed());
+            $this->assertFalse($policy->isSelfAllowed());
+            $this->assertFalse($policy->isInlineAllowed());
+            $this->assertFalse($policy->isEvalAllowed());
+            $this->assertFalse($policy->isDynamicAllowed());
+            $this->assertEmpty($policy->getSchemeSources());
+            $this->assertEmpty($policy->getNonceValues());
+            if ($policy->getId() === 'object-src') {
+                $this->assertInstanceOf(FetchPolicy::class, $policy);
+                $this->assertEquals(['http://magento.com', 'https://devdocs.magento.com'], $policy->getHostSources());
+                $this->assertEquals(['B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=' => 'sha256'], $policy->getHashes());
+                $objectSrcChecked = true;
+            } elseif ($policy->getId() === 'media-src') {
+                $this->assertInstanceOf(FetchPolicy::class, $policy);
+                $this->assertEquals(['https://magento.com', 'https://devdocs.magento.com'], $policy->getHostSources());
+                $this->assertEmpty($policy->getHashes());
+                $mediaSrcChecked = true;
+            }
+        }
+        $this->assertTrue($objectSrcChecked);
+        $this->assertTrue($mediaSrcChecked);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Model/CompositePolicyCollectorTest.php b/dev/tests/integration/testsuite/Magento/Csp/Model/CompositePolicyCollectorTest.php
new file mode 100644
index 0000000000000..fd0c58235de1d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Csp/Model/CompositePolicyCollectorTest.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model;
+
+use Magento\Csp\Api\PolicyCollectorInterface;
+use Magento\Csp\Model\Policy\FetchPolicy;
+use Magento\Csp\Model\Policy\FlagPolicy;
+use Magento\Csp\Model\Policy\PluginTypesPolicy;
+use Magento\Csp\Model\Policy\SandboxPolicy;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test that composite collector properly calls other collectors and merges results.
+ */
+class CompositePolicyCollectorTest extends TestCase
+{
+    /**
+     * Create mock collectors that will populate policies.
+     *
+     * @return PolicyCollectorInterface[]
+     */
+    private function createMockCollectors(): array
+    {
+        $mockCollector1 = $this->getMockForAbstractClass(PolicyCollectorInterface::class);
+        $mockCollector1->method('collect')
+            ->willReturnCallback(
+                function (array $prevPolicies) {
+                    return array_merge(
+                        $prevPolicies,
+                        [
+                            new FetchPolicy(
+                                'script-src',
+                                false,
+                                ['https://magento.com'],
+                                ['https'],
+                                true,
+                                false,
+                                true,
+                                ['569403695046645'],
+                                ['B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=' => 'sha256'],
+                                false,
+                                true
+                            ),
+                            new FetchPolicy('script-src', false, ['https://devdocs.magento.com']),
+                            new FlagPolicy('upgrade-insecure-requests'),
+                            new PluginTypesPolicy(['application/x-shockwave-flash']),
+                            new SandboxPolicy(false, true, false, true, false, true, false, true, false, true, false)
+                        ]
+                    );
+                }
+            );
+        $mockCollector2 = $this->getMockForAbstractClass(PolicyCollectorInterface::class);
+        $mockCollector2->method('collect')
+            ->willReturnCallback(
+                function (array $prevPolicies) {
+                    return array_merge(
+                        $prevPolicies,
+                        [
+                            new FetchPolicy(
+                                'script-src',
+                                true,
+                                ['http://magento.com'],
+                                ['http'],
+                                false,
+                                false,
+                                false,
+                                ['5694036950466451'],
+                                ['B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF7=' => 'sha256'],
+                                true,
+                                false
+                            ),
+                            new FetchPolicy('default-src', false, [], [], true),
+                            new FlagPolicy('upgrade-insecure-requests'),
+                            new PluginTypesPolicy(['application/x-java-applet']),
+                            new SandboxPolicy(true, false, true, false, true, false, true, false, true, false, false)
+                        ]
+                    );
+                }
+            );
+
+        return [$mockCollector1, $mockCollector2];
+    }
+
+    /**
+     * Test collect method.
+     *
+     * Supply fake collectors, check results.
+     *
+     * @return void
+     */
+    public function testCollect(): void
+    {
+        /** @var CompositePolicyCollector $collector */
+        $collector = Bootstrap::getObjectManager()->create(
+            CompositePolicyCollector::class,
+            ['collectors' => $this->createMockCollectors()]
+        );
+
+        $collected = $collector->collect([]);
+        /** @var FetchPolicy[]|FlagPolicy[]|PluginTypesPolicy[]|SandboxPolicy[] $policies */
+        $policies = [];
+        /** @var \Magento\Csp\Api\Data\PolicyInterface $policy */
+        foreach ($collected as $policy) {
+            $policies[$policy->getId()] = $policy;
+        }
+        //Comparing resulting policies
+        $this->assertArrayHasKey('script-src', $policies);
+        $this->assertTrue($policies['script-src']->isNoneAllowed());
+        $this->assertTrue($policies['script-src']->isSelfAllowed());
+        $this->assertFalse($policies['script-src']->isInlineAllowed());
+        $this->assertTrue($policies['script-src']->isEvalAllowed());
+        $this->assertTrue($policies['script-src']->isDynamicAllowed());
+        $this->assertTrue($policies['script-src']->areEventHandlersAllowed());
+        $foundHosts = $policies['script-src']->getHostSources();
+        $hosts = ['http://magento.com', 'https://magento.com', 'https://devdocs.magento.com'];
+        sort($foundHosts);
+        sort($hosts);
+        $this->assertEquals($hosts, $foundHosts);
+        $foundSchemes = $policies['script-src']->getSchemeSources();
+        $schemes = ['https', 'http'];
+        sort($foundSchemes);
+        sort($schemes);
+        $this->assertEquals($schemes, $foundSchemes);
+        $foundNonceValues = $policies['script-src']->getNonceValues();
+        $nonceValues = ['5694036950466451', '569403695046645'];
+        sort($foundNonceValues);
+        sort($nonceValues);
+        $this->assertEquals($nonceValues, $foundNonceValues);
+        $foundHashes = $policies['script-src']->getHashes();
+        $hashes = [
+            'B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF7=' => 'sha256',
+            'B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=' => 'sha256'
+        ];
+        $this->assertEquals($hashes, $foundHashes);
+
+        $this->assertArrayHasKey('default-src', $policies);
+        $this->assertFalse($policies['default-src']->isNoneAllowed());
+        $this->assertTrue($policies['default-src']->isSelfAllowed());
+        $this->assertFalse($policies['default-src']->isInlineAllowed());
+        $this->assertFalse($policies['default-src']->isEvalAllowed());
+        $this->assertFalse($policies['default-src']->isDynamicAllowed());
+        $this->assertFalse($policies['default-src']->areEventHandlersAllowed());
+        $this->assertEmpty($policies['default-src']->getHashes());
+        $this->assertEmpty($policies['default-src']->getNonceValues());
+        $this->assertEmpty($policies['default-src']->getHostSources());
+        $this->assertEmpty($policies['default-src']->getSchemeSources());
+
+        $this->assertArrayHasKey('upgrade-insecure-requests', $policies);
+        $this->assertInstanceOf(FlagPolicy::class, $policies['upgrade-insecure-requests']);
+
+        $this->assertArrayHasKey('plugin-types', $policies);
+        $types = ['application/x-java-applet', 'application/x-shockwave-flash'];
+        $foundTypes = $policies['plugin-types']->getTypes();
+        sort($types);
+        sort($foundTypes);
+        $this->assertEquals($types, $foundTypes);
+
+        $this->assertArrayHasKey('sandbox', $policies);
+        $this->assertTrue($policies['sandbox']->isFormAllowed());
+        $this->assertTrue($policies['sandbox']->isModalsAllowed());
+        $this->assertTrue($policies['sandbox']->isOrientationLockAllowed());
+        $this->assertTrue($policies['sandbox']->isPointerLockAllowed());
+        $this->assertTrue($policies['sandbox']->isPopupsAllowed());
+        $this->assertTrue($policies['sandbox']->isPopupsToEscapeSandboxAllowed());
+        $this->assertTrue($policies['sandbox']->isScriptsAllowed());
+        $this->assertFalse($policies['sandbox']->isTopNavigationByUserActivationAllowed());
+        $this->assertTrue($policies['sandbox']->isTopNavigationAllowed());
+        $this->assertTrue($policies['sandbox']->isSameOriginAllowed());
+        $this->assertTrue($policies['sandbox']->isPresentationAllowed());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Model/Mode/ConfigManagerTest.php b/dev/tests/integration/testsuite/Magento/Csp/Model/Mode/ConfigManagerTest.php
new file mode 100644
index 0000000000000..44790ef9dbc94
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Csp/Model/Mode/ConfigManagerTest.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Mode;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test config manager.
+ */
+class ConfigManagerTest extends TestCase
+{
+    /**
+     * @var ConfigManager
+     */
+    private $manager;
+
+    /**
+     * @inheritDoc
+     */
+    public function setUp()
+    {
+        $this->manager = Bootstrap::getObjectManager()->get(ConfigManager::class);
+    }
+
+    /**
+     * Check the default configurations of CSP.
+     *
+     * @magentoAppArea frontend
+     * @return void
+     */
+    public function testStorefrontDefault(): void
+    {
+        $config = $this->manager->getConfigured();
+        $this->assertTrue($config->isReportOnly());
+        $this->assertNull($config->getReportUri());
+    }
+
+    /**
+     * Check the default configurations of CSP.
+     *
+     * @magentoAppArea adminhtml
+     * @return void
+     */
+    public function testAdminDefault(): void
+    {
+        $config = $this->manager->getConfigured();
+        $this->assertTrue($config->isReportOnly());
+        $this->assertNull($config->getReportUri());
+    }
+
+    /**
+     * Check that class returns correct configurations.
+     *
+     * @magentoAppArea frontend
+     * @magentoConfigFixture default_store csp/mode/storefront/report_only 0
+     * @magentoConfigFixture default_store csp/mode/storefront/report_uri https://magento.com
+     * @return void
+     */
+    public function testFrontendConfigured(): void
+    {
+        $config = $this->manager->getConfigured();
+        $this->assertFalse($config->isReportOnly());
+        $this->assertEquals('https://magento.com', $config->getReportUri());
+    }
+
+    /**
+     * Check that class returns correct configurations.
+     *
+     * @magentoAppArea adminhtml
+     * @magentoConfigFixture default_store csp/mode/admin/report_only 0
+     * @magentoConfigFixture default_store csp/mode/admin/report_uri https://magento.com
+     * @return void
+     */
+    public function testAdminConfigured(): void
+    {
+        $config = $this->manager->getConfigured();
+        $this->assertFalse($config->isReportOnly());
+        $this->assertEquals('https://magento.com', $config->getReportUri());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRendererTest.php b/dev/tests/integration/testsuite/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRendererTest.php
new file mode 100644
index 0000000000000..a67665c6d3c48
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRendererTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Policy\Renderer;
+
+use Magento\Csp\Model\Policy\FetchPolicy;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\App\Response\Http as HttpResponse;
+
+/**
+ * Test that rendering policies via headers works.
+ */
+class SimplePolicyHeaderRendererTest extends TestCase
+{
+    /**
+     * @var SimplePolicyHeaderRenderer
+     */
+    private $renderer;
+
+    /**
+     * @var HttpResponse
+     */
+    private $response;
+
+    /**
+     * @inheritDoc
+     */
+    public function setUp()
+    {
+        $this->renderer = Bootstrap::getObjectManager()->get(SimplePolicyHeaderRenderer::class);
+        $this->response = Bootstrap::getObjectManager()->create(HttpResponse::class);
+    }
+
+    /**
+     * Test policy rendering in restrict mode.
+     *
+     * @magentoAppArea frontend
+     * @magentoConfigFixture default_store csp/mode/storefront/report_only 0
+     * @magentoConfigFixture default_store csp/mode/storefront/report_uri 0
+     *
+     * @return void
+     */
+    public function testRenderRestrictMode(): void
+    {
+        $policy = new FetchPolicy('default-src', false, ['https://magento.com'], [], true);
+
+        $this->renderer->render($policy, $this->response);
+
+        $this->assertNotEmpty($header = $this->response->getHeader('Content-Security-Policy'));
+        $this->assertEmpty($this->response->getHeader('Content-Security-Policy-Report-Only'));
+        $this->assertEquals('default-src https://magento.com \'self\';', $header->getFieldValue());
+    }
+
+    /**
+     * Test policy rendering in restrict mode with report URL provided.
+     *
+     * @magentoAppArea frontend
+     * @magentoConfigFixture default_store csp/mode/storefront/report_only 0
+     * @magentoConfigFixture default_store csp/mode/storefront/report_uri /csp-reports/
+     *
+     * @return void
+     */
+    public function testRenderRestrictWithReportingMode(): void
+    {
+        $policy = new FetchPolicy('default-src', false, ['https://magento.com'], [], true);
+
+        $this->renderer->render($policy, $this->response);
+
+        $this->assertNotEmpty($header = $this->response->getHeader('Content-Security-Policy'));
+        $this->assertEmpty($this->response->getHeader('Content-Security-Policy-Report-Only'));
+        $this->assertEquals(
+            'default-src https://magento.com \'self\'; report-uri /csp-reports/; report-to report-endpoint;',
+            $header->getFieldValue()
+        );
+        $this->assertNotEmpty($reportToHeader = $this->response->getHeader('Report-To'));
+        $this->assertNotEmpty($reportData = json_decode("[{$reportToHeader->getFieldValue()}]", true));
+        $this->assertEquals('report-endpoint', $reportData[0]['group']);
+    }
+
+    /**
+     * Test policy rendering in report-only mode.
+     *
+     * @magentoAppArea frontend
+     * @magentoConfigFixture default_store csp/mode/storefront/report_only 1
+     * @magentoConfigFixture default_store csp/mode/storefront/report_uri 0
+     *
+     * @return void
+     */
+    public function testRenderReportMode(): void
+    {
+        $policy = new FetchPolicy(
+            'default-src',
+            false,
+            ['https://magento.com'],
+            ['https'],
+            true,
+            true,
+            true,
+            ['5749837589457695'],
+            ['B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=' => 'sha256'],
+            true,
+            true
+        );
+
+        $this->renderer->render($policy, $this->response);
+
+        $this->assertNotEmpty($header = $this->response->getHeader('Content-Security-Policy-Report-Only'));
+        $this->assertEmpty($this->response->getHeader('Content-Security-Policy'));
+        $this->assertEquals(
+            'default-src https://magento.com https: \'self\' \'unsafe-inline\' \'unsafe-eval\' \'strict-dynamic\''
+            . ' \'unsafe-hashes\' \'nonce-'.base64_encode($policy->getNonceValues()[0]).'\''
+            . ' \'sha256-B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=\';',
+            $header->getFieldValue()
+        );
+    }
+
+    /**
+     * Test policy rendering in report-only mode with report URL provided.
+     *
+     * @magentoAppArea frontend
+     * @magentoConfigFixture default_store csp/mode/storefront/report_only 1
+     * @magentoConfigFixture default_store csp/mode/storefront/report_uri /csp-reports/
+     *
+     * @return void
+     */
+    public function testRenderReportWithReportingMode(): void
+    {
+        $policy = new FetchPolicy('default-src', false, ['https://magento.com'], [], true);
+
+        $this->renderer->render($policy, $this->response);
+
+        $this->assertNotEmpty($header = $this->response->getHeader('Content-Security-Policy-Report-Only'));
+        $this->assertEmpty($this->response->getHeader('Content-Security-Policy'));
+        $this->assertEquals(
+            'default-src https://magento.com \'self\'; report-uri /csp-reports/; report-to report-endpoint;',
+            $header->getFieldValue()
+        );
+        $this->assertNotEmpty($reportToHeader = $this->response->getHeader('Report-To'));
+        $this->assertNotEmpty($reportData = json_decode("[{$reportToHeader->getFieldValue()}]", true));
+        $this->assertEquals('report-endpoint', $reportData[0]['group']);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/AddressTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/AddressTest.php
index b159dceadfb77..c5b76807f1ff9 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/AddressTest.php
@@ -69,7 +69,7 @@ public function testGetCustomer()
 
     public function testGetCustomerMissingCustomer()
     {
-        $moduleManager = $this->objectManager->get(\Magento\Framework\Module\ModuleManagerInterface::class);
+        $moduleManager = $this->objectManager->get(\Magento\Framework\Module\Manager::class);
         if ($moduleManager->isEnabled('Magento_PageCache')) {
             $customerDataFactory = $this->objectManager->create(
                 \Magento\Customer\Api\Data\CustomerInterfaceFactory::class
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 e28a9602b9377..9ddba4b994b40 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
@@ -9,7 +9,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
- * Class NewsletterTest
+ * Test Customer account form block functionality
  *
  * @magentoAppArea adminhtml
  */
@@ -61,12 +61,13 @@ public function tearDown()
      */
     public function testRenderingNewsletterBlock()
     {
+        $websiteId = 1;
         $this->getRequest()->setParam('id', 1);
         $this->dispatch('backend/customer/index/edit');
         $body = $this->getResponse()->getBody();
 
         $this->assertContains('\u003Cspan\u003ENewsletter Information\u003C\/span\u003E', $body);
-        $this->assertContains('\u003Cinput id=\"_newslettersubscription\"', $body);
+        $this->assertContains('\u003Cinput id=\"_newslettersubscription_status_' . $websiteId . '\"', $body);
         $this->assertNotContains('checked="checked"', $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/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
index 566dfbadedd29..df4acf3acca91 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
@@ -9,6 +9,7 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\Account\Redirect;
+use Magento\Customer\Model\CustomerRegistry;
 use Magento\Customer\Model\Session;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -20,11 +21,14 @@
 use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Stdlib\CookieManagerInterface;
+use Magento\Store\Model\StoreManager;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Mail\Template\TransportBuilderMock;
 use Magento\TestFramework\Request;
 use Magento\TestFramework\Response;
 use Magento\Theme\Controller\Result\MessagePlugin;
+use PHPUnit\Framework\Constraint\StringContains;
 use Zend\Stdlib\Parameters;
 
 /**
@@ -744,6 +748,65 @@ public function testLoginPostRedirect($redirectDashboard, string $redirectUrl)
         $this->assertTrue($this->_objectManager->get(Session::class)->isLoggedIn());
     }
 
+    /**
+     * Register Customer with email confirmation.
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer_confirmation_config_enable.php
+     * @return void
+     */
+    public function testRegisterCustomerWithEmailConfirmation(): void
+    {
+        $email = 'test_example@email.com';
+        $this->fillRequestWithAccountDataAndFormKey($email);
+        $this->dispatch('customer/account/createPost');
+        $this->assertRedirect($this->stringContains('customer/account/index/'));
+        $this->assertSessionMessages(
+            $this->equalTo(
+                [
+                    'You must confirm your account. Please check your email for the confirmation link or '
+                    . '<a href="http://localhost/index.php/customer/account/confirmation/'
+                    . '?email=test_example%40email.com">click here</a> for a new link.'
+                ]
+            ),
+            MessageInterface::TYPE_SUCCESS
+        );
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->_objectManager->create(CustomerRepositoryInterface::class);
+        /** @var CustomerInterface $customer */
+        $customer = $customerRepository->get($email);
+        $confirmation = $customer->getConfirmation();
+        $message = $this->transportBuilderMock->getSentMessage();
+        $rawMessage = $message->getBody()->getParts()[0]->getRawContent();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains("You must confirm your {$email} email before you can sign in (link is only valid once"),
+            new StringContains("customer/account/confirm/?id={$customer->getId()}&amp;key={$confirmation}")
+        );
+        $this->assertThat($rawMessage, $messageConstraint);
+
+        /** @var CookieManagerInterface $cookieManager */
+        $cookieManager = $this->_objectManager->get(CookieManagerInterface::class);
+        $cookieManager->deleteCookie(MessagePlugin::MESSAGES_COOKIES_NAME);
+        $this->_objectManager->removeSharedInstance(Http::class);
+        $this->_objectManager->removeSharedInstance(Request::class);
+        $this->_request = null;
+
+        $this->getRequest()
+            ->setParam('id', $customer->getId())
+            ->setParam('key', $confirmation);
+        $this->dispatch('customer/account/confirm');
+
+        /** @var StoreManager $store */
+        $store = $this->_objectManager->get(StoreManagerInterface::class);
+        $name = $store->getStore()->getFrontendName();
+
+        $this->assertRedirect($this->stringContains('customer/account/index/'));
+        $this->assertSessionMessages(
+            $this->equalTo(["Thank you for registering with {$name}."]),
+            MessageInterface::TYPE_SUCCESS
+        );
+        $this->assertEmpty($customerRepository->get($email)->getConfirmation());
+    }
+
     /**
      * Test that confirmation email address displays special characters correctly.
      *
@@ -769,9 +832,21 @@ public function testConfirmationEmailWithSpecialCharacters(): void
         $message = $this->transportBuilderMock->getSentMessage();
         $rawMessage = $message->getRawMessage();
 
-        $this->assertContains('To: John Smith <' . $email . '>', $rawMessage);
+        /** @var \Zend\Mime\Part $messageBodyPart */
+        $messageBodyParts = $message->getBody()->getParts();
+        $messageBodyPart = reset($messageBodyParts);
+        $messageEncoding = $messageBodyPart->getCharset();
+        $name = 'John Smith';
+
+        if (strtoupper($messageEncoding) !== 'ASCII') {
+            $name = \Zend\Mail\Header\HeaderWrap::mimeEncodeValue($name, $messageEncoding);
+        }
+
+        $nameEmail = sprintf('%s <%s>', $name, $email);
+
+        $this->assertContains('To: ' . $nameEmail, $rawMessage);
 
-        $content = $message->getBody()->getParts()[0]->getRawContent();
+        $content = $messageBodyPart->getRawContent();
         $confirmationUrl = $this->getConfirmationUrlFromMessageContent($content);
         $this->setRequestInfo($confirmationUrl, 'confirm');
         $this->clearCookieMessagesList();
@@ -784,6 +859,141 @@ public function testConfirmationEmailWithSpecialCharacters(): void
         );
     }
 
+    /**
+     * Check that Customer which change email can't log in with old email.
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoConfigFixture current_store customer/captcha/enable 0
+     *
+     * @return void
+     */
+    public function testResetPasswordWhenEmailChanged(): void
+    {
+        $email = 'customer@example.com';
+        $newEmail = 'new_customer@example.com';
+
+        /* Reset password and check mail with token */
+        $this->getRequest()->setPostValue(['email' => $email]);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+
+        $this->dispatch('customer/account/forgotPasswordPost');
+        $this->assertRedirect($this->stringContains('customer/account/'));
+        $this->assertSessionMessages(
+            $this->equalTo(
+                [
+                    "If there is an account associated with {$email} you will receive an email with a link "
+                    . "to reset your password."
+                ]
+            ),
+            MessageInterface::TYPE_SUCCESS
+        );
+
+        /** @var CustomerRegistry $customerRegistry */
+        $customerRegistry = $this->_objectManager->get(CustomerRegistry::class);
+        $customerData = $customerRegistry->retrieveByEmail($email);
+        $token = $customerData->getRpToken();
+        $this->assertForgotPasswordEmailContent($token);
+
+        /* Set new email */
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->_objectManager->create(CustomerRepositoryInterface::class);
+        /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
+        $customer = $customerRepository->getById($customerData->getId());
+        $customer->setEmail($newEmail);
+        $customerRepository->save($customer);
+
+        /* Goes through the link in a mail */
+        $this->resetRequest();
+        $this->getRequest()
+            ->setParam('token', $token)
+            ->setParam('id', $customerData->getId());
+
+        $this->dispatch('customer/account/createPassword');
+
+        $this->assertRedirect($this->stringContains('customer/account/forgotpassword'));
+        $this->assertSessionMessages(
+            $this->equalTo(['Your password reset link has expired.']),
+            MessageInterface::TYPE_ERROR
+        );
+        /* Trying to log in with old email */
+        $this->resetRequest();
+        $this->clearCookieMessagesList();
+        $customerRegistry->removeByEmail($email);
+
+        $this->dispatchLoginPostAction($email, 'password');
+        $this->assertSessionMessages(
+            $this->equalTo(
+                [
+                    'The account sign-in was incorrect or your account is disabled temporarily. '
+                    . 'Please wait and try again later.'
+                ]
+            ),
+            MessageInterface::TYPE_ERROR
+        );
+        $this->assertRedirect($this->stringContains('customer/account/login'));
+        /** @var Session $session */
+        $session = $this->_objectManager->get(Session::class);
+        $this->assertFalse($session->isLoggedIn());
+
+        /* Trying to log in with correct(new) email */
+        $this->resetRequest();
+        $this->dispatchLoginPostAction($newEmail, 'password');
+        $this->assertRedirect($this->stringContains('customer/account/'));
+        $this->assertTrue($session->isLoggedIn());
+        $session->logout();
+    }
+
+    /**
+     * Set needed parameters and dispatch Customer loginPost action.
+     *
+     * @param string $email
+     * @param string $password
+     * @return void
+     */
+    private function dispatchLoginPostAction(string $email, string $password): void
+    {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue(
+            [
+                'login' => [
+                    'username' => $email,
+                    'password' => $password,
+                ],
+            ]
+        );
+        $this->dispatch('customer/account/loginPost');
+    }
+
+    /**
+     * Check that 'Forgot password' email contains correct data.
+     *
+     * @param string $token
+     * @return void
+     */
+    private function assertForgotPasswordEmailContent(string $token): void
+    {
+        $message = $this->transportBuilderMock->getSentMessage();
+        $pattern = "/<a.+customer\/account\/createPassword\/\?token={$token}.+Set\s+a\s+New\s+Password<\/a\>/";
+        $rawMessage = $message->getBody()->getParts()[0]->getRawContent();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains('There was recently a request to change the password for your account.'),
+            $this->matchesRegularExpression($pattern)
+        );
+        $this->assertThat($rawMessage, $messageConstraint);
+    }
+
+    /**
+     * Clear request object.
+     *
+     * @return void
+     */
+    private function resetRequest(): void
+    {
+        $this->_objectManager->removeSharedInstance(Http::class);
+        $this->_objectManager->removeSharedInstance(Request::class);
+        $this->_request = null;
+    }
+
     /**
      * Data provider for testLoginPostRedirect.
      *
@@ -798,21 +1008,6 @@ public function loginPostRedirectDataProvider()
         ];
     }
 
-    /**
-     * @magentoDataFixture Magento/Customer/_files/customer.php
-     * @magentoDataFixture Magento/Customer/_files/customer_address.php
-     * @magentoAppArea frontend
-     */
-    public function testCheckVisitorModel()
-    {
-        /** @var \Magento\Customer\Model\Visitor $visitor */
-        $visitor = $this->_objectManager->get(\Magento\Customer\Model\Visitor::class);
-        $this->login(1);
-        $this->assertNull($visitor->getId());
-        $this->dispatch('customer/account/index');
-        $this->assertNotNull($visitor->getId());
-    }
-
     /**
      * @param string $email
      * @return void
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php
index db1cc4995e676..d584fb46cda02 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php
@@ -39,15 +39,6 @@ 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.
      */
@@ -199,7 +190,7 @@ public function testSaveActionCreateNewGroupWithoutCode()
         $this->dispatch('backend/customer/group/save');
 
         $this->assertSessionMessages(
-            $this->equalTo(['"code" is required. Enter and try again.']),
+            $this->equalTo([htmlspecialchars('"code" is required. Enter and try again.')]),
             MessageInterface::TYPE_ERROR
         );
     }
@@ -292,7 +283,7 @@ public function testSaveActionNewGroupWithoutGroupCode()
         $this->dispatch('backend/customer/group/save');
 
         $this->assertSessionMessages(
-            $this->equalTo(['"code" is required. Enter and try again.']),
+            $this->equalTo([htmlspecialchars('"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/IndexTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
index 1b7f2c1f7efdd..4fc549f3caf86 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
@@ -128,6 +128,7 @@ public function testSaveActionWithInvalidFormData()
     public function testSaveActionExistingCustomerUnsubscribeNewsletter()
     {
         $customerId = 1;
+        $websiteId = 1;
 
         /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
         $subscriber = $this->objectManager->get(\Magento\Newsletter\Model\SubscriberFactory::class)->create();
@@ -144,7 +145,7 @@ public function testSaveActionExistingCustomerUnsubscribeNewsletter()
                 'lastname' => 'test lastname',
                 'sendemail_store_id' => 1
             ],
-            'subscription' => '0'
+            'subscription_status' => [$websiteId => '0']
         ];
         $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setParam('id', 1);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/attribute_user_defined_address_custom_attribute.php b/dev/tests/integration/testsuite/Magento/Customer/_files/attribute_user_defined_address_custom_attribute.php
index 516e266927179..61f92070923cd 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/attribute_user_defined_address_custom_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/attribute_user_defined_address_custom_attribute.php
@@ -4,55 +4,37 @@
  * See COPYING.txt for license details.
  */
 
-$model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Attribute::class);
-$model->setName(
-    'custom_attribute1'
-)->setEntityTypeId(
-    2
-)->setAttributeSetId(
-    2
-)->setAttributeGroupId(
-    1
-)->setFrontendInput(
-    'text'
-)->setFrontendLabel(
-    'custom_attribute_frontend_label'
-)->setIsUserDefined(
-    1
-);
-$model->save();
-
-$model2 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Attribute::class);
-$model2->setName(
-    'custom_attribute2'
-)->setEntityTypeId(
-    2
-)->setAttributeSetId(
-    2
-)->setAttributeGroupId(
-    1
-)->setFrontendInput(
-    'text'
-)->setFrontendLabel(
-    'custom_attribute_frontend_label'
-)->setIsUserDefined(
-    1
-);
-$model2->save();
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Customer\Model\AttributeFactory $attributeFactory */
+$attributeFactory = $objectManager->create(\Magento\Customer\Model\AttributeFactory::class);
+
+/** @var \Magento\Eav\Api\AttributeRepositoryInterface $attributeRepository */
+$attributeRepository =  $objectManager->create(\Magento\Eav\Api\AttributeRepositoryInterface::class);
 
 /** @var \Magento\Customer\Setup\CustomerSetup $setupResource */
-$setupResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Setup\CustomerSetup::class
-);
-
-$data = [['form_code' => 'customer_address_edit', 'attribute_id' => $model->getAttributeId()]];
-$setupResource->getSetup()->getConnection()->insertMultiple(
-    $setupResource->getSetup()->getTable('customer_form_attribute'),
-    $data
-);
-
-$data2 = [['form_code' => 'customer_address_edit', 'attribute_id' => $model2->getAttributeId()]];
-$setupResource->getSetup()->getConnection()->insertMultiple(
-    $setupResource->getSetup()->getTable('customer_form_attribute'),
-    $data2
-);
+$setupResource = $objectManager->create(\Magento\Customer\Setup\CustomerSetup::class);
+
+$attributeNames = ['custom_attribute1', 'custom_attribute2'];
+foreach ($attributeNames as $attributeName) {
+    /** @var \Magento\Customer\Model\Attribute $attribute */
+    $attribute = $attributeFactory->create();
+
+    $attribute->setName($attributeName)
+        ->setEntityTypeId(2)
+        ->setAttributeSetId(2)
+        ->setAttributeGroupId(1)
+        ->setFrontendInput('text')
+        ->setFrontendLabel('custom_attribute_frontend_label')
+        ->setIsUserDefined(true);
+
+    $attributeRepository->save($attribute);
+
+    $setupResource->getSetup()
+        ->getConnection()
+        ->insertMultiple(
+            $setupResource->getSetup()->getTable('customer_form_attribute'),
+            [['form_code' => 'customer_address_edit', 'attribute_id' => $attribute->getAttributeId()]]
+        );
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/attribute_user_defined_address_custom_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/attribute_user_defined_address_custom_attribute_rollback.php
index 915b3da19783c..467356a9d914c 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/attribute_user_defined_address_custom_attribute_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/attribute_user_defined_address_custom_attribute_rollback.php
@@ -5,8 +5,9 @@
  * See COPYING.txt for license details.
  */
 
-$model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Attribute::class);
-$model->load('custom_attribute_test', 'attribute_code')->delete();
-
-$model2 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Attribute::class);
-$model2->load('custom_attributes_test', 'attribute_code')->delete();
+/** @var \Magento\Customer\Model\Attribute $attributeModel */
+$attributeModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Attribute::class
+);
+$attributeModel->load('custom_attribute1', 'attribute_code')->delete();
+$attributeModel->load('custom_attribute2', 'attribute_code')->delete();
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_store.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_store.php
index d8c56b7bf6f4f..79fd831dee27a 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_store.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_store.php
@@ -7,11 +7,14 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
 
 require __DIR__ . '/customer.php';
 
 $objectManager = Bootstrap::getObjectManager();
+$storeRepository = $objectManager->get(StoreRepositoryInterface::class);
+$storeId = $storeRepository->get('fixture_second_store')->getId();
 $repository = $objectManager->create(CustomerRepositoryInterface::class);
 $customer = $repository->get('customer@example.com');
-$customer->setStoreId(2);
+$customer->setStoreId($storeId);
 $repository->save($customer);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers.php b/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers.php
index 2f9c3dc31ef3d..9b989779e4cbd 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers.php
@@ -3,16 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-$customers = [];
 
-$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Model\Customer::class
-);
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Customer\Model\Customer;
+use Magento\Framework\Registry;
+
+/** @var $objectManager ObjectManagerInterface */
+$objectManager = Bootstrap::getObjectManager();
+
+$customers = [];
+$customer = $objectManager->create(Customer::class);
 
 $customer->setWebsiteId(
     1
-)->setEntityId(
-    1
 )->setEntityTypeId(
     1
 )->setAttributeSetId(
@@ -40,13 +44,9 @@
 $customer->save();
 $customers[] = $customer;
 
-$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Model\Customer::class
-);
+$customer = $objectManager->create(Customer::class);
 $customer->setWebsiteId(
     1
-)->setEntityId(
-    2
 )->setEntityTypeId(
     1
 )->setAttributeSetId(
@@ -74,13 +74,9 @@
 $customer->save();
 $customers[] = $customer;
 
-$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Model\Customer::class
-);
+$customer = $objectManager->create(Customer::class);
 $customer->setWebsiteId(
     1
-)->setEntityId(
-    3
 )->setEntityTypeId(
     1
 )->setAttributeSetId(
@@ -108,9 +104,7 @@
 $customer->save();
 $customers[] = $customer;
 
-/** @var $objectManager \Magento\TestFramework\ObjectManager */
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-$objectManager->get(\Magento\Framework\Registry::class)
+$objectManager->get(Registry::class)
     ->unregister('_fixture/Magento_ImportExport_Customer_Collection');
-$objectManager->get(\Magento\Framework\Registry::class)
+$objectManager->get(Registry::class)
     ->register('_fixture/Magento_ImportExport_Customer_Collection', $customers);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers_rollback.php
new file mode 100644
index 0000000000000..f8eeb8edd15da
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers_rollback.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Model\Customer;
+
+/** @var $objectManager ObjectManagerInterface */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var $registry Registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $customer Customer */
+$customer = $objectManager->create(Customer::class);
+
+$emailsToDelete = [
+    'customer@example.com',
+    'julie.worrell@example.com',
+    'david.lamar@example.com',
+];
+foreach ($emailsToDelete as $email) {
+    try {
+        $customer->loadByEmail($email)->delete();
+    } catch (\Exception $e) {
+    }
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+$registry->unregister('_fixture/Magento_ImportExport_Customer_Collection');
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
index 88b748f8bbbae..884a4a38ebe0f 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
@@ -4,80 +4,254 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Test for customer export model
- */
 namespace Magento\CustomerImportExport\Model\Export;
 
+use Magento\Framework\Registry;
+use Magento\Customer\Model\Attribute;
+use Magento\ImportExport\Model\Export;
+use Magento\ImportExport\Model\Import;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\ImportExport\Model\Export\Adapter\Csv;
+use Magento\Customer\Model\Customer as CustomerModel;
+use Magento\CustomerImportExport\Model\Export\Customer;
+use Magento\Customer\Model\ResourceModel\Attribute\Collection;
+use Magento\Customer\Model\ResourceModel\Customer\Collection as CustomerCollection;
+
+/**
+ * Tests for customer export model.
+ *
+ * @magentoAppArea adminhtml
+ */
 class CustomerTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\CustomerImportExport\Model\Export\Customer
+     * @var Customer
      */
     protected $_model;
 
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var array
+     */
+    private $attributeValues;
+
+    /**
+     * @var array
+     */
+    private $attributeTypes;
+
+    /**
+     * @var Collection
+     */
+    private $attributeCollection;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\CustomerImportExport\Model\Export\Customer::class
-        );
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->_model = $this->objectManager->create(Customer::class);
+        $this->attributeCollection = $this->objectManager->create(Collection::class);
     }
 
     /**
-     * Test export method
+     * Export "Customer Main File".
      *
      * @magentoDataFixture Magento/Customer/_files/import_export/customers.php
+     * @return void
      */
     public function testExport()
+    {
+        $this->processCustomerAttribute();
+        $expectedAttributes = $this->getExpectedAttributes();
+        $lines = $this->export($expectedAttributes);
+        $this->checkExportData($lines, $expectedAttributes);
+    }
+
+    /**
+     * Return attributes which should be exported.
+     *
+     * @return array
+     */
+    private function getExpectedAttributes(): array
     {
         $expectedAttributes = [];
-        /** @var $collection \Magento\Customer\Model\ResourceModel\Attribute\Collection */
-        $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Model\ResourceModel\Attribute\Collection::class
-        );
-        /** @var $attribute \Magento\Customer\Model\Attribute */
-        foreach ($collection as $attribute) {
+        /** @var Attribute $attribute */
+        foreach ($this->attributeCollection as $attribute) {
             $expectedAttributes[] = $attribute->getAttributeCode();
         }
-        $expectedAttributes = array_diff($expectedAttributes, $this->_model->getDisabledAttributes());
 
-        $this->_model->setWriter(
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                \Magento\ImportExport\Model\Export\Adapter\Csv::class
-            )
-        );
+        return array_diff($expectedAttributes, $this->_model->getDisabledAttributes());
+    }
+
+    /**
+     * Prepare Customer attribute.
+     *
+     * @return void
+     */
+    private function processCustomerAttribute(): void
+    {
+        $this->initAttributeValues($this->attributeCollection);
+        $this->initAttributeTypes($this->attributeCollection);
+    }
+
+    /**
+     * Export customer.
+     *
+     * @param array $expectedAttributes
+     * @return array
+     */
+    private function export(array $expectedAttributes): array
+    {
+        $this->_model->setWriter($this->objectManager->create(Csv::class));
         $data = $this->_model->export();
+
         $this->assertNotEmpty($data);
 
         $lines = $this->_csvToArray($data, 'email');
-
         $this->assertEquals(
             count($expectedAttributes),
             count(array_intersect($expectedAttributes, $lines['header'])),
-            'Expected attribute codes were not exported'
+            'Expected attribute codes were not exported.'
         );
 
-        $this->assertNotEmpty($lines['data'], 'No data was exported');
+        $this->assertNotEmpty($lines['data'], 'No data was exported.');
 
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var $customers \Magento\Customer\Model\Customer[] */
-        $customers = $objectManager->get(
-            \Magento\Framework\Registry::class
-        )->registry(
-            '_fixture/Magento_ImportExport_Customer_Collection'
-        );
-        foreach ($customers as $key => $customer) {
-            foreach ($expectedAttributes as $code) {
-                if (!in_array($code, $this->_model->getDisabledAttributes()) && isset($lines[$key][$code])) {
-                    $this->assertEquals(
-                        $customer->getData($code),
-                        $lines[$key][$code],
-                        'Attribute "' . $code . '" is not equal'
-                    );
+        return $lines;
+    }
+
+    /**
+     * Check that exported data is correct.
+     *
+     * @param array $lines
+     * @param array $expectedAttributes
+     * @return void
+     */
+    private function checkExportData(array $lines, array $expectedAttributes): void
+    {
+        /** @var CustomerModel[] $customers */
+        $customers = $this->objectManager->create(CustomerCollection::class);
+        foreach ($customers as $customer) {
+            $data = $this->processCustomerData($customer, $expectedAttributes);
+            $exportData = $lines['data'][$data['email']];
+            $exportData = $this->unsetDuplicateData($exportData);
+
+            foreach ($data as $key => $value) {
+                $this->assertEquals($value, $exportData[$key], "Attribute '{$key}' is not equal.");
+            }
+        }
+    }
+
+    /**
+     * Initialize attribute option values.
+     *
+     * @param Collection $attributeCollection
+     * @return CustomerTest
+     */
+    private function initAttributeValues(Collection $attributeCollection): CustomerTest
+    {
+        /** @var Attribute $attribute */
+        foreach ($attributeCollection as $attribute) {
+            $this->attributeValues[$attribute->getAttributeCode()] = $this->_model->getAttributeOptions($attribute);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Initialize attribute types.
+     *
+     * @param \Magento\Customer\Model\ResourceModel\Attribute\Collection $attributeCollection
+     * @return CustomerTest
+     */
+    private function initAttributeTypes(Collection $attributeCollection): CustomerTest
+    {
+        /** @var Attribute $attribute */
+        foreach ($attributeCollection as $attribute) {
+            $this->attributeTypes[$attribute->getAttributeCode()] = $attribute->getFrontendInput();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Format Customer data as same as export data.
+     *
+     * @param CustomerModel $item
+     * @param array $expectedAttributes
+     * @return array
+     */
+    private function processCustomerData(CustomerModel $item, array $expectedAttributes): array
+    {
+        $data = [];
+        foreach ($expectedAttributes as $attributeCode) {
+            $attributeValue = $item->getData($attributeCode);
+
+            if ($this->isMultiselect($attributeCode)) {
+                $values = [];
+                $attributeValue = explode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $attributeValue);
+                foreach ($attributeValue as $value) {
+                    $values[] = $this->getAttributeValueById($attributeCode, $value);
                 }
+                $data[$attributeCode] = implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $values);
+            } else {
+                $data[$attributeCode] = $this->getAttributeValueById($attributeCode, $attributeValue);
             }
         }
+
+        return $data;
+    }
+
+    /**
+     * Check that attribute is multiselect type by attribute code.
+     *
+     * @param string $attributeCode
+     * @return bool
+     */
+    private function isMultiselect(string $attributeCode): bool
+    {
+        return isset($this->attributeTypes[$attributeCode])
+            && $this->attributeTypes[$attributeCode] === 'multiselect';
+    }
+
+    /**
+     * Return attribute value by id.
+     *
+     * @param string $attributeCode
+     * @param int|string $valueId
+     * @return int|string|array
+     */
+    private function getAttributeValueById(string $attributeCode, $valueId)
+    {
+        if (isset($this->attributeValues[$attributeCode])
+            && isset($this->attributeValues[$attributeCode][$valueId])
+        ) {
+            return $this->attributeValues[$attributeCode][$valueId];
+        }
+
+        return $valueId;
+    }
+
+    /**
+     * Unset non-useful or duplicate data from exported file data.
+     *
+     * @param array $data
+     * @return array
+     */
+    private function unsetDuplicateData(array $data): array
+    {
+        unset($data['_website']);
+        unset($data['_store']);
+        unset($data['password']);
+
+        return $data;
     }
 
     /**
@@ -93,10 +267,7 @@ public function testGetEntityTypeCode()
      */
     public function testGetAttributeCollection()
     {
-        $this->assertInstanceOf(
-            \Magento\Customer\Model\ResourceModel\Attribute\Collection::class,
-            $this->_model->getAttributeCollection()
-        );
+        $this->assertInstanceOf(Collection::class, $this->_model->getAttributeCollection());
     }
 
     /**
@@ -104,14 +275,14 @@ public function testGetAttributeCollection()
      */
     public function testFilterAttributeCollection()
     {
-        /** @var $collection \Magento\Customer\Model\ResourceModel\Attribute\Collection */
+        /** @var $collection Collection */
         $collection = $this->_model->getAttributeCollection();
         $collection = $this->_model->filterAttributeCollection($collection);
         /**
          * Check that disabled attributes is not existed in attribute collection
          */
         $existedAttributes = [];
-        /** @var $attribute \Magento\Customer\Model\Attribute */
+        /** @var $attribute Attribute */
         foreach ($collection as $attribute) {
             $existedAttributes[] = $attribute->getAttributeCode();
         }
@@ -127,7 +298,7 @@ public function testFilterAttributeCollection()
          * Check that all overridden attributes were affected during filtering process
          */
         $overriddenAttributes = $this->_model->getOverriddenAttributes();
-        /** @var $attribute \Magento\Customer\Model\Attribute */
+        /** @var $attribute Attribute */
         foreach ($collection as $attribute) {
             if (isset($overriddenAttributes[$attribute->getAttributeCode()])) {
                 foreach ($overriddenAttributes[$attribute->getAttributeCode()] as $propertyKey => $property) {
@@ -149,28 +320,19 @@ public function testFilterAttributeCollection()
     public function testFilterEntityCollection()
     {
         $createdAtDate = '2038-01-01';
-
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
         /**
          * Change created_at date of first customer for future filter test.
          */
-        $customers = $objectManager->get(
-            \Magento\Framework\Registry::class
-        )->registry(
-            '_fixture/Magento_ImportExport_Customer_Collection'
-        );
+        $customers = $this->objectManager->get(Registry::class)
+            ->registry('_fixture/Magento_ImportExport_Customer_Collection');
         $customers[0]->setCreatedAt($createdAtDate);
         $customers[0]->save();
         /**
          * Change type of created_at attribute. In this case we have possibility to test date rage filter
          */
-        $attributeCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Model\ResourceModel\Attribute\Collection::class
-        );
+        $attributeCollection = $this->objectManager->create(Collection::class);
         $attributeCollection->addFieldToFilter('attribute_code', 'created_at');
-        /** @var $createdAtAttribute \Magento\Customer\Model\Attribute */
+        /** @var $createdAtAttribute Attribute */
         $createdAtAttribute = $attributeCollection->getFirstItem();
         $createdAtAttribute->setBackendType('datetime');
         $createdAtAttribute->save();
@@ -178,19 +340,17 @@ public function testFilterEntityCollection()
          * Prepare filter.asd
          */
         $parameters = [
-            \Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP => [
+            Export::FILTER_ELEMENT_GROUP => [
                 'email' => 'example.com',
                 'created_at' => [$createdAtDate, ''],
-                'store_id' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                    \Magento\Store\Model\StoreManagerInterface::class
-                )->getStore()->getId()
+                'store_id' => $this->objectManager->get(StoreManagerInterface::class)->getStore()->getId()
             ]
         ];
         $this->_model->setParameters($parameters);
-        /** @var $customers \Magento\Customer\Model\ResourceModel\Customer\Collection */
+        /** @var $customers Collection */
         $collection = $this->_model->filterEntityCollection(
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                \Magento\Customer\Model\ResourceModel\Customer\Collection::class
+            $this->objectManager->create(
+                CustomerCollection::class
             )
         );
         $collection->load();
@@ -223,6 +383,7 @@ protected function _csvToArray($content, $entityId = null)
                 }
             }
         }
+
         return $data;
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Deploy/DeployTest.php b/dev/tests/integration/testsuite/Magento/Deploy/DeployTest.php
index ea155894d7299..a9591f1968ef7 100644
--- a/dev/tests/integration/testsuite/Magento/Deploy/DeployTest.php
+++ b/dev/tests/integration/testsuite/Magento/Deploy/DeployTest.php
@@ -71,6 +71,7 @@ class DeployTest extends \PHPUnit\Framework\TestCase
     private $options = [
         Options::DRY_RUN => false,
         Options::NO_JAVASCRIPT => false,
+        Options::NO_JS_BUNDLE => false,
         Options::NO_CSS => false,
         Options::NO_LESS => false,
         Options::NO_IMAGES => false,
@@ -100,9 +101,10 @@ protected function setUp()
         $this->rootDir = $this->filesystem->getDirectoryRead(DirectoryList::ROOT);
 
         $logger = $objectManager->get(\Psr\Log\LoggerInterface::class);
-        $this->deployService = $objectManager->create(DeployStaticContent::class, [
-            'logger' => $logger
-        ]);
+        $this->deployService = $objectManager->create(
+            DeployStaticContent::class,
+            ['logger' => $logger]
+        );
 
         $this->bundleConfig = $objectManager->create(BundleConfig::class);
         $this->config = $objectManager->create(View::class);
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php b/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php
index 69eab0656f89b..a6a293d384d56 100644
--- a/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php
+++ b/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php
@@ -15,12 +15,15 @@
 use Magento\Quote\Model\Quote\Address\RateRequest;
 use Magento\Shipping\Model\Shipment\Request;
 use Magento\Shipping\Model\Tracking\Result\Status;
+use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\HTTP\AsyncClientInterfaceMock;
 use Magento\Shipping\Model\Simplexml\Element as ShippingElement;
 
 /**
  * Test for DHL integration.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CarrierTest extends \PHPUnit\Framework\TestCase
 {
@@ -411,7 +414,108 @@ private function getExpectedLabelRequestXml(
      */
     public function testCollectRates()
     {
-        $requestData = [
+        $requestData = $this->getRequestData();
+        //phpcs:disable Magento2.Functions.DiscouragedFunction
+        $response = new Response(
+            200,
+            [],
+            file_get_contents(__DIR__ . '/../_files/dhl_quote_response.xml')
+        );
+        //phpcs:enable Magento2.Functions.DiscouragedFunction
+        $this->httpClient->nextResponses(array_fill(0, Carrier::UNAVAILABLE_DATE_LOOK_FORWARD + 1, $response));
+        /** @var RateRequest $request */
+        $request = Bootstrap::getObjectManager()->create(RateRequest::class, $requestData);
+        $expectedRates = [
+            ['carrier' => 'dhl', 'carrier_title' => 'DHL Title', 'cost' => 45.85, 'method' => 'E', 'price' => 45.85],
+            ['carrier' => 'dhl', 'carrier_title' => 'DHL Title', 'cost' => 35.26, 'method' => 'Q', 'price' => 35.26],
+            ['carrier' => 'dhl', 'carrier_title' => 'DHL Title', 'cost' => 37.38, 'method' => 'Y', 'price' => 37.38],
+            ['carrier' => 'dhl', 'carrier_title' => 'DHL Title', 'cost' => 35.26, 'method' => 'P', 'price' => 35.26]
+        ];
+
+        $actualRates = $this->dhlCarrier->collectRates($request)->getAllRates();
+
+        self::assertEquals(count($expectedRates), count($actualRates));
+        foreach ($actualRates as $i => $actualRate) {
+            $actualRate = $actualRate->getData();
+            unset($actualRate['method_title']);
+            self::assertEquals($expectedRates[$i], $actualRate);
+        }
+        $requestXml = $this->httpClient->getLastRequest()->getBody();
+        self::assertContains('<Weight>18.223</Weight>', $requestXml);
+        self::assertContains('<Height>0.63</Height>', $requestXml);
+        self::assertContains('<Width>0.63</Width>', $requestXml);
+        self::assertContains('<Depth>0.63</Depth>', $requestXml);
+    }
+
+    /**
+     * Tests that quotes request doesn't contain dimensions when it shouldn't.
+     *
+     * @param string|null $size
+     * @param string|null $height
+     * @param string|null $width
+     * @param string|null $depth
+     * @magentoConfigFixture default_store carriers/dhl/active 1
+     * @dataProvider collectRatesWithoutDimensionsDataProvider
+     */
+    public function testCollectRatesWithoutDimensions(?string $size, ?string $height, ?string $width, ?string $depth)
+    {
+        $requestData = $this->getRequestData();
+        $this->setDhlConfig(['size' => $size, 'height' => $height, 'width' => $width, 'depth' => $depth]);
+
+        /** @var RateRequest $request */
+        $request = Bootstrap::getObjectManager()->create(RateRequest::class, $requestData);
+        $this->dhlCarrier = Bootstrap::getObjectManager()->create(Carrier::class);
+        $this->dhlCarrier->collectRates($request)->getAllRates();
+
+        $requestXml = $this->httpClient->getLastRequest()->getBody();
+        $this->assertNotContains('<Width>', $requestXml);
+        $this->assertNotContains('<Height>', $requestXml);
+        $this->assertNotContains('<Depth>', $requestXml);
+
+        $this->config->reinit();
+    }
+
+    /**
+     * @return array
+     */
+    public function collectRatesWithoutDimensionsDataProvider()
+    {
+        return [
+            ['size' => '0', 'height' => '1.1', 'width' => '0.6', 'depth' => '0.7'],
+            ['size' => '1', 'height' => '', 'width' => '', 'depth' => ''],
+            ['size' => null, 'height' => '1.1', 'width' => '0.6', 'depth' => '0.7'],
+            ['size' => '1', 'height' => '1', 'width' => '', 'depth' => ''],
+            ['size' => null, 'height' => null, 'width' => null, 'depth' => null],
+        ];
+    }
+
+    /**
+     * Sets DHL config value.
+     *
+     * @param array $params
+     * @return void
+     */
+    private function setDhlConfig(array $params)
+    {
+        foreach ($params as $name => $val) {
+            if ($val !== null) {
+                $this->config->setValue(
+                    'carriers/dhl/' . $name,
+                    $val,
+                    ScopeInterface::SCOPE_STORE
+                );
+            }
+        }
+    }
+
+    /**
+     * Returns request data.
+     *
+     * @return array
+     */
+    private function getRequestData(): array
+    {
+        return [
             'data' => [
                 'dest_country_id' => 'DE',
                 'dest_region_id' => '82',
@@ -454,35 +558,5 @@ public function testCollectRates()
                 'all_items' => [],
             ]
         ];
-        //phpcs:disable Magento2.Functions.DiscouragedFunction
-        $response = new Response(
-            200,
-            [],
-            file_get_contents(__DIR__ . '/../_files/dhl_quote_response.xml')
-        );
-        //phpcs:enable Magento2.Functions.DiscouragedFunction
-        $this->httpClient->nextResponses(array_fill(0, Carrier::UNAVAILABLE_DATE_LOOK_FORWARD + 1, $response));
-        /** @var RateRequest $request */
-        $request = Bootstrap::getObjectManager()->create(RateRequest::class, $requestData);
-        $expectedRates = [
-            ['carrier' => 'dhl', 'carrier_title' => 'DHL Title', 'cost' => 45.85, 'method' => 'E', 'price' => 45.85],
-            ['carrier' => 'dhl', 'carrier_title' => 'DHL Title', 'cost' => 35.26, 'method' => 'Q', 'price' => 35.26],
-            ['carrier' => 'dhl', 'carrier_title' => 'DHL Title', 'cost' => 37.38, 'method' => 'Y', 'price' => 37.38],
-            ['carrier' => 'dhl', 'carrier_title' => 'DHL Title', 'cost' => 35.26, 'method' => 'P', 'price' => 35.26]
-        ];
-
-        $actualRates = $this->dhlCarrier->collectRates($request)->getAllRates();
-
-        self::assertEquals(count($expectedRates), count($actualRates));
-        foreach ($actualRates as $i => $actualRate) {
-            $actualRate = $actualRate->getData();
-            unset($actualRate['method_title']);
-            self::assertEquals($expectedRates[$i], $actualRate);
-        }
-        $requestXml = $this->httpClient->getLastRequest()->getBody();
-        self::assertContains('<Weight>18.223</Weight>', $requestXml);
-        self::assertContains('<Height>0.630</Height>', $requestXml);
-        self::assertContains('<Width>0.630</Width>', $requestXml);
-        self::assertContains('<Depth>0.630</Depth>', $requestXml);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Controller/Adminhtml/Json/CountryRegionTest.php b/dev/tests/integration/testsuite/Magento/Directory/Controller/Adminhtml/Json/CountryRegionTest.php
new file mode 100644
index 0000000000000..8d3b12aa34f1e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Directory/Controller/Adminhtml/Json/CountryRegionTest.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Directory\Controller\Adminhtml\Json;
+
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class CountryRegionTest extends AbstractBackendController
+{
+    /**
+     * Test Execute without param
+     */
+    public function testExecuteWithNoCountryParam()
+    {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue([]);
+        $this->dispatch('backend/directory/json/countryRegion');
+
+        $actual = $this->getResponse()->getBody();
+
+        $this->assertEquals('[]', $actual);
+    }
+
+    /**
+     * Test Execute with region in the fixture
+     *
+     * @magentoDataFixture Magento/Directory/_files/example_region_in_country.php
+     */
+    public function testExecute()
+    {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue([
+            'parent' => 'WW'
+        ]);
+        $this->dispatch('backend/directory/json/countryRegion');
+
+        $actual = $this->getResponse()->getBody();
+
+        $this->assertContains('Example Region 1', $actual);
+        $this->assertContains('Example Region 2', $actual);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Directory/_files/example_region_in_country.php b/dev/tests/integration/testsuite/Magento/Directory/_files/example_region_in_country.php
new file mode 100644
index 0000000000000..ba33b09a1f948
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Directory/_files/example_region_in_country.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Directory\Model\Region as RegionModel;
+use Magento\Directory\Model\ResourceModel\Region as RegionResource;
+
+$objectManager = Bootstrap::getObjectManager();
+
+$regionData = [
+    [
+        'country_id' => 'WW',
+        'code' => 'ER1',
+        'default_name' => 'Example Region 1'
+    ],
+    [
+        'country_id' => 'WW',
+        'code' => 'ER2',
+        'default_name' => 'Example Region 2'
+    ]
+];
+
+/** @var RegionModel $region */
+$region = $objectManager->create(RegionModel::class);
+/** @var RegionResource $regionResource */
+$regionResource = $objectManager->get(RegionResource::class);
+
+foreach ($regionData as $data) {
+    /** @var RegionModel $region */
+    $region = $objectManager->create(RegionModel::class);
+    $region->setData($data);
+    $regionResource->save($region);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Directory/_files/example_region_in_country_rollback.php b/dev/tests/integration/testsuite/Magento/Directory/_files/example_region_in_country_rollback.php
new file mode 100644
index 0000000000000..4f78873aa380f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Directory/_files/example_region_in_country_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\TestFramework\Helper\Bootstrap;
+use Magento\Directory\Model\Region as RegionModel;
+use Magento\Directory\Model\ResourceModel\Region as RegionResource;
+use Magento\Directory\Model\ResourceModel\Region\Collection as RegionResourceCollection;
+
+$objectManager = Bootstrap::getObjectManager();
+$regionCode = ['ER1', 'ER2'];
+
+/** @var RegionResource $regionResource */
+$regionResource = $objectManager->get(RegionResource::class);
+
+$regionCollection = $objectManager->create(RegionResourceCollection::class)
+    ->addFieldToFilter('code', ['in' => $regionCode]);
+
+/** @var RegionModel $region */
+foreach ($regionCollection as $region) {
+    $regionResource->delete($region);
+}
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 60c2a41fae49f..6333d60da3cfe 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,36 +1,59 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable;
 
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * Magento\Downloadable\Controller\Adminhtml\Downloadable\File
  *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
  * @magentoAppArea adminhtml
  */
 class FileTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
+    /**
+     * @var Json
+     */
+    private $jsonSerializer;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->jsonSerializer = $this->_objectManager->get(Json::class);
+    }
+
     /**
      * @inheritdoc
      */
     protected function tearDown()
     {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $filePath = dirname(__DIR__) . '/_files/sample.tmp';
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         if (is_file($filePath)) {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
             unlink($filePath);
         }
     }
 
     public function testUploadAction()
     {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         copy(dirname(__DIR__) . '/_files/sample.txt', dirname(__DIR__) . '/_files/sample.tmp');
+        // phpcs:ignore Magento2.Security.Superglobal
         $_FILES = [
             'samples' => [
                 'name' => 'sample.txt',
                 'type' => 'text/plain',
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 'tmp_name' => dirname(__DIR__) . '/_files/sample.tmp',
                 'error' => 0,
                 'size' => 0,
@@ -40,7 +63,7 @@ public function testUploadAction()
         $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);
+        $result = $this->jsonSerializer->unserialize($body);
         $this->assertEquals(0, $result['error']);
     }
 
@@ -52,9 +75,11 @@ public function testUploadAction()
      */
     public function testUploadProhibitedExtensions($fileName)
     {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $path = dirname(__DIR__) . '/_files/';
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         copy($path . 'sample.txt', $path . 'sample.tmp');
-
+        // phpcs:ignore Magento2.Security.Superglobal
         $_FILES = [
             'samples' => [
                 'name' => $fileName,
@@ -68,7 +93,7 @@ public function testUploadProhibitedExtensions($fileName)
         $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);
+        $result = $this->jsonSerializer->unserialize($body);
 
         self::assertArrayHasKey('errorcode', $result);
         self::assertEquals(0, $result['errorcode']);
@@ -90,4 +115,37 @@ public function extensionsDataProvider()
             ['sample.php7'],
         ];
     }
+
+    /**
+     * @dataProvider uploadWrongUploadTypeDataProvider
+     * @return void
+     */
+    public function testUploadWrongUploadType($postData): void
+    {
+        $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod('POST');
+
+        $this->dispatch('backend/admin/downloadable_file/upload');
+
+        $body = $this->getResponse()->getBody();
+        $result = $this->jsonSerializer->unserialize($body);
+        $this->assertEquals('Upload type can not be determined.', $result['error']);
+        $this->assertEquals(0, $result['errorcode']);
+    }
+
+    public function uploadWrongUploadTypeDataProvider(): array
+    {
+        return [
+            [
+                ['type' => 'test'],
+            ],
+            [
+                [
+                    'type' => [
+                        'type1' => 'test',
+                    ],
+                ],
+            ],
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/Model/Url/DomainValidatorTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Model/Url/DomainValidatorTest.php
new file mode 100644
index 0000000000000..86b5bf3ed05cf
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/Model/Url/DomainValidatorTest.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Downloadable\Model\Url;
+
+use Magento\Downloadable\Model\DomainManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\DeploymentConfig;
+
+/**
+ * Test for Magento\Downloadable\Model\Url\DomainValidator
+ */
+class DomainValidatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var DomainValidator
+     */
+    private $model;
+
+    /**
+     * @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfig;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+
+        $this->deploymentConfig = $this->createPartialMock(
+            DeploymentConfig::class,
+            ['get']
+        );
+
+        $domainManager = $objectManager->create(
+            DomainManager::class,
+            ['deploymentConfig' => $this->deploymentConfig]
+        );
+
+        $this->model = $objectManager->create(
+            DomainValidator::class,
+            ['domainManager' => $domainManager]
+        );
+    }
+
+    /**
+     * @param string $urlInput
+     * @param array $envDomainWhitelist
+     * @param bool $isValid
+     *
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoConfigFixture current_store web/unsecure/base_url http://example.com/
+     * @magentoConfigFixture current_store web/secure/base_url https://secure.example.com/
+     * @magentoConfigFixture fixture_second_store_store web/unsecure/base_url http://example2.com/
+     * @magentoConfigFixture fixture_second_store_store web/secure/base_url https://secure.example2.com/
+     * @dataProvider isValidDataProvider
+     */
+    public function testIsValid(string $urlInput, array $envDomainWhitelist, bool $isValid)
+    {
+        $this->deploymentConfig
+            ->method('get')
+            ->with(DomainValidator::PARAM_DOWNLOADABLE_DOMAINS)
+            ->willReturn($envDomainWhitelist);
+
+        $this->assertEquals(
+            $isValid,
+            $this->model->isValid($urlInput),
+            'Failed asserting is ' . ($isValid ? 'valid' : 'not valid') . ': ' . $urlInput .
+            PHP_EOL .
+            'Domain whitelist: ' . implode(', ', $envDomainWhitelist)
+        );
+    }
+
+    public function isValidDataProvider()
+    {
+        return [
+            ['http://example.com', ['example.co'], false],
+            [' http://example.com ', ['example.com'], false],
+            ['http://example.com', ['example.com'], true],
+            ['https://example.com', ['example.com'], true],
+            ['https://example.com/downloadable.pdf', ['example.com'], true],
+            ['https://example.com:8080/downloadable.pdf', ['example.com'], true],
+            ['http://secure.example.com', ['secure.example.com'], true],
+            ['https://secure.example.com', ['secure.example.com'], true],
+            ['https://ultra.secure.example.com', ['secure.example.com'], false],
+            ['http://example2.com', ['example2.com'], true],
+            ['https://example2.com', ['example2.com'], true],
+            ['http://subdomain.example2.com', ['example2.com'], false],
+            ['https://adobe.com', ['adobe.com'], true],
+            ['https://subdomain.adobe.com', ['adobe.com'], false],
+            ['https://ADOBE.COm', ['adobe.com'], true],
+            ['https://adobe.com', ['ADOBE.COm'], true],
+            ['http://127.0.0.1', ['127.0.0.1'], false],
+            ['http://[::1]', ['::1'], false],
+        ];
+    }
+}
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
index 9c0b328fc1664..e312d973aeb17 100644
--- 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
@@ -3,10 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
+
+use Magento\Downloadable\Api\DomainManagerInterface;
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
+/** @var DomainManagerInterface $domainManager */
+$domainManager = $objectManager->get(DomainManagerInterface::class);
+$domainManager->addDomains(['example.com', 'sampleurl.com']);
+
 /**
  * @var \Magento\Catalog\Model\Product $product
  */
@@ -74,6 +79,7 @@
  */
 $sampleContent = $objectManager->create(\Magento\Downloadable\Api\Data\File\ContentInterfaceFactory::class)->create();
 $sampleContent->setFileData(
+    // @codingStandardsIgnoreLine
     base64_encode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR . 'test_image.jpg'))
 );
 $sampleContent->setName('jellyfish_1_3.jpg');
@@ -92,10 +98,10 @@
  */
 $content = $objectManager->create(\Magento\Downloadable\Api\Data\File\ContentInterfaceFactory::class)->create();
 $content->setFileData(
+    // @codingStandardsIgnoreLine
     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;
 
@@ -146,6 +152,7 @@
             \Magento\Downloadable\Api\Data\File\ContentInterfaceFactory::class
         )->create();
         $content->setFileData(
+            // @codingStandardsIgnoreLine
             base64_encode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR . 'test_image.jpg'))
         );
         $content->setName('jellyfish_1_4.jpg');
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
index 9ad910eed8739..48d6966fb90df 100644
--- 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
@@ -3,4 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\Downloadable\Api\DomainManagerInterface;
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var DomainManagerInterface $domainManager */
+$domainManager = $objectManager->get(DomainManagerInterface::class);
+$domainManager->removeDomains(['sampleurl.com']);
+
+// @codingStandardsIgnoreLine
 require __DIR__ . '/product_downloadable_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 19cf449912b66..25344ea447d9a 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable.php
@@ -3,10 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/**
- * @var \Magento\Catalog\Model\Product $product
- */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+
+use Magento\Downloadable\Api\DomainManagerInterface;
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var DomainManagerInterface $domainManager */
+$domainManager = $objectManager->get(DomainManagerInterface::class);
+$domainManager->addDomains(
+    [
+        'example.com',
+        'www.example.com',
+        'www.sample.example.com',
+        'google.com'
+    ]
+);
+
+/** @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)
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_rollback.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_rollback.php
index 996fbb01d72c4..9a2e1c74fcd33 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_rollback.php
@@ -3,23 +3,38 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\Downloadable\Api\DomainManagerInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 
 \Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
 
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var DomainManagerInterface $domainManager */
+$domainManager = $objectManager->get(DomainManagerInterface::class);
+$domainManager->removeDomains(
+    [
+        'example.com',
+        'www.example.com',
+        'www.sample.example.com',
+        'google.com'
+    ]
+);
+
 /** @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);
 
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+$productRepository = $objectManager
     ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 try {
     $product = $productRepository->get('downloadable-product', false, null, true);
     $productRepository->delete($product);
-} catch (NoSuchEntityException $e) {
+} catch (NoSuchEntityException $e) { // @codingStandardsIgnoreLine
 }
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_custom_options.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_custom_options.php
index b5528dd27ee7c..f0a26f8a36d99 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_custom_options.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_custom_options.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\TestFramework\Helper\Bootstrap as Bootstrap;
+use Magento\TestFramework\Helper\Bootstrap;
 
 require __DIR__ . '/product_downloadable_with_purchased_separately_links.php';
 
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_download_limit.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_download_limit.php
new file mode 100644
index 0000000000000..f0c6e013a9d95
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_download_limit.php
@@ -0,0 +1,72 @@
+<?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\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Downloadable\Api\Data\LinkInterface;
+use Magento\Downloadable\Api\LinkRepositoryInterface;
+use Magento\Downloadable\Helper\Download;
+use Magento\Downloadable\Model\Link;
+use Magento\Downloadable\Model\Product\Type;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Downloadable\Api\DomainManagerInterface;
+
+/** @var DomainManagerInterface $domainManager */
+$domainManager = Bootstrap::getObjectManager()->get(DomainManagerInterface::class);
+$domainManager->addDomains(['example.com']);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()
+    ->get(ProductRepositoryInterface::class);
+/** @var LinkRepositoryInterface $linkRepository */
+$linkRepository = Bootstrap::getObjectManager()
+    ->create(LinkRepositoryInterface::class);
+/** @var ProductInterface $product */
+$product = Bootstrap::getObjectManager()
+    ->create(ProductInterface::class);
+/** @var LinkInterface $downloadableProductLink */
+$downloadableProductLink = Bootstrap::getObjectManager()
+    ->create(LinkInterface::class);
+
+$downloadableProductLink
+//    ->setId(null)
+    ->setLinkType(Download::LINK_TYPE_URL)
+    ->setTitle('Downloadable Product Link')
+    ->setIsShareable(Link::LINK_SHAREABLE_CONFIG)
+    ->setLinkUrl('http://example.com/downloadable.txt')
+    ->setNumberOfDownloads(100)
+    ->setSortOrder(1)
+    ->setPrice(0);
+
+$downloadableProductLinks[] = $downloadableProductLink;
+
+$product
+    ->setId(1)
+    ->setTypeId(Type::TYPE_DOWNLOADABLE)
+    ->setExtensionAttributes(
+        $product->getExtensionAttributes()
+            ->setDownloadableProductLinks($downloadableProductLinks)
+    )
+    ->setSku('downloadable-product')
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Downloadable Product Limited')
+    ->setPrice(10)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setLinksPurchasedSeparately(true)
+    ->setStockData(
+        [
+            'qty' => 100,
+            'is_in_stock' => 1,
+            'manage_stock' => 1,
+        ]
+    );
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_download_limit_rollback.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_download_limit_rollback.php
new file mode 100644
index 0000000000000..d88f6f1803434
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_download_limit_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__ . '/product_downloadable_rollback.php';
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 86aa61a99e1e8..a6c58c586ea16 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
@@ -4,8 +4,22 @@
  * See COPYING.txt for license details.
  */
 
+use Magento\Downloadable\Api\DomainManagerInterface;
+
 \Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var DomainManagerInterface $domainManager */
+$domainManager = $objectManager->get(DomainManagerInterface::class);
+$domainManager->addDomains(
+    [
+        'example.com',
+        'www.example.com',
+        'www.sample.example.com',
+        'google.com'
+    ]
+);
+
 /**
  * @var \Magento\Catalog\Model\Product $product
  */
@@ -81,10 +95,10 @@
  */
 $content = $objectManager->create(\Magento\Downloadable\Api\Data\File\ContentInterfaceFactory::class)->create();
 $content->setFileData(
+    // @codingStandardsIgnoreLine
     base64_encode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR . 'test_image.jpg'))
 );
 $content->setName('jellyfish_2_4.jpg');
-//$content->setName('');
 $link->setLinkFileContent($content);
 
 /**
@@ -92,6 +106,7 @@
  */
 $sampleContent = $objectManager->create(\Magento\Downloadable\Api\Data\File\ContentInterfaceFactory::class)->create();
 $sampleContent->setFileData(
+    // @codingStandardsIgnoreLine
     base64_encode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR . 'test_image.jpg'))
 );
 $sampleContent->setName('jellyfish_1_3.jpg');
@@ -136,6 +151,7 @@
                 \Magento\Downloadable\Api\Data\File\ContentInterfaceFactory::class
             )->create();
             $content->setFileData(
+                // @codingStandardsIgnoreLine
                 base64_encode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR . 'test_image.jpg'))
             );
             $content->setName('jellyfish_1_4.jpg');
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links.php
index 6ceb4d90787e1..0101fb74200bc 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links.php
@@ -5,10 +5,15 @@
  */
 declare(strict_types=1);
 
-use Magento\TestFramework\Helper\Bootstrap as Bootstrap;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Downloadable\Model\Product\Type as ProductType;
 use Magento\Catalog\Model\Product\Visibility as ProductVisibility;
+use Magento\Downloadable\Api\DomainManagerInterface;
+
+/** @var DomainManagerInterface $domainManager */
+$domainManager = Bootstrap::getObjectManager()->get(DomainManagerInterface::class);
+$domainManager->addDomains(['example.com']);
 
 /**
  * @var \Magento\Catalog\Model\Product $product
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links_rollback.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links_rollback.php
index 308a48c144e22..5fcab9af5eb77 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links_rollback.php
@@ -7,6 +7,11 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Downloadable\Api\DomainManagerInterface;
+
+/** @var DomainManagerInterface $domainManager */
+$domainManager = Bootstrap::getObjectManager()->get(DomainManagerInterface::class);
+$domainManager->removeDomains(['example.com']);
 
 /** @var \Magento\Framework\Registry $registry */
 $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_without_purchased_separately_links.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_without_purchased_separately_links.php
index f55261be04ce6..254e388c39037 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_without_purchased_separately_links.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_without_purchased_separately_links.php
@@ -5,10 +5,15 @@
  */
 declare(strict_types=1);
 
-use Magento\TestFramework\Helper\Bootstrap as Bootstrap;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Downloadable\Model\Product\Type as ProductType;
 use Magento\Catalog\Model\Product\Visibility as ProductVisibility;
+use Magento\Downloadable\Api\DomainManagerInterface;
+
+/** @var DomainManagerInterface $domainManager */
+$domainManager = Bootstrap::getObjectManager()->get(DomainManagerInterface::class);
+$domainManager->addDomains(['example.com']);
 
 /**
  * @var \Magento\Catalog\Model\Product $product
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_without_purchased_separately_links_rollback.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_without_purchased_separately_links_rollback.php
index 4569460b10181..498fab815cdb7 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_without_purchased_separately_links_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_without_purchased_separately_links_rollback.php
@@ -7,6 +7,11 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Downloadable\Api\DomainManagerInterface;
+
+/** @var DomainManagerInterface $domainManager */
+$domainManager = Bootstrap::getObjectManager()->get(DomainManagerInterface::class);
+$domainManager->removeDomains(['example.com']);
 
 /** @var \Magento\Framework\Registry $registry */
 $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
diff --git a/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/Import/Product/Type/DownloadableTest.php b/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/Import/Product/Type/DownloadableTest.php
index 776ec9f990f5e..15dd157a3154b 100644
--- a/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/Import/Product/Type/DownloadableTest.php
+++ b/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/Import/Product/Type/DownloadableTest.php
@@ -5,10 +5,12 @@
  */
 namespace Magento\DownloadableImportExport\Model\Import\Product\Type;
 
+use Magento\Downloadable\Api\DomainManagerInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DownloadableTest extends \PHPUnit\Framework\TestCase
 {
@@ -32,6 +34,11 @@ class DownloadableTest extends \PHPUnit\Framework\TestCase
      */
     const TEST_PRODUCT_SAMPLES_GROUP_NAME = 'TEST Import Samples';
 
+    /**
+     * @var DomainManagerInterface
+     */
+    private $domainManager;
+
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product
      */
@@ -47,6 +54,9 @@ class DownloadableTest extends \PHPUnit\Framework\TestCase
      */
     protected $productMetadata;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -56,6 +66,17 @@ protected function setUp()
         /** @var \Magento\Framework\EntityManager\MetadataPool $metadataPool */
         $metadataPool = $this->objectManager->get(\Magento\Framework\EntityManager\MetadataPool::class);
         $this->productMetadata = $metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+
+        $this->domainManager = $this->objectManager->get(DomainManagerInterface::class);
+        $this->domainManager->addDomains(['www.bing.com', 'www.google.com', 'www.yahoo.com']);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown()
+    {
+        $this->domainManager->removeDomains(['www.bing.com', 'www.google.com', 'www.yahoo.com']);
     }
 
     /**
@@ -112,7 +133,7 @@ public function testDownloadableImport()
         $downloadableSamples        = $product->getDownloadableSamples();
 
         //TODO: Track Fields: id, link_id, link_file and sample_file)
-        $expectedLinks= [
+        $expectedLinks = [
             'file' => [
                 'title' => 'TEST Import Link Title File',
                 'sort_order' => '78',
@@ -154,7 +175,7 @@ public function testDownloadableImport()
         }
 
         //TODO: Track Fields: id, sample_id and sample_file)
-        $expectedSamples= [
+        $expectedSamples = [
             'file' => [
                 'title' => 'TEST Import Sample File',
                 'sort_order' => '178',
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/DateTest.php b/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/DateTest.php
new file mode 100644
index 0000000000000..cb75d3e0d4a8e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/DateTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Controller\Adminhtml\Product\Attribute\Save\InputType;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save\InputType\AbstractSaveAttributeTest;
+
+/**
+ * Test cases related to create attribute with input type date.
+ *
+ * @magentoDbIsolation enabled
+ */
+class DateTest extends AbstractSaveAttributeTest
+{
+    /**
+     * Test create attribute and compare attribute data and input data.
+     *
+     * @dataProvider \Magento\TestFramework\Eav\Model\Attribute\DataProvider\Date::getAttributeDataWithCheckArray()
+     *
+     * @param array $attributePostData
+     * @param array $checkArray
+     * @return void
+     */
+    public function testCreateAttribute(array $attributePostData, array $checkArray): void
+    {
+        $this->createAttributeUsingDataAndAssert($attributePostData, $checkArray);
+    }
+
+    /**
+     * Test create attribute with error.
+     *
+     * @dataProvider \Magento\TestFramework\Eav\Model\Attribute\DataProvider\Date::getAttributeDataWithErrorMessage()
+     *
+     * @param array $attributePostData
+     * @param string $errorMessage
+     * @return void
+     */
+    public function testCreateAttributeWithError(array $attributePostData, string $errorMessage): void
+    {
+        $this->createAttributeUsingDataWithErrorAndAssert($attributePostData, $errorMessage);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/DropDownTest.php b/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/DropDownTest.php
new file mode 100644
index 0000000000000..1a3f363832d6e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/DropDownTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Controller\Adminhtml\Product\Attribute\Save\InputType;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save\InputType\AbstractSaveAttributeTest;
+
+/**
+ * Test cases related to create attribute with input type dropdown.
+ *
+ * @magentoDbIsolation enabled
+ */
+class DropDownTest extends AbstractSaveAttributeTest
+{
+    /**
+     * Test create attribute and compare attribute data and input data.
+     *
+     * @dataProvider \Magento\TestFramework\Eav\Model\Attribute\DataProvider\DropDown::getAttributeDataWithCheckArray()
+     *
+     * @param array $attributePostData
+     * @param array $checkArray
+     * @return void
+     */
+    public function testCreateAttribute(array $attributePostData, array $checkArray): void
+    {
+        $this->createAttributeUsingDataAndAssert($attributePostData, $checkArray);
+    }
+
+    /**
+     * Test create attribute with error.
+     *
+     * @dataProvider \Magento\TestFramework\Eav\Model\Attribute\DataProvider\DropDown::getAttributeDataWithErrorMessage()
+     *
+     * @param array $attributePostData
+     * @param string $errorMessage
+     * @return void
+     */
+    public function testCreateAttributeWithError(array $attributePostData, string $errorMessage): void
+    {
+        $this->createAttributeUsingDataWithErrorAndAssert($attributePostData, $errorMessage);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/MultipleSelectTest.php b/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/MultipleSelectTest.php
new file mode 100644
index 0000000000000..1c0f5ea720f70
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/MultipleSelectTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Controller\Adminhtml\Product\Attribute\Save\InputType;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save\InputType\AbstractSaveAttributeTest;
+
+/**
+ * Test cases related to create attribute with input type multiselect.
+ *
+ * @magentoDbIsolation enabled
+ */
+class MultipleSelectTest extends AbstractSaveAttributeTest
+{
+    /**
+     * Test create attribute and compare attribute data and input data.
+     *
+     * @dataProvider \Magento\TestFramework\Eav\Model\Attribute\DataProvider\MultipleSelect::getAttributeDataWithCheckArray()
+     *
+     * @param array $attributePostData
+     * @param array $checkArray
+     * @return void
+     */
+    public function testCreateAttribute(array $attributePostData, array $checkArray): void
+    {
+        $this->createAttributeUsingDataAndAssert($attributePostData, $checkArray);
+    }
+
+    /**
+     * Test create attribute with error.
+     *
+     * @dataProvider \Magento\TestFramework\Eav\Model\Attribute\DataProvider\MultipleSelect::getAttributeDataWithErrorMessage()
+     *
+     * @param array $attributePostData
+     * @param string $errorMessage
+     * @return void
+     */
+    public function testCreateAttributeWithError(array $attributePostData, string $errorMessage): void
+    {
+        $this->createAttributeUsingDataWithErrorAndAssert($attributePostData, $errorMessage);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/TextAreaTest.php b/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/TextAreaTest.php
new file mode 100644
index 0000000000000..9c5b1a8587674
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/TextAreaTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Controller\Adminhtml\Product\Attribute\Save\InputType;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save\InputType\AbstractSaveAttributeTest;
+
+/**
+ * Test cases related to create attribute with input type text_area.
+ *
+ * @magentoDbIsolation enabled
+ */
+class TextAreaTest extends AbstractSaveAttributeTest
+{
+    /**
+     * Test create attribute and compare attribute data and input data.
+     *
+     * @dataProvider \Magento\TestFramework\Eav\Model\Attribute\DataProvider\TextArea::getAttributeDataWithCheckArray()
+     *
+     * @param array $attributePostData
+     * @param array $checkArray
+     * @return void
+     */
+    public function testCreateAttribute(array $attributePostData, array $checkArray): void
+    {
+        $this->createAttributeUsingDataAndAssert($attributePostData, $checkArray);
+    }
+
+    /**
+     * Test create attribute with error.
+     *
+     * @dataProvider \Magento\TestFramework\Eav\Model\Attribute\DataProvider\TextArea::getAttributeDataWithErrorMessage()
+     *
+     * @param array $attributePostData
+     * @param string $errorMessage
+     * @return void
+     */
+    public function testCreateAttributeWithError(array $attributePostData, string $errorMessage): void
+    {
+        $this->createAttributeUsingDataWithErrorAndAssert($attributePostData, $errorMessage);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/TextEditorTest.php b/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/TextEditorTest.php
new file mode 100644
index 0000000000000..807e0cfd570b2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/TextEditorTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Controller\Adminhtml\Product\Attribute\Save\InputType;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save\InputType\AbstractSaveAttributeTest;
+
+/**
+ * Test cases related to create attribute with input type text_editor.
+ *
+ * @magentoDbIsolation enabled
+ */
+class TextEditorTest extends AbstractSaveAttributeTest
+{
+    /**
+     * Test create attribute and compare attribute data and input data.
+     *
+     * @dataProvider \Magento\TestFramework\Eav\Model\Attribute\DataProvider\TextEditor::getAttributeDataWithCheckArray()
+     *
+     * @param array $attributePostData
+     * @param array $checkArray
+     * @return void
+     */
+    public function testCreateAttribute(array $attributePostData, array $checkArray): void
+    {
+        $this->createAttributeUsingDataAndAssert($attributePostData, $checkArray);
+    }
+
+    /**
+     * Test create attribute with error.
+     *
+     * @dataProvider \Magento\TestFramework\Eav\Model\Attribute\DataProvider\TextEditor::getAttributeDataWithErrorMessage()
+     *
+     * @param array $attributePostData
+     * @param string $errorMessage
+     * @return void
+     */
+    public function testCreateAttributeWithError(array $attributePostData, string $errorMessage): void
+    {
+        $this->createAttributeUsingDataWithErrorAndAssert($attributePostData, $errorMessage);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/TextTest.php b/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/TextTest.php
new file mode 100644
index 0000000000000..70069dcedd0e4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/TextTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Controller\Adminhtml\Product\Attribute\Save\InputType;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save\InputType\AbstractSaveAttributeTest;
+
+/**
+ * Test cases related to create attribute with input type text.
+ *
+ * @magentoDbIsolation enabled
+ */
+class TextTest extends AbstractSaveAttributeTest
+{
+    /**
+     * Test create attribute and compare attribute data and input data.
+     *
+     * @dataProvider \Magento\TestFramework\Eav\Model\Attribute\DataProvider\Text::getAttributeDataWithCheckArray()
+     *
+     * @param array $attributePostData
+     * @param array $checkArray
+     * @return void
+     */
+    public function testCreateAttribute(array $attributePostData, array $checkArray): void
+    {
+        $this->createAttributeUsingDataAndAssert($attributePostData, $checkArray);
+    }
+
+    /**
+     * Test create attribute with error.
+     *
+     * @dataProvider \Magento\TestFramework\Eav\Model\Attribute\DataProvider\Text::getAttributeDataWithErrorMessage()
+     *
+     * @param array $attributePostData
+     * @param string $errorMessage
+     * @return void
+     */
+    public function testCreateAttributeWithError(array $attributePostData, string $errorMessage): void
+    {
+        $this->createAttributeUsingDataWithErrorAndAssert($attributePostData, $errorMessage);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/YesNoTest.php b/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/YesNoTest.php
new file mode 100644
index 0000000000000..7bb26556c3fd6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Eav/Controller/Adminhtml/Product/Attribute/Save/InputType/YesNoTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Controller\Adminhtml\Product\Attribute\Save\InputType;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save\InputType\AbstractSaveAttributeTest;
+
+/**
+ * Test cases related to create attribute with yes/no input type.
+ *
+ * @magentoDbIsolation enabled
+ */
+class YesNoTest extends AbstractSaveAttributeTest
+{
+    /**
+     * Test create attribute and compare attribute data and input data.
+     *
+     * @dataProvider \Magento\TestFramework\Eav\Model\Attribute\DataProvider\YesNo::getAttributeDataWithCheckArray()
+     *
+     * @param array $attributePostData
+     * @param array $checkArray
+     * @return void
+     */
+    public function testCreateAttribute(array $attributePostData, array $checkArray): void
+    {
+        $this->createAttributeUsingDataAndAssert($attributePostData, $checkArray);
+    }
+
+    /**
+     * Test create attribute with error.
+     *
+     * @dataProvider \Magento\TestFramework\Eav\Model\Attribute\DataProvider\YesNo::getAttributeDataWithErrorMessage()
+     *
+     * @param array $attributePostData
+     * @param string $errorMessage
+     * @return void
+     */
+    public function testCreateAttributeWithError(array $attributePostData, string $errorMessage): void
+    {
+        $this->createAttributeUsingDataWithErrorAndAssert($attributePostData, $errorMessage);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Eav/Model/ConfigTest.php
index c333098410800..f3d6247fa37ff 100644
--- a/dev/tests/integration/testsuite/Magento/Eav/Model/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Eav/Model/ConfigTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Eav\Model;
 
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
 use Magento\Framework\DataObject;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Helper\CacheCleaner;
@@ -12,7 +13,6 @@
 /**
  * @magentoAppIsolation enabled
  * @magentoDbIsolation enabled
- * @magentoDataFixture Magento/Eav/_files/attribute_for_search.php
  */
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
@@ -27,6 +27,9 @@ protected function setUp()
         $this->config = $objectManager->get(Config::class);
     }
 
+    /**
+     * @magentoDataFixture Magento/Eav/_files/attribute_for_search.php
+     */
     public function testGetEntityAttributeCodes()
     {
         $entityType = 'test';
@@ -47,6 +50,9 @@ public function testGetEntityAttributeCodes()
         $this->assertEquals($entityAttributeCodes1, $entityAttributeCodes2);
     }
 
+    /**
+     * @magentoDataFixture Magento/Eav/_files/attribute_for_search.php
+     */
     public function testGetEntityAttributeCodesWithObject()
     {
         $entityType = 'test';
@@ -74,6 +80,9 @@ public function testGetEntityAttributeCodesWithObject()
         $this->assertEquals($entityAttributeCodes1, $entityAttributeCodes2);
     }
 
+    /**
+     * @magentoDataFixture Magento/Eav/_files/attribute_for_search.php
+     */
     public function testGetAttributes()
     {
         $entityType = 'test';
@@ -96,6 +105,9 @@ public function testGetAttributes()
         $this->assertEquals($attributes1, $attributes2);
     }
 
+    /**
+     * @magentoDataFixture Magento/Eav/_files/attribute_for_search.php
+     */
     public function testGetAttribute()
     {
         $entityType = 'test';
@@ -109,4 +121,77 @@ public function testGetAttribute()
         $attribute2 = $this->config->getAttribute($entityType, 'attribute_for_search_1');
         $this->assertEquals($attribute1, $attribute2);
     }
+
+    /**
+     * @magentoDataFixture Magento/Eav/_files/attribute_for_caching.php
+     */
+    public function testGetAttributeWithCacheUserDefinedAttribute()
+    {
+        /** @var MutableScopeConfigInterface $mutableScopeConfig */
+        $mutableScopeConfig = Bootstrap::getObjectManager()->get(MutableScopeConfigInterface::class);
+        $mutableScopeConfig->setValue('dev/caching/cache_user_defined_attributes', 1);
+        $entityType = 'catalog_product';
+        $attribute = $this->config->getAttribute($entityType, 'foo');
+        $this->assertEquals('foo', $attribute->getAttributeCode());
+        $this->assertEquals('foo', $attribute->getFrontendLabel());
+        $this->assertEquals('varchar', $attribute->getBackendType());
+        $this->assertEquals(1, $attribute->getIsRequired());
+        $this->assertEquals(1, $attribute->getIsUserDefined());
+        $this->assertEquals(0, $attribute->getIsUnique());
+        // Update attribute
+        $eavSetupFactory = Bootstrap::getObjectManager()->create(\Magento\Eav\Setup\EavSetupFactory::class);
+        /** @var \Magento\Eav\Setup\EavSetup $eavSetup */
+        $eavSetup = $eavSetupFactory->create();
+        $eavSetup->updateAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'foo',
+            [
+                'frontend_label' => 'bar',
+            ]
+        );
+        // Check that attribute data has not changed
+        $config = Bootstrap::getObjectManager()->create(\Magento\Eav\Model\Config::class);
+        $updatedAttribute = $config->getAttribute($entityType, 'foo');
+        $this->assertEquals('foo', $updatedAttribute->getFrontendLabel());
+        // Clean cache
+        CacheCleaner::cleanAll();
+        $config = Bootstrap::getObjectManager()->create(\Magento\Eav\Model\Config::class);
+        // Check that attribute data has changed
+        $updatedAttributeAfterCacheClean = $config->getAttribute($entityType, 'foo');
+        $this->assertEquals('bar', $updatedAttributeAfterCacheClean->getFrontendLabel());
+        $mutableScopeConfig->setValue('dev/caching/cache_user_defined_attributes', 0);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Eav/_files/attribute_for_caching.php
+     */
+    public function testGetAttributeWithInitUserDefinedAttribute()
+    {
+        /** @var MutableScopeConfigInterface $mutableScopeConfig */
+        $mutableScopeConfig = Bootstrap::getObjectManager()->get(MutableScopeConfigInterface::class);
+        $mutableScopeConfig->setValue('dev/caching/cache_user_defined_attributes', 0);
+        $entityType = 'catalog_product';
+        $attribute = $this->config->getAttribute($entityType, 'foo');
+        $this->assertEquals('foo', $attribute->getAttributeCode());
+        $this->assertEquals('foo', $attribute->getFrontendLabel());
+        $this->assertEquals('varchar', $attribute->getBackendType());
+        $this->assertEquals(1, $attribute->getIsRequired());
+        $this->assertEquals(1, $attribute->getIsUserDefined());
+        $this->assertEquals(0, $attribute->getIsUnique());
+        // Update attribute
+        $eavSetupFactory = Bootstrap::getObjectManager()->create(\Magento\Eav\Setup\EavSetupFactory::class);
+        /** @var \Magento\Eav\Setup\EavSetup $eavSetup */
+        $eavSetup = $eavSetupFactory->create();
+        $eavSetup->updateAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            'foo',
+            [
+                'frontend_label' => 'bar',
+            ]
+        );
+        // Check that attribute data has changed
+        $config = Bootstrap::getObjectManager()->create(\Magento\Eav\Model\Config::class);
+        $updatedAttributeAfterCacheClean = $config->getAttribute($entityType, 'foo');
+        $this->assertEquals('bar', $updatedAttributeAfterCacheClean->getFrontendLabel());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/AttributeTest.php
index 2750e2a768aab..5b05308c786b5 100644
--- a/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Eav/Model/Entity/AttributeTest.php
@@ -3,15 +3,19 @@
  * 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;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
-class AttributeTest extends \PHPUnit\Framework\TestCase
+/**
+ * Class to test EAV Entity attribute model
+ */
+class AttributeTest extends TestCase
 {
     /**
      * @var Attribute
@@ -19,33 +23,33 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
     private $attribute;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     private $objectManager;
 
     /**
      * @var ResolverInterface
      */
-    private $_localeResolver;
+    private $localeResolver;
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->attribute = $this->objectManager->get(Attribute::class);
-        $this->_localeResolver = $this->objectManager->get(ResolverInterface::class);
+        $this->localeResolver = $this->objectManager->get(ResolverInterface::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function tearDown()
     {
         $this->attribute = null;
         $this->objectManager = null;
-        $this->_localeResolver = null;
+        $this->localeResolver = null;
     }
 
     /**
@@ -56,11 +60,17 @@ protected function tearDown()
      * @dataProvider beforeSaveDataProvider
      * @throws
      */
-    public function testBeforeSave($defaultValue, $backendType, $locale, $expected)
-    {
+    public function testBeforeSave(
+        string $defaultValue,
+        string $backendType,
+        string $frontendInput,
+        string $locale,
+        string $expected
+    ) {
         $this->attribute->setDefaultValue($defaultValue);
         $this->attribute->setBackendType($backendType);
-        $this->_localeResolver->setLocale($locale);
+        $this->attribute->setFrontendInput($frontendInput);
+        $this->localeResolver->setLocale($locale);
         $this->attribute->beforeSave();
 
         $this->assertEquals($expected, $this->attribute->getDefaultValue());
@@ -74,13 +84,15 @@ public function testBeforeSave($defaultValue, $backendType, $locale, $expected)
     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'],
+            ['21/07/18', 'datetime', 'date', 'en_AU', '2018-07-21 00:00:00'],
+            ['07/21/18', 'datetime', 'date', 'en_US', '2018-07-21 00:00:00'],
+            ['21/07/18', 'datetime', 'date', 'fr_FR', '2018-07-21 00:00:00'],
+            ['21/07/18', 'datetime', 'date', 'de_DE', '2018-07-21 00:00:00'],
+            ['21/07/18', 'datetime', 'date', 'uk_UA', '2018-07-21 00:00:00'],
+            ['100.50', 'decimal', 'decimal', 'en_US', '100.50'],
+            ['100,50', 'decimal', 'decimal', 'uk_UA', '100.5'],
+            ['07/21/2019 2:30 PM', 'datetime', 'datetime', 'en_US', '2019-07-21 21:30:00'],
+            ['21.07.2019 14:30', 'datetime', 'datetime', 'uk_UA', '2019-07-21 21:30:00'],
         ];
     }
 
@@ -96,7 +108,7 @@ public function testBeforeSaveErrorData($defaultValue, $backendType, $locale, $e
     {
         $this->attribute->setDefaultValue($defaultValue);
         $this->attribute->setBackendType($backendType);
-        $this->_localeResolver->setLocale($locale);
+        $this->localeResolver->setLocale($locale);
         $this->attribute->beforeSave();
 
         $this->expectExceptionMessage($expected);
diff --git a/dev/tests/integration/testsuite/Magento/Eav/_files/attribute_for_caching.php b/dev/tests/integration/testsuite/Magento/Eav/_files/attribute_for_caching.php
new file mode 100644
index 0000000000000..10e8109f3f31f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Eav/_files/attribute_for_caching.php
@@ -0,0 +1,45 @@
+<?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)
+    ->loadByCode('catalog_product');
+$data = $entityType->getData();
+$entityTypeId = $entityType->getId();
+
+/** @var \Magento\Eav\Model\Entity\Attribute\Set $attributeSet */
+$attributeSet = $objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class);
+$attributeSet->setData(
+    [
+        'attribute_set_name' => 'test_attribute_set',
+        'entity_type_id' => $entityTypeId,
+        'sort_order' => 100
+    ]
+);
+$attributeSet->validate();
+$attributeSet->save();
+
+$attributeData = [
+    [
+        'attribute_code' => 'foo',
+        'entity_type_id' => $entityTypeId,
+        'backend_type' => 'varchar',
+        'is_required' => 1,
+        'is_user_defined' => 1,
+        'is_unique' => 0,
+        'frontend_label' => ['foo'],
+        'attribute_set_id' => $entityType->getDefaultAttributeSetId()
+    ]
+];
+
+foreach ($attributeData as $data) {
+    /** @var \Magento\Eav\Model\Entity\Attribute $attribute */
+    $attribute = $objectManager->create(\Magento\Eav\Model\Entity\Attribute::class);
+    $attribute->setData($data);
+    $attribute->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Eav/_files/attribute_for_caching_rollback.php b/dev/tests/integration/testsuite/Magento/Eav/_files/attribute_for_caching_rollback.php
new file mode 100644
index 0000000000000..ebc3d58028e37
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Eav/_files/attribute_for_caching_rollback.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Eav\Model\Entity\Attribute\Set;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Registry;
+
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var Attribute $attribute */
+$attribute = $objectManager->create(Attribute::class);
+$attribute->loadByCode(4, 'foo');
+
+if ($attribute->getId()) {
+    $attribute->delete();
+}
+
+/** @var Set $attributeSet */
+$attributeSet = $objectManager->create(Set::class)->load('test_attribute_set', 'attribute_set_name');
+if ($attributeSet->getId()) {
+    $attributeSet->delete();
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
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
index 787e554a947a1..6e21dfcab6a89 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/Adminhtml/Category/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/Adminhtml/Category/SaveTest.php
@@ -52,6 +52,7 @@ protected function tearDown()
     /**
      * Checks a case when indexers are invalidated if products for category were changed.
      *
+     * @magentoConfigFixture current_store catalog/frontend/flat_catalog_category true
      * @magentoDataFixture Magento/Catalog/_files/category_product.php
      * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
      */
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch6/SearchAdapter/ConnectionManagerTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch6/SearchAdapter/ConnectionManagerTest.php
new file mode 100644
index 0000000000000..2b531eac4e423
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch6/SearchAdapter/ConnectionManagerTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch6\SearchAdapter;
+
+use Magento\Elasticsearch\Elasticsearch5\SearchAdapter\ConnectionManager;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test for \Magento\Elasticsearch\SearchAdapter\ConnectionManager class.
+ */
+class ConnectionManagerTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Elasticsearch\SearchAdapter\ConnectionManager
+     */
+    private $connectionManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->connectionManager = $this->objectManager->create(ConnectionManager::class);
+    }
+
+    /**
+     * Test if 'elasticsearch5' search engine returned by connection manager.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch5
+     */
+    public function testCorrectElasticsearchClientEs5()
+    {
+        $connection = $this->connectionManager->getConnection();
+        $this->assertInstanceOf(
+            \Magento\Elasticsearch\Elasticsearch5\Model\Client\Elasticsearch::class,
+            $connection
+        );
+    }
+
+    /**
+     * Test if 'elasticsearch6' search engine returned by connection manager.
+     *
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
+     */
+    public function testCorrectElasticsearchClientEs6()
+    {
+        $connection = $this->connectionManager->getConnection();
+        $this->assertInstanceOf(
+            \Magento\Elasticsearch6\Model\Client\Elasticsearch::class,
+            $connection
+        );
+    }
+}
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 5b354dce5062f..be29846ea9f85 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
@@ -156,10 +156,11 @@ public function layoutDirectiveDataProvider()
      * @param $directive
      * @param $translations
      * @param $expectedResult
+     * @param array $variables
      * @internal param $translatorData
      * @dataProvider transDirectiveDataProvider
      */
-    public function testTransDirective($directive, $translations, $expectedResult)
+    public function testTransDirective($directive, $translations, $expectedResult, $variables = [])
     {
         $renderer = Phrase::getRenderer();
 
@@ -168,9 +169,12 @@ public function testTransDirective($directive, $translations, $expectedResult)
             ->setMethods(['getData'])
             ->getMock();
 
-        $translator->expects($this->atLeastOnce())
-            ->method('getData')
-            ->will($this->returnValue($translations));
+        $translator->method('getData')
+            ->willReturn($translations);
+
+        if (!empty($variables)) {
+            $this->model->setVariables($variables);
+        }
 
         $this->objectManager->addSharedInstance($translator, \Magento\Framework\Translate::class);
         $this->objectManager->removeSharedInstance(\Magento\Framework\Phrase\Renderer\Translate::class);
@@ -196,7 +200,65 @@ public function transDirectiveDataProvider()
                 '{{trans "foobar"}}',
                 ['foobar' => 'barfoo'],
                 'barfoo',
-            ]
+            ],
+            'empty directive' => [
+                '{{trans}}',
+                [],
+                '',
+            ],
+            'empty string' => [
+                '{{trans ""}}',
+                [],
+                '',
+            ],
+            'no padding' => [
+                '{{trans"Hello cruel coder..."}}',
+                [],
+                'Hello cruel coder...',
+            ],
+            'multi-line padding' => [
+                "{{trans \t\n\r'Hello cruel coder...' \t\n\r}}",
+                [],
+                'Hello cruel coder...',
+            ],
+            'capture escaped double-quotes inside text' => [
+                '{{trans "Hello \"tested\" world!"}}',
+                [],
+                'Hello &quot;tested&quot; world!',
+            ],
+            'capture escaped single-quotes inside text' => [
+                "{{trans 'Hello \\'tested\\' world!'|escape}}",
+                [],
+                "Hello &#039;tested&#039; world!",
+            ],
+            'filter with params' => [
+                "{{trans 'Hello \\'tested\\' world!'|escape:html}}",
+                [],
+                "Hello &#039;tested&#039; world!",
+            ],
+            'basic var' => [
+                '{{trans "Hello %adjective world!" adjective="tested"}}',
+                [],
+                'Hello tested world!',
+            ],
+            'auto-escaped output' => [
+                '{{trans "Hello %adjective <strong>world</strong>!" adjective="<em>bad</em>"}}',
+                [],
+                'Hello &lt;em&gt;bad&lt;/em&gt; &lt;strong&gt;world&lt;/strong&gt;!',
+            ],
+            'unescaped modifier' => [
+                '{{trans "Hello %adjective <strong>world</strong>!" adjective="<em>bad</em>"|raw}}',
+                [],
+                'Hello <em>bad</em> <strong>world</strong>!',
+            ],
+            'variable replacement' => [
+                '{{trans "Hello %adjective world!" adjective="$mood"}}',
+                [],
+                'Hello happy world!',
+                [
+                    'mood' => 'happy'
+                ],
+            ],
         ];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
index f791cdbeffe59..6ab457811999a 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
@@ -8,6 +8,7 @@
 use Magento\Backend\App\Area\FrontNameResolver as BackendFrontNameResolver;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\View\DesignInterface;
 use Magento\Store\Model\ScopeInterface;
@@ -345,6 +346,76 @@ public function templateDirectiveDataProvider()
         ];
     }
 
+    /**
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     * @magentoComponentsDir Magento/Email/Model/_files/design
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     */
+    public function testTemplateLoadedFromDbIsFilteredInStrictMode()
+    {
+        $this->mockModel();
+
+        $this->setUpThemeFallback(BackendFrontNameResolver::AREA_CODE);
+
+        $this->model->setTemplateType(TemplateTypesInterface::TYPE_HTML);
+        // The first variable should be processed because it didn't come from the DB
+        $template = '{{var store.isSaveAllowed()}} - {{template config_path="design/email/footer_template"}}';
+        $this->model->setTemplateText($template);
+
+        // Allows for testing of templates overridden in backend
+        $template = $this->objectManager->create(\Magento\Email\Model\Template::class);
+        $templateData = [
+            'template_code' => 'some_unique_code',
+            'template_type' => TemplateTypesInterface::TYPE_HTML,
+            // This template will be processed in strict mode
+            'template_text' => '{{var this.template_code}}'
+                . ' - {{var store.isSaveAllowed()}} - {{var this.getTemplateCode()}}',
+        ];
+        $template->setData($templateData);
+        $template->save();
+
+        // Store the ID of the newly created template in the system config so that this template will be loaded
+        $this->objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
+            ->setValue('design/email/footer_template', $template->getId(), ScopeInterface::SCOPE_STORE, 'fixturestore');
+
+        self::assertEquals('1 - some_unique_code -  - some_unique_code', $this->model->getProcessedTemplate());
+    }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     * @magentoComponentsDir Magento/Email/Model/_files/design
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     */
+    public function testLegacyTemplateLoadedFromDbIsFilteredInLegacyMode()
+    {
+        $this->mockModel();
+
+        $this->setUpThemeFallback(BackendFrontNameResolver::AREA_CODE);
+
+        $this->model->setTemplateType(TemplateTypesInterface::TYPE_HTML);
+        $template = '{{var store.isSaveAllowed()}} - {{template config_path="design/email/footer_template"}}';
+        $this->model->setTemplateText($template);
+
+        $template = $this->objectManager->create(\Magento\Email\Model\Template::class);
+        $templateData = [
+            'is_legacy' => '1',
+            'template_code' => 'some_unique_code',
+            'template_type' => TemplateTypesInterface::TYPE_HTML,
+            'template_text' => '{{var this.template_code}}'
+                . ' - {{var store.isSaveAllowed()}} - {{var this.getTemplateCode()}}',
+        ];
+        $template->setData($templateData);
+        $template->save();
+
+        // Store the ID of the newly created template in the system config so that this template will be loaded
+        $this->objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
+            ->setValue('design/email/footer_template', $template->getId(), ScopeInterface::SCOPE_STORE, 'fixturestore');
+
+        self::assertEquals('1 - some_unique_code - 1 - some_unique_code', $this->model->getProcessedTemplate());
+    }
+
     /**
      * Ensure that the template_styles variable contains styles from either <!--@styles @--> or the "Template Styles"
      * textarea in backend, depending on whether template was loaded from filesystem or DB.
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/email_template.php b/dev/tests/integration/testsuite/Magento/Email/Model/_files/email_template.php
index bbbcc3133d4ba..6d5f760d7894d 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/email_template.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/email_template.php
@@ -10,9 +10,9 @@
 $template->setOptions(['area' => 'test area', 'store' => 1]);
 $template->setData(
     [
-        'template_text' =>
-            file_get_contents(__DIR__ . '/template_fixture.html'),
-        'template_code' => \Magento\Theme\Model\Config\ValidatorTest::TEMPLATE_CODE
+        'template_text' => file_get_contents(__DIR__ . '/template_fixture.html'),
+        'template_code' => \Magento\Theme\Model\Config\ValidatorTest::TEMPLATE_CODE,
+        'template_type' => \Magento\Email\Model\Template::TYPE_TEXT
     ]
 );
 $template->save();
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Async/ProxyDeferredFactoryTest.php b/dev/tests/integration/testsuite/Magento/Framework/Async/ProxyDeferredFactoryTest.php
index e4385b598c604..21392e5f7b127 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Async/ProxyDeferredFactoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Async/ProxyDeferredFactoryTest.php
@@ -18,7 +18,7 @@
 class ProxyDeferredFactoryTest extends TestCase
 {
     /**
-     * @var ProxyDeferredFactory
+     * @var \TestDeferred\TestClass\ProxyDeferredFactory
      */
     private $factory;
 
@@ -43,6 +43,7 @@ protected function setUp()
         //phpcs:ignore
         include_once __DIR__ .'/_files/test_class.php';
         \TestDeferred\TestClass::$created = 0;
+        $this->factory = Bootstrap::getObjectManager()->get(\TestDeferred\TestClass\ProxyDeferredFactory::class);
     }
 
     /*
@@ -57,9 +58,10 @@ public function testCreate(): void
             return new \TestDeferred\TestClass($value);
         };
         /** @var \TestDeferred\TestClass $proxy */
-        $proxy = $this->factory->createFor(
-            \TestDeferred\TestClass::class,
-            $this->callbackDeferredFactory->create(['callback' => $callback])
+        $proxy = $this->factory->create(
+            [
+                'deferred' => $this->callbackDeferredFactory->create(['callback' => $callback])
+            ]
         );
         $this->assertInstanceOf(\TestDeferred\TestClass::class, $proxy);
         $this->assertEmpty(\TestDeferred\TestClass::$created);
@@ -80,9 +82,10 @@ public function testSerialize(): void
             return new \TestDeferred\TestClass($value);
         };
         /** @var \TestDeferred\TestClass $proxy */
-        $proxy = $this->factory->createFor(
-            \TestDeferred\TestClass::class,
-            $this->callbackDeferredFactory->create(['callback' => $callback])
+        $proxy = $this->factory->create(
+            [
+                'deferred' => $this->callbackDeferredFactory->create(['callback' => $callback])
+            ]
         );
         //phpcs:disable
         /** @var \TestDeferred\TestClass $unserialized */
@@ -106,9 +109,10 @@ public function testClone(): void
             return new \TestDeferred\TestClass($value);
         };
         /** @var \TestDeferred\TestClass $proxy */
-        $proxy = $this->factory->createFor(
-            \TestDeferred\TestClass::class,
-            $this->callbackDeferredFactory->create(['callback' => $callback])
+        $proxy = $this->factory->create(
+            [
+                'deferred' => $this->callbackDeferredFactory->create(['callback' => $callback])
+            ]
         );
         $this->assertEquals(0, \TestDeferred\TestClass::$created);
         $this->assertEquals(0, $called);
@@ -137,9 +141,10 @@ public function getValue()
             };
         };
         /** @var \TestDeferred\TestClass $proxy */
-        $proxy = $this->factory->createFor(
-            \TestDeferred\TestClass::class,
-            $this->callbackDeferredFactory->create(['callback' => $callback])
+        $proxy = $this->factory->create(
+            [
+                'deferred' => $this->callbackDeferredFactory->create(['callback' => $callback])
+            ]
         );
         $this->assertInstanceOf(\TestDeferred\TestClass::class, $proxy);
         $this->assertEmpty(\TestDeferred\TestClass::$created);
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 fe1d382b361fa..ed9965622dc40 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
@@ -7,7 +7,7 @@
         "AFL-3.0"
     ],
     "require": {
-        "php": "~5.5.22|~5.6.0|~7.0.0",
+        "php": "~5.5.22||~5.6.0||~7.0.0",
         "ext-ctype": "*",
         "ext-curl": "*",
         "ext-dom": "*",
@@ -17,7 +17,6 @@
         "ext-intl": "*",
         "ext-mcrypt": "*",
         "ext-simplexml": "*",
-        "ext-spl": "*",
         "lib-libxml": "*",
         "composer/composer": "1.0.0-alpha9",
         "magento/magento-composer-installer": "*",
diff --git a/dev/tests/integration/testsuite/Magento/Framework/File/UploaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/File/UploaderTest.php
new file mode 100644
index 0000000000000..15e52f5b17565
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/File/UploaderTest.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\File;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Test for \Magento\Framework\File\Uploader
+ */
+class UploaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\MediaStorage\Model\File\UploaderFactory
+     */
+    private $uploaderFactory;
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->uploaderFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\MediaStorage\Model\File\UploaderFactory::class);
+
+        $this->filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\Filesystem::class);
+    }
+
+    /**
+     * @return void
+     */
+    public function testUploadFileFromAllowedFolder(): void
+    {
+        $mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
+
+        $fileName = 'text.txt';
+        $tmpDir = 'tmp';
+        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+
+        $tmpDirectory->writeFile($fileName, 'just a text');
+
+        $type = [
+            'tmp_name' => $filePath,
+            'name' => $fileName,
+        ];
+
+        $uploader = $this->uploaderFactory->create(['fileId' => $type]);
+        $uploader->save($mediaDirectory->getAbsolutePath($tmpDir));
+
+        $this->assertTrue($mediaDirectory->isFile($tmpDir . DIRECTORY_SEPARATOR . $fileName));
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Invalid parameter given. A valid $fileId[tmp_name] is expected.
+     *
+     * @return void
+     */
+    public function testUploadFileFromNotAllowedFolder(): void
+    {
+        $fileName = 'text.txt';
+        $tmpDir = 'tmp';
+        $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::LOG);
+        $filePath = $tmpDirectory->getAbsolutePath() . $tmpDir . DIRECTORY_SEPARATOR . $fileName;
+
+        $tmpDirectory->writeFile($tmpDir . DIRECTORY_SEPARATOR . $fileName, 'just a text');
+
+        $type = [
+            'tmp_name' => $filePath,
+            'name' => $fileName,
+        ];
+
+        $this->uploaderFactory->create(['fileId' => $type]);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        $tmpDir = 'tmp';
+        $mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $mediaDirectory->delete($tmpDir);
+
+        $logDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::LOG);
+        $logDirectory->delete($tmpDir);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/DependDirectiveTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/DependDirectiveTest.php
new file mode 100644
index 0000000000000..548696f178559
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/DependDirectiveTest.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter\DirectiveProcessor;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\VariableResolver\StrictResolver;
+use Magento\Framework\Filter\VariableResolverInterface;
+use PHPUnit\Framework\TestCase;
+
+class DependDirectiveTest extends TestCase
+{
+    /**
+     * @var VariableResolverInterface
+     */
+    private $variableResolver;
+
+    /**
+     * @var DependDirective
+     */
+    private $processor;
+
+    /**
+     * @var Template
+     */
+    private $filter;
+
+    protected function setUp()
+    {
+        $objectManager = ObjectManager::getInstance();
+        $this->variableResolver = $objectManager->get(StrictResolver::class);
+        $this->filter = $objectManager->get(Template::class);
+        $this->processor = $objectManager->create(
+            DependDirective::class,
+            ['variableResolver' => $this->variableResolver]
+        );
+    }
+
+    public function testFallbackWithNoVariables()
+    {
+        $template = 'blah {{depend foo}}blah{{/depend}} blah';
+        $result = $this->processor->process($this->createConstruction($this->processor, $template), $this->filter, []);
+        self::assertEquals('{{depend foo}}blah{{/depend}}', $result);
+    }
+
+    /**
+     * @dataProvider useCasesProvider
+     */
+    public function testCases(string $parameter, array $variables, bool $isTrue)
+    {
+        $template = 'blah {{depend ' . $parameter . '}}blah{{/depend}} blah';
+        $result = $this->processor->process(
+            $this->createConstruction($this->processor, $template),
+            $this->filter,
+            $variables
+        );
+        self::assertEquals($isTrue ? 'blah' : '', $result);
+    }
+
+    public function useCasesProvider()
+    {
+        return [
+            ['foo',['foo' => true], true],
+            ['foo',['foo' => false], false],
+            ['foo.bar',['foo' => ['bar' => true]], true],
+            ['foo.bar',['foo' => ['bar' => false]], false],
+            ['foo.getBar().baz',['foo' => new DataObject(['bar' => ['baz' => true]])], true],
+            ['foo.getBar().baz',['foo' => new DataObject(['bar' => ['baz' => false]])], false],
+        ];
+    }
+
+    private function createConstruction(DependDirective $directive, string $value): array
+    {
+        preg_match($directive->getRegularExpression(), $value, $construction);
+
+        return $construction;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/Filter/FilterApplierTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/Filter/FilterApplierTest.php
new file mode 100644
index 0000000000000..f5222c2ead1ac
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/Filter/FilterApplierTest.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\Filter\DirectiveProcessor\Filter;
+
+use Magento\Framework\App\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+class FilterApplierTest extends TestCase
+{
+    /**
+     * @var FilterApplier
+     */
+    private $applier;
+
+    protected function setUp()
+    {
+        $this->applier = ObjectManager::getInstance()->get(FilterApplier::class);
+    }
+
+    /**
+     * @dataProvider arrayUseCaseProvider
+     */
+    public function testArrayUseCases($param, $input, $expected)
+    {
+        $result = $this->applier->applyFromArray($param, $input);
+
+        self::assertSame($expected, $result);
+    }
+
+    public function arrayUseCaseProvider()
+    {
+        $standardInput = 'Hello ' . "\n" . ' &world!';
+        return [
+            'raw' => [['raw'], $standardInput, $standardInput],
+            'standard usage' => [['escape', 'nl2br'], $standardInput, 'Hello <br />' . "\n" . ' &amp;world!'],
+            'single usage' => [['escape'], $standardInput, 'Hello ' . "\n" . ' &amp;world!'],
+            'params' => [
+                ['nl2br', 'escape:url', 'foofilter'],
+                $standardInput,
+                '12%DLROW62%02%A0%E3%F2%02%RBC3%02%OLLEH'
+            ],
+            'no filters' => [[], $standardInput, $standardInput],
+            'bad filters' => [['', false, 0, null], $standardInput, $standardInput],
+            'mixed filters' => [['', false, 'escape', 0, null], $standardInput, 'Hello ' . "\n" . ' &amp;world!'],
+        ];
+    }
+
+    /**
+     * @dataProvider rawUseCaseProvider
+     */
+    public function testRawUseCases($param, $input, $expected)
+    {
+        $result = $this->applier->applyFromRawParam($param, $input, ['escape']);
+
+        self::assertSame($expected, $result);
+    }
+
+    public function rawUseCaseProvider()
+    {
+        $standardInput = 'Hello ' . "\n" . ' &world!';
+        return [
+            'raw' => ['|raw', $standardInput, $standardInput],
+            'standard usage' => ['|escape|nl2br', $standardInput, 'Hello <br />' . "\n" . ' &amp;world!'],
+            'single usage' => ['|escape', $standardInput, 'Hello ' . "\n" . ' &amp;world!'],
+            'default filters' => ['', $standardInput, 'Hello ' . "\n" . ' &amp;world!'],
+            'params' => ['|nl2br|escape:url|foofilter', $standardInput, '12%DLROW62%02%A0%E3%F2%02%RBC3%02%OLLEH'],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/ForDirectiveTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/ForDirectiveTest.php
new file mode 100644
index 0000000000000..d7b268a8af6f4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/ForDirectiveTest.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\DirectiveProcessor;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\VariableResolver\StrictResolver;
+use Magento\Framework\Filter\VariableResolverInterface;
+use PHPUnit\Framework\TestCase;
+
+class ForDirectiveTest extends TestCase
+{
+    /**
+     * @var VariableResolverInterface
+     */
+    private $variableResolver;
+
+    /**
+     * @var DependDirective
+     */
+    private $processor;
+
+    /**
+     * @var Template
+     */
+    private $filter;
+
+    protected function setUp()
+    {
+        $objectManager = ObjectManager::getInstance();
+        $this->variableResolver = $objectManager->get(StrictResolver::class);
+        $this->filter = $objectManager->get(Template::class);
+        $this->processor = $objectManager->create(
+            ForDirective::class,
+            ['variableResolver' => $this->variableResolver]
+        );
+    }
+
+    /**
+     * @dataProvider invalidFormatProvider
+     */
+    public function testFallbackWithIncorrectFormat($template)
+    {
+        $result = $this->processor->process($this->createConstruction($this->processor, $template), $this->filter, []);
+        self::assertEquals($template, $result);
+    }
+
+    /**
+     * @dataProvider useCasesProvider
+     */
+    public function testCases(string $template, array $variables, string $expect)
+    {
+        $result = $this->processor->process(
+            $this->createConstruction($this->processor, $template),
+            $this->filter,
+            $variables
+        );
+        self::assertEquals($expect, $result);
+    }
+
+    public function useCasesProvider()
+    {
+        $items = [
+            'ignoreme' => [
+                'a' => 'hello1',
+                'b' => ['world' => new DataObject(['foo' => 'bar1'])]
+            ],
+            [
+                'a' => 'hello2',
+                'b' => ['world' => new DataObject(['foo' => 'bar2'])]
+            ],
+        ];
+        $expect = '0a:hello1,b:bar11a:hello2,b:bar2';
+        $body = '{{var loop.index}}a:{{var item.a}},b:{{var item.b.world.foo}}';
+
+        return [
+            ['{{for item in foo}}' . $body . '{{/for}}',['foo' => $items], $expect],
+            ['{{for item in foo.bar}}' . $body . '{{/for}}',['foo' => ['bar' => $items]], $expect],
+            [
+                '{{for item in foo.getBar().baz}}' . $body . '{{/for}}',
+                ['foo' => new DataObject(['bar' => ['baz' => $items]])],
+                $expect
+            ],
+        ];
+    }
+
+    public function invalidFormatProvider()
+    {
+        return [
+            ['{{for in}}foo{{/for}}'],
+            ['{{for in items}}foo{{/for}}'],
+        ];
+    }
+
+    private function createConstruction(ForDirective $directive, string $value): array
+    {
+        preg_match($directive->getRegularExpression(), $value, $construction);
+
+        return $construction;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/IfDirectiveTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/IfDirectiveTest.php
new file mode 100644
index 0000000000000..1ba4412a07a54
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/IfDirectiveTest.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\Filter\DirectiveProcessor;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\VariableResolver\StrictResolver;
+use Magento\Framework\Filter\VariableResolverInterface;
+use PHPUnit\Framework\TestCase;
+
+class IfDirectiveTest extends TestCase
+{
+    /**
+     * @var VariableResolverInterface
+     */
+    private $variableResolver;
+
+    /**
+     * @var DependDirective
+     */
+    private $processor;
+
+    /**
+     * @var Template
+     */
+    private $filter;
+
+    protected function setUp()
+    {
+        $objectManager = ObjectManager::getInstance();
+        $this->variableResolver = $objectManager->get(StrictResolver::class);
+        $this->filter = $objectManager->get(Template::class);
+        $this->processor = $objectManager->create(
+            IfDirective::class,
+            ['variableResolver' => $this->variableResolver]
+        );
+    }
+
+    public function testFallbackWithNoVariables()
+    {
+        $template = 'blah {{if foo}}blah{{/if}} blah';
+        $result = $this->processor->process($this->createConstruction($this->processor, $template), $this->filter, []);
+        self::assertEquals('{{if foo}}blah{{/if}}', $result);
+    }
+
+    /**
+     * @dataProvider useCasesProvider
+     */
+    public function testCases(string $template, array $variables, string $expect)
+    {
+        $result = $this->processor->process(
+            $this->createConstruction($this->processor, $template),
+            $this->filter,
+            $variables
+        );
+        self::assertEquals($expect, $result);
+    }
+
+    public function useCasesProvider()
+    {
+        return [
+            ['{{if foo}}blah{{/if}}',['foo' => true], 'blah'],
+            ['{{if foo}}blah{{/if}}',['foo' => false], ''],
+            ['{{if foo.bar}}blah{{/if}}',['foo' => ['bar' => true]], 'blah'],
+            ['{{if foo.bar}}blah{{/if}}',['foo' => ['bar' => false]], ''],
+            ['{{if foo.getBar().baz}}blah{{/if}}',['foo' => new DataObject(['bar' => ['baz' => true]])], 'blah'],
+            ['{{if foo.getBar().baz}}blah{{/if}}',['foo' => new DataObject(['bar' => ['baz' => false]])], ''],
+
+            ['{{if foo}}blah{{else}}other{{/if}}',['foo' => true], 'blah'],
+            ['{{if foo}}blah{{else}}other{{/if}}',['foo' => false], 'other'],
+            ['{{if foo.bar}}blah{{else}}other{{/if}}',['foo' => ['bar' => true]], 'blah'],
+            ['{{if foo.bar}}blah{{else}}other{{/if}}',['foo' => ['bar' => false]], 'other'],
+            [
+                '{{if foo.getBar().baz}}blah{{else}}other{{/if}}',
+                ['foo' => new DataObject(['bar' => ['baz' => true]])],
+                'blah'
+            ],
+            [
+                '{{if foo.getBar().baz}}blah{{else}}other{{/if}}',
+                ['foo' => new DataObject(['bar' => ['baz' => false]])],
+                'other'
+            ],
+        ];
+    }
+
+    private function createConstruction(IfDirective $directive, string $value): array
+    {
+        preg_match($directive->getRegularExpression(), $value, $construction);
+
+        return $construction;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/LegacyDirectiveTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/LegacyDirectiveTest.php
new file mode 100644
index 0000000000000..fcfcd943b603c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/LegacyDirectiveTest.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\Filter\DirectiveProcessor;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filter\Template;
+use Magento\TestModuleSimpleTemplateDirective\Model\LegacyFilter;
+use PHPUnit\Framework\TestCase;
+
+class LegacyDirectiveTest extends TestCase
+{
+    /**
+     * @var DependDirective
+     */
+    private $processor;
+
+    /**
+     * @var Template
+     */
+    private $filter;
+
+    protected function setUp()
+    {
+        $objectManager = ObjectManager::getInstance();
+        $this->filter = $objectManager->create(LegacyFilter::class);
+        $this->processor = $objectManager->create(LegacyDirective::class);
+    }
+
+    public function testFallbackWithNoVariables()
+    {
+        $template = 'blah {{unknown foobar}} blah';
+        $result = $this->processor->process($this->createConstruction($this->processor, $template), $this->filter, []);
+        self::assertEquals('{{unknown foobar}}', $result);
+    }
+
+    /**
+     * @dataProvider useCaseProvider
+     */
+    public function testCases(string $template, array $variables, string $expect)
+    {
+        $result = $this->processor->process(
+            $this->createConstruction($this->processor, $template),
+            $this->filter,
+            $variables
+        );
+        self::assertEquals($expect, $result);
+    }
+
+    public function useCaseProvider()
+    {
+        return [
+            'protected method' => ['{{cool "blah" foo bar baz=bash}}', [], 'value1: cool: "blah" foo bar baz=bash'],
+            'public method' => ['{{cooler "blah" foo bar baz=bash}}', [], 'value2: cooler: "blah" foo bar baz=bash'],
+            'simple directive' => ['{{mydir "blah" param1=bash}}foo{{/mydir}}', [], 'OOFHSABHALB'],
+        ];
+    }
+
+    private function createConstruction(LegacyDirective $directive, string $value): array
+    {
+        preg_match($directive->getRegularExpression(), $value, $construction);
+
+        return $construction;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/SimpleDirectiveTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/SimpleDirectiveTest.php
new file mode 100644
index 0000000000000..ccf867c51c3c8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/SimpleDirectiveTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter\DirectiveProcessor;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filter\DirectiveProcessor\Filter\FilterPool;
+use Magento\Framework\Filter\DirectiveProcessor\Filter\NewlineToBreakFilter;
+use Magento\Framework\Filter\SimpleDirective\ProcessorPool;
+use Magento\Framework\Filter\Template;
+use Magento\TestModuleSimpleTemplateDirective\Model\FooFilter;
+use Magento\TestModuleSimpleTemplateDirective\Model\MyDirProcessor;
+use PHPUnit\Framework\TestCase;
+
+class SimpleDirectiveTest extends TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = ObjectManager::getInstance();
+    }
+
+    public function testFallbackWhenDirectiveNotFound()
+    {
+        $filter = $this->objectManager->get(Template::class);
+        $processor = $this->createWithProcessorsAndFilters([], []);
+
+        $template = 'blah {{foo bar}} blah';
+        $result = $processor->process($this->createConstruction($processor, $template), $filter, []);
+        self::assertEquals('{{foo bar}}', $result);
+    }
+
+    public function testProcessorAndFilterPoolsAreUsed()
+    {
+        $filter = $this->objectManager->create(Template::class);
+
+        $processor = $this->createWithProcessorsAndFilters(
+            ['mydir' => $this->objectManager->create(MyDirProcessor::class)],
+            [
+                'foofilter' => $this->objectManager->create(FooFilter::class),
+                'nl2br' => $this->objectManager->create(NewlineToBreakFilter::class)
+            ]
+        );
+
+        $template = 'blah {{mydir "somevalue" param1=yes|foofilter|nl2br|doesntexist|foofilter}}blah '
+            . "\n" . '{{var address}} blah{{/mydir}} blah';
+        $result = $processor->process($this->createConstruction($processor, $template), $filter, ['foo' => 'foobar']);
+        self::assertEquals('SOMEVALUEYESBLAH ' . "\n" .'>/ RB< BLAH', $result);
+    }
+
+    public function testDefaultFiltersAreUsed()
+    {
+        $filter = $this->objectManager->create(Template::class);
+
+        $processor = $this->createWithProcessorsAndFilters(
+            ['mydir' => $this->objectManager->create(MyDirProcessor::class)],
+            ['foofilter' => $this->objectManager->create(FooFilter::class)]
+        );
+
+        $template = 'blah {{mydir "somevalue" param1=yes}}blah '
+            . "\n" . '{{var address}} blah{{/mydir}} blah';
+        $result = $processor->process($this->createConstruction($processor, $template), $filter, []);
+        self::assertEquals('HALB ' . "\n" . ' HALBSEYEULAVEMOS', $result);
+    }
+
+    public function testParametersAreParsed()
+    {
+        $filter = $this->objectManager->create(Template::class);
+
+        $processor = $this->createWithProcessorsAndFilters(
+            ['mydir' => $this->objectManager->create(MyDirProcessor::class)],
+            ['foofilter' => $this->objectManager->create(FooFilter::class)]
+        );
+
+        $template = '{{mydir "somevalue" param1=$bar}}blah{{/mydir}}';
+        $result = $processor->process($this->createConstruction($processor, $template), $filter, ['bar' => 'abc']);
+        self::assertEquals('HALBCBAEULAVEMOS', $result);
+    }
+
+    private function createWithProcessorsAndFilters(array $processors, array $filters): SimpleDirective
+    {
+        return $this->objectManager->create(
+            SimpleDirective::class,
+            [
+                'processorPool' => $this->objectManager->create(ProcessorPool::class, ['processors' => $processors]),
+                'filterPool' => $this->objectManager->create(FilterPool::class, ['filters' => $filters]),
+            ]
+        );
+    }
+
+    private function createConstruction(SimpleDirective $directive, string $value): array
+    {
+        preg_match($directive->getRegularExpression(), $value, $construction);
+
+        return $construction;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/TemplateDirectiveTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/TemplateDirectiveTest.php
new file mode 100644
index 0000000000000..dc6ef2cd256e8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/TemplateDirectiveTest.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter\DirectiveProcessor;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
+use Magento\Framework\Filter\Template;
+use PHPUnit\Framework\TestCase;
+
+class TemplateDirectiveTest extends TestCase
+{
+    /**
+     * @var DependDirective
+     */
+    private $processor;
+
+    /**
+     * @var Template
+     */
+    private $filter;
+
+    protected function setUp()
+    {
+        $objectManager = ObjectManager::getInstance();
+        $this->filter = $objectManager->create(Template::class);
+        $this->processor = $objectManager->create(TemplateDirective::class);
+    }
+
+    public function testNoTemplateProcessor()
+    {
+        $template = 'blah {{template config_path="foo"}} blah';
+        $result = $this->processor->process($this->createConstruction($this->processor, $template), $this->filter, []);
+        self::assertEquals('{Error in template processing}', $result);
+    }
+
+    public function testNoConfigPath()
+    {
+        $this->filter->setTemplateProcessor([$this, 'processTemplate']);
+        $template = 'blah {{template}} blah';
+        $result = $this->processor->process($this->createConstruction($this->processor, $template), $this->filter, []);
+        self::assertEquals('{Error in template processing}', $result);
+    }
+
+    /**
+     * @dataProvider useCaseProvider
+     */
+    public function testCases(string $template, array $variables, string $expect)
+    {
+        $this->filter->setTemplateProcessor([$this, 'processTemplate']);
+        $result = $this->processor->process(
+            $this->createConstruction($this->processor, $template),
+            $this->filter,
+            $variables
+        );
+        self::assertEquals($expect, $result);
+    }
+
+    public function useCaseProvider()
+    {
+        $prefix = '{{template config_path=$path param1=myparam ';
+        $expect = 'path=varpath/myparamabc/varpath';
+
+        return [
+            [$prefix . 'varparam=$foo}}',['foo' => 'abc','path'=>'varpath'], $expect],
+            [$prefix . 'varparam=$foo.bar}}',['foo' => ['bar' => 'abc'],'path'=>'varpath'], $expect],
+            [
+                $prefix . 'varparam=$foo.getBar().baz}}',
+                ['foo' => new DataObject(['bar' => ['baz' => 'abc']]),'path'=>'varpath'],
+                $expect
+            ],
+        ];
+    }
+
+    public function processTemplate(string $configPath, array $parameters)
+    {
+        // Argument
+        return 'path=' . $configPath
+            // Directive argument
+            . '/' . $parameters['param1'] . $parameters['varparam']
+            // Template variable
+            . '/' . $parameters['path'];
+    }
+
+    private function createConstruction(TemplateDirective $directive, string $value): array
+    {
+        preg_match($directive->getRegularExpression(), $value, $construction);
+
+        return $construction;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/VarDirectiveTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/VarDirectiveTest.php
new file mode 100644
index 0000000000000..7fab06178cf25
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/VarDirectiveTest.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\Filter\DirectiveProcessor;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\VariableResolver\StrictResolver;
+use Magento\Framework\Filter\VariableResolverInterface;
+use PHPUnit\Framework\TestCase;
+
+class VarDirectiveTest extends TestCase
+{
+    /**
+     * @var VariableResolverInterface
+     */
+    private $variableResolver;
+
+    /**
+     * @var DependDirective
+     */
+    private $processor;
+
+    /**
+     * @var Template
+     */
+    private $filter;
+
+    protected function setUp()
+    {
+        $objectManager = ObjectManager::getInstance();
+        $this->variableResolver = $objectManager->get(StrictResolver::class);
+        $this->filter = $objectManager->get(Template::class);
+        $this->processor = $objectManager->create(
+            VarDirective::class,
+            ['variableResolver' => $this->variableResolver]
+        );
+    }
+
+    public function testFallback()
+    {
+        $template = 'blah {{var}} blah';
+        $result = $this->processor->process($this->createConstruction($this->processor, $template), $this->filter, []);
+        self::assertSame('{{var}}', $result);
+    }
+
+    /**
+     * @dataProvider useCasesProvider
+     */
+    public function testCases(string $parameter, array $variables, string $expect)
+    {
+        $template = 'blah {{var ' . $parameter . '}} blah';
+        $result = $this->processor->process(
+            $this->createConstruction($this->processor, $template),
+            $this->filter,
+            $variables
+        );
+        self::assertEquals($expect, $result);
+    }
+
+    public function useCasesProvider()
+    {
+        return [
+            ['foo',['foo' => true], '1'],
+            ['foo',['foo' => 'abc'], 'abc'],
+            ['foo',['foo' => 1.234], '1.234'],
+            ['foo',['foo' => 0xF], '15'],
+            ['foo',['foo' => false], ''],
+            ['foo',['foo' => null], ''],
+            ['foo.bar',['foo' => ['bar' => 'abc']], 'abc'],
+            ['foo.bar',['foo' => ['bar' => false]], ''],
+            ['foo.getBar().baz',['foo' => new DataObject(['bar' => ['baz' => 'abc']])], 'abc'],
+            ['foo.getBar().baz',['foo' => new DataObject(['bar' => ['baz' => false]])], ''],
+            [
+                'foo.getBar().baz|foofilter|nl2br',
+                ['foo' => new DataObject(['bar' => ['baz' => "foo\nbar"]])],
+                "RAB<br />\nOOF"
+            ],
+            [
+                'foo.getBar().baz|foofilter:myparam|nl2br|doesntexist|nl2br',
+                ['foo' => new DataObject(['bar' => ['baz' => "foo\nbar"]])],
+                "MARAPYMRAB<br /><br />\nOOF"
+            ],
+        ];
+    }
+
+    private function createConstruction(VarDirective $directive, string $value): array
+    {
+        preg_match($directive->getRegularExpression(), $value, $construction);
+
+        return $construction;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/TemplateTest.php
index 71e4e438d945d..de09b87b04e4a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Filter/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filter/TemplateTest.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Framework\Filter;
 
+use Magento\Framework\DataObject;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\ObjectManager;
+
 class TemplateTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -14,26 +18,26 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->templateFilter = \Magento\TestFramework\ObjectManager::getInstance()->create(Template::class);
+        $this->templateFilter = ObjectManager::getInstance()->create(Template::class);
     }
 
     /**
      * @param array $results
-     * @param array $values
+     * @param array $value
      * @dataProvider getFilterForDataProvider
      */
-    public function testFilterFor($results, $values)
+    public function testFilterFor($results, $value)
     {
         $this->templateFilter->setVariables(['order' => $this->getOrder(), 'things' => $this->getThings()]);
-        $this->assertEquals($results, $this->invokeMethod($this->templateFilter, 'filterFor', [$values]));
+        self::assertEquals($results, $this->templateFilter->filter($value));
     }
 
     /**
-     * @return \Magento\Framework\DataObject
+     * @return DataObject
      */
     private function getOrder()
     {
-        $order = new \Magento\Framework\DataObject();
+        $order = new DataObject();
         $visibleItems = [
             [
                 'sku' => 'ABC123',
@@ -121,20 +125,256 @@ public function getFilterForDataProvider()
         ];
     }
 
+    public function testDependDirective()
+    {
+        $this->templateFilter->setVariables(
+            [
+                'customer' => new DataObject(['name' => 'John Doe']),
+            ]
+        );
+
+        $template = '{{depend customer.getName()}}foo{{/depend}}';
+        $template .= '{{depend customer.getName()}}{{var customer.getName()}}{{/depend}}';
+        $template .= '{{depend customer.getFoo()}}bar{{/depend}}';
+        $expected = 'fooJohn Doe';
+        self::assertEquals($expected, $this->templateFilter->filter($template));
+    }
+
+    public function testIfDirective()
+    {
+        $this->templateFilter->setVariables(
+            [
+                'customer' => new DataObject(['name' => 'John Doe']),
+            ]
+        );
+
+        $template = '{{if customer.getName()}}foo{{/if}}{{if customer.getNope()}}not me{{else}}bar{{/if}}';
+        $expected = 'foobar';
+        self::assertEquals($expected, $this->templateFilter->filter($template));
+    }
+
+    public function testNonDataObjectVariableParsing()
+    {
+        $this->templateFilter->setVariables(
+            [
+                'address' => new class {
+                    public function format($type)
+                    {
+                        return '<foo>' . $type . '</foo>';
+                    }
+                }
+            ]
+        );
+
+        $template = '{{var address.format(\'html\')}}';
+        $expected = '<foo>html</foo>';
+        self::assertEquals($expected, $this->templateFilter->filter($template));
+    }
+
+    public function testComplexVariableArguments()
+    {
+        $this->templateFilter->setVariables(
+            [
+                'address' => new class {
+                    public function format($a, $b, $c)
+                    {
+                        return $a . ' ' . $b . ' ' . $c['param1'];
+                    }
+                },
+                'arg1' => 'foo'
+            ]
+        );
+
+        $template = '{{var address.format($arg1,\'bar\',[param1:baz])}}';
+        $expected = 'foo bar baz';
+        self::assertEquals($expected, $this->templateFilter->filter($template));
+    }
+
+    public function testComplexVariableGetterArguments()
+    {
+        $this->templateFilter->setVariables(
+            [
+                'address' => new class extends DataObject {
+                    public function getFoo($a, $b, $c)
+                    {
+                        return $a . ' ' . $b . ' ' . $c['param1'];
+                    }
+                },
+                'arg1' => 'foo'
+            ]
+        );
+
+        $template = '{{var address.getFoo($arg1,\'bar\',[param1:baz])}}';
+        $expected = 'foo bar baz';
+        self::assertEquals($expected, $this->templateFilter->filter($template));
+    }
+
+    public function testNonDataObjectRendersBlankInStrictMode()
+    {
+        $this->templateFilter->setStrictMode(true);
+        $this->templateFilter->setVariables(
+            [
+                'address' => new class {
+                    public function format($type)
+                    {
+                        return '<foo>' . $type . '</foo>';
+                    }
+                },
+            ]
+        );
+
+        $template = '{{var address.format(\'html\')}}';
+        $expected = '';
+        self::assertEquals($expected, $this->templateFilter->filter($template));
+    }
+
+    public function testDataObjectCanRenderPropertiesStrictMode()
+    {
+        $this->templateFilter->setStrictMode(true);
+        $this->templateFilter->setVariables(
+            [
+                'customer' => new DataObject(['name' => 'John Doe']),
+            ]
+        );
+
+        $template = '{{var customer.name}} - {{var customer.getName()}}';
+        $expected = 'John Doe - John Doe';
+        self::assertEquals($expected, $this->templateFilter->filter($template));
+    }
+
+    /**
+     * @dataProvider strictModeTrueFalseProvider
+     */
+    public function testScalarDataKeys($strictMode)
+    {
+        $this->templateFilter->setStrictMode($strictMode);
+        $this->templateFilter->setVariables(
+            [
+                'customer_data' => [
+                    'name' => 'John Doe',
+                    'address' => [
+                        'street' => ['easy'],
+                        'zip' => new DataObject(['bar' => 'yay'])
+                    ]
+                ],
+                'myint' => 123,
+                'myfloat' => 1.23,
+                'mystring' => 'abc',
+                'mybool' => true,
+                'myboolf' => false,
+            ]
+        );
+
+        $template = '{{var customer_data.name}}'
+        . ' {{var customer_data.address.street.0}}'
+        . ' {{var customer_data.address.zip.bar}}'
+        . ' {{var}}'
+        . ' {{var myint}}'
+        . ' {{var myfloat}}'
+        . ' {{var mystring}}'
+        . ' {{var mybool}}'
+        . ' {{var myboolf}}';
+
+        $expected = 'John Doe easy yay {{var}} 123 1.23 abc 1 ';
+        self::assertEquals($expected, $this->templateFilter->filter($template));
+    }
+
+    public function testModifiers()
+    {
+        $this->templateFilter->setVariables(
+            [
+                'address' => '11501 Domain Dr.' . "\n" . 'Austin, TX 78758'
+            ]
+        );
+
+        $template = '{{mydir "somevalue" param1=yes|foofilter|nl2br}}blah {{var address}} blah{{/mydir}}';
+
+        $expected = 'HALB 85787 XT ,NITSUA<br />' . "\n" . '.RD NIAMOD 10511 HALBSEYEULAVEMOS';
+        self::assertEquals($expected, $this->templateFilter->filter($template));
+    }
+
+    public function testDefaultModifiers()
+    {
+        $this->templateFilter->setVariables(
+            [
+                'address' => '11501 Domain Dr.' . "\n" . 'Austin, TX 78758'
+            ]
+        );
+
+        $template = '{{mydir "somevalue" param1=yes}}blah {{var address}} blah{{/mydir}}';
+
+        $expected = 'HALB 85787 XT ,NITSUA' . "\n" . '.RD NIAMOD 10511 HALBSEYEULAVEMOS';
+        self::assertEquals($expected, $this->templateFilter->filter($template));
+    }
+
+    public function testFilterVarious1()
+    {
+        $this->templateFilter->setVariables(
+            [
+                'customer' => new DataObject(['firstname' => 'Felicia', 'lastname' => 'Henry']),
+                'company' => 'A. L. Price',
+                'street1' => '687 Vernon Street',
+                'city' => 'Parker Dam',
+                'region' => 'CA',
+                'postcode' => '92267',
+                'telephone' => '760-663-5876',
+            ]
+        );
+
+        $template = <<<TEMPLATE
+{{var customer.firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var customer.getLastname()}}
+{{depend company}}{{var company}}{{/depend}}
+{{if street1}}{{var street1}}
+{{/if}}
+{{depend street2}}{{var street2}}{{/depend}}
+{{depend street3}}{{var street3}}{{/depend}}
+{{depend street4}}{{var street4}}{{/depend}}
+{{if city}}{{var city}},  {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}
+{{var country}}
+{{depend telephone}}T: {{var telephone}}{{/depend}}
+{{depend fax}}F: {{var fax}}{{/depend}}
+{{depend vat_id}}VAT: {{var vat_id}}{{/depend}}
+TEMPLATE;
+
+        $expectedResult = <<<EXPECTED_RESULT
+Felicia Henry
+A. L. Price
+687 Vernon Street
+
+
+
+
+Parker Dam,  CA, 92267
+
+T: 760-663-5876
+
+
+EXPECTED_RESULT;
+
+        $this->assertEquals(
+            $expectedResult,
+            $this->templateFilter->filter($template),
+            'Template was processed incorrectly'
+        );
+    }
+
     /**
-     * Call protected/private method of a class.
-     *
-     * @param object &$object
-     * @param string $methodName
-     * @param array  $parameters
-     *
-     * @return mixed Method return.
+     * Check that if calling a method of an object fails expected result is returned.
      */
-    private function invokeMethod(&$object, $methodName, array $parameters = [])
+    public function testInvalidMethodCall()
     {
-        $reflection = new \ReflectionClass(get_class($object));
-        $method = $reflection->getMethod($methodName);
-        $method->setAccessible(true);
-        return $method->invokeArgs($object, $parameters);
+        $this->templateFilter->setVariables(['dateTime' => '\DateTime']);
+        $this->assertEquals(
+            '\DateTime',
+            $this->templateFilter->filter('{{var dateTime.createFromFormat(\'d\',\'1548201468\')}}')
+        );
+    }
+
+    public function strictModeTrueFalseProvider()
+    {
+        return [
+            'strictMode' => [true],
+            'legacyMode' => [false]
+        ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/VariableResolver/LegacyResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/VariableResolver/LegacyResolverTest.php
new file mode 100644
index 0000000000000..28d2ed6e039bd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filter/VariableResolver/LegacyResolverTest.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter\VariableResolver;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\VariableResolverInterface;
+use PHPUnit\Framework\TestCase;
+
+class LegacyResolverTest extends TestCase
+{
+    /**
+     * @var VariableResolverInterface
+     */
+    private $variableResolver;
+
+    /**
+     * @var Template
+     */
+    private $filter;
+
+    protected function setUp()
+    {
+        $objectManager = ObjectManager::getInstance();
+        $this->variableResolver = $objectManager->get(LegacyResolver::class);
+        $this->filter = $objectManager->get(Template::class);
+    }
+
+    /**
+     * @dataProvider useCasesProvider
+     */
+    public function testResolve($value, array $variables, $expected)
+    {
+        $result = $this->variableResolver->resolve($value, $this->filter, $variables);
+        self::assertSame($expected, $result);
+    }
+
+    public function useCasesProvider()
+    {
+        $classStub = new class {
+            public function doParams($arg1, $args)
+            {
+                $result = $arg1;
+                foreach ($args as $key => $value) {
+                    $result .= $key . '=' . $value . ',';
+                }
+                return $result;
+            }
+            public function doThing()
+            {
+                return 'abc';
+            }
+            public function getThing()
+            {
+                return 'abc';
+            }
+        };
+        $dataClassStub = new class extends DataObject {
+            public function doThing()
+            {
+                return 'abc';
+            }
+            public function doParams($arg1, $args)
+            {
+                $result = $arg1;
+                foreach ($args as $key => $value) {
+                    $result .= $key . '=' . $value . ',';
+                }
+                return $result;
+            }
+            public function getThing()
+            {
+                return 'abc';
+            }
+        };
+        $dataClassStub->setData('foo', 'bar');
+
+        return [
+            ['', [], null],
+            ['foo',['foo' => true], true],
+            ['foo',['foo' => 123], 123],
+            ['foo',['foo' => 'abc'], 'abc'],
+            ['foo',['foo' => false], false],
+            ['foo',['foo' => null], null],
+            ['foo',['foo' => ''], ''],
+            ['foo.bar',['foo' => ['bar' => 123]], 123],
+            'nested array' => ['foo.bar.baz',['foo' => ['bar' => ['baz' => 123]]], 123],
+            'getter data object with mixed array usage' =>
+                ['foo.getBar().baz',['foo' => new DataObject(['bar' => ['baz' => 'abc']])], 'abc'],
+            'allow method' => ['foo.doThing()',['foo' => $classStub], 'abc'],
+            'allow getter method' => ['foo.getThing()',['foo' => $classStub], 'abc'],
+            'arguments for normal class' => [
+                'foo.doParams("f", [a:123,b:321])',
+                ['foo' => $classStub],
+                'fa=123,b=321,'
+            ],
+            'arguments for normal class with recursive resolution' => [
+                'foo.doParams($g.h.i, [a:123,b:321])',
+                ['foo' => $classStub, 'g' => ['h' => ['i' => 'abc']]],
+                'abca=123,b=321,'
+            ],
+            'allow normal method for DataObject' => ['foo.doThing()',['foo' => $dataClassStub], 'abc'],
+            'allow getter method for DataObject' => ['foo.getThing()',['foo' => $dataClassStub], 'abc'],
+            'arguments for DataObject' => [
+                'foo.doParams(\'f\', [a:123,b:321])',
+                ['foo' => $dataClassStub],
+                'fa=123,b=321,'
+            ],
+            'arguments for DataObject with recursive resolution' => [
+                'foo.doParams($g.h.i, [a:123,b:321])',
+                ['foo' => $dataClassStub, 'g' => ['h' => ['i' => 'abc']]],
+                'abca=123,b=321,'
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/VariableResolver/StrictResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/VariableResolver/StrictResolverTest.php
new file mode 100644
index 0000000000000..a52bb067f6e7f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filter/VariableResolver/StrictResolverTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter\VariableResolver;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\VariableResolverInterface;
+use PHPUnit\Framework\TestCase;
+
+class StrictResolverTest extends TestCase
+{
+    /**
+     * @var VariableResolverInterface
+     */
+    private $variableResolver;
+
+    /**
+     * @var Template
+     */
+    private $filter;
+
+    protected function setUp()
+    {
+        $objectManager = ObjectManager::getInstance();
+        $this->variableResolver = $objectManager->get(StrictResolver::class);
+        $this->filter = $objectManager->get(Template::class);
+    }
+
+    /**
+     * @dataProvider useCasesProvider
+     */
+    public function testResolve($value, array $variables, $expected)
+    {
+        $result = $this->variableResolver->resolve($value, $this->filter, $variables);
+        self::assertSame($expected, $result);
+    }
+
+    public function useCasesProvider()
+    {
+        $classStub = new class {
+            public function doThing()
+            {
+                return 'abc';
+            }
+            public function getThing()
+            {
+                return 'abc';
+            }
+        };
+        $dataClassStub = new class extends DataObject {
+            public function doThing()
+            {
+                return 'abc';
+            }
+            public function getThing()
+            {
+                return 'abc';
+            }
+        };
+        $dataClassStub->setData('foo', 'bar');
+
+        $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
+        $emailTemplate = $this->createMock(\Magento\Email\Model\Template::class);
+        $emailTemplate->method('getUrl')
+            ->with($storeMock, 'some path', ['_query' => ['id' => 'abc', 'token' => 'abc'], 'abc' => '1'])
+            ->willReturn('a url');
+
+        return [
+            ['', [], null],
+            ['foo',['foo' => true], true],
+            ['foo',['foo' => 123], 123],
+            ['foo',['foo' => 'abc'], 'abc'],
+            ['foo',['foo' => false], false],
+            ['foo',['foo' => null], null],
+            ['foo',['foo' => ''], ''],
+            ['foo.bar',['foo' => ['bar' => 123]], 123],
+            'nested array' => ['foo.bar.baz',['foo' => ['bar' => ['baz' => 123]]], 123],
+            'getter data object with mixed array usage' =>
+                ['foo.getBar().baz',['foo' => new DataObject(['bar' => ['baz' => 'abc']])], 'abc'],
+            'data object with mixed array usage' =>
+                ['foo.bar.baz',['foo' => new DataObject(['bar' => ['baz' => 'abc']])], 'abc'],
+            'deny method' => ['foo.doThing()',['foo' => $classStub], null],
+            'deny getter method' => ['foo.getThing()',['foo' => $classStub], null],
+            'deny normal method for DataObject' => ['foo.doThing()',['foo' => $dataClassStub], null],
+            'deny getter method for DataObject' => ['foo.getThing()',['foo' => $dataClassStub], null],
+            'convert getter method to getData(foo)' => ['foo.getFoo()',['foo' => $dataClassStub], 'bar'],
+            'backwards compatibility exception for getUrl' => [
+                'foo.email.getUrl($store,\'some path\',[_query:[id:$foo.bar.baz.bash,token:abc],abc:1])',
+                [
+                    'store' => $storeMock,
+                    'foo' => [
+                        'email' => $emailTemplate,
+                        'bar' => new DataObject(['baz' => ['bash' => 'abc']])
+                    ]
+                ],
+                'a url'
+            ]
+        ];
+    }
+}
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 bc8281d55ac4f..3b7273e088105 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php
@@ -703,12 +703,47 @@ public function testValidateUploadFile()
     }
 
     /**
+     * @dataProvider testValidateUploadFileExceptionDataProvider
      * @expectedException \InvalidArgumentException
+     * @param string $fileName
+     * @param string $expectedErrorMsg
+     * @param bool $useFixture
      */
-    public function testValidateUploadFileException()
+    public function testValidateUploadFileException($fileName, $expectedErrorMsg, $useFixture)
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $imageAdapter = $objectManager->get(\Magento\Framework\Image\AdapterFactory::class)->create();
-        $imageAdapter->validateUploadFile(__FILE__);
+        $filePath = $useFixture ? $this->_getFixture($fileName) : $fileName;
+
+        try {
+            $imageAdapter->validateUploadFile($filePath);
+        } catch (\InvalidArgumentException $e) {
+            $this->assertEquals($expectedErrorMsg, $e->getMessage());
+            throw $e;
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function testValidateUploadFileExceptionDataProvider()
+    {
+        return [
+            'image_notfound' => [
+                'fileName' => 'notfound.png',
+                'expectedErrorMsg' => 'Upload file does not exist.',
+                'useFixture' => false
+            ],
+            'image_empty' => [
+                'fileName' => 'empty.png',
+                'expectedErrorMsg' => 'Wrong file size.',
+                'useFixture' => true
+            ],
+            'notanimage' => [
+                'fileName' => 'notanimage.txt',
+                'expectedErrorMsg' => 'Disallowed file type.',
+                'useFixture' => true
+            ]
+        ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Image/_files/empty.png b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/empty.png
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Image/_files/notanimage.txt b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/notanimage.txt
new file mode 100644
index 0000000000000..81bc3abd37125
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Image/_files/notanimage.txt
@@ -0,0 +1 @@
+Not an image.
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Mail/EmailMessageTest.php b/dev/tests/integration/testsuite/Magento/Framework/Mail/EmailMessageTest.php
index 10a54b4e1b879..186c3e2796c8e 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Mail/EmailMessageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Mail/EmailMessageTest.php
@@ -14,6 +14,7 @@
 
 /**
  * Class EmailMessageTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class EmailMessageTest extends TestCase
 {
@@ -164,23 +165,42 @@ public function testEmailMessage($content, $type): void
             'cc' => $cc,
             'replyTo' => $replyTo,
             'bcc' => $bcc,
-            'sender' => $sender
+            'sender' => $sender,
         ];
         $message = $this->messageFactory->create($data);
 
         $this->assertContains($content, $message->toString());
         $this->assertContains('Content-Type: ' . $type, $message->toString());
-        $senderString = 'Sender: ' . $sender->getName() . ' <' . $sender->getEmail() . '>';
+        $senderString = 'Sender: =?utf-8?Q?'
+            . str_replace(' ', '=20', $sender->getName())
+            . '?= <'
+            . $sender->getEmail()
+            . '>';
         $this->assertContains($senderString, $message->toString());
         $this->assertContains('From: ' . $from[0]->getEmail(), $message->toString());
-        $replyToString = 'Reply-To: ' . $replyTo[0]->getName() . ' <' . $replyTo[0]->getEmail() . '>';
+        $replyToString = 'Reply-To: =?utf-8?Q?'
+            . str_replace(' ', '=20', $replyTo[0]->getName())
+            . '?= <'
+            . $replyTo[0]->getEmail()
+            . '>';
         $this->assertContains($replyToString, $message->toString());
-        $toString = 'To: ' . $to[0]->getName() . ' <' . $to[0]->getEmail() . '>';
+        $toString = 'To: =?utf-8?Q?'
+            . str_replace(' ', '=20', $to[0]->getName())
+            . '?= <'
+            . $to[0]->getEmail()
+            . '>';
         $this->assertContains($toString, $message->toString());
-        $ccString = 'Cc: ' . $cc[0]->getName() . ' <' . $cc[0]->getEmail() . '>';
+        $ccString = 'Cc: =?utf-8?Q?'
+            . str_replace(' ', '=20', $cc[0]->getName())
+            . '?= <'
+            . $cc[0]->getEmail()
+            . '>';
         $this->assertContains($ccString, $message->toString());
         $this->assertContains('Bcc: ' . $bcc[0]->getEmail(), $message->toString());
-        $this->assertContains('Content-Description: ' . $this->description, $message->toString());
+        $contentDescription = 'Content-Description: =?utf-8?Q?'
+            . str_replace(' ', '=20', $this->description)
+            . '?=';
+        $this->assertContains($contentDescription, $message->toString());
         $this->assertContains('Subject: ' . $this->subject, $message->toString());
         $this->assertContains($content, $message->toString());
         //tests address factory
@@ -235,6 +255,7 @@ public function testEmailMessageWithAttachment(): void
             'body' => $mimeMessage,
             'subject' => $this->subject,
             'to' => [$addressTo],
+            'encoding' => '',
         ];
         $message = $this->messageFactory->create($data);
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php
new file mode 100644
index 0000000000000..03bdc9a365526
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Mail;
+
+use Magento\Email\Model\BackendTemplate;
+use Magento\Email\Model\Template;
+use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class EmailMessageTest
+ */
+class TransportBuilderTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $di;
+
+    /**
+     * @var TransportBuilder
+     */
+    protected $builder;
+
+    /**
+     * @var Template
+     */
+    protected $template;
+
+    protected function setUp()
+    {
+        $this->di = Bootstrap::getObjectManager();
+        $this->builder = $this->di->get(TransportBuilder::class);
+        $this->template = $this->di->get(Template::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Email/Model/_files/email_template.php
+     * @magentoDbIsolation enabled
+     *
+     * @param string|array $email
+     * @dataProvider emailDataProvider
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testAddToEmail($email)
+    {
+        $templateId = $this->template->load('email_exception_fixture', 'template_code')->getId();
+
+        $this->builder->setTemplateModel(BackendTemplate::class);
+
+        $vars = ['reason' => 'Reason', 'customer' => 'Customer'];
+        $options = ['area' => 'frontend', 'store' => 1];
+        $this->builder->setTemplateIdentifier($templateId)->setTemplateVars($vars)->setTemplateOptions($options);
+
+        $this->builder->addTo($email);
+
+        /** @var EmailMessage $emailMessage */
+        $emailMessage = $this->builder->getTransport();
+
+        $addresses = $emailMessage->getMessage()->getTo();
+
+        $emails = [];
+        /** @var Address $toAddress */
+        foreach ($addresses as $address) {
+            $emails[] = $address->getEmail();
+        }
+
+        if (is_string($email)) {
+            $this->assertCount(1, $emails);
+            $this->assertEquals($email, $emails[0]);
+        } else {
+            $this->assertEquals($email, $emails);
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function emailDataProvider(): array
+    {
+        return [
+            [
+                'billy.everything@someserver.com',
+            ],
+            [
+                [
+                    'billy.everything@someserver.com',
+                    'john.doe@someserver.com',
+                ]
+            ]
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/date_attribute.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/date_attribute.php
index c7e118f4a4e2b..d11248a47a0cc 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/date_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/date_attribute.php
@@ -25,6 +25,7 @@
         'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
         'is_global' => 1,
         'is_filterable' => 1,
+        'is_user_defined' => 1,
         'backend_type' => 'datetime',
         'frontend_input' => 'date',
         'frontend_label' => 'Test Date',
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attribute.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attribute.php
index 9188bb9657633..a74669e9890af 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attribute.php
@@ -21,6 +21,7 @@
         'is_global' => 1,
         'frontend_input' => 'select',
         'is_filterable' => 1,
+        'is_user_defined' => 1,
         'option' => [
             'value' => ['option_0' => ['Option 1'], 'option_1' => ['Option 2']],
             'order' => ['option_0' => 1, 'option_1' => 2],
@@ -48,6 +49,7 @@
         'is_global' => 1,
         'frontend_input' => 'multiselect',
         'is_filterable' => 1,
+        'is_user_defined' => 1,
         'option' => [
             'value' => ['option_0' => ['Option 1'], 'option_1' => ['Option 2']],
             'order' => ['option_0' => 1, 'option_1' => 2],
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php
index f4f3337a253c0..03269b88ee2a1 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php
@@ -78,6 +78,7 @@
         'entity_type_id' => $productEntityTypeId,
         'is_global' => 1,
         'is_filterable' => 1,
+        'is_user_defined' => 1,
         'backend_type' => 'datetime',
         'frontend_input' => 'date',
         'frontend_label' => 'Test Date',
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
deleted file mode 100644
index 5e70eb491b50c..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\Session;
-
-use Magento\Framework\App\State;
-use Zend\Stdlib\Parameters;
-
-class SidResolverTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Framework\Session\SidResolver
-     */
-    protected $model;
-
-    /**
-     * @var \Magento\Framework\Session\Generic
-     */
-    protected $session;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\Store
-     */
-    protected $store;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $scopeConfig;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\UrlInterface
-     */
-    protected $urlBuilder;
-
-    /**
-     * @var string
-     */
-    protected $customSessionName = 'csn';
-
-    /**
-     * @var string
-     */
-    protected $customSessionQueryParam = 'csqp';
-
-    /**
-     * @var \Magento\Framework\App\RequestInterface
-     */
-    protected $request;
-
-    /**
-     * @var State|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $appState;
-
-    protected function setUp()
-    {
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        /** @var \Magento\Framework\Session\Generic _model */
-        $this->session = $objectManager->get(\Magento\Framework\Session\Generic::class);
-
-        $this->scopeConfig = $this->getMockBuilder(
-            \Magento\Framework\App\Config\ScopeConfigInterface::class
-        )->setMethods(
-            ['getValue']
-        )->disableOriginalConstructor()->getMockForAbstractClass();
-
-        $this->urlBuilder = $this->getMockBuilder(
-            \Magento\Framework\Url::class
-        )->setMethods(
-            ['isOwnOriginUrl']
-        )->disableOriginalConstructor()->getMockForAbstractClass();
-
-        $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,
-            [
-                'scopeConfig' => $this->scopeConfig,
-                'urlBuilder' => $this->urlBuilder,
-                'sidNameMap' => [$this->customSessionName => $this->customSessionQueryParam],
-                'request' => $this->request,
-                'appState' => $this->appState,
-            ]
-        );
-    }
-
-    public function tearDown()
-    {
-        $this->request->setQuery(new Parameters());
-    }
-
-    /**
-     * @param mixed $sid
-     * @param bool $useFrontedSid
-     * @param bool $isOwnOriginUrl
-     * @param mixed $testSid
-     * @dataProvider dataProviderTestGetSid
-     */
-    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(
-            'isSetFlag'
-        )->with(
-            \Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        )->will(
-            $this->returnValue($useFrontedSid)
-        );
-
-        $this->urlBuilder->expects($this->any())->method('isOwnOriginUrl')->will($this->returnValue($isOwnOriginUrl));
-
-        if ($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());
-    }
-
-    /**
-     * @return array
-     */
-    public function dataProviderTestGetSid()
-    {
-        return [
-            [null, false, false, 'test-sid'],
-            [null, false, true, 'test-sid'],
-            [null, false, false, 'test-sid'],
-            [null, true, false, 'test-sid'],
-            [null, false, true, 'test-sid'],
-            ['test-sid', true, true, 'test-sid'],
-            [null, true, true, null]
-        ];
-    }
-
-    public function testGetSessionIdQueryParam()
-    {
-        $this->assertEquals(SidResolver::SESSION_ID_QUERY_PARAM, $this->model->getSessionIdQueryParam($this->session));
-    }
-
-    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()
-    {
-        $this->assertFalse($this->model->getUseSessionVar());
-        $this->model->setUseSessionVar(true);
-        $this->assertTrue($this->model->getUseSessionVar());
-    }
-
-    /**
-     * 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->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/UrlTest.php b/dev/tests/integration/testsuite/Magento/Framework/UrlTest.php
index 9d1d8761a16a7..db830d228201c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/UrlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/UrlTest.php
@@ -8,6 +8,9 @@
 use Zend\Stdlib\Parameters;
 use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * Test class for \Magento\Framework\Url
+ */
 class UrlTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -22,7 +25,7 @@ protected function setUp()
 
     public function testSetGetUseSession()
     {
-        $this->assertTrue((bool)$this->model->getUseSession());
+        $this->assertFalse((bool)$this->model->getUseSession());
         $this->model->setUseSession(false);
         $this->assertFalse($this->model->getUseSession());
     }
@@ -491,6 +494,7 @@ public function testSessionUrlVar()
 
     public function testUseSessionIdForUrl()
     {
+        // phpcs:ignore
         $_SERVER['HTTP_HOST'] = 'localhost';
         $this->assertFalse($this->model->useSessionIdForUrl(true));
         $this->assertFalse($this->model->useSessionIdForUrl(false));
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/TemplateEngine/PhpTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/TemplateEngine/PhpTest.php
new file mode 100644
index 0000000000000..f4227ee41b53d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/TemplateEngine/PhpTest.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\View\TemplateEngine;
+
+use Magento\Framework\View\Element\BlockInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Testing .phtml templating.
+ */
+class PhpTest extends TestCase
+{
+    /**
+     * @var Php
+     */
+    private $templateEngine;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->templateEngine = $objectManager->get(Php::class);
+    }
+
+    /**
+     * See that templates get access to certain variables.
+     *
+     * @return void
+     */
+    public function testVariablesAvailable(): void
+    {
+        $block = new class implements BlockInterface {
+            /**
+             * @inheritDoc
+             */
+            public function toHtml()
+            {
+                return '<b>BLOCK</b>';
+            }
+        };
+
+        $rendered = $this->templateEngine->render($block, __DIR__ .'/../_files/test_template.phtml');
+        $this->assertEquals(
+            '<p>This template has access to &lt;b&gt;$escaper&lt;/b&gt; and $block &quot;<b>BLOCK</b>&quot;</p>'
+            .PHP_EOL,
+            $rendered
+        );
+    }
+}
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 7bb283e0b3514..bb901988c5b8a 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.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
+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;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;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{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{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{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{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;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{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;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;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{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{color:#645d53;cursor:pointer;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;box-sizing:border-box;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;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;color:#645d53;cursor:pointer;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;box-sizing:border-box;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;padding:0 9px;font-size:14px;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;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{color:#645d53;cursor:pointer;font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.3rem;box-sizing:border-box;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{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 90ca42321c921..e95c7f72c706b 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
@@ -484,7 +484,6 @@ table .col-draggable .draggable-handle {
   border: 0;
   display: inline;
   line-height: 1.42857143;
-  margin: 0;
   padding: 0;
   color: #1979c3;
   text-decoration: none;
@@ -621,7 +620,6 @@ fieldset[disabled] .grid-actions .action-reset {
   background: none;
   border: 0;
   display: inline;
-  line-height: 1.42857143;
   margin: 0;
   padding: 0;
   color: #1979c3;
@@ -683,7 +681,6 @@ fieldset[disabled] .pager .action-next {
   text-decoration: none;
 }
 .pager .action-previous > span {
-  clip: rect(0, 0, 0, 0);
   border: 0;
   clip: rect(0 0 0 0);
   height: 1px;
@@ -733,7 +730,6 @@ fieldset[disabled] .pager .action-next {
   text-decoration: none;
 }
 .pager .action-next > span {
-  clip: rect(0, 0, 0, 0);
   border: 0;
   clip: rect(0 0 0 0);
   height: 1px;
@@ -1510,7 +1506,6 @@ fieldset[disabled] .pager .action-next {
   text-decoration: none;
 }
 .search-global-field .label > span {
-  clip: rect(0, 0, 0, 0);
   border: 0;
   clip: rect(0 0 0 0);
   height: 1px;
@@ -1622,7 +1617,6 @@ fieldset[disabled] .pager .action-next {
   color: #676056;
 }
 .notifications-action .text {
-  clip: rect(0, 0, 0, 0);
   border: 0;
   clip: rect(0 0 0 0);
   height: 1px;
@@ -1707,7 +1701,6 @@ fieldset[disabled] .pager .action-next {
   z-index: 1;
   top: 12px;
   right: 12px;
-  display: inline-block;
   background-image: none;
   background: none;
   border: 0;
@@ -2358,7 +2351,6 @@ fieldset[disabled] .notifications-close.action {
   text-decoration: none;
 }
 #product-variations-matrix .actions-image-uploader {
-  display: inline-block;
   position: relative;
   display: block;
   width: 50px;
@@ -3109,7 +3101,6 @@ body > * {
   background-image: none;
   background: none;
   border: 0;
-  margin: 0;
   padding: 0;
   -moz-box-sizing: content-box;
   box-shadow: none;
@@ -3396,7 +3387,6 @@ fieldset[disabled] .page-main-actions .page-actions .action-add.mselect-button-a
   box-shadow: none;
   text-shadow: none;
   text-decoration: none;
-  line-height: inherit;
   font-weight: 400;
   color: #026294;
   line-height: normal;
@@ -3464,7 +3454,6 @@ fieldset[disabled] .store-switcher .actions.dropdown .action.toggle {
   margin-top: 10px;
 }
 .store-switcher .actions.dropdown ul.dropdown-menu .dropdown-toolbar a {
-  display: inline-block;
   text-decoration: none;
   display: block;
 }
@@ -4833,17 +4822,11 @@ fieldset[disabled] .control-text + .ui-datepicker-trigger {
   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;
@@ -4946,7 +4929,6 @@ fieldset[disabled] .filters-toggle {
 .filters-item .action-remove {
   background-image: none;
   background: #f2ebde;
-  padding: 6px 13px;
   color: #645d53;
   border: 1px solid #ada89e;
   cursor: pointer;
@@ -5038,17 +5020,11 @@ fieldset[disabled] .filters-item .action-remove {
   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;
@@ -5283,13 +5259,11 @@ fieldset[disabled] .filters-form .action-close {
   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;
@@ -5487,17 +5461,11 @@ fieldset[disabled] .filters .field-date .group .hasDatepicker + .ui-datepicker-t
   background: rgba(0, 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;
@@ -5754,7 +5722,6 @@ fieldset[disabled] .mass-select-toggle {
 .page-actions.fixed .page-actions-inner,
 .page-content,
 .page-footer {
-  width: auto;
   min-width: 960px;
   max-width: 1300px;
   margin: 0 auto;
@@ -6104,7 +6071,7 @@ table tfoot tr td:last-child {
   clear: both;
 }
 .test-content {
-  width: calc(20px + 100*0.2);
+  width: calc(20px + 100 * 0.2);
 }
 .test-content:before {
   content: '.test {\A    ' attr(data-attribute) ': 0.2em;' '\A    content:\'';
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/test_template.phtml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/test_template.phtml
new file mode 100644
index 0000000000000..e41d495327a5d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/test_template.phtml
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<?php
+// phpcs:disable
+?>
+<?php
+/**
+ * Template meant for testing.
+ *
+ * @var \Magento\Framework\View\Element\BlockInterface $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
+?>
+<p>This template has access to <?= $escaper->escapeHtml('<b>$escaper</b>') ?> and $block &quot;<?= $block->toHtml() ?>&quot;</p>
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_without_masked_quote_id.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_without_masked_quote_id.php
new file mode 100644
index 0000000000000..184023a504a13
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_without_masked_quote_id.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CartManagementInterface $cartManagement */
+$cartManagement = Bootstrap::getObjectManager()->get(CartManagementInterface::class);
+/** @var CartRepositoryInterface $cartRepository */
+$cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
+
+$cartId = $cartManagement->createEmptyCartForCustomer(1);
+$cart = $cartRepository->get($cartId);
+$cartRepository->save($cart);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_without_masked_quote_id_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_without_masked_quote_id_rollback.php
new file mode 100644
index 0000000000000..6874610bc261b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_without_masked_quote_id_rollback.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, '1', 'customer_id');
+$quoteResource->delete($quote);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/CategoryListCacheTest.php b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/CategoryListCacheTest.php
new file mode 100644
index 0000000000000..a8e9059a84eb6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/CategoryListCacheTest.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQlCache\Controller\Catalog;
+
+use Magento\GraphQlCache\Controller\AbstractGraphqlCacheTest;
+
+/**
+ * Test caching works for categoryList query
+ *
+ * @magentoAppArea graphql
+ * @magentoCache full_page enabled
+ * @magentoDbIsolation disabled
+ */
+class CategoryListCacheTest extends AbstractGraphqlCacheTest
+{
+    /**
+     * Test cache tags are generated
+     *
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
+     */
+    public function testRequestCacheTagsForCategoryList(): void
+    {
+        $categoryId ='333';
+        $query
+            = <<<QUERY
+        {
+            categoryList(filters: {ids: {in: ["$categoryId"]}}) {
+                id
+                name
+                url_key
+                description
+                product_count
+           }
+       }
+QUERY;
+        $response = $this->dispatchGraphQlGETRequest(['query' => $query]);
+        $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
+        $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
+        $expectedCacheTags = ['cat_c','cat_c_' . $categoryId, 'FPC'];
+        $this->assertEquals($expectedCacheTags, $actualCacheTags);
+    }
+
+    /**
+     * Test request is served from cache
+     *
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
+     */
+    public function testSecondRequestIsServedFromCache()
+    {
+        $categoryId ='333';
+        $query
+            = <<<QUERY
+        {
+            categoryList(filters: {ids: {in: ["$categoryId"]}}) {
+                id
+                name
+                url_key
+                description
+                product_count
+           }
+       }
+QUERY;
+        $expectedCacheTags = ['cat_c','cat_c_' . $categoryId, 'FPC'];
+
+        $response = $this->dispatchGraphQlGETRequest(['query' => $query]);
+        $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
+        $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
+        $this->assertEquals($expectedCacheTags, $actualCacheTags);
+
+        $cacheResponse = $this->dispatchGraphQlGETRequest(['query' => $query]);
+        $this->assertEquals('HIT', $cacheResponse->getHeader('X-Magento-Cache-Debug')->getFieldValue());
+        $actualCacheTags = explode(',', $cacheResponse->getHeader('X-Magento-Tags')->getFieldValue());
+        $this->assertEquals($expectedCacheTags, $actualCacheTags);
+    }
+
+    /**
+     * Test cache tags are generated
+     *
+     * @magentoDataFixture Magento/Catalog/_files/category_tree.php
+     */
+    public function testRequestCacheTagsForCategoryListOnMultipleIds(): void
+    {
+        $categoryId1 ='400';
+        $categoryId2 = '401';
+        $query
+            = <<<QUERY
+        {
+            categoryList(filters: {ids: {in: ["$categoryId1", "$categoryId2"]}}) {
+                id
+                name
+                url_key
+                description
+                product_count
+           }
+       }
+QUERY;
+        //added the previous category in expected tags as it is cached
+        $expectedCacheTags = ['cat_c','cat_c_' .'333', 'cat_c_' . $categoryId1, 'cat_c_' . $categoryId2, 'FPC'];
+
+        $response = $this->dispatchGraphQlGETRequest(['query' => $query]);
+        $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
+        $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
+        $this->assertEquals($expectedCacheTags, $actualCacheTags);
+    }
+
+    /**
+     * Test request is served from cache
+     *
+     * @magentoDataFixture Magento/Catalog/_files/category_tree.php
+     */
+    public function testSecondRequestIsServedFromCacheOnMultipleIds()
+    {
+        $categoryId1 ='400';
+        $categoryId2 = '401';
+        $query
+            = <<<QUERY
+        {
+            categoryList(filters: {ids: {in: ["$categoryId1", "$categoryId2"]}}) {
+                id
+                name
+                url_key
+                description
+                product_count
+           }
+       }
+QUERY;
+        //added the previous category in expected tags as it is cached
+        $expectedCacheTags = ['cat_c','cat_c_' .'333', 'cat_c_' . $categoryId1, 'cat_c_' . $categoryId2, 'FPC'];
+
+        $response = $this->dispatchGraphQlGETRequest(['query' => $query]);
+        $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
+        $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
+        $this->assertEquals($expectedCacheTags, $actualCacheTags);
+
+        $cacheResponse = $this->dispatchGraphQlGETRequest(['query' => $query]);
+        $this->assertEquals('HIT', $cacheResponse->getHeader('X-Magento-Cache-Debug')->getFieldValue());
+        $actualCacheTags = explode(',', $cacheResponse->getHeader('X-Magento-Tags')->getFieldValue());
+        $this->assertEquals($expectedCacheTags, $actualCacheTags);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/ProductLink/GroupedProductLinkQueryTest.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/ProductLink/GroupedProductLinkQueryTest.php
new file mode 100644
index 0000000000000..813a636086bb4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/ProductLink/GroupedProductLinkQueryTest.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\GroupedProduct\Model\ProductLink;
+
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\ProductLink\Data\ListCriteria;
+use Magento\Catalog\Model\ProductLink\ProductLinkQuery;
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test grouped links.
+ */
+class GroupedProductLinkQueryTest extends TestCase
+{
+    /**
+     * @var ProductLinkQuery
+     */
+    private $query;
+
+    /**
+     * @var ProductRepository
+     */
+    private $productRepo;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $criteriaBuilder;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $objectManager = Bootstrap::getObjectManager();
+        $this->query = $objectManager->get(ProductLinkQuery::class);
+        $this->productRepo = $objectManager->get(ProductRepository::class);
+        $this->criteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+    }
+
+    /**
+     * Test getting links for a list of products.
+     *
+     * @magentoDataFixture Magento/GroupedProduct/_files/product_grouped.php
+     * @return void
+     * @throws \Throwable
+     */
+    public function testSearch(): void
+    {
+        $sku = 'grouped-product';
+        //Generating criteria
+        /** @var ListCriteria[] $criteriaList */
+        $criteriaList = [
+            new ListCriteria($sku, ['associated']),
+            new ListCriteria($sku, ['related'])
+        ];
+
+        //Finding the list
+        $result = $this->query->search($criteriaList);
+        //Validating results
+        //1st criteria
+        $this->assertEmpty($result[0]->getError());
+        $this->assertNotEmpty($result[0]->getResult());
+        $this->assertCount(2, $result[0]->getResult());
+        foreach ($result[0]->getResult() as $link) {
+            $this->assertEquals($sku, $link->getSku());
+            $this->assertEquals('associated', $link->getLinkType());
+            $this->assertContains($link->getLinkedProductSku(), ['virtual-product', 'simple']);
+            $this->assertNotEmpty($link->getExtensionAttributes()->getQty());
+        }
+        //2nd criteria
+        $this->assertEmpty($result[1]->getError());
+        $this->assertEmpty($result[1]->getResult());
+    }
+}
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 a3cf42b48489f..d9a758b549667 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
@@ -93,7 +93,7 @@ public function validationDataProvider(): array
             [
                 'file_name' => 'test.txt',
                 'mime-type' => 'text/csv',
-                'message' => '\'txt\' file extension is not supported',
+                'message' => 'The file cannot be uploaded.',
                 'delimiter' => ',',
             ],
             [
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/ImportTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/ImportTest.php
index 0c1f2d2fcc8d7..0f92da2230f7c 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Model/ImportTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/ImportTest.php
@@ -7,6 +7,8 @@
 
 use Magento\Framework\Phrase;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
+use Magento\ImportExport\Model\Import\ImageDirectoryBaseProvider;
+use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * @magentoDataFixture Magento/ImportExport/_files/import_data.php
@@ -21,7 +23,7 @@ class ImportTest extends \PHPUnit\Framework\TestCase
     protected $_model;
 
     /**
-     * @var \Magento\ImportExport\Model\Import\Config
+     * @var Import\Config
      */
     protected $_importConfig;
 
@@ -65,13 +67,35 @@ class ImportTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->_importConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\ImportExport\Model\Import\Config::class
+        $this->_importConfig = Bootstrap::getObjectManager()->create(
+            Import\Config::class
         );
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        /** @var ImageDirectoryBaseProvider $provider */
+        $provider = Bootstrap::getObjectManager()->get(ImageDirectoryBaseProvider::class);
+        $this->_model = Bootstrap::getObjectManager()->create(
             Import::class,
-            ['importConfig' => $this->_importConfig]
+            [
+                'importConfig' => $this->_importConfig
+            ]
+        );
+        $this->_model->setData('images_base_directory', $provider->getDirectory());
+    }
+
+    /**
+     * Test validation of images directory against provided base directory.
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Images file directory is outside required directory
+     * @return void
+     */
+    public function testImagesDirBase(): void
+    {
+        $this->_model->setData(
+            Import::FIELD_NAME_VALIDATION_STRATEGY,
+            ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS
         );
+        $this->_model->setData(Import::FIELD_NAME_IMG_FILE_DIR, '../_files');
+        $this->_model->importSource();
     }
 
     /**
@@ -80,7 +104,7 @@ protected function setUp()
     public function testImportSource()
     {
         /** @var $customersCollection \Magento\Customer\Model\ResourceModel\Customer\Collection */
-        $customersCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $customersCollection = Bootstrap::getObjectManager()->create(
             \Magento\Customer\Model\ResourceModel\Customer\Collection::class
         );
 
diff --git a/dev/tests/integration/testsuite/Magento/Indexer/Console/Command/IndexerReindexCommandTest.php b/dev/tests/integration/testsuite/Magento/Indexer/Console/Command/IndexerReindexCommandTest.php
new file mode 100644
index 0000000000000..80b6f887d6501
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Indexer/Console/Command/IndexerReindexCommandTest.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Indexer\Console\Command;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Tests for \Magento\Indexer\Console\Command\IndexerReindexCommand.
+ *
+ * @magentoDbIsolation disabled
+ * @magentoAppIsolation enabled
+ */
+class IndexerReindexCommandTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var InputInterface|Mock
+     */
+    private $inputMock;
+
+    /**
+     * @var OutputInterface|Mock
+     */
+    private $outputMock;
+
+    /**
+     * @var IndexerReindexCommand
+     */
+    private $command;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->inputMock = $this->getMockBuilder(InputInterface::class)->getMockForAbstractClass();
+        $this->outputMock = $this->getMockBuilder(OutputInterface::class)->getMockForAbstractClass();
+
+        $this->command = $this->objectManager->get(IndexerReindexCommand::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_store_group_with_second_website.php
+     */
+    public function testReindexAll()
+    {
+        $status = $this->command->run($this->inputMock, $this->outputMock);
+        $this->assertEquals(
+            \Magento\Framework\Console\Cli::RETURN_SUCCESS,
+            $status,
+            'Index wasn\'t success'
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/AbstractCategoryTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/AbstractCategoryTest.php
new file mode 100644
index 0000000000000..aad0fcd08656f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/AbstractCategoryTest.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\Block\Navigation;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\LayeredNavigation\Block\Navigation;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Base class for filters block tests on category page.
+ */
+abstract class AbstractCategoryTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @var CollectionFactory
+     */
+    protected $categoryCollectionFactory;
+
+    /**
+     * @var CategoryResource
+     */
+    protected $categoryResource;
+
+    /**
+     * @var Navigation
+     */
+    protected $navigationBlock;
+
+    /**
+     * @var LayoutInterface
+     */
+    protected $layout;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->categoryCollectionFactory = $this->objectManager->create(CollectionFactory::class);
+        $this->categoryResource = $this->objectManager->get(CategoryResource::class);
+        $this->layout = $this->objectManager->get(LayoutInterface::class);
+        $this->navigationBlock = $this->objectManager->create(Category::class);
+        parent::setUp();
+    }
+
+    /**
+     * Inits navigation block.
+     *
+     * @param string $categoryName
+     * @param int $storeId
+     * @return void
+     */
+    protected function prepareNavigationBlock(
+        string $categoryName,
+        int $storeId = Store::DEFAULT_STORE_ID
+    ): void {
+        $category = $this->loadCategory($categoryName, $storeId);
+        $this->navigationBlock->getLayer()->setCurrentCategory($category);
+        $this->navigationBlock->setLayout($this->layout);
+    }
+
+    /**
+     * Loads category by id.
+     *
+     * @param string $categoryName
+     * @param int $storeId
+     * @return CategoryInterface
+     */
+    protected function loadCategory(string $categoryName, int $storeId): CategoryInterface
+    {
+        /** @var Collection $categoryCollection */
+        $categoryCollection = $this->categoryCollectionFactory->create();
+        /** @var CategoryInterface $category */
+        $category = $categoryCollection->setStoreId($storeId)
+            ->addAttributeToSelect('display_mode', 'left')
+            ->addAttributeToFilter(CategoryInterface::KEY_NAME, $categoryName)
+            ->setPageSize(1)
+            ->getFirstItem();
+        $category->setStoreId($storeId);
+
+        return $category;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/AbstractFiltersTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/AbstractFiltersTest.php
new file mode 100644
index 0000000000000..00c14b6a72d04
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/AbstractFiltersTest.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LayeredNavigation\Block\Navigation\Category;
+
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
+use Magento\Catalog\Model\Layer\Filter\Item;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
+use Magento\Framework\Search\Request\Builder;
+use Magento\Framework\Search\Request\Config;
+use Magento\LayeredNavigation\Block\Navigation\AbstractCategoryTest;
+use Magento\Search\Model\Search;
+use Magento\Store\Model\Store;
+
+/**
+ * Base class for custom filters in navigation block on category page.
+ */
+abstract class AbstractFiltersTest extends AbstractCategoryTest
+{
+    /**
+     * @var ProductAttributeRepositoryInterface
+     */
+    protected $attributeRepository;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    protected $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->attributeRepository = $this->objectManager->create(ProductAttributeRepositoryInterface::class);
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * Tests getFilters method from navigation block.
+     *
+     * @param array $products
+     * @param int $filterable
+     * @param array $expectation
+     * @param string $attributeCode
+     * @return void
+     */
+    protected function getFiltersAndAssert(
+        array $products,
+        int $filterable,
+        array $expectation,
+        string $attributeCode
+    ): void {
+        $this->updateAttribute($attributeCode, $filterable);
+        $this->updateProducts($products, $attributeCode);
+        $this->prepareNavigationBlock('Category 999');
+        $filter = $this->getFilterByCode($this->navigationBlock->getFilters(), $attributeCode);
+
+        if ($filterable) {
+            $this->assertNotNull($filter);
+            $this->assertEquals($expectation, $this->prepareFilterItems($filter));
+        } else {
+            $this->assertNull($filter);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function prepareNavigationBlock(string $categoryName, int $storeId = Store::DEFAULT_STORE_ID): void
+    {
+        $this->objectManager->removeSharedInstance(Config::class);
+        $this->objectManager->removeSharedInstance(Builder::class);
+        $this->objectManager->removeSharedInstance(Search::class);
+        $this->objectManager->create(Processor::class)->reindexAll();
+        parent::prepareNavigationBlock($categoryName, $storeId);
+    }
+
+    /**
+     * Returns filter with specified attribute.
+     *
+     * @param AbstractFilter[] $filters
+     * @param string $code
+     * @return AbstractFilter|null
+     */
+    protected function getFilterByCode(array $filters, string $code): ?AbstractFilter
+    {
+        $filter = array_filter(
+            $filters,
+            function (AbstractFilter $filter) use ($code) {
+                return $filter->getData('attribute_model')
+                    && $filter->getData('attribute_model')->getAttributeCode() === $code;
+            }
+        );
+
+        return array_shift($filter);
+    }
+
+    /**
+     * Updates attribute data.
+     *
+     * @param string $attributeCode
+     * @param int $filterable
+     * @return void
+     */
+    protected function updateAttribute(
+        string $attributeCode,
+        int $filterable
+    ): void {
+        $attribute = $this->attributeRepository->get($attributeCode);
+        $attribute->setData('is_filterable', $filterable);
+        $this->attributeRepository->save($attribute);
+    }
+
+    /**
+     * Returns filter items as array.
+     *
+     * @param AbstractFilter $filter
+     * @return array
+     */
+    protected function prepareFilterItems(AbstractFilter $filter): array
+    {
+        $items = [];
+        /** @var Item $item */
+        foreach ($filter->getItems() as $item) {
+            $items[] = [
+                'label' => $item->getData('label'),
+                'count' => $item->getData('count'),
+            ];
+        }
+
+        return $items;
+    }
+
+    /**
+     * Update products data by attribute.
+     *
+     * @param array $products
+     * @param string $attributeCode
+     * @return void
+     */
+    protected function updateProducts(array $products, string $attributeCode): void
+    {
+        $attribute = $this->attributeRepository->get($attributeCode);
+
+        foreach ($products as $productSku => $stringValue) {
+            $product = $this->productRepository->get($productSku, false, Store::DEFAULT_STORE_ID, true);
+            $product->addData(
+                [$attribute->getAttributeCode() => $attribute->getSource()->getOptionId($stringValue)]
+            );
+            $this->productRepository->save($product);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/BooleanFilterTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/BooleanFilterTest.php
new file mode 100644
index 0000000000000..83636ff55dce8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/BooleanFilterTest.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LayeredNavigation\Block\Navigation\Category;
+
+use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
+
+/**
+ * Provides tests for custom boolean filter in navigation block on category page.
+ *
+ * @magentoAppArea frontend
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ */
+class BooleanFilterTest extends AbstractFiltersTest
+{
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_boolean_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/category_with_different_price_products.php
+     * @dataProvider getFiltersWithCustomAttributeDataProvider
+     * @param array $products
+     * @param int $filterable
+     * @param array $expectation
+     * @return void
+     */
+    public function testGetFiltersWithCustomAttribute(array $products, int $filterable, array $expectation): void
+    {
+        $this->getFiltersAndAssert($products, $filterable, $expectation, 'boolean_attribute');
+    }
+
+    /**
+     * @return array
+     */
+    public function getFiltersWithCustomAttributeDataProvider(): array
+    {
+        return [
+            'not_used_in_navigation' => [
+                'products_data' => [],
+                'filterable' => 0,
+                'expectation' => [],
+            ],
+            'used_in_navigation_with_results' => [
+                'products_data' => [
+                    'simple1000' => 'Yes',
+                    'simple1001' => 'Yes',
+                ],
+                'filterable' => AbstractFilter::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS,
+                'expectation' => [
+                    ['label' => 'Yes', 'count' => 2],
+                ],
+            ],
+            'used_in_navigation_without_results' => [
+                'products_data' => [
+                    'simple1000' => 'Yes',
+                    'simple1001' => 'Yes',
+                ],
+                'filterable' => 2,
+                'expectation' => [
+                    ['label' => 'Yes', 'count' => 2],
+                    ['label' => 'No', 'count' => 0],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/DecimalFilterTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/DecimalFilterTest.php
new file mode 100644
index 0000000000000..e79b521f7f13c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/DecimalFilterTest.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LayeredNavigation\Block\Navigation\Category;
+
+use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
+use Magento\Catalog\Model\Layer\Filter\Item;
+use Magento\Store\Model\Store;
+
+/**
+ * Provides tests for custom price filter in navigation block on category page.
+ *
+ * @magentoAppArea frontend
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ */
+class DecimalFilterTest extends AbstractFiltersTest
+{
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_decimal_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/category_with_different_price_products.php
+     * @dataProvider getFiltersWithCustomAttributeDataProvider
+     * @param array $products
+     * @param int $filterable
+     * @param array $expectation
+     * @return void
+     */
+    public function testGetFiltersWithCustomAttribute(array $products, int $filterable, array $expectation): void
+    {
+        $this->getFiltersAndAssert($products, $filterable, $expectation, 'decimal_attribute');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function prepareFilterItems(AbstractFilter $filter): array
+    {
+        $items = [];
+        /** @var Item $item */
+        foreach ($filter->getItems() as $item) {
+            $item = [
+                'label' => __($item->getData('label'))->render(),
+                'value' => $item->getData('value'),
+                'count' => $item->getData('count'),
+            ];
+            $items[] = $item;
+        }
+
+        return $items;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function updateProducts(array $products, string $attributeCode): void
+    {
+        $attribute = $this->attributeRepository->get($attributeCode);
+
+        foreach ($products as $productSku => $value) {
+            $product = $this->productRepository->get($productSku, false, Store::DEFAULT_STORE_ID, true);
+            $product->addData(
+                [$attribute->getAttributeCode() => $value]
+            );
+            $this->productRepository->save($product);
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function getFiltersWithCustomAttributeDataProvider(): array
+    {
+        return [
+            'not_used_in_navigation' => [
+                'products_data' => [],
+                'filterable' => 0,
+                'expectation' => [],
+            ],
+            'used_in_navigation_with_results' => [
+                'products_data' => [
+                    'simple1000' => 10.00,
+                    'simple1001' => 20.00,
+                ],
+                'filterable' => AbstractFilter::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS,
+                'expectation' => [
+                    [
+                        'label' => '<span class="price">$10.00</span> - <span class="price">$19.99</span>',
+                        'value' => '10-20',
+                        'count' => 1,
+                    ],
+                    [
+                        'label' => '<span class="price">$20.00</span> and above',
+                        'value' => '20-',
+                        'count' => 1,
+                    ],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/MultiselectFilterTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/MultiselectFilterTest.php
new file mode 100644
index 0000000000000..14d121eb15b79
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/MultiselectFilterTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LayeredNavigation\Block\Navigation\Category;
+
+use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
+
+/**
+ * Provides tests for custom multiselect filter in navigation block on category page.
+ *
+ * @magentoAppArea frontend
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ */
+class MultiselectFilterTest extends AbstractFiltersTest
+{
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/multiselect_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/category_with_different_price_products.php
+     * @dataProvider getFiltersWithCustomAttributeDataProvider
+     * @param array $products
+     * @param int $filterable
+     * @param array $expectation
+     * @return void
+     */
+    public function testGetFiltersWithCustomAttribute(array $products, int $filterable, array $expectation): void
+    {
+        $this->getFiltersAndAssert($products, $filterable, $expectation, 'multiselect_attribute');
+    }
+
+    /**
+     * @return array
+     */
+    public function getFiltersWithCustomAttributeDataProvider(): array
+    {
+        return [
+            'not_used_in_navigation' => [
+                'products_data' => [],
+                'filterable' => 0,
+                'expectation' => [],
+            ],
+            'used_in_navigation_with_results' => [
+                'products_data' => [
+                    'simple1000' => 'Option 1',
+                    'simple1001' => 'Option 2',
+                ],
+                'filterable' => AbstractFilter::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS,
+                'expectation' => [
+                    ['label' => 'Option 1', 'count' => 1],
+                    ['label' => 'Option 2', 'count' => 1],
+                ],
+            ],
+            'used_in_navigation_without_results' => [
+                'products_data' => [
+                    'simple1000' => 'Option 1',
+                    'simple1001' => 'Option 2',
+                ],
+                'filterable' => 2,
+                'expectation' => [
+                    ['label' => 'Option 1', 'count' => 1],
+                    ['label' => 'Option 2', 'count' => 1],
+                    ['label' => 'Option 3', 'count' => 0],
+                    ['label' => 'Option 4 "!@#$%^&*', 'count' => 0],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/SelectFilterTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/SelectFilterTest.php
new file mode 100644
index 0000000000000..76217e9683993
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/SelectFilterTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LayeredNavigation\Block\Navigation\Category;
+
+use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
+
+/**
+ * Provides tests for custom select filter in navigation block on category page.
+ *
+ * @magentoAppArea frontend
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ */
+class SelectFilterTest extends AbstractFiltersTest
+{
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_dropdown_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/category_with_different_price_products.php
+     * @dataProvider getFiltersWithCustomAttributeDataProvider
+     * @param array $products
+     * @param int $filterable
+     * @param array $expectation
+     * @return void
+     */
+    public function testGetFiltersWithCustomAttribute(array $products, int $filterable, array $expectation): void
+    {
+        $this->getFiltersAndAssert($products, $filterable, $expectation, 'dropdown_attribute');
+    }
+
+    /**
+     * @return array
+     */
+    public function getFiltersWithCustomAttributeDataProvider(): array
+    {
+        return [
+            'not_used_in_navigation' => [
+                'products_data' => [],
+                'filterable' => 0,
+                'expectation' => [],
+            ],
+            'used_in_navigation_with_results' => [
+                'products_data' => [
+                    'simple1000' => 'Option 1',
+                    'simple1001' => 'Option 2',
+                ],
+                'filterable' => AbstractFilter::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS,
+                'expectation' => [
+                    ['label' => 'Option 1', 'count' => 1],
+                    ['label' => 'Option 2', 'count' => 1],
+                ],
+            ],
+            'used_in_navigation_without_results' => [
+                'products_data' => [
+                    'simple1000' => 'Option 1',
+                    'simple1001' => 'Option 2',
+                ],
+                'filterable' => 2,
+                'expectation' => [
+                    ['label' => 'Option 1', 'count' => 1],
+                    ['label' => 'Option 2', 'count' => 1],
+                    ['label' => 'Option 3', 'count' => 0],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/CategoryTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/CategoryTest.php
new file mode 100644
index 0000000000000..3a2de697bd5ef
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/CategoryTest.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LayeredNavigation\Block\Navigation;
+
+use Magento\Catalog\Api\Data\CategoryInterfaceFactory;
+use Magento\Catalog\Model\Category as CategoryModel;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Provides tests for filters block on category page.
+ *
+ * @magentoAppArea frontend
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ */
+class CategoryTest extends AbstractCategoryTest
+{
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category.php
+     * @return void
+     */
+    public function testCanShowBlockWithoutProducts(): void
+    {
+        $this->prepareNavigationBlock('Category 1');
+        $this->assertFalse($this->navigationBlock->canShowBlock());
+        $this->assertCount(0, $this->navigationBlock->getLayer()->getProductCollection()->getItems());
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
+     * @return void
+     */
+    public function testCanShowBlockWithoutFilterOptions(): void
+    {
+        $this->prepareNavigationBlock('Category 1');
+        $this->assertFalse($this->navigationBlock->canShowBlock());
+        $this->assertCount(1, $this->navigationBlock->getLayer()->getProductCollection()->getItems());
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category_with_different_price_products.php
+     * @dataProvider canShowBlockWithDisplayModeDataProvider
+     * @param string $displayMode
+     * @param bool $canShow
+     * @return void
+     */
+    public function testCanShowBlockWithDisplayMode(string $displayMode, bool $canShow): void
+    {
+        $this->updateCategoryDisplayMode('Category 999', $displayMode);
+        $this->prepareNavigationBlock('Category 999');
+        $this->assertEquals($canShow, $this->navigationBlock->canShowBlock());
+    }
+
+    /**
+     * @return array
+     */
+    public function canShowBlockWithDisplayModeDataProvider(): array
+    {
+        return [
+            'with_mode_products' => ['mode' => CategoryModel::DM_PRODUCT, 'can_show' => true],
+            'with_mode_cms_block' => ['mode' => CategoryModel::DM_PAGE, 'can_show' => false],
+            'with_mode_cms_block_and_products' => ['mode' => CategoryModel::DM_MIXED, 'can_show' => true],
+        ];
+    }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/Catalog/_files/category_with_different_price_products.php
+     * @dataProvider canShowBlockWithDisplayModeDataProviderOnStoreView
+     * @param string $defaultMode
+     * @param string $storeMode
+     * @param bool $canShow
+     * @return void
+     */
+    public function testCanShowBlockWithDisplayModeOnStoreView(
+        string $defaultMode,
+        string $storeMode,
+        bool $canShow
+    ): void {
+        $secondStoreId = (int)$this->storeManager->getStore('fixture_second_store')->getId();
+        $this->updateCategoryDisplayMode('Category 999', $defaultMode);
+        $this->updateCategoryDisplayMode('Category 999', $storeMode, $secondStoreId);
+        $this->prepareNavigationBlock('Category 999', $secondStoreId);
+        $this->assertEquals($canShow, $this->navigationBlock->canShowBlock());
+    }
+
+    /**
+     * @return array
+     */
+    public function canShowBlockWithDisplayModeDataProviderOnStoreView(): array
+    {
+        return [
+            'with_mode_products' => [
+                'default_mode' => CategoryModel::DM_PAGE,
+                'store_mode' => CategoryModel::DM_PRODUCT,
+                'can_show' => true,
+            ],
+            'with_mode_cms_block' => [
+                'default_mode' => CategoryModel::DM_PRODUCT,
+                'store_mode' => CategoryModel::DM_PAGE,
+                'can_show' => false
+            ],
+            'with_mode_cms_block_and_products' => [
+                'default_mode' => CategoryModel::DM_PAGE,
+                'store_mode' => CategoryModel::DM_MIXED,
+                'can_show' => true
+            ],
+        ];
+    }
+
+    /**
+     * Updates category display mode.
+     *
+     * @param string $categoryName
+     * @param string $displayMode
+     * @param int $storeId
+     * @return void
+     */
+    private function updateCategoryDisplayMode(
+        string $categoryName,
+        string $displayMode,
+        int $storeId = Store::DEFAULT_STORE_ID
+    ): void {
+        $category = $this->loadCategory($categoryName, $storeId);
+        $category->setData('display_mode', $displayMode);
+
+        if ($category->dataHasChangedFor('display_mode')) {
+            $this->categoryResource->save($category);
+        }
+    }
+}
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
index 847d15b6753a0..836fd817f1b72 100644
--- 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
@@ -26,7 +26,7 @@
 
 // assign virtual product to the billing address
 $billingAddress = $quote->getBillingAddress();
-$virtualItem = $items[sizeof($items) - 1];
+$virtualItem = $items[count($items) - 1];
 $billingAddress->setTotalQty(1);
 $billingAddress->addItem($virtualItem);
 
diff --git a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php
index 56dd77d3da17c..cba3334f1b7f3 100644
--- a/dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\MysqlMq\Model;
 
 /**
@@ -23,27 +25,26 @@ class QueueManagementTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->queueManagement = $this->objectManager->create(\Magento\MysqlMq\Model\QueueManagement::class);
+        $this->queueManagement = $this->objectManager->create(QueueManagement::class);
     }
 
     /**
      * @magentoDataFixture Magento/MysqlMq/_files/queues.php
      */
-    public function testAllFlows()
+    public function testMessageReading()
     {
-        $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']);
+        $this->queueManagement->addMessageToQueues('topic1', 'messageBody1', ['queue1']);
+        $this->queueManagement->addMessageToQueues('topic2', 'messageBody2', ['queue1']);
+        $this->queueManagement->addMessageToQueues('topic3', 'messageBody3', ['queue1']);
         $maxMessagesNumber = 2;
-        $messages = $this->queueManagement->readMessages('queue3', $maxMessagesNumber);
+        $messages = $this->queueManagement->readMessages('queue1', $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('topic1', $firstMessage[QueueManagement::MESSAGE_TOPIC]);
+        $this->assertEquals('messageBody1', $firstMessage[QueueManagement::MESSAGE_BODY]);
+        $this->assertEquals('queue1', $firstMessage[QueueManagement::MESSAGE_QUEUE_NAME]);
         $this->assertEquals(
             QueueManagement::MESSAGE_STATUS_IN_PROGRESS,
             $firstMessage[QueueManagement::MESSAGE_STATUS]
@@ -55,9 +56,9 @@ public function testAllFlows()
         $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('topic2', $secondMessage[QueueManagement::MESSAGE_TOPIC]);
+        $this->assertEquals('messageBody2', $secondMessage[QueueManagement::MESSAGE_BODY]);
+        $this->assertEquals('queue1', $secondMessage[QueueManagement::MESSAGE_QUEUE_NAME]);
         $this->assertEquals(
             QueueManagement::MESSAGE_STATUS_IN_PROGRESS,
             $secondMessage[QueueManagement::MESSAGE_STATUS]
@@ -67,37 +68,130 @@ public function testAllFlows()
         $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]));
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     */
+    public function testMessageReadingMultipleQueues()
+    {
+        $this->queueManagement->addMessageToQueues('topic1', 'messageBody1', ['queue1']);
+        $this->queueManagement->addMessageToQueues('topic2', 'messageBody2', ['queue1', 'queue2']);
+        $this->queueManagement->addMessageToQueues('topic3', 'messageBody3', ['queue2']);
+
+        $maxMessagesNumber = 2;
+        $messages = $this->queueManagement->readMessages('queue1', $maxMessagesNumber);
+        $this->assertCount($maxMessagesNumber, $messages);
+
+        $message = array_shift($messages);
+        $this->assertEquals('topic1', $message[QueueManagement::MESSAGE_TOPIC]);
+        $this->assertEquals('messageBody1', $message[QueueManagement::MESSAGE_BODY]);
+        $this->assertEquals('queue1', $message[QueueManagement::MESSAGE_QUEUE_NAME]);
+        $this->assertEquals(
+            QueueManagement::MESSAGE_STATUS_IN_PROGRESS,
+            $message[QueueManagement::MESSAGE_STATUS]
+        );
+
+        $message= array_shift($messages);
+        $this->assertEquals('topic2', $message[QueueManagement::MESSAGE_TOPIC]);
+        $this->assertEquals('messageBody2', $message[QueueManagement::MESSAGE_BODY]);
+        $this->assertEquals('queue1', $message[QueueManagement::MESSAGE_QUEUE_NAME]);
+        $this->assertEquals(
+            QueueManagement::MESSAGE_STATUS_IN_PROGRESS,
+            $message[QueueManagement::MESSAGE_STATUS]
+        );
+
+        $maxMessagesNumber = 2;
+        $messages = $this->queueManagement->readMessages('queue2', $maxMessagesNumber);
+        $this->assertCount($maxMessagesNumber, $messages);
+
+        $message= array_shift($messages);
+        $this->assertEquals('topic2', $message[QueueManagement::MESSAGE_TOPIC]);
+        $this->assertEquals('messageBody2', $message[QueueManagement::MESSAGE_BODY]);
+        $this->assertEquals('queue2', $message[QueueManagement::MESSAGE_QUEUE_NAME]);
+        $this->assertEquals(
+            QueueManagement::MESSAGE_STATUS_IN_PROGRESS,
+            $message[QueueManagement::MESSAGE_STATUS]
+        );
+
+        $message = array_shift($messages);
+        $this->assertEquals('topic3', $message[QueueManagement::MESSAGE_TOPIC]);
+        $this->assertEquals('messageBody3', $message[QueueManagement::MESSAGE_BODY]);
+        $this->assertEquals('queue2', $message[QueueManagement::MESSAGE_QUEUE_NAME]);
+        $this->assertEquals(
+            QueueManagement::MESSAGE_STATUS_IN_PROGRESS,
+            $message[QueueManagement::MESSAGE_STATUS]
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     */
+    public function testChangingMessageStatus()
+    {
+        $this->queueManagement->addMessageToQueues('topic1', 'messageBody1', ['queue1']);
+        $this->queueManagement->addMessageToQueues('topic2', 'messageBody2', ['queue1']);
+        $this->queueManagement->addMessageToQueues('topic3', 'messageBody3', ['queue1']);
+        $this->queueManagement->addMessageToQueues('topic4', 'messageBody4', ['queue1']);
+
+        $maxMessagesNumber = 4;
+        $messages = $this->queueManagement->readMessages('queue1', $maxMessagesNumber);
+        $this->assertCount($maxMessagesNumber, $messages);
+
+        $firstMessage = array_shift($messages);
+        $secondMessage = array_shift($messages);
+        $thirdMessage = array_shift($messages);
+        $fourthMessage = array_shift($messages);
+
+        $this->queueManagement->changeStatus(
+            [
+                $firstMessage[QueueManagement::MESSAGE_QUEUE_RELATION_ID]
+            ],
+            QueueManagement::MESSAGE_STATUS_ERROR
+        );
 
-        /** 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]
+                $thirdMessage[QueueManagement::MESSAGE_QUEUE_RELATION_ID]
             ],
-            QueueManagement::MESSAGE_STATUS_ERROR
+            QueueManagement::MESSAGE_STATUS_NEW
+        );
+
+        $this->queueManagement->changeStatus(
+            [
+                $fourthMessage[QueueManagement::MESSAGE_QUEUE_RELATION_ID]
+            ],
+            QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED
         );
-        $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);
+        $messages = $this->queueManagement->readMessages('queue1');
+        $this->assertCount(2, $messages);
+    }
+
+    /**
+     * @magentoDataFixture Magento/MysqlMq/_files/queues.php
+     */
+    public function testMessageRetry()
+    {
+        $this->queueManagement->addMessageToQueues('topic1', 'messageBody1', ['queue1']);
+
+        $messages = $this->queueManagement->readMessages('queue1', 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);
+            $messages = $this->queueManagement->readMessages('queue1', 1);
             $message = array_shift($messages);
             $this->assertEquals($messageRelationId, $message[QueueManagement::MESSAGE_QUEUE_RELATION_ID]);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
index 9dbf5c4d2a2a9..bf19d6ddefc36 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/SubscriberTest.php
@@ -3,8 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Newsletter\Controller;
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\AccountConfirmation;
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Newsletter\Model\ResourceModel\Subscriber as SubscriberLoader;
+use Magento\Newsletter\Model\Subscriber;
+use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\AbstractController;
 
@@ -13,11 +23,6 @@
  */
 class SubscriberTest extends AbstractController
 {
-    protected function setUp()
-    {
-        parent::setUp();
-    }
-
     public function testNewAction()
     {
         $this->getRequest()->setMethod('POST');
@@ -34,9 +39,7 @@ public function testNewAction()
     public function testNewActionUnusedEmail()
     {
         $this->getRequest()->setMethod('POST');
-        $this->getRequest()->setPostValue([
-            'email' => 'not_used@example.com',
-        ]);
+        $this->getRequest()->setPostValue(['email' => 'not_used@example.com']);
 
         $this->dispatch('newsletter/subscriber/new');
 
@@ -50,15 +53,11 @@ public function testNewActionUnusedEmail()
     public function testNewActionUsedEmail()
     {
         $this->getRequest()->setMethod('POST');
-        $this->getRequest()->setPostValue([
-            'email' => 'customer@example.com',
-        ]);
+        $this->getRequest()->setPostValue(['email' => 'customer@example.com']);
 
         $this->dispatch('newsletter/subscriber/new');
 
-        $this->assertSessionMessages($this->equalTo([
-                'Thank you for your subscription.',
-            ]));
+        $this->assertSessionMessages($this->equalTo(['Thank you for your subscription.']));
         $this->assertRedirect($this->anything());
     }
 
@@ -68,9 +67,7 @@ public function testNewActionUsedEmail()
     public function testNewActionOwnerEmail()
     {
         $this->getRequest()->setMethod('POST');
-        $this->getRequest()->setPostValue([
-            'email' => 'customer@example.com',
-        ]);
+        $this->getRequest()->setPostValue(['email' => 'customer@example.com']);
         $this->login(1);
 
         $this->dispatch('newsletter/subscriber/new');
@@ -79,6 +76,80 @@ public function testNewActionOwnerEmail()
         $this->assertRedirect($this->anything());
     }
 
+    /**
+     * Check that Customer still subscribed for newsletters emails after registration.
+     *
+     * @magentoDbIsolation enabled
+     */
+    public function testCreatePosWithSubscribeEmailAction()
+    {
+        $this->markTestSkipped('Skip until failed. MAGETWO-96420');
+
+        $config = Bootstrap::getObjectManager()->get(MutableScopeConfigInterface::class);
+        $accountConfirmationRequired = $config->getValue(
+            AccountConfirmation::XML_PATH_IS_CONFIRM,
+            ScopeInterface::SCOPE_WEBSITES
+        );
+        $config->setValue(AccountConfirmation::XML_PATH_IS_CONFIRM, 1, ScopeInterface::SCOPE_WEBSITES);
+
+        $subscriber = Bootstrap::getObjectManager()->create(Subscriber::class);
+        $customerEmail = 'subscribeemail@example.com';
+        // Subscribe by email
+        $subscriber->subscribe($customerEmail);
+        $subscriber->loadByEmail($customerEmail);
+        $subscriber->confirm($subscriber->getSubscriberConfirmCode());
+
+        // Create customer
+        $this->fillRequestWithAccountDataAndFormKey($customerEmail);
+        $this->dispatch('customer/account/createPost');
+        $this->dispatch('customer/account/confirm');
+
+        $customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+        /** @var  \Magento\Customer\Api\Data\CustomerInterface $customer */
+        $customer = $customerRepository->get($customerEmail);
+        $subscriberResource = Bootstrap::getObjectManager()
+            ->create(SubscriberLoader::class);
+
+        // check customer subscribed to newsletter
+        $this->assertTrue($subscriberResource->loadByCustomerData($customer)['subscriber_status'] === "1");
+
+        $config->setValue(
+            AccountConfirmation::XML_PATH_IS_CONFIRM,
+            $accountConfirmationRequired,
+            ScopeInterface::SCOPE_WEBSITES
+        );
+    }
+
+    /**
+     * Customer Data.
+     *
+     * @param string $email
+     * @return void
+     */
+    private function fillRequestWithAccountDataAndFormKey($email)
+    {
+        Bootstrap::getObjectManager()->get(RequestInterface::class)
+            ->setMethod('POST')
+            ->setParam('firstname', 'firstname1')
+            ->setParam('lastname', 'lastname1')
+            ->setParam('company', '')
+            ->setParam('email', $email)
+            ->setParam('password', '_Password1')
+            ->setParam('password_confirmation', '_Password1')
+            ->setParam('telephone', '5123334444')
+            ->setParam('street', ['1234 fake street', ''])
+            ->setParam('city', 'Austin')
+            ->setParam('region_id', 57)
+            ->setParam('region', '')
+            ->setParam('postcode', '78701')
+            ->setParam('country_id', 'US')
+            ->setParam('default_billing', '1')
+            ->setParam('default_shipping', '1')
+            ->setParam('is_subscribed', '0')
+            ->setPostValue('create_address', true)
+            ->setParam('form_key', Bootstrap::getObjectManager()->get(FormKey::class)->getFormKey());
+    }
+
     /**
      * Login the user
      *
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
index e971ca88c4e57..bdcbdc035d2b0 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
@@ -100,7 +100,7 @@ public function testConfirm()
 
         $this->assertContains(
             'You have been successfully subscribed to our newsletter.',
-            $transportBuilder->getSentMessage()->getRawMessage()
+            $transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
index 60b61415e0169..dda72ef353f10 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Newsletter\Model;
 
+use Magento\Framework\App\TemplateTypesInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
  */
@@ -17,7 +21,7 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->_model = Bootstrap::getObjectManager()->create(
             \Magento\Newsletter\Model\Template::class
         );
     }
@@ -35,7 +39,7 @@ public function testGetProcessedTemplateFrontend($store, $design)
     {
         $this->_model->setTemplateText('{{view url="Magento_Theme::favicon.ico"}}');
         if ($store != 'default') {
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            Bootstrap::getObjectManager()->get(
                 \Magento\Framework\App\Config\MutableScopeConfigInterface::class
             )->setValue(
                 \Magento\Theme\Model\View\Design::XML_PATH_THEME_ID,
@@ -45,7 +49,7 @@ public function testGetProcessedTemplateFrontend($store, $design)
             );
         }
         $this->_model->emulateDesign($store, 'frontend');
-        $processedTemplate = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $processedTemplate = Bootstrap::getObjectManager()->get(
             \Magento\Framework\App\State::class
         )->emulateAreaCode(
             'frontend',
@@ -78,7 +82,7 @@ public function testGetProcessedTemplateArea($area, $design)
     {
         $this->_model->setTemplateText('{{view url="Magento_Theme::favicon.ico"}}');
         $this->_model->emulateDesign('default', $area);
-        $processedTemplate = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $processedTemplate = Bootstrap::getObjectManager()->get(
             \Magento\Framework\App\State::class
         )->emulateAreaCode(
             $area,
@@ -131,4 +135,77 @@ public function isValidToSendDataProvider()
             ['', '', '', false]
         ];
     }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     */
+    public function testLegacyTemplateFromDbLoadsInLegacyMode()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+
+        $this->_model->setTemplateType(TemplateTypesInterface::TYPE_HTML);
+        $templateText = '{{var store.isSaveAllowed()}} - {{template config_path="foobar"}}';
+        $this->_model->setTemplateText($templateText);
+
+        $template = $objectManager->create(\Magento\Email\Model\Template::class);
+        $templateData = [
+            'is_legacy' => '1',
+            'template_code' => 'some_unique_code',
+            'template_type' => TemplateTypesInterface::TYPE_HTML,
+            'template_text' => '{{var this.template_code}}'
+                . ' - {{var store.isSaveAllowed()}} - {{var this.getTemplateCode()}}',
+        ];
+        $template->setData($templateData);
+        $template->save();
+
+        // Store the ID of the newly created template in the system config so that this template will be loaded
+        $objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
+            ->setValue('foobar', $template->getId(), ScopeInterface::SCOPE_STORE, 'default');
+
+        $this->_model->emulateDesign('default', 'frontend');
+        $processedTemplate = Bootstrap::getObjectManager()->get(
+            \Magento\Framework\App\State::class
+        )->emulateAreaCode(
+            'frontend',
+            [$this->_model, 'getProcessedTemplate']
+        );
+        self::assertEquals('1 - some_unique_code - 1 - some_unique_code', $processedTemplate);
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     */
+    public function testTemplateFromDbLoadsInStrictMode()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+
+        $this->_model->setTemplateType(TemplateTypesInterface::TYPE_HTML);
+        $templateText = '{{var store.isSaveAllowed()}} - {{template config_path="foobar"}}';
+        $this->_model->setTemplateText($templateText);
+
+        $template = $objectManager->create(\Magento\Email\Model\Template::class);
+        $templateData = [
+            'template_code' => 'some_unique_code',
+            'template_type' => TemplateTypesInterface::TYPE_HTML,
+            'template_text' => '{{var this.template_code}}'
+                . ' - {{var store.isSaveAllowed()}} - {{var this.getTemplateCode()}}',
+        ];
+        $template->setData($templateData);
+        $template->save();
+
+        // Store the ID of the newly created template in the system config so that this template will be loaded
+        $objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
+            ->setValue('foobar', $template->getId(), ScopeInterface::SCOPE_STORE, 'default');
+
+        $this->_model->emulateDesign('default', 'frontend');
+        $processedTemplate = Bootstrap::getObjectManager()->get(
+            \Magento\Framework\App\State::class
+        )->emulateAreaCode(
+            'frontend',
+            [$this->_model, 'getProcessedTemplate']
+        );
+        self::assertEquals('1 - some_unique_code -  - some_unique_code', $processedTemplate);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ImportExportTableratesTest.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ImportExportTableratesTest.php
new file mode 100644
index 0000000000000..f0d7846e366b1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ImportExportTableratesTest.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\OfflineShipping\Controller\Adminhtml\System\Config;
+
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\OfflineShipping\Block\Adminhtml\Carrier\Tablerate\Grid;
+use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\Collection;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Filesystem;
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Test tablerates import and export.
+ *
+ * @magentoAppArea adminhtml
+ */
+class ImportExportTableratesTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Filesystem
+     */
+    private $fileSystem;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var int
+     */
+    private $websiteId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->fileSystem = $this->objectManager->get(Filesystem::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $this->websiteId = $this->storeManager->getWebsite()->getId();
+
+        parent::setUp();
+    }
+
+    /**
+     * Import Table Rates to be used in Configuration Settings.
+     *
+     * @magentoDataFixture Magento/OfflineShipping/_files/tablerate_create_file_in_tmp.php
+     * @return void
+     */
+    public function testImportExportTablerates(): void
+    {
+        $importCsv = 'tablerates.csv';
+        $tmpDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::SYS_TMP);
+        $importCsvPath = $tmpDirectory->getAbsolutePath($importCsv);
+
+        $_FILES['groups'] = [
+            'name' => ['tablerate' => ['fields' => ['import' => ['value' => $importCsv]]]],
+            'type' => ['tablerate' => ['fields' => ['import' => ['value' => 'text/csv']]]],
+            'tmp_name' => ['tablerate' => ['fields' => ['import' => ['value' => $importCsvPath]]]],
+            'error'=> ['tablerate' => ['fields' => ['import' => ['value' => 0]]]],
+            'size' => ['tablerate' => ['fields' => ['import' => ['value' => 102]]]],
+        ];
+
+        $this->getRequest()->setPostValue(
+            [
+                'groups' => [
+                    'tablerate' => [
+                        'fields' => [
+                            'condition_name' => ['value' => 'package_weight'],
+                            'import' => ['value' => microtime(true)],
+                        ],
+                    ],
+                ],
+            ]
+        )->setMethod(HttpRequest::METHOD_POST);
+
+        $this->dispatch('backend/admin/system_config/save/section/carriers/website/' . $this->websiteId . '/');
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You saved the configuration.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
+
+        /** @var Collection $tablerateCollection */
+        $tablerateCollection = $this->objectManager->create(Collection::class);
+        $tablerateData = $tablerateCollection->setConditionFilter('package_weight')->getItems()[0]->getData();
+        $this->assertEquals('666.0000', $tablerateData['price']);
+        $this->assertEquals('USA', $tablerateData['dest_country']);
+        $this->assertEquals('10.0000', $tablerateData['condition_value']);
+
+        $exportCsvContent = $this->getTablerateCsv();
+        $importCsvContent = $tmpDirectory->openFile($importCsvPath, 'r')->readAll();
+
+        $this->assertEquals($importCsvContent, $exportCsvContent);
+    }
+
+    /**
+     * @return string
+     */
+    private function getTablerateCsv(): string
+    {
+        /** @var WriteInterface $varDirectory */
+        $varDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+
+        /** @var Grid $gridBlock */
+        $gridBlock = $this->objectManager->get(LayoutInterface::class)->createBlock(Grid::class);
+        $exportCsv = $gridBlock->setWebsiteId($this->websiteId)->setConditionName('package_weight')->getCsvFile();
+        $exportCsvContent = $varDirectory->openFile($exportCsv['value'], 'r')->readAll();
+
+        return $exportCsvContent;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/Model/CollectRatesTest.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/Model/CollectRatesTest.php
new file mode 100644
index 0000000000000..1b85f99752cf8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/Model/CollectRatesTest.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\OfflineShipping\Model;
+
+/**
+ * Integration tests for offline shipping carriers.
+ * @magentoAppIsolation enabled
+ */
+class CollectRatesTest extends \Magento\Shipping\Model\CollectRatesAbstract
+{
+    /**
+     * @var string
+     */
+    protected $carrier = 'flatrate';
+
+    /**
+     * @var string
+     */
+    protected $errorMessage = 'This shipping method is not available. To use this shipping method, please contact us.';
+
+    /**
+     * @magentoConfigFixture default_store carriers/flatrate/active 1
+     * @magentoConfigFixture default_store carriers/flatrate/sallowspecific 1
+     * @magentoConfigFixture default_store carriers/flatrate/specificcountry UK
+     * @magentoConfigFixture default_store carriers/flatrate/showmethod 1
+     */
+    // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
+    public function testCollectRatesWhenShippingCarrierIsAvailableAndNotApplicable()
+    {
+        parent::testCollectRatesWhenShippingCarrierIsAvailableAndNotApplicable();
+    }
+
+    /**
+     * @magentoConfigFixture default_store carriers/flatrate/active 0
+     * @magentoConfigFixture default_store carriers/flatrate/sallowspecific 1
+     * @magentoConfigFixture default_store carriers/flatrate/specificcountry UK
+     * @magentoConfigFixture default_store carriers/flatrate/showmethod 1
+     */
+    // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
+    public function testCollectRatesWhenShippingCarrierIsNotAvailableAndNotApplicable()
+    {
+        parent::testCollectRatesWhenShippingCarrierIsNotAvailableAndNotApplicable();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerate_create_file_in_tmp.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerate_create_file_in_tmp.php
new file mode 100644
index 0000000000000..edeb533ad6470
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerate_create_file_in_tmp.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+
+$importCsv = 'tablerates.csv';
+$objectManager = Bootstrap::getObjectManager();
+/** @var Filesystem $fileSystem */
+$fileSystem = $objectManager->get(Filesystem::class);
+/** @var WriteInterface $tmpDirectory */
+$tmpDirectory = $fileSystem->getDirectoryWrite(DirectoryList::SYS_TMP);
+$importCsvPath = $tmpDirectory->getAbsolutePath($importCsv);
+
+$fixtureDir = realpath(__DIR__);
+copy($fixtureDir . DIRECTORY_SEPARATOR . $importCsv, $importCsvPath);
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerate_create_file_in_tmp_rollback.php b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerate_create_file_in_tmp_rollback.php
new file mode 100644
index 0000000000000..2333e48ee71e5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerate_create_file_in_tmp_rollback.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Filesystem $fileSystem */
+$fileSystem = $objectManager->get(Filesystem::class);
+/** @var WriteInterface $tmpDirectory */
+$tmpDirectory = $fileSystem->getDirectoryWrite(DirectoryList::SYS_TMP);
+$fileName = 'tablerates.csv';
+
+$tmpDirectory->delete($fileName);
diff --git a/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates.csv b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates.csv
new file mode 100644
index 0000000000000..de92b11c93242
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/OfflineShipping/_files/tablerates.csv
@@ -0,0 +1,2 @@
+Country,Region/State,"Zip/Postal Code","Weight (and above)","Shipping Price"
+USA,*,*,10.0000,666.0000
diff --git a/dev/tests/integration/testsuite/Magento/Payment/Block/InfoTest.php b/dev/tests/integration/testsuite/Magento/Payment/Block/InfoTest.php
index 3bd966018b945..ff4f3f8a58bcf 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/Block/InfoTest.php
+++ b/dev/tests/integration/testsuite/Magento/Payment/Block/InfoTest.php
@@ -5,9 +5,24 @@
  */
 namespace Magento\Payment\Block;
 
+use Magento\Framework\View\Element\Text;
+use Magento\Framework\View\LayoutInterface;
+use Magento\OfflinePayments\Model\Banktransfer;
+use Magento\OfflinePayments\Model\Checkmo;
+use Magento\Payment\Block\Info as BlockInfo;
+use Magento\Payment\Block\Info\Instructions;
+use Magento\Payment\Model\Info;
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class InfoTest
+ */
 class InfoTest extends \PHPUnit\Framework\TestCase
 {
     /**
+     * Tests payment info block.
+     *
      * @magentoConfigFixture current_store payment/banktransfer/title Bank Method Title
      * @magentoConfigFixture current_store payment/checkmo/title Checkmo Title Of The Method
      * @magentoAppArea adminhtml
@@ -15,37 +30,32 @@ class InfoTest extends \PHPUnit\Framework\TestCase
     public function testGetChildPdfAsArray()
     {
         /** @var $layout \Magento\Framework\View\Layout */
-        $layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\View\LayoutInterface::class
-        );
-        $block = $layout->createBlock(\Magento\Payment\Block\Info::class, 'block');
+        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
+        $block = $layout->createBlock(BlockInfo::class, 'block');
 
-        /** @var $paymentInfoBank \Magento\Payment\Model\Info  */
-        $paymentInfoBank = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Payment\Model\Info::class
-        );
-        $paymentInfoBank->setMethodInstance(
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                \Magento\OfflinePayments\Model\Banktransfer::class
-            )
+        /** @var $paymentInfoBank Info  */
+        $paymentInfoBank = Bootstrap::getObjectManager()->create(
+            Info::class
         );
-        /** @var $childBank \Magento\Payment\Block\Info\Instructions */
-        $childBank = $layout->addBlock(\Magento\Payment\Block\Info\Instructions::class, 'child.one', 'block');
+        $order = Bootstrap::getObjectManager()->create(Order::class);
+        $banktransferPayment = Bootstrap::getObjectManager()->create(Banktransfer::class);
+        $paymentInfoBank->setMethodInstance($banktransferPayment);
+        $paymentInfoBank->setOrder($order);
+        /** @var $childBank Instructions */
+        $childBank = $layout->addBlock(Instructions::class, 'child.one', 'block');
         $childBank->setInfo($paymentInfoBank);
 
         $nonExpectedHtml = 'non-expected html';
-        $childHtml = $layout->addBlock(\Magento\Framework\View\Element\Text::class, 'child.html', 'block');
+        $childHtml = $layout->addBlock(Text::class, 'child.html', 'block');
         $childHtml->setText($nonExpectedHtml);
 
-        /** @var $paymentInfoCheckmo \Magento\Payment\Model\Info */
-        $paymentInfoCheckmo = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Payment\Model\Info::class
-        );
-        $paymentInfoCheckmo->setMethodInstance(
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                \Magento\OfflinePayments\Model\Checkmo::class
-            )
+        /** @var $paymentInfoCheckmo Info */
+        $paymentInfoCheckmo = Bootstrap::getObjectManager()->create(
+            Info::class
         );
+        $checkmoPayment = Bootstrap::getObjectManager()->create(Checkmo::class);
+        $paymentInfoCheckmo->setMethodInstance($checkmoPayment);
+        $paymentInfoCheckmo->setOrder($order);
         /** @var $childCheckmo \Magento\OfflinePayments\Block\Info\Checkmo */
         $childCheckmo = $layout->addBlock(
             \Magento\OfflinePayments\Block\Info\Checkmo::class,
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php
index 51745fb6aaf9a..b5f097cceb189 100644
--- a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php
+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php
@@ -123,6 +123,7 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void
             {
            cancel_url:"paypal/payflow/cancelPayment"
            return_url:"paypal/payflow/returnUrl"
+           error_url:"paypal/payflow/errorUrl"
           }
       }
   }) {    
diff --git a/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php b/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
index ad254e1db40b5..0b2a4124dcc2e 100644
--- a/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
+++ b/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
@@ -101,7 +101,7 @@ public function testSend($isCustomerIdUsed)
         $this->_emailModel->send();
 
         $this->assertContains(
-            'John Smith,',
+            'Smith,',
             $this->transportBuilder->getSentMessage()->getRawMessage()
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/ProductAlert/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/ProductAlert/Model/ObserverTest.php
index 0f19edc349e84..e4721f515a320 100644
--- a/dev/tests/integration/testsuite/Magento/ProductAlert/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/ProductAlert/Model/ObserverTest.php
@@ -70,7 +70,7 @@ public function testProcess()
     {
         $this->observer->process();
         $this->assertContains(
-            'John Smith,',
+            'ohn Smith,',
             $this->transportBuilder->getSentMessage()->getRawMessage()
         );
     }
@@ -78,8 +78,9 @@ public function testProcess()
     /**
      * Check translations for product alerts
      *
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppArea frontend
+     * @magentoDataFixture Magento/Catalog/_files/category.php
      * @magentoConfigFixture current_store catalog/productalert/allow_price 1
      * @magentoDataFixture Magento/Store/_files/second_store.php
      * @magentoConfigFixture fixture_second_store_store general/locale/code pt_BR
@@ -116,9 +117,10 @@ public function testProcessPortuguese()
 
         // dispatch process() method and check sent message
         $this->observer->process();
-        $message = $this->transportBuilder->getSentMessage()->getRawMessage();
+        $message = $this->transportBuilder->getSentMessage();
+        $messageContent = $message->getBody()->getParts()[0]->getRawContent();
         $expectedText = array_shift($translation);
-        $this->assertContains('/frontend/Magento/luma/pt_BR/', $message);
-        $this->assertContains(substr($expectedText, 0, 50), $message);
+        $this->assertContains('/frontend/Magento/luma/pt_BR/', $messageContent);
+        $this->assertContains(substr($expectedText, 0, 50), $messageContent);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ProductAlert/_files/product_alert_with_store.php b/dev/tests/integration/testsuite/Magento/ProductAlert/_files/product_alert_with_store.php
index 38f00d49f1d47..fef16baed1704 100644
--- a/dev/tests/integration/testsuite/Magento/ProductAlert/_files/product_alert_with_store.php
+++ b/dev/tests/integration/testsuite/Magento/ProductAlert/_files/product_alert_with_store.php
@@ -8,22 +8,26 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\ProductAlert\Model\Price;
 use Magento\ProductAlert\Model\Stock;
+use Magento\Store\Api\StoreRepositoryInterface;
 
 require __DIR__ . '/../../../Magento/Customer/_files/customer_for_second_store.php';
 require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_out_of_stock_without_categories.php';
 
 $objectManager = Bootstrap::getObjectManager();
+$storeRepository = $objectManager->get(StoreRepositoryInterface::class);
+$storeId = $storeRepository->get('fixture_second_store')->getId();
+
 $price = $objectManager->create(Price::class);
 $price->setCustomerId($customer->getId())
     ->setProductId($product->getId())
     ->setPrice($product->getPrice()+1)
     ->setWebsiteId(1)
-    ->setStoreId(2);
+    ->setStoreId($storeId);
 $price->save();
 
 $stock = $objectManager->create(Stock::class);
 $stock->setCustomerId($customer->getId())
     ->setProductId($product->getId())
     ->setWebsiteId(1)
-    ->setStoreId(2);
+    ->setStoreId($storeId);
 $stock->save();
diff --git a/dev/tests/integration/testsuite/Magento/Quote/_files/quote_for_customer_and_custom_store.php b/dev/tests/integration/testsuite/Magento/Quote/_files/quote_for_customer_and_custom_store.php
new file mode 100644
index 0000000000000..6e1fba3db57cb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/_files/quote_for_customer_and_custom_store.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+$customer = $objectManager->get(CustomerRepositoryInterface::class)->get('customer@example.com');
+$store = $objectManager->get(StoreRepositoryInterface::class)->get('secondstore');
+
+$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' => 'tsg-123456789',
+            'is_active' => true,
+            'is_multishipping' => false
+        ],
+    ]
+);
+$quote->setShippingAddress($shippingAddress)
+    ->setBillingAddress($billingAddress);
+
+/** @var CartRepositoryInterface $repository */
+$repository = $objectManager->get(CartRepositoryInterface::class);
+$repository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Quote/_files/quote_for_customer_and_custom_store_rollback.php b/dev/tests/integration/testsuite/Magento/Quote/_files/quote_for_customer_and_custom_store_rollback.php
new file mode 100644
index 0000000000000..9d922b8bd0bd8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/_files/quote_for_customer_and_custom_store_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\Registry;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$quote = $objectManager->get(GetQuoteByReservedOrderId::class)->execute('tsg-123456789');
+if ($quote !== null) {
+    /** @var CartRepositoryInterface $cartRepository */
+    $cartRepository = $objectManager->get(CartRepositoryInterface::class);
+    $cartRepository->delete($quote);
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
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
index 2f89f70a6c872..ffe3ccf49ebad 100644
--- a/dev/tests/integration/testsuite/Magento/ReleaseNotification/Controller/Adminhtml/Dashboard/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/ReleaseNotification/Controller/Adminhtml/Dashboard/IndexTest.php
@@ -72,7 +72,7 @@ public function testExecuteEmptyContent()
         $this->assertEquals(200, $this->getResponse()->getHttpResponseCode());
 
         $actual = $this->getResponse()->getBody();
-        $this->assertNotContains('"autoOpen":true', $actual);
+        $this->assertContains('"autoOpen":false', $actual);
     }
 
     public function testExecuteFalseContent()
@@ -87,6 +87,6 @@ public function testExecuteFalseContent()
         $this->assertEquals(200, $this->getResponse()->getHttpResponseCode());
 
         $actual = $this->getResponse()->getBody();
-        $this->assertNotContains('"autoOpen":true', $actual);
+        $this->assertContains('"autoOpen":false', $actual);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Statistics/IndexTest.php b/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Statistics/IndexTest.php
new file mode 100644
index 0000000000000..e7d74159e48fc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Statistics/IndexTest.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Reports\Controller\Adminhtml\Report\Statistics;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * Test load page
+     */
+    public function testExecute()
+    {
+        $this->dispatch('backend/reports/report_statistics');
+        $actual = $this->getResponse()->getBody();
+        $this->assertContains('Never', $actual);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Report/Product/Viewed/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Report/Product/Viewed/CollectionTest.php
index 7f0da2fabd9a1..fff057fd05688 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Report/Product/Viewed/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Report/Product/Viewed/CollectionTest.php
@@ -27,6 +27,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/Reports/_files/viewed_products.php
+     * @magentoConfigFixture default/reports/options/enabled 1
      */
     public function testGetItems()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php b/dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php
index 54d88d054dc9f..d1a4933231f0e 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php
@@ -20,6 +20,15 @@
 $simpleDuplicatedId = $productRepository->get('simple-1')->getId();
 $virtualId = $productRepository->get('virtual-product')->getId();
 
+$config = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    \Magento\Framework\App\Config\MutableScopeConfigInterface::class
+);
+$config->setValue(
+    'reports/options/enabled',
+    1,
+    \Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+);
+
 // imitate product views
 /** @var \Magento\Reports\Observer\CatalogProductViewObserver $reportObserver */
 $reportObserver = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
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 4473d31047d4b..48e0bb62a4fba 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
@@ -60,13 +60,20 @@ public function testAttachConditionToCollection(): void
                     'operator' => '==',
                     'value' => '2017-09-15',
                 ],
+                '1--3' => [
+                    'type' => ProductCondition::class,
+                    'attribute' => 'sku',
+                    'operator' => '()',
+                    'value' => ' :(  ,  :) ',
+                ]
             ],
         ];
 
         $rule->loadPost($ruleConditionArray);
         $this->model->attachConditionToCollection($collection, $rule->getConditions());
 
-        $whereString = "/\(category_id IN \('3'\).+\(IFNULL\(`e`\.`entity_id`,.+\) = '2017-09-15'\)/";
-        $this->assertNotFalse(preg_match($whereString, $collection->getSelectSql(true)));
+        $whereString = "/\(category_id IN \('3'\).+\(IFNULL\(`e`\.`entity_id`,.+\) = '2017-09-15 00:00:00'\)"
+            . ".+ORDER BY \(FIELD\(`e`.`sku`, ':\(', ':\)'\)\)/";
+        $this->assertEquals(1, preg_match($whereString, $collection->getSelectSql(true)));
     }
 }
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 a07616474a410..3d0eb2d4d75e9 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
@@ -55,7 +55,7 @@ public function testLoadBlockAction()
         $this->getRequest()->setParam('block', ',');
         $this->getRequest()->setParam('json', 1);
         $this->dispatch('backend/sales/order_create/loadBlock');
-        $this->assertEquals('{"message":""}', $this->getResponse()->getBody());
+        $this->assertContains('"message":""}', $this->getResponse()->getBody());
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php
index 40540f3126899..2dc5f5adc86d2 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php
@@ -28,7 +28,7 @@ class SaveTest extends AbstractInvoiceControllerTest
      */
     public function testSendEmailOnInvoiceSave(): void
     {
-        $order = $this->prepareRequest(['invoice' => ['send_email' => true]]);
+        $order = $this->prepareRequest();
         $this->dispatch('backend/sales/order_invoice/save');
 
         $this->assertSessionMessages(
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Cron/CleanExpiredQuotesTest.php b/dev/tests/integration/testsuite/Magento/Sales/Cron/CleanExpiredQuotesTest.php
index 1b68bc0520ce5..fc39972b5e9f7 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Cron/CleanExpiredQuotesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Cron/CleanExpiredQuotesTest.php
@@ -53,10 +53,14 @@ protected function setUp()
      */
     public function testExecute()
     {
-        $this->cleanExpiredQuotes->execute();
         $searchCriteria = $this->searchCriteriaBuilder->create();
-        $totalCount = $this->quoteRepository->getList($searchCriteria)->getTotalCount();
+        //Initial count - should be equal to stores number.
+        $this->assertEquals(2, $this->quoteRepository->getList($searchCriteria)->getTotalCount());
 
+        //Deleting expired quotes
+        $this->cleanExpiredQuotes->execute();
+        $totalCount = $this->quoteRepository->getList($searchCriteria)->getTotalCount();
+        //Only 1 will be deleted for the store that has all of them expired by config (default_store)
         $this->assertEquals(
             1,
             $totalCount
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 1d04a79ae3f84..11499a024b44d 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ShipmentTest.php
@@ -117,9 +117,12 @@ public function testAddComment()
         $saved = $this->shipmentRepository->save($shipment);
 
         $comments = $saved->getComments();
-        $actual = array_map(function (CommentInterface $comment) {
-            return $comment->getComment();
-        }, $comments);
+        $actual = array_map(
+            function (CommentInterface $comment) {
+                return $comment->getComment();
+            },
+            $comments
+        );
         self::assertEquals(2, count($actual));
         self::assertEquals([$message1, $message2], $actual);
     }
@@ -144,4 +147,59 @@ private function getOrder(string $incrementId): OrderInterface
 
         return array_pop($items);
     }
+
+    /**
+     * Check that getTracksCollection() returns only order related tracks.
+     *
+     * @magentoDataFixture Magento/Sales/_files/two_orders_with_order_items.php
+     */
+    public function testGetTracksCollection()
+    {
+        $order = $this->getOrder('100000001');
+        $items = [];
+        foreach ($order->getItems() as $item) {
+            $items[$item->getId()] = $item->getQtyOrdered();
+        }
+        /** @var \Magento\Sales\Model\Order\Shipment $shipment */
+        $shipment = $this->objectManager->get(ShipmentFactory::class)
+            ->create($order, $items);
+
+        $tracks = $shipment->getTracksCollection();
+        self::assertTrue(empty($tracks->getItems()));
+
+        /** @var ShipmentTrackInterface $track */
+        $track = $this->objectManager->create(ShipmentTrackInterface::class);
+        $track->setNumber('Test Number')
+            ->setTitle('Test Title')
+            ->setCarrierCode('Test CODE');
+
+        $shipment->addTrack($track);
+        $this->shipmentRepository->save($shipment);
+        $shipmentTracksCollection = $shipment->getTracksCollection();
+
+        $secondOrder = $this->getOrder('100000002');
+        $secondOrderItems = [];
+        foreach ($secondOrder->getItems() as $item) {
+            $secondOrderItems[$item->getId()] = $item->getQtyOrdered();
+        }
+        /** @var \Magento\Sales\Model\Order\Shipment $secondOrderShipment */
+        $secondOrderShipment = $this->objectManager->get(ShipmentFactory::class)
+            ->create($secondOrder, $secondOrderItems);
+
+        /** @var ShipmentTrackInterface $secondShipmentTrack */
+        $secondShipmentTrack = $this->objectManager->create(ShipmentTrackInterface::class);
+        $secondShipmentTrack->setNumber('Test Number2')
+            ->setTitle('Test Title2')
+            ->setCarrierCode('Test CODE2');
+
+        $secondOrderShipment->addTrack($secondShipmentTrack);
+        $this->shipmentRepository->save($secondOrderShipment);
+        $secondShipmentTrackCollection = $secondOrderShipment->getTracksCollection();
+
+        self::assertEquals($shipmentTracksCollection->getColumnValues('id'), [$track->getEntityId()]);
+        self::assertEquals(
+            $secondShipmentTrackCollection->getColumnValues('id'),
+            [$secondShipmentTrack->getEntityId()]
+        );
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/OrderTest.php
index d6fe86b6232d3..25f759e7b1b97 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/OrderTest.php
@@ -3,8 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\ResourceModel;
 
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory as OrderCollectionFactory;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class OrderTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -22,27 +32,48 @@ class OrderTest extends \PHPUnit\Framework\TestCase
      */
     protected $objectManager;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->resourceModel = $this->objectManager->create(\Magento\Sales\Model\ResourceModel\Order::class);
         $this->orderIncrementId = '100000001';
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $this->storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown()
     {
         $registry = $this->objectManager->get(\Magento\Framework\Registry::class);
         $registry->unregister('isSecureArea');
         $registry->register('isSecureArea', true);
 
-        /** @var \Magento\Sales\Model\Order $order */
-        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
-        $order->loadByIncrementId($this->orderIncrementId);
-        $order->delete();
+        $orderCollection = $this->objectManager->create(OrderCollectionFactory::class)->create();
+        foreach ($orderCollection as $order) {
+            $order->delete();
+        }
 
         $registry->unregister('isSecureArea');
         $registry->register('isSecureArea', false);
 
+        $defaultStore = $this->storeRepository->get('default');
+        $this->storeManager->setCurrentStore($defaultStore->getId());
+
         parent::tearDown();
     }
 
@@ -108,4 +139,29 @@ public function testSaveOrder()
         $this->assertNotNull($order->getCreatedAt());
         $this->assertNotNull($order->getUpdatedAt());
     }
+
+    /**
+     * Check that store name with length within 255 chars can be saved in table sales_order
+     *
+     * @magentoDataFixture Magento/Store/_files/store_with_long_name.php
+     * @magentoDbIsolation disabled
+     * @return void
+     */
+    public function testSaveStoreName()
+    {
+        $store = $this->storeRepository->get('test_2');
+        $this->storeManager->setCurrentStore($store->getId());
+        $eventManager = $this->objectManager->get(ManagerInterface::class);
+        $eventManager->dispatch('store_add', ['store' => $store]);
+        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
+        $payment = $this->objectManager->create(\Magento\Sales\Model\Order\Payment::class);
+        $payment->setMethod('checkmo');
+        $order->setStoreId($store->getId())->setPayment($payment);
+        $this->resourceModel->save($order);
+        $orderRepository = $this->objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
+        $order = $orderRepository->get($order->getId());
+        $this->assertEquals(255, strlen($order->getStoreName()));
+        $this->assertContains($store->getWebsite()->getName(), $order->getStoreName());
+        $this->assertContains($store->getGroup()->getName(), $order->getStoreName());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php
index 6367ff6d1a6d3..383af7968e047 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Service/PaymentFailuresServiceTest.php
@@ -91,6 +91,8 @@ public function testHandlerWithCustomer(): void
             'total' => 'USD 30.0000',
             'billingAddress' => $this->quote->getBillingAddress(),
             'shippingAddress' => $this->quote->getShippingAddress(),
+            'billingAddressHtml' => $this->quote->getBillingAddress()->format('html'),
+            'shippingAddressHtml' => $this->quote->getShippingAddress()->format('html'),
         ];
 
         $this->assertEquals($expectedVars, $templateVars);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quotes.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quotes.php
index b916fc0240417..508563df2d5c0 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/quotes.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quotes.php
@@ -5,12 +5,15 @@
  */
 declare(strict_types=1);
 
+use Magento\Store\Model\StoreRepository;
 use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteRepository;
+use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 
-require dirname(dirname(__DIR__)) . '/Store/_files/second_store.php';
+require __DIR__ . '/../../Store/_files/second_store.php';
 
 /** @var $objectManager ObjectManager */
 $objectManager = Bootstrap::getObjectManager();
@@ -18,17 +21,25 @@
 $quoteFactory = $objectManager->get(QuoteFactory::class);
 /** @var QuoteRepository $quoteRepository */
 $quoteRepository = $objectManager->get(QuoteRepository::class);
+/** @var  StoreRepository $storeRepository */
+$storeRepository = $objectManager->get(StoreRepository::class);
+
+/** @var Store $defaultStore */
+$defaultStore = $storeRepository->getActiveStoreByCode('default');
+/** @var Store $secondStore */
+$secondStore = $storeRepository->getActiveStoreByCode('fixture_second_store');
 
 $quotes = [
     'quote for first store' => [
-        'store' => 1,
+        'store' => $defaultStore->getId(),
     ],
     'quote for second store' => [
-        'store' => 2,
+        'store' => $secondStore->getId(),
     ],
 ];
 
 foreach ($quotes as $quoteData) {
+    /** @var Quote $quote */
     $quote = $quoteFactory->create();
     $quote->setStoreId($quoteData['store']);
     $quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/two_orders_with_order_items.php b/dev/tests/integration/testsuite/Magento/Sales/_files/two_orders_with_order_items.php
new file mode 100644
index 0000000000000..ade37aed49d59
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/two_orders_with_order_items.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * 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 */
+
+$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')
+    ->setName($product->getName())
+    ->setSku($product->getSku());
+
+/** @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);
+
+/** @var Payment $payment */
+$secondPayment = $objectManager->create(Payment::class);
+$secondPayment->setMethod('checkmo')
+    ->setAdditionalInformation('last_trans_id', '11122')
+    ->setAdditionalInformation(
+        'metadata',
+        [
+            'type' => 'free',
+            'fraudulent' => false,
+        ]
+    );
+
+/** @var OrderItem $orderItem */
+$secondOrderItem = $objectManager->create(OrderItem::class);
+$secondOrderItem->setProductId($product->getId())
+    ->setQtyOrdered(2)
+    ->setBasePrice($product->getPrice())
+    ->setPrice($product->getPrice())
+    ->setRowTotal($product->getPrice())
+    ->setProductType('simple')
+    ->setName($product->getName())
+    ->setSku($product->getSku());
+
+/** @var Order $order */
+$secondOrder = $objectManager->create(Order::class);
+$secondOrder->setIncrementId('100000002')
+    ->setState(Order::STATE_PROCESSING)
+    ->setStatus($secondOrder->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($secondOrderItem)
+    ->setPayment($secondPayment);
+$orderRepository->save($secondOrder);
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
index df26c1cc48f7b..f56fb0a2c6135 100644
--- 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
@@ -131,7 +131,6 @@ public function testOrderWithFixedDiscount(): void
         $quote->setCouponCode('CART_FIXED_DISCOUNT_15');
         $quote->collectTotals();
         $this->quoteRepository->save($quote);
-
         $this->assertEquals($expectedGrandTotal, $quote->getGrandTotal());
 
         /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
@@ -144,6 +143,47 @@ public function testOrderWithFixedDiscount(): void
         $this->assertEquals($expectedGrandTotal, $order->getGrandTotal());
     }
 
+    /**
+     * Applies fixed discount amount on whole cart and quote and checks the quote model for item discounts
+     *
+     * @magentoDbIsolation disabled
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture default_store carriers/freeshipping/active 1
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @magentoDataFixture Magento/SalesRule/_files/coupon_cart_fixed_subtotal_with_discount.php
+     */
+    public function testDiscountsOnQuoteWithFixedDiscount(): void
+    {
+        $quote = $this->getQuote();
+        $quote->getShippingAddress()
+            ->setShippingMethod('freeshipping_freeshipping')
+            ->setCollectShippingRates(true);
+        $quote->setCouponCode('CART_FIXED_DISCOUNT_15');
+        $quote->collectTotals();
+        $this->quoteRepository->save($quote);
+        /** @var CartItemInterface $item */
+        $item = $quote->getItems()[0];
+        $quoteItemDiscounts = $item->getExtensionAttributes()->getDiscounts();
+        $this->assertArrayHasKey('0', $quoteItemDiscounts);
+        $discountData = $quoteItemDiscounts[0]->getDiscountData();
+        $ruleLabel = $quoteItemDiscounts[0]->getRuleLabel();
+        $this->assertEquals(5, $discountData->getAmount());
+        $this->assertEquals(5, $discountData->getBaseAmount());
+        $this->assertEquals(5, $discountData->getOriginalAmount());
+        $this->assertEquals(10, $discountData->getBaseOriginalAmount());
+        $this->assertEquals('TestRule_Coupon', $ruleLabel);
+
+        $quoteAddressItemDiscount = $quote->getShippingAddressesItems()[0]->getExtensionAttributes()->getDiscounts();
+        $this->assertArrayHasKey('0', $quoteAddressItemDiscount);
+        $discountData = $quoteAddressItemDiscount[0]->getDiscountData();
+        $ruleLabel = $quoteAddressItemDiscount[0]->getRuleLabel();
+        $this->assertEquals(5, $discountData->getAmount());
+        $this->assertEquals(5, $discountData->getBaseAmount());
+        $this->assertEquals(5, $discountData->getOriginalAmount());
+        $this->assertEquals(10, $discountData->getBaseOriginalAmount());
+        $this->assertEquals('TestRule_Coupon', $ruleLabel);
+    }
+
     /**
      * Load cart from fixture.
      *
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_product_in_category.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_product_in_category.php
new file mode 100644
index 0000000000000..1c6b6a954cc2e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_product_in_category.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\SalesRule\Model\Rule $rule */
+$salesRule = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Rule::class);
+$salesRule->setData(
+    [
+        'name' => '50% Off on Large 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,
+        'simple_action' => 'by_percent',
+        'discount_amount' => 50,
+        'discount_step' => 0,
+        'stop_rules_processing' => 0,
+        'website_ids' => [
+            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+                \Magento\Store\Model\StoreManagerInterface::class
+            )->getWebsite()->getId()
+        ],
+        'store_labels' => [
+
+                'store_id' => 0,
+                'store_label' => 'TestRule_Label',
+
+        ]
+    ]
+);
+
+$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' => 'category_ids',
+                                    'operator' => '==',
+                                    'value' => '56',
+                                    'is_value_processed' => false,
+                                ],
+                        ],
+                ],
+        ],
+    ]
+);
+
+$salesRule->save();
+
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(
+    56
+)->setCreatedAt(
+    '2019-09-23 09:50:07'
+)->setName(
+    'Category 56'
+)->setParentId(
+    2
+)->setPath(
+    '1/2/56'
+)->setLevel(
+    2
+)->setAvailableSortBy(
+    ['position', 'name']
+)->setDefaultSortBy(
+    'name'
+)->setIsActive(
+    true
+)->setPosition(
+    1
+)->save();
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_product_in_category_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_product_in_category_rollback.php
new file mode 100644
index 0000000000000..1fd594503a65f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_product_in_category_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\TestFramework\Helper\Bootstrap;
+
+// phpcs:ignore Magento2.Security.IncludeFile
+require __DIR__ . '/rules_rollback.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
+$category->load(56);
+if ($category->getId()) {
+    $category->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
index 08e3ffe6e046c..7cdc611702c98 100644
--- 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
@@ -37,6 +37,11 @@
         'website_ids' => [
             $objectManager->get(StoreManagerInterface::class)->getWebsite()->getId(),
         ],
+        'store_labels' => [
+
+            'store_id' => 0,
+            'store_label' => 'TestRule_Coupon',
+        ]
     ]
 );
 $objectManager->get(\Magento\SalesRule\Model\ResourceModel\Rule::class)->save($salesRule);
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
index 8794dfdff8fd7..a94a96c5cbefb 100644
--- a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/Product/CustomerSendmailTest.php
@@ -17,6 +17,9 @@
 use Magento\Framework\Message\MessageInterface;
 use Magento\Captcha\Helper\Data as CaptchaHelper;
 
+/**
+ * Class CustomerSendmailTest
+ */
 class CustomerSendmailTest extends AbstractController
 {
     /**
@@ -58,6 +61,7 @@ protected function setUp()
     }
 
     /**
+     * @magentoConfigFixture default_store sendfriend/email/enabled 1
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      */
@@ -95,6 +99,7 @@ public function testExecute()
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoConfigFixture default_store customer/captcha/forms product_sendtofriend_form
+     * @magentoConfigFixture default_store sendfriend/email/enabled 1
      */
     public function testWithCaptchaFailed()
     {
@@ -133,7 +138,7 @@ public function testWithCaptchaFailed()
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoConfigFixture default_store customer/captcha/forms product_sendtofriend_form
-     *
+     * @magentoConfigFixture default_store sendfriend/email/enabled 1
      */
     public function testWithCaptchaSuccess()
     {
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php
index 8dbe9468923fb..1d6adf52466d2 100644
--- a/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Controller/SendmailTest.php
@@ -24,10 +24,11 @@ class SendmailTest extends AbstractController
     /**
      * Share the product to friend as logged in customer
      *
+     * @magentoAppArea frontend
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/sendfriend/email/allow_guest 0
-     * @magentoConfigFixture default/sendfriend/email/enabled 1
+     * @magentoConfigFixture default_store sendfriend/email/allow_guest 0
+     * @magentoConfigFixture default_store sendfriend/email/enabled 1
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Catalog/_files/products.php
      */
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Model/CollectRatesAbstract.php b/dev/tests/integration/testsuite/Magento/Shipping/Model/CollectRatesAbstract.php
new file mode 100644
index 0000000000000..e120f2f64359b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Model/CollectRatesAbstract.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Shipping\Model;
+
+use Magento\Framework\DataObject;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Quote\Model\Quote\Address\RateResult\Error;
+use Magento\Quote\Model\Quote\Address\RateResult\Method;
+use Magento\Shipping\Model\Rate\Result;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Abstract class for testing shipping carriers.
+ */
+abstract class CollectRatesAbstract extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Shipping
+     */
+    protected $shipping;
+
+    /**
+     * @var string
+     */
+    protected $carrier = '';
+
+    /**
+     * @var string
+     */
+    protected $errorMessage = '';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->shipping = $this->objectManager->get(Shipping::class);
+    }
+
+    /**
+     * Tests that an error message is displayed when the shipping method is enabled and not applicable.
+     *
+     * @return void
+     */
+    public function testCollectRatesWhenShippingCarrierIsAvailableAndNotApplicable()
+    {
+        $result = $this->shipping->collectRatesByAddress($this->getAddress(), $this->carrier);
+        $rate = $this->getRate($result->getResult());
+
+        static::assertEquals($this->carrier, $rate->getData('carrier'));
+        static::assertEquals($this->errorMessage, $rate->getData('error_message'));
+    }
+
+    /**
+     * Tests that shipping rates don't return when the shipping method is disabled and not applicable.
+     *
+     * @return void
+     */
+    public function testCollectRatesWhenShippingCarrierIsNotAvailableAndNotApplicable()
+    {
+        $result = $this->shipping->collectRatesByAddress($this->getAddress(), $this->carrier);
+        $rate = $this->getRate($result->getResult());
+
+        static::assertNull($rate);
+    }
+
+    /**
+     * Returns customer address.
+     *
+     * @return DataObject
+     */
+    private function getAddress(): DataObject
+    {
+        $address = $this->objectManager->create(
+            DataObject::class,
+            [
+                'data' => [
+                    'region_id' => 'CA',
+                    'postcode' => '11111',
+                    'lastname' => 'John',
+                    'firstname' => 'Doe',
+                    'street' => 'Some street',
+                    'city' => 'Los Angeles',
+                    'email' => 'john.doe@example.com',
+                    'telephone' => '11111111',
+                    'country_id' => 'US',
+                    'item_qty' => 1,
+                ],
+            ]
+        );
+
+        return $address;
+    }
+
+    /**
+     * Returns shipping rate by the result.
+     *
+     * @param Result $result
+     * @return Method|Error
+     */
+    private function getRate(Result $result)
+    {
+        $rates = $result->getAllRates();
+
+        return array_pop($rates);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Model/SitemapTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Model/SitemapTest.php
new file mode 100644
index 0000000000000..73863e0915c66
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sitemap/Model/SitemapTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sitemap\Model;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Sitemap\Model\Sitemap;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Request;
+use Zend\Stdlib\Parameters;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests \Magento\Sitemap\Model\Sitemap functionality.
+ */
+class SitemapTest extends TestCase
+{
+    /**
+     * @var Sitemap
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->model = $this->objectManager->get(Sitemap::class);
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
+    }
+
+    /**
+     * Test get sitemap URL from parent root directory path
+     *
+     * @return void
+     */
+    public function testGetSitemapUrlFromParentRootDirectoryPath(): void
+    {
+        $rootDir = $this->filesystem->getDirectoryRead(DirectoryList::ROOT)
+            ->getAbsolutePath();
+        $requestPath = dirname($rootDir);
+
+        /** @var Request $request */
+        $request = $this->objectManager->get(Request::class);
+        //imitation run script from parent root directory
+        $request->setServer(new Parameters(['DOCUMENT_ROOT' => $requestPath]));
+
+        $sitemapUrl = $this->model->getSitemapUrl('/', 'sitemap.xml');
+
+        $this->assertEquals('http://localhost/sitemap.xml', $sitemapUrl);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Store/App/FrontController/Plugin/RequestPreprocessorTest.php b/dev/tests/integration/testsuite/Magento/Store/App/FrontController/Plugin/RequestPreprocessorTest.php
index 0e158821f1802..a1a99ecd32b89 100644
--- a/dev/tests/integration/testsuite/Magento/Store/App/FrontController/Plugin/RequestPreprocessorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/App/FrontController/Plugin/RequestPreprocessorTest.php
@@ -14,7 +14,7 @@
 use Zend\Stdlib\Parameters;
 
 /**
- * Class RequestPreprocessorTest @covers \Magento\Store\App\FrontController\Plugin\RequestPreprocessor.
+ * Tests \Magento\Store\App\FrontController\Plugin\RequestPreprocessor.
  */
 class RequestPreprocessorTest extends \Magento\TestFramework\TestCase\AbstractController
 {
@@ -24,6 +24,28 @@ class RequestPreprocessorTest extends \Magento\TestFramework\TestCase\AbstractCo
      * @var string
      */
     private $baseUrl;
+    /**
+     * @var array;
+     */
+    private $config;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->config = [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown()
+    {
+        $this->setConfig($this->config);
+        parent::tearDown();
+    }
 
     /**
      * Test non-secure POST request is redirected right away on completely secure frontend.
@@ -62,6 +84,115 @@ public function testHttpsPassSecureLoginPost()
         $this->setFrontendCompletelySecureRollback();
     }
 
+    /**
+     * Test auto redirect to base URL
+     *
+     * @param array $config
+     * @param string $requestUrl
+     * @param string $redirectUrl
+     * @dataProvider autoRedirectToBaseURLDataProvider
+     */
+    public function testAutoRedirectToBaseURL(array $config, string $requestUrl, string $redirectUrl)
+    {
+        $request = [
+            'REQUEST_SCHEME' => parse_url($requestUrl, PHP_URL_SCHEME),
+            'SERVER_NAME' => parse_url($requestUrl, PHP_URL_HOST),
+            'SCRIPT_NAME' => '/index.php',
+            'SCRIPT_FILENAME' => 'index.php',
+            'REQUEST_URI' => parse_url($requestUrl, PHP_URL_PATH),
+        ];
+        $this->setConfig($config);
+        $this->setServer($request);
+        $app = $this->_objectManager->create(\Magento\Framework\App\Http::class, ['_request' => $this->getRequest()]);
+        $this->_response = $app->launch();
+        $this->assertRedirect($this->equalTo($redirectUrl));
+    }
+
+    /**
+     * @return array
+     */
+    public function autoRedirectToBaseURLDataProvider(): array
+    {
+        $baseConfig = [
+            'web/unsecure/base_url' => 'http://magento.com/us/',
+            'web/session/use_frontend_sid' => 0,
+            'web/seo/use_rewrites' => 1,
+        ];
+
+        return [
+            [
+                'config' => $baseConfig,
+                'request' => 'http://magento.com/a/b/c/d/e.html',
+                'redirectUrl' => 'http://magento.com/us/a/b/c/d/e.html'
+            ],
+            [
+                'config' => $baseConfig,
+                'request' => 'http://magento.com/a/b/c/d.html',
+                'redirectUrl' => 'http://magento.com/us/a/b/c/d.html'
+            ],
+            [
+                'config' => $baseConfig,
+                'request' => 'http://magento.com/a/b/c.html',
+                'redirectUrl' => 'http://magento.com/us/a/b/c.html'
+            ],
+            [
+                'config' => $baseConfig,
+                'request' => 'http://magento.com/a/b.html',
+                'redirectUrl' => 'http://magento.com/us/a/b.html'
+            ],
+            [
+                'config' => $baseConfig,
+                'request' => 'http://magento.com/a.html',
+                'redirectUrl' => 'http://magento.com/us/a.html'
+            ],
+            [
+                'config' => $baseConfig,
+                'request' => 'http://magento.com/a/b/c/d/e',
+                'redirectUrl' => 'http://magento.com/us/a/b/c/d/e'
+            ],
+            [
+                'config' => $baseConfig,
+                'request' => 'http://magento.com/a/b/c/d',
+                'redirectUrl' => 'http://magento.com/us/a/b/c/d'
+            ],
+            [
+                'config' => $baseConfig,
+                'request' => 'http://magento.com/a/b/c',
+                'redirectUrl' => 'http://magento.com/us/a/b/c'
+            ],
+            [
+                'config' => $baseConfig,
+                'request' => 'http://magento.com/a/b',
+                'redirectUrl' => 'http://magento.com/us/a/b'
+            ],
+            [
+                'config' => $baseConfig,
+                'request' => 'http://magento.com/a',
+                'redirectUrl' => 'http://magento.com/us/a'
+            ],
+            [
+                'config' => $baseConfig,
+                'request' => 'http://magento.com/',
+                'redirectUrl' => 'http://magento.com/us/'
+            ],
+            [
+                'config' => array_merge($baseConfig, ['web/seo/use_rewrites' => 0]),
+                'request' => 'http://magento.com/',
+                'redirectUrl' => 'http://magento.com/us/index.php/'
+            ],
+            [
+                'config' => array_merge($baseConfig, ['web/seo/use_rewrites' => 0]),
+                'request' => 'http://magento.com/a/b/c/d.html',
+                'redirectUrl' => 'http://magento.com/us/index.php/a/b/c/d.html'
+            ],
+            [
+                'config' => array_merge($baseConfig, ['web/seo/use_rewrites' => 0]),
+                'request' => 'http://magento.com/a/b/c/d',
+                'redirectUrl' => 'http://magento.com/us/index.php/a/b/c/d'
+            ],
+        ];
+    }
+
     /**
      * Assert response is redirect with https protocol.
      *
@@ -83,22 +214,26 @@ private function assertResponseRedirect(Response $response, string $redirectUrl)
      */
     private function prepareRequest(bool $isSecure = false)
     {
-        $post = new Parameters([
-            'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
-            'login' => [
-                'username' => 'customer@example.com',
-                'password' => 'password'
+        $post = new Parameters(
+            [
+                'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
+                'login' => [
+                    'username' => 'customer@example.com',
+                    'password' => 'password'
+                ]
             ]
-        ]);
+        );
         $request = $this->getRequest();
         $request->setMethod(\Magento\TestFramework\Request::METHOD_POST);
         $request->setRequestUri('customer/account/loginPost/');
         $request->setPost($post);
         if ($isSecure) {
-            $server = new Parameters([
-                'HTTPS' => 'on',
-                'SERVER_PORT' => 443
-            ]);
+            $server = new Parameters(
+                [
+                    'HTTPS' => 'on',
+                    'SERVER_PORT' => 443
+                ]
+            );
             $request->setServer($server);
         }
 
@@ -151,4 +286,45 @@ private function setFrontendCompletelySecureRollback()
         $reinitibleConfig = $this->_objectManager->create(ReinitableConfigInterface::class);
         $reinitibleConfig->reinit();
     }
+
+    private function setConfig(array $config): void
+    {
+        foreach ($config as $path => $value) {
+            $model = $this->_objectManager->create(Value::class);
+            $model->load($path, 'path');
+            if (!isset($this->config[$path])) {
+                $this->config[$path] = $model->getValue();
+            }
+            if (!$model->getPath()) {
+                $model->setPath($path);
+            }
+            if ($value !== null) {
+                $model->setValue($value);
+                $model->save();
+            } elseif ($model->getId()) {
+                $model->delete();
+            }
+        }
+        $this->_objectManager->create(ReinitableConfigInterface::class)->reinit();
+    }
+
+    private function setServer(array $server)
+    {
+        $request = $this->getRequest();
+        $properties = [
+            'baseUrl',
+            'basePath',
+            'requestUri',
+            'originalPathInfo',
+            'pathInfo',
+        ];
+        $reflection = new \ReflectionClass($request);
+
+        foreach ($properties as $name) {
+            $property = $reflection->getProperty($name);
+            $property->setAccessible(true);
+            $property->setValue($request, null);
+        }
+        $request->setServer(new Parameters($server));
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/HashGeneratorTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/HashGeneratorTest.php
new file mode 100644
index 0000000000000..1bacd79b74f49
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/HashGeneratorTest.php
@@ -0,0 +1,180 @@
+<?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;
+use Magento\Store\Model\StoreSwitcher\HashGenerator;
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Model\Session as CustomerSession;
+use \Magento\Framework\App\DeploymentConfig as DeploymentConfig;
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\Url\Helper\Data as UrlHelper;
+use Magento\Store\Model\StoreSwitcher\HashGenerator\HashData;
+
+/**
+ * Test class for \Magento\Store\Model\StoreSwitcher\HashGenerator
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class HashGeneratorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var HashGenerator
+     */
+    private $hashGenerator;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var int
+     */
+    private $customerId;
+
+    /** @var AccountManagementInterface */
+    private $accountManagement;
+
+    /**
+     * @var \Magento\Customer\Model\Authorization\CustomerSessionUserContext
+     */
+    private $customerSessionUserContext;
+
+    /**
+     * @var \Magento\Framework\App\DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var string
+     */
+    private $key;
+
+    /**
+     * @var UrlHelper
+     */
+    private $urlHelper;
+
+    /**
+     * @var HashData
+     */
+    private $hashData;
+
+    /**
+     * @var CustomerSession
+     */
+    private $customerSession;
+
+    /**
+     * Class dependencies initialization
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->customerSession = $this->objectManager->create(
+            CustomerSession::class
+        );
+        $this->accountManagement = $this->objectManager->create(AccountManagementInterface::class);
+        $customer = $this->accountManagement->authenticate('customer@example.com', 'password');
+        $this->customerSession->setCustomerDataAsLoggedIn($customer);
+        $this->customerSessionUserContext = $this->objectManager->create(
+            \Magento\Customer\Model\Authorization\CustomerSessionUserContext::class,
+            ['customerSession' => $this->customerSession]
+        );
+        $this->hashGenerator = $this->objectManager->create(
+            StoreSwitcher\HashGenerator::class,
+            ['currentUser' => $this->customerSessionUserContext]
+        );
+        $this->customerId = $customer->getId();
+        $this->deploymentConfig = $this->objectManager->get(DeploymentConfig::class);
+        $this->key = (string)$this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_CRYPT_KEY);
+        $this->urlHelper=$this->objectManager->create(UrlHelper::class);
+        $this->hashData=$this->objectManager->create(HashData::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->customerSession->logout();
+        parent::tearDown();
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @return void
+     */
+    public function testSwitch(): void
+    {
+        $redirectUrl = "http://domain.com/";
+        $fromStoreCode = 'test';
+        $fromStore  = $this->createPartialMock(Store::class, ['getCode']);
+        $toStore = $this->createPartialMock(Store::class, ['getCode']);
+        $fromStore->expects($this->once())->method('getCode')->willReturn($fromStoreCode);
+        $targetUrl=$this->hashGenerator->switch($fromStore, $toStore, $redirectUrl);
+        // phpcs:ignore
+        $urlParts=parse_url($targetUrl, PHP_URL_QUERY);
+        $signature='';
+        // phpcs:ignore
+        parse_str($urlParts, $params);
+
+        if (isset($params['signature'])) {
+            $signature=$params['signature'];
+        }
+        $this->assertEquals($params['customer_id'], $this->customerId);
+        $this->assertEquals($params['___from_store'], $fromStoreCode);
+
+        $data =  new HashData(
+            [
+                "customer_id" => $this->customerId,
+                "time_stamp" => $params['time_stamp'],
+                "___from_store" => $fromStoreCode
+            ]
+        );
+        $this->assertTrue($this->hashGenerator->validateHash($signature, $data));
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @return void
+     */
+    public function testValidateHashWithInCorrectData(): void
+    {
+        $timeStamp = 0;
+        $customerId = 8;
+        $fromStoreCode = 'store1';
+        $data = new HashData(
+            [
+                "customer_id" => $customerId,
+                "time_stamp" => $timeStamp,
+                "___from_store" => $fromStoreCode
+            ]
+        );
+        $redirectUrl = "http://domain.com/";
+        $fromStore = $this->createPartialMock(Store::class, ['getCode']);
+        $toStore = $this->createPartialMock(Store::class, ['getCode']);
+        $fromStore->expects($this->once())->method('getCode')->willReturn($fromStoreCode);
+        $targetUrl = $this->hashGenerator->switch($fromStore, $toStore, $redirectUrl);
+        // phpcs:ignore
+        $urlParts = parse_url($targetUrl,PHP_URL_QUERY);
+        $signature = '';
+        // phpcs:ignore
+        parse_str($urlParts, $params);
+
+        if (isset($params['signature'])) {
+            $signature = $params['signature'];
+        }
+        $this->assertFalse($this->hashGenerator->validateHash($signature, $data));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_group_with_second_website.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_group_with_second_website.php
new file mode 100644
index 0000000000000..799cda7e97423
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_group_with_second_website.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require_once __DIR__ . '/website.php';
+
+/**
+ * @var \Magento\Store\Model\Group $storeGroup
+ */
+$storeGroup = $objectManager->create(\Magento\Store\Model\Group::class);
+$storeGroup->setCode('some_group')
+    ->setName('custom store group')
+    ->setWebsite($website);
+$storeGroup->save($storeGroup);
+
+/* Refresh stores memory cache */
+$objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_group_with_second_website_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_group_with_second_website_rollback.php
new file mode 100644
index 0000000000000..e014dc9402475
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_group_with_second_website_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require_once __DIR__ . '/website_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/store_with_long_name.php b/dev/tests/integration/testsuite/Magento/Store/_files/store_with_long_name.php
new file mode 100644
index 0000000000000..f1beaee683b82
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/store_with_long_name.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var $store \Magento\Store\Model\Store */
+$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+$storeName = str_repeat('a', 255);
+if (!$store->load('test', 'code')->getId()) {
+    $store->setData(
+        [
+            'code' => 'test_2',
+            'website_id' => '1',
+            'group_id' => '1',
+            'name' => $storeName,
+            'sort_order' => '10',
+            'is_active' => '1',
+        ]
+    );
+    $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_2',
+                'website_id' => '1',
+                'group_id' => '1',
+                'name' => $storeName,
+                'sort_order' => '10',
+                'is_active' => '1',
+            ]
+        );
+        $store->save();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/store_with_long_name_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/store_with_long_name_rollback.php
new file mode 100644
index 0000000000000..5fe19e1e97df1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/store_with_long_name_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\Framework\Registry;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var Store $store */
+$store = $objectManager->get(Store::class);
+$store->load('test_2', 'code');
+if ($store->getId()) {
+    $store->delete();
+}
+
+/** @var Store $store */
+$store = $objectManager->get(Store::class);
+$store->load('test_2', 'code');
+if ($store->getId()) {
+    $store->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Save/InputType/TextSwatchTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Save/InputType/TextSwatchTest.php
new file mode 100644
index 0000000000000..e9839266b07a0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Save/InputType/TextSwatchTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Swatches\Controller\Adminhtml\Product\Attribute\Save\InputType;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save\InputType\AbstractSaveAttributeTest;
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Eav\Model\Entity\Attribute\Source\Table;
+
+/**
+ * Test cases related to create attribute with input type text swatch.
+ *
+ * @magentoDbIsolation enabled
+ */
+class TextSwatchTest extends AbstractSaveAttributeTest
+{
+    /**
+     * Test create attribute and compare attribute data and input data.
+     *
+     * @dataProvider \Magento\TestFramework\Swatches\Model\Attribute\DataProvider\TextSwatch::getAttributeDataWithCheckArray()
+     *
+     * @param array $attributePostData
+     * @param array $checkArray
+     * @return void
+     */
+    public function testCreateAttribute(array $attributePostData, array $checkArray): void
+    {
+        $this->createAttributeUsingDataAndAssert($attributePostData, $checkArray);
+    }
+
+    /**
+     * Test create attribute with error.
+     *
+     * @dataProvider \Magento\TestFramework\Swatches\Model\Attribute\DataProvider\TextSwatch::getAttributeDataWithErrorMessage()
+     *
+     * @param array $attributePostData
+     * @param string $errorMessage
+     * @return void
+     */
+    public function testCreateAttributeWithError(array $attributePostData, string $errorMessage): void
+    {
+        $this->createAttributeUsingDataWithErrorAndAssert($attributePostData, $errorMessage);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function assertAttributeOptions(AttributeInterface $attribute, array $optionsData): void
+    {
+        /** @var Table $attributeSource */
+        $attributeSource = $attribute->getSource();
+        $swatchOptions = $attributeSource->getAllOptions(true, true);
+        foreach ($optionsData as $optionData) {
+            $optionVisualValueArr = $optionData['optiontext']['value'];
+            $optionVisualValue = reset($optionVisualValueArr)[0];
+            $optionFounded = false;
+            foreach ($swatchOptions as $attributeOption) {
+                if ($attributeOption['label'] === $optionVisualValue) {
+                    $optionFounded = true;
+                    break;
+                }
+            }
+            $this->assertTrue($optionFounded);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Save/InputType/VisualSwatchTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Save/InputType/VisualSwatchTest.php
new file mode 100644
index 0000000000000..56b051c8ec9c2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/Attribute/Save/InputType/VisualSwatchTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Swatches\Controller\Adminhtml\Product\Attribute\Save\InputType;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save\InputType\AbstractSaveAttributeTest;
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Eav\Model\Entity\Attribute\Source\Table;
+
+/**
+ * Test cases related to create attribute with input type visual swatch.
+ *
+ * @magentoDbIsolation enabled
+ */
+class VisualSwatchTest extends AbstractSaveAttributeTest
+{
+    /**
+     * Test create attribute and compare attribute data and input data.
+     *
+     * @dataProvider \Magento\TestFramework\Swatches\Model\Attribute\DataProvider\VisualSwatch::getAttributeDataWithCheckArray()
+     *
+     * @param array $attributePostData
+     * @param array $checkArray
+     * @return void
+     */
+    public function testCreateAttribute(array $attributePostData, array $checkArray): void
+    {
+        $this->createAttributeUsingDataAndAssert($attributePostData, $checkArray);
+    }
+
+    /**
+     * Test create attribute with error.
+     *
+     * @dataProvider \Magento\TestFramework\Swatches\Model\Attribute\DataProvider\VisualSwatch::getAttributeDataWithErrorMessage()
+     *
+     * @param array $attributePostData
+     * @param string $errorMessage
+     * @return void
+     */
+    public function testCreateAttributeWithError(array $attributePostData, string $errorMessage): void
+    {
+        $this->createAttributeUsingDataWithErrorAndAssert($attributePostData, $errorMessage);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function assertAttributeOptions(AttributeInterface $attribute, array $optionsData): void
+    {
+        /** @var Table $attributeSource */
+        $attributeSource = $attribute->getSource();
+        $swatchOptions = $attributeSource->getAllOptions(true, true);
+        foreach ($optionsData as $optionData) {
+            $optionVisualValueArr = $optionData['optionvisual']['value'];
+            $optionVisualValue = reset($optionVisualValueArr)[0];
+            $optionFounded = false;
+            foreach ($swatchOptions as $attributeOption) {
+                if ($attributeOption['label'] === $optionVisualValue) {
+                    $optionFounded = true;
+                    break;
+                }
+            }
+            $this->assertTrue($optionFounded);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeTextSwatchTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeTextSwatchTest.php
new file mode 100644
index 0000000000000..067ca94e02371
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeTextSwatchTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Swatches\Model;
+
+use Magento\Catalog\Model\Product\Attribute\Save\AbstractAttributeTest;
+
+/**
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture Magento/Swatches/_files/product_text_swatch_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+ */
+class AttributeTextSwatchTest extends AbstractAttributeTest
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getAttributeCode(): string
+    {
+        return 'text_swatch_attribute';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getDefaultAttributeValue(): string
+    {
+        return $this->getAttribute()->getSource()->getOptionId('Option 2');
+    }
+
+    /**
+     * @magentoDataFixture Magento/Swatches/_files/product_text_swatch_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     * @dataProvider uniqueAttributeValueProvider
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
+     * @inheritdoc
+     */
+    public function testUniqueAttribute(string $firstSku, string $secondSku): void
+    {
+        parent::testUniqueAttribute($firstSku, $secondSku);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function productProvider(): array
+    {
+        return [
+            [
+                'product_sku' => 'simple2',
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function uniqueAttributeValueProvider(): array
+    {
+        return [
+            [
+                'first_product_sku' => 'simple2',
+                'second_product_sku' => 'simple-out-of-stock',
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeVisualSwatchTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeVisualSwatchTest.php
new file mode 100644
index 0000000000000..ab9030f5ed8d9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeVisualSwatchTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Swatches\Model;
+
+use Magento\Catalog\Model\Product\Attribute\Save\AbstractAttributeTest;
+
+/**
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture Magento/Swatches/_files/product_visual_swatch_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+ */
+class AttributeVisualSwatchTest extends AbstractAttributeTest
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getAttributeCode(): string
+    {
+        return 'visual_swatch_attribute';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getDefaultAttributeValue(): string
+    {
+        return $this->getAttribute()->getSource()->getOptionId('option 2');
+    }
+
+    /**
+     * @magentoDataFixture Magento/Swatches/_files/product_visual_swatch_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     * @dataProvider uniqueAttributeValueProvider
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
+     * @inheritdoc
+     */
+    public function testUniqueAttribute(string $firstSku, string $secondSku): void
+    {
+        parent::testUniqueAttribute($firstSku, $secondSku);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function productProvider(): array
+    {
+        return [
+            [
+                'product_sku' => 'simple2',
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function uniqueAttributeValueProvider(): array
+    {
+        return [
+            [
+                'first_product_sku' => 'simple2',
+                'second_product_sku' => 'simple-out-of-stock',
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Ui/DataProvider/Product/Form/Modifier/Eav/TextSwatchAttributeTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Ui/DataProvider/Product/Form/Modifier/Eav/TextSwatchAttributeTest.php
new file mode 100644
index 0000000000000..4ee01d8541f4a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Ui/DataProvider/Product/Form/Modifier/Eav/TextSwatchAttributeTest.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Swatches\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav\SelectAttributeTest;
+
+/**
+ * Provides tests for product form eav modifier with custom text swatch attribute.
+ *
+ * @magentoDataFixture Magento/Swatches/_files/product_text_swatch_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoDbIsolation enabled
+ */
+class TextSwatchAttributeTest extends SelectAttributeTest
+{
+    /**
+     * @return void
+     */
+    public function testModifyMeta(): void
+    {
+        $this->callModifyMetaAndAssert(
+            $this->getProduct(),
+            $this->addMetaNesting($this->getAttributeMeta(), 'product-details', 'text_swatch_attribute')
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testModifyData(): void
+    {
+        $product = $this->getProduct();
+        $optionValue = $this->getOptionValueByLabel('text_swatch_attribute', 'Option 1');
+        $attributeData = ['text_swatch_attribute' => $optionValue];
+        $this->saveProduct($product, $attributeData);
+        $expectedData = $this->addDataNesting($attributeData);
+        $this->callModifyDataAndAssert($product, $expectedData);
+    }
+
+    /**
+     * @return array
+     */
+    private function getAttributeMeta(): array
+    {
+        return [
+            'dataType' => 'select',
+            'formElement' => 'select',
+            'visible' => '1',
+            'required' => '0',
+            'label' => 'Text swatch attribute',
+            'code' => 'text_swatch_attribute',
+            'source' => 'product-details',
+            'scopeLabel' => '[GLOBAL]',
+            'globalScope' => true,
+            'sortOrder' => '__placeholder__',
+            'options' => $this->getAttributeOptions('text_swatch_attribute'),
+            'componentType' => 'field',
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Ui/DataProvider/Product/Form/Modifier/Eav/VisualSwatchAttributeTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Ui/DataProvider/Product/Form/Modifier/Eav/VisualSwatchAttributeTest.php
new file mode 100644
index 0000000000000..34a263081c92f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Ui/DataProvider/Product/Form/Modifier/Eav/VisualSwatchAttributeTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Swatches\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav\SelectAttributeTest;
+
+/**
+ * Provides tests for product form eav modifier with custom visual swatch attribute.
+ *
+ * @magentoDataFixture Magento/Swatches/_files/product_swatch_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoDbIsolation enabled
+ */
+class VisualSwatchAttributeTest extends SelectAttributeTest
+{
+    /**
+     * @return void
+     */
+    public function testModifyMeta(): void
+    {
+        $expectedMeta = $this->addMetaNesting(
+            $this->getAttributeMeta(),
+            'product-details',
+            'color_swatch'
+        );
+        $this->callModifyMetaAndAssert($this->getProduct(), $expectedMeta);
+    }
+
+    /**
+     * @return void
+     */
+    public function testModifyData(): void
+    {
+        $product = $this->getProduct();
+        $attributeData = [
+            'color_swatch' => $this->getOptionValueByLabel('color_swatch', 'option 1')
+        ];
+        $this->saveProduct($product, $attributeData);
+        $expectedData = $this->addDataNesting($attributeData);
+        $this->callModifyDataAndAssert($product, $expectedData);
+    }
+
+    /**
+     * @return array
+     */
+    private function getAttributeMeta(): array
+    {
+        return [
+            'dataType' => 'swatch_visual',
+            'formElement' => 'swatch_visual',
+            'visible' => '1',
+            'required' => '1',
+            'label' => 'Attribute ',
+            'code' => 'color_swatch',
+            'source' => 'product-details',
+            'scopeLabel' => '[GLOBAL]',
+            'globalScope' => true,
+            'sortOrder' => '__placeholder__',
+            'options' => $this->getAttributeOptions('color_swatch'),
+            'componentType' => 'field',
+            'validation' => [
+                'required-entry' => true,
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/product_swatch_attribute.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/product_swatch_attribute.php
new file mode 100644
index 0000000000000..7dd3c9fb36e3d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/_files/product_swatch_attribute.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\TestFramework\Helper\Bootstrap;
+
+include __DIR__ . '/swatch_attribute.php';
+
+$objectManager = Bootstrap::getObjectManager();
+$installer = $objectManager->create(CategorySetup::class);
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+$entityType = $installer->getEntityTypeId(ProductAttributeInterface::ENTITY_TYPE_CODE);
+$attribute = $objectManager->create(AttributeFactory::class)->create()
+    ->loadByCode($entityType, 'color_swatch');
+
+if ($attribute->getAttributeId()) {
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup(
+        ProductAttributeInterface::ENTITY_TYPE_CODE,
+        'Default',
+        'General',
+        $attribute->getAttributeId()
+    );
+}
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/product_swatch_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/product_swatch_attribute_rollback.php
new file mode 100644
index 0000000000000..14aecdbc0c729
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/_files/product_swatch_attribute_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__ . '/swatch_attribute_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/product_text_swatch_attribute.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/product_text_swatch_attribute.php
new file mode 100644
index 0000000000000..934c150049b27
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/_files/product_text_swatch_attribute.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$installer = $objectManager->create(CategorySetup::class);
+$attribute = $objectManager->create(AttributeFactory::class)->create();
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+$entityType = $installer->getEntityTypeId(ProductAttributeInterface::ENTITY_TYPE_CODE);
+if (!$attribute->loadByCode($entityType, 'text_swatch_attribute')->getAttributeId()) {
+    $attribute->setData(
+        [
+            'frontend_label' => ['Text swatch attribute'],
+            'entity_type_id' => $entityType,
+            'frontend_input' => 'select',
+            'backend_type' => 'int',
+            'is_required' => '0',
+            'attribute_code' => 'text_swatch_attribute',
+            'is_global' => '1',
+            'is_user_defined' => 1,
+            'is_unique' => '0',
+            'is_searchable' => '0',
+            'is_comparable' => '0',
+            'is_filterable' => '1',
+            'is_filterable_in_search' => '0',
+            'is_used_for_promo_rules' => '0',
+            'is_html_allowed_on_front' => '1',
+            'used_in_product_listing' => '1',
+            'used_for_sort_by' => '0',
+            'swatch_input_type' => 'text',
+            'optiontext' => [
+                'order' => [
+                    'option_0' => 1,
+                    'option_1' => 2,
+                    'option_3' => 3,
+                ],
+                'value' => [
+                    'option_0' => ['Option 1'],
+                    'option_1' => ['Option 2'],
+                    'option_2' => ['Option 3'],
+                ],
+            ],
+            'swatchtext' => [
+                'value' => [
+                    'option_0' => ['Swatch 1'],
+                    'option_1' => ['Swatch 2'],
+                    'option_2' => ['Swatch 3'],
+                ],
+            ],
+        ]
+    );
+    $attribute->save();
+    $installer->addAttributeToGroup(
+        ProductAttributeInterface::ENTITY_TYPE_CODE,
+        'Default',
+        'General',
+        $attribute->getId()
+    );
+}
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/product_text_swatch_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/product_text_swatch_attribute_rollback.php
new file mode 100644
index 0000000000000..67157532bdb98
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/_files/product_text_swatch_attribute_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\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Registry;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+
+try {
+    $attributeRepository->deleteById('text_swatch_attribute');
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/product_visual_swatch_attribute.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/product_visual_swatch_attribute.php
new file mode 100644
index 0000000000000..e567e12ff4782
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/_files/product_visual_swatch_attribute.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$installer = $objectManager->create(CategorySetup::class);
+$attribute = $objectManager->create(AttributeFactory::class)->create();
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+$entityType = $installer->getEntityTypeId(ProductAttributeInterface::ENTITY_TYPE_CODE);
+if (!$attribute->loadByCode($entityType, 'visual_swatch_attribute')->getAttributeId()) {
+    $attribute->setData(
+        [
+            'frontend_label' => ['Visual swatch attribute'],
+            'entity_type_id' => $entityType,
+            'frontend_input' => 'select',
+            'backend_type' => 'int',
+            'is_required' => '0',
+            'attribute_code' => 'visual_swatch_attribute',
+            'is_global' => '1',
+            'is_user_defined' => 1,
+            'is_unique' => '0',
+            'is_searchable' => '0',
+            'is_comparable' => '0',
+            'is_filterable' => '1',
+            'is_filterable_in_search' => '0',
+            'is_used_for_promo_rules' => '0',
+            'is_html_allowed_on_front' => '1',
+            'used_in_product_listing' => '1',
+            'used_for_sort_by' => '0',
+            'swatch_input_type' => 'visual',
+            'swatchvisual' => [
+                'value' => [
+                    'option_1' => '#555555',
+                    'option_2' => '#aaaaaa',
+                    'option_3' => '#ffffff',
+                ],
+            ],
+            'optionvisual' => [
+                'value' => [
+                    'option_1' => ['option 1'],
+                    'option_2' => ['option 2'],
+                    'option_3' => ['option 3']
+                ],
+            ],
+            'options' => [
+                'option' => [
+                    ['label' => 'Option 1', 'value' => 'option_1'],
+                    ['label' => 'Option 2', 'value' => 'option_2'],
+                    ['label' => 'Option 3', 'value' => 'option_3'],
+                ],
+            ],
+        ]
+    );
+    $attributeRepository->save($attribute);
+    $installer->addAttributeToGroup(
+        ProductAttributeInterface::ENTITY_TYPE_CODE,
+        'Default',
+        'General',
+        $attribute->getId()
+    );
+}
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/product_visual_swatch_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/product_visual_swatch_attribute_rollback.php
new file mode 100644
index 0000000000000..67157532bdb98
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Swatches/_files/product_visual_swatch_attribute_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\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Registry;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+
+try {
+    $attributeRepository->deleteById('text_swatch_attribute');
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/swatch_attribute.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/swatch_attribute.php
index 182f4781a9632..202fd0a8c73d5 100644
--- a/dev/tests/integration/testsuite/Magento/Swatches/_files/swatch_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Swatches/_files/swatch_attribute.php
@@ -16,6 +16,7 @@
     'backend_type' => '',
     'is_searchable' => 0,
     'is_filterable' => 0,
+    'is_user_defined' => 1,
     'is_filterable_in_search' => 0,
     'frontend_label' => 'Attribute ',
     'entity_type_id' => 4
diff --git a/dev/tests/integration/testsuite/Magento/SwatchesLayeredNavigation/Block/Navigation/Category/SwatchTextFilterTest.php b/dev/tests/integration/testsuite/Magento/SwatchesLayeredNavigation/Block/Navigation/Category/SwatchTextFilterTest.php
new file mode 100644
index 0000000000000..345d11e9948d2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SwatchesLayeredNavigation/Block/Navigation/Category/SwatchTextFilterTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SwatchesLayeredNavigation\Block\Navigation\Category;
+
+use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
+use Magento\LayeredNavigation\Block\Navigation\Category\AbstractFiltersTest;
+
+/**
+ * Provides tests for custom text swatch filter in navigation block on category page.
+ *
+ * @magentoAppArea frontend
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ */
+class SwatchTextFilterTest extends AbstractFiltersTest
+{
+    /**
+     * @magentoDataFixture Magento/Swatches/_files/product_text_swatch_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/category_with_different_price_products.php
+     * @dataProvider getFiltersWithCustomAttributeDataProvider
+     * @param array $products
+     * @param int $filterable
+     * @param array $expectation
+     * @return void
+     */
+    public function testGetFiltersWithCustomAttribute(array $products, int $filterable, array $expectation): void
+    {
+        $this->getFiltersAndAssert($products, $filterable, $expectation, 'text_swatch_attribute');
+    }
+
+    /**
+     * @return array
+     */
+    public function getFiltersWithCustomAttributeDataProvider(): array
+    {
+        return [
+            'not_used_in_navigation' => [
+                'products_data' => [],
+                'filterable' => 0,
+                'expectation' => [],
+            ],
+            'used_in_navigation_with_results' => [
+                'products_data' => [
+                    'simple1000' => 'Option 1',
+                    'simple1001' => 'Option 2',
+                ],
+                'filterable' => AbstractFilter::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS,
+                'expectation' => [
+                    ['label' => 'Option 1', 'count' => 1],
+                    ['label' => 'Option 2', 'count' => 1],
+                ],
+            ],
+            'used_in_navigation_without_results' => [
+                'products_data' => [
+                    'simple1000' => 'Option 1',
+                    'simple1001' => 'Option 2',
+                ],
+                'filterable' => 2,
+                'expectation' => [
+                    ['label' => 'Option 3', 'count' => 0],
+                    ['label' => 'Option 1', 'count' => 1],
+                    ['label' => 'Option 2', 'count' => 1],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/SwatchesLayeredNavigation/Block/Navigation/Category/SwatchVisualFilterTest.php b/dev/tests/integration/testsuite/Magento/SwatchesLayeredNavigation/Block/Navigation/Category/SwatchVisualFilterTest.php
new file mode 100644
index 0000000000000..6f34a7bad9ebc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SwatchesLayeredNavigation/Block/Navigation/Category/SwatchVisualFilterTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SwatchesLayeredNavigation\Block\Navigation\Category;
+
+use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
+use Magento\LayeredNavigation\Block\Navigation\Category\AbstractFiltersTest;
+
+/**
+ * Provides tests for custom text swatch filter in navigation block on category page.
+ *
+ * @magentoAppArea frontend
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ */
+class SwatchVisualFilterTest extends AbstractFiltersTest
+{
+    /**
+     * @magentoDataFixture Magento/Swatches/_files/product_visual_swatch_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/category_with_different_price_products.php
+     * @dataProvider getFiltersWithCustomAttributeDataProvider
+     * @param array $products
+     * @param int $filterable
+     * @param array $expectation
+     * @return void
+     */
+    public function testGetFiltersWithCustomAttribute(array $products, int $filterable, array $expectation): void
+    {
+        $this->getFiltersAndAssert($products, $filterable, $expectation, 'visual_swatch_attribute');
+    }
+
+    /**
+     * @return array
+     */
+    public function getFiltersWithCustomAttributeDataProvider(): array
+    {
+        return [
+            'not_used_in_navigation' => [
+                'products_data' => [],
+                'filterable' => 0,
+                'expectation' => [],
+            ],
+            'used_in_navigation_with_results' => [
+                'products_data' => [
+                    'simple1000' => 'option 1',
+                    'simple1001' => 'option 2',
+                ],
+                'filterable' => AbstractFilter::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS,
+                'expectation' => [
+                    ['label' => 'option 1', 'count' => 1],
+                    ['label' => 'option 2', 'count' => 1],
+                ],
+            ],
+            'used_in_navigation_without_results' => [
+                'products_data' => [
+                    'simple1000' => 'option 1',
+                    'simple1001' => 'option 2',
+                ],
+                'filterable' => 2,
+                'expectation' => [
+                    ['label' => 'option 1', 'count' => 1],
+                    ['label' => 'option 2', 'count' => 1],
+                    ['label' => 'option 3', 'count' => 0],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/GeneralTest.php b/dev/tests/integration/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/GeneralTest.php
index 2539011f25a36..2613b71c24202 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/GeneralTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/GeneralTest.php
@@ -16,7 +16,7 @@ class GeneralTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\View\Design\ThemeInterface */
     protected $_theme;
 
-    /** @var \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab_General */
+    /** @var \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\General */
     protected $_block;
 
     protected function setUp()
diff --git a/dev/tests/integration/testsuite/Magento/Ups/Model/CollectRatesTest.php b/dev/tests/integration/testsuite/Magento/Ups/Model/CollectRatesTest.php
new file mode 100644
index 0000000000000..7cfaa8c7de733
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ups/Model/CollectRatesTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Ups\Model;
+
+/**
+ * Integration tests for online shipping carriers.
+ * @magentoAppIsolation enabled
+ */
+class CollectRatesTest extends \Magento\Shipping\Model\CollectRatesAbstract
+{
+    /**
+     * @var string
+     */
+    protected $carrier = 'ups';
+
+    /**
+     * @var string
+     */
+    protected $errorMessage = 'This shipping method is currently unavailable. ' .
+    'If you would like to ship using this shipping method, please contact us.';
+
+    /**
+     * @magentoConfigFixture default_store carriers/ups/active 1
+     * @magentoConfigFixture default_store carriers/ups/type UPS
+     * @magentoConfigFixture default_store carriers/ups/sallowspecific 1
+     * @magentoConfigFixture default_store carriers/ups/specificcountry UK
+     * @magentoConfigFixture default_store carriers/ups/showmethod 1
+     */
+    // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
+    public function testCollectRatesWhenShippingCarrierIsAvailableAndNotApplicable()
+    {
+        parent::testCollectRatesWhenShippingCarrierIsAvailableAndNotApplicable();
+    }
+
+    /**
+     * @magentoConfigFixture default_store carriers/ups/active 0
+     * @magentoConfigFixture default_store carriers/ups/type UPS
+     * @magentoConfigFixture default_store carriers/ups/sallowspecific 1
+     * @magentoConfigFixture default_store carriers/ups/specificcountry UK
+     * @magentoConfigFixture default_store carriers/ups/showmethod 1
+     */
+    // phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
+    public function testCollectRatesWhenShippingCarrierIsNotAvailableAndNotApplicable()
+    {
+        parent::testCollectRatesWhenShippingCarrierIsNotAvailableAndNotApplicable();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php
index 8dcc309514733..65cba5947ba05 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php
@@ -190,6 +190,7 @@ public function testGetEntityStoresCategoryStoresException()
      *
      * @static
      * @return array
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     public static function formPostInitDataProvider()
     {
@@ -226,6 +227,7 @@ public static function formPostInitDataProvider()
      *
      * @static
      * @return array
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     public static function getEntityStoresDataProvider()
     {
@@ -234,10 +236,11 @@ public static function getEntityStoresDataProvider()
                 null,
                 ['entity_id' => 3, 'store_ids' => [1]],
                 [
-                    ['label' => 'Main Website', 'value' => []],
+                    ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
                     [
                         'label' => '    Main Website Store',
-                        'value' => [['label' => '    Default Store View', 'value' => 1]]
+                        'value' => [['label' => '    Default Store View', 'value' => 1]],
+                        '__disableTmpl' => true
                     ]
                 ],
             ],
@@ -245,10 +248,11 @@ public static function getEntityStoresDataProvider()
                 ['entity_id' => 2, 'name' => 'product2', 'url_key' => 'product2', 'store_ids' => [1]],
                 null,
                 [
-                    ['label' => 'Main Website', 'value' => []],
+                    ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
                     [
                         'label' => '    Main Website Store',
-                        'value' => [['label' => '    Default Store View', 'value' => 1]]
+                        'value' => [['label' => '    Default Store View', 'value' => 1]],
+                        '__disableTmpl' => true
                     ]
                 ]
             ],
@@ -256,10 +260,11 @@ public static function getEntityStoresDataProvider()
                 ['entity_id' => 2, 'name' => 'product2', 'url_key' => 'product2', 'store_ids' => [1]],
                 ['entity_id' => 3, 'name' => 'product3', 'url_key' => 'product3', 'store_ids' => [1]],
                 [
-                    ['label' => 'Main Website', 'value' => []],
+                    ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
                     [
                         'label' => '    Main Website Store',
-                        'value' => [['label' => '    Default Store View', 'value' => 1]]
+                        'value' => [['label' => '    Default Store View', 'value' => 1]],
+                        '__disableTmpl' => true
                     ]
                 ]
             ]
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php
index c3b93efece456..041a2c268a55a 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/Edit/FormTest.php
@@ -78,10 +78,11 @@ public function testGetEntityStores()
         $form = $this->_getFormInstance($args);
 
         $expectedStores = [
-            ['label' => 'Main Website', 'value' => []],
+            ['label' => 'Main Website', 'value' => [], '__disableTmpl' => true],
             [
                 'label' => '    Main Website Store',
-                'value' => [['label' => '    Default Store View', 'value' => 1]]
+                'value' => [['label' => '    Default Store View', 'value' => 1]],
+                '__disableTmpl' => true
             ],
         ];
         $this->assertEquals($expectedStores, $form->getElement('store_id')->getValues());
@@ -110,6 +111,7 @@ public function testGetEntityStoresProductStoresException()
      *
      * @static
      * @return array
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     public static function formPostInitDataProvider()
     {
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
index 795f29332876a..5f8adc5d65113 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\UrlRewrite\Controller;
 
 use Magento\TestFramework\TestCase\AbstractController;
@@ -23,21 +25,22 @@ class UrlRewriteTest extends AbstractController
      * @param string $request
      * @param string $redirect
      * @param int $expectedCode
+     * @return void
      *
      * @dataProvider requestDataProvider
      */
     public function testMatchUrlRewrite(
         string $request,
         string $redirect,
-        int $expectedCode = 301
-    ) {
+        int $expectedCode = HttpResponse::STATUS_CODE_301
+    ): void {
         $this->dispatch($request);
         /** @var HttpResponse $response */
         $response = $this->getResponse();
         $code = $response->getHttpResponseCode();
         $this->assertEquals($expectedCode, $code, 'Invalid response code');
 
-        if ($expectedCode !== 200) {
+        if ($expectedCode !== HttpResponse::STATUS_CODE_200) {
             $location = $response->getHeader('Location')->getFieldValue();
             $this->assertStringEndsWith(
                 $redirect,
@@ -50,7 +53,7 @@ public function testMatchUrlRewrite(
     /**
      * @return array
      */
-    public function requestDataProvider()
+    public function requestDataProvider(): array
     {
         return [
             'Use Case #1: Rewrite: page-one/ --(301)--> page-a/; Request: page-one/ --(301)--> page-a/' => [
@@ -77,11 +80,6 @@ public function requestDataProvider()
                 'request' => '/page-similar/',
                 'redirect' => '/page-b',
             ],
-            'Use Case #7: Request with query params' => [
-                'request' => '/enable-cookies/?test-param',
-                'redirect' => '',
-                200,
-            ],
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php
index d7da1389ac847..317d26abd3370 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php
@@ -8,21 +8,28 @@
 namespace Magento\UrlRewrite\Model\StoreSwitcher;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\ActionInterface;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Value;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManagerInterface as ObjectManager;
+use Magento\Framework\Url\DecoderInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\StoreSwitcher;
-use Magento\Framework\ObjectManagerInterface as ObjectManager;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * Test store switching
  */
-class RewriteUrlTest extends \PHPUnit\Framework\TestCase
+class RewriteUrlTest extends TestCase
 {
     /**
      * @var StoreSwitcher
@@ -66,7 +73,7 @@ protected function setUp()
      * @magentoAppIsolation enabled
      * @return void
      * @throws StoreSwitcher\CannotSwitchStoreException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     public function testSwitchToNonExistingPage(): void
     {
@@ -91,7 +98,7 @@ public function testSwitchToNonExistingPage(): void
      * @magentoDbIsolation disabled
      * @return void
      * @throws StoreSwitcher\CannotSwitchStoreException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     public function testSwitchToExistingPage(): void
     {
@@ -120,6 +127,46 @@ public function testSwitchCmsPageToAnotherStore(): void
         $this->assertEquals($expectedUrl, $this->storeSwitcher->switch($fromStore, $toStore, $redirectUrl));
     }
 
+    /**
+     * Test store switching with logged in customer on cms page with different url_key
+     *
+     * @magentoDataFixture Magento/UrlRewrite/_files/url_rewrite.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDbIsolation disabled
+     * @magentoAppArea frontend
+     * @return void
+     */
+    public function testSwitchCmsPageToAnotherStoreAsCustomer(): void
+    {
+        /** @var CustomerRepositoryInterface $repository */
+        $repository = $this->objectManager->create(CustomerRepositoryInterface::class);
+        $this->loginAsCustomer($repository->get('customer@example.com'));
+        $fromStore = $this->getStoreByCode('default');
+        $toStore = $this->getStoreByCode('fixture_second_store');
+
+        $redirectUrl = "http://localhost/index.php/page-c/";
+        $expectedUrl = "http://localhost/index.php/page-c-on-2nd-store";
+        /** @var DecoderInterface $decoder */
+        $decoder = $this->objectManager->create(DecoderInterface::class);
+        $secureRedirectUrl = $this->storeSwitcher->switch($fromStore, $toStore, $redirectUrl);
+        parse_str(parse_url($secureRedirectUrl, PHP_URL_QUERY), $secureRedirectUrlQueryParams);
+        $encodedActualUrl = $secureRedirectUrlQueryParams[ActionInterface::PARAM_NAME_URL_ENCODED];
+        $actualUrl = $decoder->decode($encodedActualUrl);
+        $this->assertEquals($expectedUrl, $actualUrl);
+    }
+
+    /**
+     * Login as customer
+     *
+     * @param CustomerInterface $customer
+     */
+    private function loginAsCustomer($customer)
+    {
+        /** @var Session $session */
+        $session = $this->objectManager->get(Session::class);
+        $session->setCustomerDataAsLoggedIn($customer);
+    }
+
     /**
      * Set base url to store.
      *
diff --git a/dev/tests/integration/testsuite/Magento/User/_files/user_with_custom_role.php b/dev/tests/integration/testsuite/Magento/User/_files/user_with_custom_role.php
new file mode 100644
index 0000000000000..867832df20240
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/User/_files/user_with_custom_role.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Authorization\Model\RoleFactory;
+use Magento\Authorization\Model\Role;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\User\Model\User;
+use Magento\Authorization\Model\RulesFactory;
+use Magento\Authorization\Model\Rules;
+
+//Creating a new admin user with a custom role to safely change role settings without affecting the main user's role.
+/** @var Role $role */
+$role = Bootstrap::getObjectManager()->get(RoleFactory::class)->create();
+$role->setName('test_custom_role');
+$role->setData('role_name', $role->getName());
+$role->setRoleType(\Magento\Authorization\Model\Acl\Role\Group::ROLE_TYPE);
+$role->setUserType((string)\Magento\Authorization\Model\UserContextInterface::USER_TYPE_ADMIN);
+$role->save();
+/** @var Rules $rules */
+$rules = Bootstrap::getObjectManager()->get(RulesFactory::class)->create();
+$rules->setRoleId($role->getId());
+//Granted all permissions.
+$rules->setResources([Bootstrap::getObjectManager()->get(\Magento\Framework\Acl\RootResource::class)->getId()]);
+$rules->saveRel();
+
+/** @var User $user */
+$user = Bootstrap::getObjectManager()->create(User::class);
+$user->setFirstname("John")
+    ->setLastname("Doe")
+    ->setUsername('customRoleUser')
+    ->setPassword(\Magento\TestFramework\Bootstrap::ADMIN_PASSWORD)
+    ->setEmail('adminUser@example.com')
+    ->setIsActive(1)
+    ->setRoleId($role->getId());
+$user->save();
diff --git a/dev/tests/integration/testsuite/Magento/User/_files/user_with_custom_role_rollback.php b/dev/tests/integration/testsuite/Magento/User/_files/user_with_custom_role_rollback.php
new file mode 100644
index 0000000000000..f3c061236a1c3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/User/_files/user_with_custom_role_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\Authorization\Model\RoleFactory;
+use Magento\Authorization\Model\Role;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\User\Model\User;
+use Magento\Authorization\Model\RulesFactory;
+use Magento\Authorization\Model\Rules;
+
+//Deleting the user and the role.
+/** @var User $user */
+$user = Bootstrap::getObjectManager()->create(User::class);
+$user->load('customRoleUser', 'username');
+$user->delete();
+/** @var Role $role */
+$role = Bootstrap::getObjectManager()->get(RoleFactory::class)->create();
+$role->load('test_custom_role', 'role_name');
+/** @var Rules $rules */
+$rules = Bootstrap::getObjectManager()->get(RulesFactory::class)->create();
+$rules->load($role->getId(), 'role_id');
+$rules->delete();
+$role->delete();
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Controller/SoapTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Controller/SoapTest.php
index 211bc6f04538b..dde440529ee66 100644
--- a/dev/tests/integration/testsuite/Magento/Webapi/Controller/SoapTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Controller/SoapTest.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Webapi\Controller;
 
+/**
+ * Test for Magento\Webapi\Controller\Soap class.
+ */
 class SoapTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -24,16 +27,31 @@ protected function setUp()
         $this->soapController = $this->objectManager->get(\Magento\Webapi\Controller\Soap::class);
     }
 
-    /*
+    /**
      * Get the public wsdl with anonymous credentials
+     *
+     * @return void
      */
-    public function testDispatchWsdlRequest()
+    public function testDispatchWsdlRequest(): void
     {
         $request = $this->objectManager->get(\Magento\Framework\Webapi\Request::class);
         $request->setParam(\Magento\Webapi\Model\Soap\Server::REQUEST_PARAM_LIST_WSDL, true);
         $response = $this->soapController->dispatch($request);
-        $decoded_wsdl = json_decode($response->getContent(), true);
-        $this->assertArrayHasKey("customerAccountManagementV1", $decoded_wsdl);
-        $this->assertArrayHasKey("integrationAdminTokenServiceV1", $decoded_wsdl);
+        $decodedWsdl = json_decode($response->getContent(), true);
+
+        $this->assertWsdlServices($decodedWsdl);
+    }
+
+    /**
+     * Check wsdl available methods.
+     *
+     * @param array $decodedWsdl
+     *
+     * @return void
+     */
+    protected function assertWsdlServices(array $decodedWsdl): void
+    {
+        $this->assertArrayHasKey('customerAccountManagementV1', $decodedWsdl);
+        $this->assertArrayHasKey('integrationAdminTokenServiceV1', $decodedWsdl);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Weee/Controller/Adminhtml/Product/Attribute/Save/InputType/FixedProductTaxTest.php b/dev/tests/integration/testsuite/Magento/Weee/Controller/Adminhtml/Product/Attribute/Save/InputType/FixedProductTaxTest.php
new file mode 100644
index 0000000000000..5a6065d249b51
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Weee/Controller/Adminhtml/Product/Attribute/Save/InputType/FixedProductTaxTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Weee\Controller\Adminhtml\Product\Attribute\Save\InputType;
+
+use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save\InputType\AbstractSaveAttributeTest;
+
+/**
+ * Test cases related to create attribute with input type fixed product tax.
+ *
+ * @magentoDbIsolation enabled
+ */
+class FixedProductTaxTest extends AbstractSaveAttributeTest
+{
+    /**
+     * Test create attribute and compare attribute data and input data.
+     *
+     * @dataProvider \Magento\TestFramework\Weee\Model\Attribute\DataProvider\FixedProductTax::getAttributeDataWithCheckArray()
+     *
+     * @param array $attributePostData
+     * @param array $checkArray
+     * @return void
+     */
+    public function testCreateAttribute(array $attributePostData, array $checkArray): void
+    {
+        $this->createAttributeUsingDataAndAssert($attributePostData, $checkArray);
+    }
+
+    /**
+     * Test create attribute with error.
+     *
+     * @dataProvider \Magento\TestFramework\Weee\Model\Attribute\DataProvider\FixedProductTax::getAttributeDataWithErrorMessage()
+     *
+     * @param array $attributePostData
+     * @param string $errorMessage
+     * @return void
+     */
+    public function testCreateAttributeWithError(array $attributePostData, string $errorMessage): void
+    {
+        $this->createAttributeUsingDataWithErrorAndAssert($attributePostData, $errorMessage);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Weee/Model/Product/Attribute/Save/AttributeFixedProductTaxTest.php b/dev/tests/integration/testsuite/Magento/Weee/Model/Product/Attribute/Save/AttributeFixedProductTaxTest.php
new file mode 100644
index 0000000000000..c83a694b4fc1d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Weee/Model/Product/Attribute/Save/AttributeFixedProductTaxTest.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Weee\Model\Product\Attribute\Save;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Eav\Model\Entity\Attribute\Exception;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture Magento/Weee/_files/fixed_product_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+ */
+class AttributeFixedProductTaxTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var string */
+    private $attributeCode;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->attributeCode = 'fixed_product_attribute';
+    }
+
+    /**
+     * @dataProvider fPTProvider
+     * @param array $data
+     * @param array $expectedData
+     * @return void
+     */
+    public function testSaveProductWithFPTAttribute(array $data, array $expectedData): void
+    {
+        $product = $this->productRepository->get('simple2');
+        $product->addData([$this->attributeCode => $data]);
+        $product = $this->productRepository->save($product);
+        $this->assertEquals($expectedData, $product->getData($this->attributeCode));
+    }
+
+    /**
+     * @return array
+     */
+    public function fPTProvider(): array
+    {
+        return [
+            [
+                'data' => [
+                    [
+                        'region_id' => '0',
+                        'country' => 'GB',
+                        'val' => '',
+                        'value' => '15',
+                        'website_id' => '0',
+                        'state' => '',
+                    ],
+                    [
+                        'region_id' => '1',
+                        'country' => 'US',
+                        'val' => '',
+                        'value' => '35',
+                        'website_id' => '0',
+                        'state' => '',
+                    ],
+                ],
+                'expected_data' => [
+                    [
+                        'website_id' => '0',
+                        'country' => 'GB',
+                        'state' => '0',
+                        'value' => '15.000',
+                        'website_value' => 15.0,
+                    ],
+                    [
+                        'website_id' => '0',
+                        'country' => 'US',
+                        'state' => '0',
+                        'value' => '35.000',
+                        'website_value' => 35.0
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @return void
+     */
+    public function testSaveProductWithFPTAttributeWithDuplicates(): void
+    {
+        $attributeValues = [
+            [
+                'region_id' => '0',
+                'country' => 'GB',
+                'val' => '',
+                'value' => '15',
+                'website_id' => '0',
+                'state' => '',
+            ],
+            [
+                'region_id' => '0',
+                'country' => 'GB',
+                'val' => '',
+                'value' => '15',
+                'website_id' => '0',
+                'state' => '',
+            ],
+        ];
+        $this->expectException(Exception::class);
+        $message = 'Set unique country-state combinations within the same fixed product tax. '
+            . 'Verify the combinations and try again.';
+        $this->expectExceptionMessage((string)__($message));
+        $product = $this->productRepository->get('simple2');
+        $product->addData([$this->attributeCode => $attributeValues]);
+        $this->productRepository->save($product);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Eav/FixedAttributeTest.php b/dev/tests/integration/testsuite/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Eav/FixedAttributeTest.php
new file mode 100644
index 0000000000000..0987d8fbe57dd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Eav/FixedAttributeTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Weee\Ui\DataProvider\Product\Form\Modifier\Eav;
+
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractEavTest;
+
+/**
+ * Provides tests for product form eav modifier with custom weee attribute.
+ *
+ * @magentoDataFixture Magento/Weee/_files/fixed_product_attribute.php
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoDbIsolation enabled
+ */
+class FixedAttributeTest extends AbstractEavTest
+{
+    /**
+     * @return void
+     */
+    public function testModifyMeta(): void
+    {
+        $this->callModifyMetaAndAssert(
+            $this->getProduct(),
+            $this->addMetaNesting($this->getAttributeMeta(), 'product-details', 'fixed_product_attribute')
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testModifyData(): void
+    {
+        $product = $this->getProduct();
+        $attributeData = [
+            'fixed_product_attribute' => [
+                ['website_id' => 0, 'country' => 'US', 'state' => 0, 'price' => 12.70, 'delete' => '']
+            ]
+        ];
+        $this->saveProduct($product, $attributeData);
+        $expectedData = $this->addDataNesting(
+            [
+                'fixed_product_attribute' => [
+                    [
+                        'website_id' => '0',
+                        'country' => 'US',
+                        'state' => '0',
+                        'value' => '12.7000',
+                        'website_value' => 12.7,
+                    ]
+                ]
+            ]
+        );
+        $this->callModifyDataAndAssert($this->getProduct(), $expectedData);
+    }
+
+    /**
+     * @return array
+     */
+    private function getAttributeMeta(): array
+    {
+        return [
+            'visible' => '1',
+            'required' => '0',
+            'label' => '',
+            'code' => 'fixed_product_attribute',
+            'source' => 'product-details',
+            'scopeLabel' => '[GLOBAL]',
+            'globalScope' => true,
+            'sortOrder' => '__placeholder__',
+            'componentType' => 'field',
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/PluginTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/PluginTest.php
new file mode 100644
index 0000000000000..5303c9f352b87
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/PluginTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Controller\Index;
+
+use Magento\TestFramework\TestCase\AbstractController;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
+/**
+ * Test for wishlist plugin before dispatch
+ */
+class PluginTest extends AbstractController
+{
+    /**
+     * @var CustomerSession
+     */
+    private $customerSession;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->customerSession = $this->_objectManager->get(CustomerSession::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->customerSession->logout();
+        $this->customerSession = null;
+        parent::tearDown();
+    }
+
+    /**
+     * Test for adding product to wishlist with invalidate credentials
+     *
+     * @return void
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_xss.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoAppArea frontend
+     */
+    public function testAddActionProductWithInvalidCredentials(): void
+    {
+        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setPostValue(
+            [
+                'login' => [
+                    'username' => 'invalidCustomer@example.com',
+                    'password' => 'invalidPassword',
+                ],
+            ]
+        );
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->_objectManager->get(ProductRepositoryInterface::class);
+
+        $product = $productRepository->get('product-with-xss');
+
+        $this->dispatch('wishlist/index/add/product/' . $product->getId() . '?nocookie=1');
+
+        $this->assertArrayNotHasKey('login', $this->customerSession->getBeforeWishlistRequest());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
index e020d31838f06..d225b40dc39da 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php
@@ -98,9 +98,12 @@ public function testAddActionProductNameXss()
     {
         /** @var \Magento\Framework\Data\Form\FormKey $formKey */
         $formKey = $this->_objectManager->get(\Magento\Framework\Data\Form\FormKey::class);
-        $this->getRequest()->setPostValue([
-            'form_key' => $formKey->getFormKey(),
-        ]);
+        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setPostValue(
+            [
+                'form_key' => $formKey->getFormKey(),
+            ]
+        );
 
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
         $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
@@ -138,7 +141,11 @@ public function testAllcartAction()
 
         $this->assertEquals(0, $quoteCount);
         $this->assertSessionMessages(
-            $this->contains('You can buy this product only in quantities of 5 at a time for "Simple Product".'),
+            $this->contains(
+                htmlspecialchars(
+                    'You can buy this product only in quantities of 5 at a time for "Simple Product".'
+                )
+            ),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }
@@ -172,7 +179,7 @@ public function testSendAction()
             \Magento\TestFramework\Mail\Template\TransportBuilderMock::class
         );
 
-        $actualResult = quoted_printable_decode($transportBuilder->getSentMessage()->getRawMessage());
+        $actualResult = $transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent();
 
         $this->assertStringMatchesFormat(
             '%A' . $this->_customerViewHelper->getCustomerName($this->_customerSession->getCustomerDataObject())
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/set-payment-information-extended.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/set-payment-information-extended.test.js
new file mode 100644
index 0000000000000..66f7731415c05
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/set-payment-information-extended.test.js
@@ -0,0 +1,85 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'squire',
+    'jquery'
+], function (Squire, $) {
+    'use strict';
+
+    var injector = new Squire(),
+        setPaymentInformation,
+        serviceUrl = 'http://url',
+        mocks = {
+            'Magento_Checkout/js/model/quote': {
+                getQuoteId: jasmine.createSpy().and.returnValue(1),
+                billingAddress: jasmine.createSpy().and.returnValue(null)
+            },
+            'Magento_Checkout/js/model/url-builder': {
+                createUrl: jasmine.createSpy().and.returnValue(serviceUrl)
+            },
+            'mage/storage': {
+                post: function () {} // jscs:ignore jsDoc
+            },
+            'Magento_Customer/js/model/customer': {
+                isLoggedIn: jasmine.createSpy().and.returnValue(false)
+            },
+            'Magento_Checkout/js/model/full-screen-loader': {
+                startLoader: jasmine.createSpy(),
+                stopLoader: jasmine.createSpy()
+            },
+            'Magento_Checkout/js/action/get-totals': jasmine.createSpy('getTotalsAction'),
+            'Magento_Checkout/js/model/error-processor': jasmine.createSpy('errorProcessor')
+        };
+
+    beforeEach(function (done) {
+        injector.mock(mocks);
+        injector.require(
+            ['Magento_Checkout/js/action/set-payment-information-extended'],
+            function (action) {
+                setPaymentInformation = action;
+                done();
+            });
+    });
+
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {
+        }
+    });
+
+    describe('Magento/Checkout/js/action/set-payment-information-extended', function () {
+        it('Checks that paymentData consist correct data value.', function () {
+            var messageContainer = jasmine.createSpy('messageContainer'),
+                deferral = new $.Deferred(),
+                paymentData = {
+                    method: 'checkmo',
+                    additionalData: null,
+                    __disableTmpl: {
+                        title: true
+                    }
+                },
+                payload = {
+                    cartId: 1,
+                    paymentMethod: {
+                        method: 'checkmo',
+                        additionalData: null
+                    },
+                    billingAddress: null
+                };
+
+            spyOn(mocks['mage/storage'], 'post').and.callFake(function () {
+                return deferral.resolve({});
+            });
+
+            setPaymentInformation(messageContainer, paymentData, false);
+            expect(mocks['Magento_Checkout/js/model/full-screen-loader'].startLoader).toHaveBeenCalled();
+            expect(mocks['mage/storage'].post).toHaveBeenCalledWith(serviceUrl, JSON.stringify(payload));
+            expect(mocks['Magento_Checkout/js/model/full-screen-loader'].stopLoader).toHaveBeenCalled();
+        });
+    });
+});
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 9b9b1ce5b1614..46d9e1974bdb7 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
@@ -174,16 +174,13 @@ define(['squire', 'ko', 'jquery', 'uiRegistry', 'jquery/validate'], function (Sq
 
         describe('"validateShippingInformation" method', function () {
             it('Check method call on negative cases.', function () {
+                /* jscs:disable */
                 var country = {
-                    'indexedOptions': {
-                        'AD':
-                            {
-                                label: 'Andorra',
-                                labeltitle: 'Andorra',
-                                value: 'AD'
-                            }
-                    }
+                    on: function () {},
+                    get: function () {},
+                    set: function () {}
                 };
+                /* jscs:enable */
 
                 registry.set('test.shippingAddress.shipping-address-fieldset.country_id', country);
                 registry.set('checkout.errors', {});
@@ -202,9 +199,20 @@ define(['squire', 'ko', 'jquery', 'uiRegistry', 'jquery/validate'], function (Sq
                 expect(obj.validateShippingInformation()).toBeFalsy();
             });
             it('Check method call on positive case.', function () {
+                /* jscs:disable */
+                var country = {
+                    on: function () {},
+                    get: function () {},
+                    set: function () {}
+                };
+                /* jscs:enable */
+
                 $('body').append('<form data-role="email-with-possible-login">' +
                     '<input type="text" name="username" />' +
                     '</form>');
+
+                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(),
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 c2a20c8339c7c..8ea992ce30e4f 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
@@ -35,7 +35,8 @@ define([
         beforeAll(function (done) {
             window.checkoutConfig = {
                 quoteData: {
-                    entityId: 1
+                    /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
+                    entity_Id: 1
                 },
                 formKey: 'formKey'
             };
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 96bca1bbd8c6b..d369d66a92225 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
@@ -47,22 +47,71 @@ define([
         });
 
         describe('update method', function () {
-            it('check for default', function () {
-                var value = 'Value',
-                    country = {
-                        indexedOptions: {
-                            'Value': {
-                                'is_zipcode_optional': true
-                            }
-                        }
-                    };
-
-                spyOn(mocks['Magento_Ui/js/lib/registry/registry'], 'get').and.returnValue(country);
+            it('makes field optional when there is no corresponding country', function () {
+                var value = 'Value';
+
+                model.countryOptions = {};
+
+                model.update(value);
+
+                expect(model.required()).toEqual(false);
+            });
+
+            it('makes field optional when post code is optional for certain country', function () {
+                var value = 'Value';
+
+                model.countryOptions = {
+                    'Value': {
+                        'is_zipcode_optional': true
+                    }
+                };
+
                 model.update(value);
-                expect(mocks['Magento_Ui/js/lib/registry/registry'].get).toHaveBeenCalled();
-                expect(model.error()).toEqual(false);
+
                 expect(model.required()).toEqual(false);
             });
+
+            it('removes field required validation when post code is optional for certain country', function () {
+                var value = 'Value';
+
+                model.countryOptions = {
+                    'Value': {
+                        'is_zipcode_optional': true
+                    }
+                };
+
+                model.update(value);
+
+                expect(model.validation['required-entry']).toBeFalsy();
+            });
+
+            it('makes field required when post code is required for certain country', function () {
+                var value = 'Value';
+
+                model.countryOptions = {
+                    'Value': {
+                        'is_zipcode_optional': false
+                    }
+                };
+
+                model.update(value);
+
+                expect(model.required()).toEqual(true);
+            });
+
+            it('sets field required validation when post code is required for certain country', function () {
+                var value = 'Value';
+
+                model.countryOptions = {
+                    'Value': {
+                        'is_zipcode_optional': false
+                    }
+                };
+
+                model.update(value);
+
+                expect(model.validation['required-entry']).toEqual(true);
+            });
         });
     });
 });
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 a36d3b0b7fefa..a957db5d1c119 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
@@ -48,22 +48,127 @@ define([
         });
 
         describe('update method', function () {
-            it('check for default', function () {
-                var value = 'Value',
-                    country = {
-                        indexedOptions: {
-                            'Value': {
-                                'is_zipcode_optional': true
-                            }
-                        }
-                    };
-
-                spyOn(mocks['Magento_Ui/js/lib/registry/registry'], 'get').and.returnValue(country);
+            it('makes field optional when there is no corresponding country', function () {
+                var value = 'Value';
+
+                model.countryOptions = {};
+
+                model.update(value);
+
+                expect(model.required()).toEqual(false);
+            });
+
+            it('makes field optional when region is optional for certain country', function () {
+                var value = 'Value';
+
+                model.countryOptions = {
+                    'Value': {
+                        'is_region_required': false
+                    }
+                };
+
                 model.update(value);
-                expect(mocks['Magento_Ui/js/lib/registry/registry'].get).toHaveBeenCalled();
-                expect(model.error()).toEqual(false);
+
                 expect(model.required()).toEqual(false);
             });
+
+            it('removes field required validation when region is optional for certain country', function () {
+                var value = 'Value';
+
+                model.countryOptions = {
+                    'Value': {
+                        'is_region_required': false
+                    }
+                };
+
+                model.update(value);
+
+                expect(model.validation['required-entry']).toBeFalsy();
+            });
+
+            it('makes field required when region is required for certain country', function () {
+                var value = 'Value';
+
+                model.countryOptions = {
+                    'Value': {
+                        'is_region_required': true
+                    }
+                };
+
+                model.update(value);
+
+                expect(model.required()).toEqual(true);
+            });
+
+            it('sets field required validation when region is required for certain country', function () {
+                var value = 'Value';
+
+                model.countryOptions = {
+                    'Value': {
+                        'is_region_required': true
+                    }
+                };
+
+                model.update(value);
+
+                expect(model.validation['required-entry']).toEqual(true);
+            });
+
+            it('keeps region visible by default', function () {
+                var value = 'Value';
+
+                model.countryOptions = {
+                    'Value': {}
+                };
+
+                model.update(value);
+
+                expect(model.visible()).toEqual(true);
+            });
+
+            it('hides region field when it should be hidden for certain country', function () {
+                var value = 'Value';
+
+                model.countryOptions = {
+                    'Value': {
+                        'is_region_visible': false
+                    }
+                };
+
+                model.update(value);
+
+                expect(model.visible()).toEqual(false);
+            });
+
+            it('makes field optional when validation should be skipped', function () {
+                var value = 'Value';
+
+                model.countryOptions = {
+                    'Value': {
+                        'is_region_required': true
+                    }
+                };
+
+                model.skipValidation = true;
+                model.update(value);
+
+                expect(model.required()).toEqual(false);
+            });
+
+            it('removes field validation when validation should be skipped', function () {
+                var value = 'Value';
+
+                model.countryOptions = {
+                    'Value': {
+                        'is_region_required': true
+                    }
+                };
+
+                model.skipValidation = true;
+                model.update(value);
+
+                expect(model.validation['required-entry']).toBeFalsy();
+            });
         });
     });
 });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/image-preview.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/image-preview.test.js
new file mode 100644
index 0000000000000..b5c6e75248bfa
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/image-preview.test.js
@@ -0,0 +1,50 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* eslint-disable max-nested-callbacks, no-undef */
+
+define([
+    'Magento_Ui/js/grid/columns/image-preview',
+    'ko',
+    'jquery'
+], function (Preview, ko, $) {
+    'use strict';
+
+    describe('Ui/js/grid/columns/image-preview', function () {
+        var record = {
+            _rowIndex: 1,
+            rowNumber: 1
+        },
+           imagePreview;
+
+        beforeEach(function () {
+            imagePreview = new Preview();
+
+            /**
+             * @return {Object}
+             */
+            function getThumbnail()  {
+                return {
+                    previewRowId: ko.observable()
+                };
+            }
+
+            imagePreview.thumbnailComponent = getThumbnail;
+
+            imagePreview.visibleRecord = ko.observable(1);
+        });
+
+        describe('show method', function () {
+            it('show image', function () {
+                var mockImg = document.createElement('img'),
+                    hide = spyOn(imagePreview, 'hide');
+
+                spyOn($.fn, 'get').and.returnValue(mockImg);
+                imagePreview.show(record);
+                expect(hide).toHaveBeenCalledTimes(1);
+            });
+
+        });
+    });
+});
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
index 9b756a2f2a49a..afbd7e8e94c2d 100644
--- 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
@@ -85,5 +85,28 @@ define([
 
             expect($.fn.init).toHaveBeenCalledWith($input, undefined);
         });
+
+        it('Verify config value is empty when reset colorpicker intput', function () {
+            var value = {
+                    configStuffInHere: true,
+                    value: jasmine.createSpy().and.returnValue(undefined)
+                },
+                valueAccessor = jasmine.createSpy().and.returnValue(value),
+                viewModel = {
+                    disabled: jasmine.createSpy().and.returnValue(false)
+                };
+
+            $.fn.spectrum = jasmine.createSpy();
+            $input = jasmine.createSpy();
+
+            ko.bindingHandlers.colorPicker.update($input, valueAccessor, null, viewModel);
+            expect($.fn.spectrum).toHaveBeenCalledTimes(1);
+            expect(valueAccessor().value).toHaveBeenCalledTimes(4);
+
+            value.value = jasmine.createSpy().and.returnValue('');
+            ko.bindingHandlers.colorPicker.update($input, valueAccessor, null, viewModel);
+            expect($.fn.spectrum).toHaveBeenCalledTimes(3);
+            expect(valueAccessor().value).toHaveBeenCalledTimes(5);
+        });
     });
 });
diff --git a/dev/tests/js/jasmine/tests/lib/mage/browser.test.js b/dev/tests/js/jasmine/tests/lib/mage/browser.test.js
new file mode 100644
index 0000000000000..06f355908daca
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/browser.test.js
@@ -0,0 +1,66 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'mage/adminhtml/browser',
+    'jquery'
+], function (browser, $) {
+    'use strict';
+
+    var obj;
+
+    beforeEach(function () {
+        /**
+         * Dummy constructor to use for instantiation
+         * @constructor
+         */
+        var Constr = function () {};
+
+        Constr.prototype = browser;
+
+        obj = new Constr();
+    });
+
+    describe('"openDialog" method', function () {
+        it('Opens dialog with provided targetElementId', function () {
+            var options = {
+                'targetElementId': 1
+            };
+
+            spyOn($, 'ajax').and.callFake(
+                function () {
+                    return {
+                        /**
+                         * Success result of ajax request
+                         */
+                        done: function () {
+                            obj.targetElementId = 1;
+                        }
+                    };
+                });
+            obj.openDialog('instance/url', 100, 100, 'title', options);
+            obj.openDialog('instance/url', 100, 100, 'title', options);
+            expect($.ajax.calls.count()).toBe(1);
+        });
+
+        it('Opens dialog with provided url param', function () {
+            spyOn($, 'ajax').and.callFake(
+                function () {
+                    return {
+                        /**
+                         * Success result of ajax request
+                         */
+                        done: function () {
+                            obj.targetElementId = 'instance/url';
+                            obj.modalLoaded = true;
+                        }
+                    };
+                });
+            obj.openDialog('instance/url', 100, 100, 'title', undefined);
+            obj.openDialog('instance/url', 100, 100, 'title', undefined);
+            expect($.ajax.calls.count()).toBe(1);
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/requirejs/mixins.test.js b/dev/tests/js/jasmine/tests/lib/mage/requirejs/mixins.test.js
new file mode 100644
index 0000000000000..52374a24e8c68
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/requirejs/mixins.test.js
@@ -0,0 +1,187 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint max-nested-callbacks: 0 */
+// jscs:disable jsDoc
+
+require.config({
+    paths: {
+        'mixins': 'mage/requirejs/mixins'
+    }
+});
+
+define(['rjsResolver', 'mixins'], function (resolver, mixins) {
+    'use strict';
+
+    describe('mixins module', function () {
+        beforeEach(function (done) {
+            spyOn(mixins, 'hasMixins').and.callThrough();
+            spyOn(mixins, 'getMixins').and.callThrough();
+            spyOn(mixins, 'load').and.callThrough();
+
+            // Wait for all modules to be loaded so they don't interfere with testing.
+            resolver(function () {
+                done();
+            });
+        });
+
+        it('does not affect modules without mixins', function (done) {
+            var name = 'tests/assets/mixins/no-mixins',
+                mixinName = 'tests/assets/mixins/no-mixins-ext';
+
+            mixins.hasMixins.and.returnValue(false);
+
+            define(name, [], function () {
+                return {
+                    value: 'original'
+                };
+            });
+
+            define(mixinName, [], function () {
+                return function (module) {
+                    module.value = 'changed';
+
+                    return module;
+                };
+            });
+
+            require([name], function (module) {
+                expect(module.value).toBe('original');
+
+                done();
+            });
+        });
+
+        it('does not affect modules that are loaded with plugins', function (done) {
+            var name = 'plugin!tests/assets/mixins/no-mixins',
+                mixinName = 'tests/assets/mixins/no-mixins-ext';
+
+            mixins.hasMixins.and.returnValue(true);
+            mixins.getMixins.and.returnValue([mixinName]);
+
+            define('plugin', [], function () {
+                return {
+                    load: function (module, req, onLoad) {
+                        req(module, onLoad);
+                    }
+                };
+            });
+
+            define(name, [], function () {
+                return {
+                    value: 'original'
+                };
+            });
+
+            define(mixinName, [], function () {
+                return function (module) {
+                    module.value = 'changed';
+
+                    return module;
+                };
+            });
+
+            require([name], function (module) {
+                expect(module.value).toBe('original');
+
+                done();
+            });
+        });
+
+        it('applies mixins for normal module with mixins', function (done) {
+            var name = 'tests/assets/mixins/mixins-applied',
+                mixinName = 'tests/assets/mixins/mixins-applied-ext';
+
+            mixins.hasMixins.and.returnValue(true);
+            mixins.getMixins.and.returnValue([mixinName]);
+
+            define(name, [], function () {
+                return {
+                    value: 'original'
+                };
+            });
+
+            define(mixinName, [], function () {
+                return function (module) {
+                    module.value = 'changed';
+
+                    return module;
+                };
+            });
+
+            require([name], function (module) {
+                expect(module.value).toBe('changed');
+
+                done();
+            });
+        });
+
+        it('applies mixins for module that is a dependency', function (done) {
+            var name = 'tests/assets/mixins/module-with-dependency',
+                dependencyName = 'tests/assets/mixins/dependency-module',
+                mixinName = 'tests/assets/mixins/dependency-module-ext';
+
+            mixins.hasMixins.and.returnValue(true);
+            mixins.getMixins.and.returnValue([mixinName]);
+
+            define(dependencyName, [], function () {
+                return {
+                    value: 'original'
+                };
+            });
+
+            define(name, [dependencyName], function (module) {
+                expect(module.value).toBe('changed');
+
+                done();
+
+                return {};
+            });
+
+            define(mixinName, [], function () {
+                return function (module) {
+                    module.value = 'changed';
+
+                    return module;
+                };
+            });
+
+            require([name], function () {});
+        });
+
+        it('applies mixins for module that is a relative dependency', function (done) {
+            var name = 'tests/assets/mixins/module-with-relative-dependency',
+                dependencyName = 'tests/assets/mixins/relative-module',
+                mixinName = 'tests/assets/mixins/relative-module-ext';
+
+            mixins.hasMixins.and.returnValue(true);
+            mixins.getMixins.and.returnValue([mixinName]);
+
+            define(dependencyName, [], function () {
+                return {
+                    value: 'original'
+                };
+            });
+
+            define(name, ['./relative-module'], function (module) {
+                expect(module.value).toBe('changed');
+
+                done();
+
+                return {};
+            });
+
+            define(mixinName, [], function () {
+                return function (module) {
+                    module.value = 'changed';
+
+                    return module;
+                };
+            });
+
+            require([name], function () {});
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/lib/mage/tinymce4Adapter.test.js b/dev/tests/js/jasmine/tests/lib/mage/tinymce4Adapter.test.js
new file mode 100644
index 0000000000000..7af1a19e4b4c1
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/lib/mage/tinymce4Adapter.test.js
@@ -0,0 +1,41 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'wysiwygAdapter',
+    'underscore'
+], function (wysiwygAdapter, _) {
+    'use strict';
+
+    var obj;
+
+    beforeEach(function () {
+
+        /**
+         * Dummy constructor to use for instantiation
+         * @constructor
+         */
+        var Constr = function () {};
+
+        Constr.prototype = wysiwygAdapter;
+
+        obj = new Constr();
+        obj.eventBus = new window.varienEvents();
+        obj.initialize(1, {
+            'store_id': 0,
+            'tinymce4': {
+                'content_css': ''
+            },
+            'files_browser_window_url': 'url'
+        });
+        obj.setup();
+    });
+
+    describe('"openFileBrowser" method', function () {
+        it('Opens file browser to given instance', function () {
+            expect(_.size(obj.eventBus.arrEvents['open_browser_callback'])).toBe(1);
+        });
+    });
+});
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/revisions/remove_fk_declaration/db_schema.xml b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/revisions/remove_fk_declaration/db_schema.xml
new file mode 100644
index 0000000000000..3ecaf2b3ac1b8
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/revisions/remove_fk_declaration/db_schema.xml
@@ -0,0 +1,39 @@
+<?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="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>
+        <!--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/revisions/remove_fk_declaration/db_schema_whitelist.json b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/revisions/remove_fk_declaration/db_schema_whitelist.json
new file mode 100644
index 0000000000000..c9274c9477fa6
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/revisions/remove_fk_declaration/db_schema_whitelist.json
@@ -0,0 +1,28 @@
+{
+  "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
+    }
+  }
+}
diff --git a/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/revisions/restore_fk_declaration_to_wl/db_schema_whitelist.json b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/revisions/restore_fk_declaration_to_wl/db_schema_whitelist.json
new file mode 100644
index 0000000000000..a800d2cbf58ee
--- /dev/null
+++ b/dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule6/revisions/restore_fk_declaration_to_wl/db_schema_whitelist.json
@@ -0,0 +1,29 @@
+{
+  "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/testsuite/Magento/Setup/SafeInstallerTest.php b/dev/tests/setup-integration/testsuite/Magento/Setup/SafeInstallerTest.php
index 5b42e6cf43e13..cb0746a66504f 100644
--- a/dev/tests/setup-integration/testsuite/Magento/Setup/SafeInstallerTest.php
+++ b/dev/tests/setup-integration/testsuite/Magento/Setup/SafeInstallerTest.php
@@ -7,11 +7,8 @@
 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\Framework\Setup\Declaration\Schema\Db\DbSchemaReaderInterface;
 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;
@@ -29,19 +26,28 @@ class SafeInstallerTest extends SetupTestCase
     /**
      * @var CliCommand
      */
-    private $cliCommad;
+    private $cliCommand;
 
     /**
      * @var ResourceConnection
      */
     private $resourceConnection;
 
+    /**
+     * @var DbSchemaReaderInterface
+     */
+    private $dbSchemaReader;
+
+    /**
+     * @inheritdoc
+     */
     public function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->moduleManager = $objectManager->get(TestModuleManager::class);
-        $this->cliCommad = $objectManager->get(CliCommand::class);
+        $this->cliCommand = $objectManager->get(CliCommand::class);
         $this->resourceConnection = $objectManager->get(ResourceConnection::class);
+        $this->dbSchemaReader = $objectManager->get(DbSchemaReaderInterface::class);
     }
 
     /**
@@ -52,7 +58,7 @@ public function testInstallation()
     {
         $testTableData = $this->getData();
         $row = reset($testTableData);
-        $this->cliCommad->install(['Magento_TestSetupDeclarationModule4']);
+        $this->cliCommand->install(['Magento_TestSetupDeclarationModule4']);
         $adapter = $this->resourceConnection->getConnection();
         $testTableName = $this->resourceConnection->getTableName('test_table');
         $adapter->insertArray(
@@ -67,7 +73,7 @@ public function testInstallation()
             'db_schema.xml',
             'etc'
         );
-        $this->cliCommad->upgrade(
+        $this->cliCommand->upgrade(
             [
                 'safe-mode' => true,
             ]
@@ -79,7 +85,7 @@ public function testInstallation()
             'db_schema.xml',
             'etc'
         );
-        $this->cliCommad->upgrade(
+        $this->cliCommand->upgrade(
             [
                 'data-restore' => true,
             ]
@@ -87,4 +93,58 @@ public function testInstallation()
         $testTableSelect = $adapter->select()->from($testTableName);
         self::assertEquals($testTableData, $adapter->fetchAll($testTableSelect));
     }
+
+    /**
+     * Tests that not whitelisted elements should not be removed from DB to avoid backwards-incompatible change.
+     *
+     * @moduleName Magento_TestSetupDeclarationModule6
+     */
+    public function testDestructiveOperationBehaviour()
+    {
+        $this->cliCommand->install(['Magento_TestSetupDeclarationModule6']);
+        $this->assertForeignKeyPresence('test_table', 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF');
+
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule6',
+            'remove_fk_declaration',
+            'db_schema.xml',
+            'etc'
+        );
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule6',
+            'remove_fk_declaration',
+            'db_schema_whitelist.json',
+            'etc'
+        );
+        $this->cliCommand->upgrade();
+        $this->assertForeignKeyPresence('test_table', 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF');
+
+        $this->moduleManager->updateRevision(
+            'Magento_TestSetupDeclarationModule6',
+            'restore_fk_declaration_to_wl',
+            'db_schema_whitelist.json',
+            'etc'
+        );
+        $this->cliCommand->upgrade();
+        $this->assertForeignKeyPresence('test_table', 'TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF', false);
+    }
+
+    /**
+     * Asserts foreign key presence.
+     *
+     * @param string $tableName
+     * @param string $foreignKeyName
+     * @param bool $isPresent
+     * @return void
+     */
+    private function assertForeignKeyPresence(string $tableName, string $foreignKeyName, bool $isPresent = true): void
+    {
+        $foreignKeys = $this->dbSchemaReader
+            ->readReferences($this->resourceConnection->getTableName($tableName), 'default');
+        if ($isPresent) {
+            $this->assertArrayHasKey($foreignKeyName, $foreignKeys);
+        } else {
+            $this->assertArrayNotHasKey($foreignKeyName, $foreignKeys);
+        }
+    }
 }
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/SerializationAware.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/SerializationAware.php
deleted file mode 100644
index e38fba8558bad..0000000000000
--- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/SerializationAware.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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 PHP serialization aware methods.
- */
-class SerializationAware extends AbstractRule implements MethodAware
-{
-    /**
-     * @inheritDoc
-     *
-     * @param ASTMethod|MethodNode $method
-     */
-    public function apply(AbstractNode $method)
-    {
-        if ($method->getName() === '__wakeup' || $method->getName() === '__sleep') {
-            $this->addViolation($method, [$method->getName(), $method->getParent()->getFullQualifiedName()]);
-        }
-    }
-}
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
index 408853141e538..611d5ec15bdc3 100644
--- 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
@@ -11,9 +11,9 @@
 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\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use PHPUnit\Framework\MockObject\Builder\InvocationMocker as InvocationMocker;
+use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
 use PHPMD\Report;
 use PHPMD\Node\ClassNode;
 
@@ -40,7 +40,8 @@ public function getCases(): array
     {
         return [
             [
-                new class implements ActionInterface, HttpGetActionInterface {
+                new class implements ActionInterface, HttpGetActionInterface
+                {
                     /**
                      * @inheritDoc
                      */
@@ -52,7 +53,8 @@ public function execute()
                 false
             ],
             [
-                new class implements ActionInterface {
+                new class implements ActionInterface
+                {
                     /**
                      * @inheritDoc
                      */
@@ -64,7 +66,8 @@ public function execute()
                 true
             ],
             [
-                new class implements HttpGetActionInterface {
+                new class implements HttpGetActionInterface
+                {
                     /**
                      * @inheritDoc
                      */
@@ -76,7 +79,8 @@ public function execute()
                 false
             ],
             [
-                new class {
+                new class
+                {
 
                 },
                 false
@@ -94,13 +98,15 @@ private function createNodeMock($dynamicObject): MockObject
         $node = $this->getMockBuilder(ClassNode::class)
             ->disableOriginalConstructor()
             ->disableProxyingToOriginalMethods()
-            ->setMethods([
-                // disable name lookup from AST artifact
-                'getNamespaceName',
-                'getParentName',
-                'getName',
-                'getFullQualifiedName',
-            ])
+            ->setMethods(
+                [
+                    // disable name lookup from AST artifact
+                    'getNamespaceName',
+                    'getParentName',
+                    'getName',
+                    'getFullQualifiedName',
+                ]
+            )
             ->getMock();
         $node->expects($this->any())
             ->method('getFullQualifiedName')
@@ -114,10 +120,8 @@ private function createNodeMock($dynamicObject): MockObject
      * @param bool $expects
      * @return InvocationMocker
      */
-    private function expectsRuleViolation(
-        AllPurposeAction $rule,
-        bool $expects
-    ): InvocationMocker {
+    private function expectsRuleViolation(AllPurposeAction $rule, bool $expects): InvocationMocker
+    {
         /** @var Report|MockObject $report */
         $report = $this->getMockBuilder(Report::class)->getMock();
         if ($expects) {
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 5f2461812bab7..53f2fe4a0084e 100644
--- a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
@@ -60,31 +60,6 @@ class OrderProcessor
         $currentOrder = $this->session->get('current_order');
         ...
     }
-}
-            ]]>
-        </example>
-    </rule>
-    <rule name="SerializationAware"
-          class="Magento\CodeMessDetector\Rule\Design\SerializationAware"
-          message="{1} has {0} method and is PHP serialization aware - PHP serialization must be avoided.">
-        <description>
-            <![CDATA[
-Using PHP serialization must be avoided in Magento for security reasons and for prevention of unexpected behaviour.
-            ]]>
-        </description>
-        <priority>2</priority>
-        <properties />
-        <example>
-            <![CDATA[
-class MyModel extends AbstractModel
-{
-
-    .......
-
-    public function __sleep()
-    {
-        .....
-    }
 }
             ]]>
         </example>
diff --git a/dev/tests/static/framework/Magento/PhpStan/Formatters/FilteredErrorFormatter.php b/dev/tests/static/framework/Magento/PhpStan/Formatters/FilteredErrorFormatter.php
new file mode 100644
index 0000000000000..b3a4bd9ae0791
--- /dev/null
+++ b/dev/tests/static/framework/Magento/PhpStan/Formatters/FilteredErrorFormatter.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PhpStan\Formatters;
+
+use PHPStan\Command\AnalysisResult;
+use PHPStan\Command\ErrorFormatter\TableErrorFormatter;
+use PHPStan\Command\Output;
+
+/**
+ * To mute the PHPStan error message add a comment above the reported error line.
+ *
+ * Example of usage:
+ *
+ *   // phpstan:ignore "Method Magento\TestModule\TestClass::testMethod() invoked with 1 parameter, 0 required."
+ *   $this->testMethod(1);
+ *
+ * or replace some part of error message with *
+ *
+ *   // phpstan:ignore "Method * invoked with 1 parameter, 0 required."
+ *   $this->testMethod(1);
+ *
+ * or just
+ *
+ *   // phpstan:ignore
+ *   $this->testMethod(1);
+ *
+ * or
+ *
+ *   $this->testMethod(1); // phpstan:ignore
+ *
+ * The error message will be suppressed.
+ *
+ * @see \Magento\PhpStan\Formatters\Fixtures\ClassWithIgnoreAnnotation
+ */
+class FilteredErrorFormatter extends TableErrorFormatter
+{
+    private const MUTE_ERROR_ANNOTATION = 'phpstan:ignore';
+
+    private const NO_ERRORS = 0;
+
+    /**
+     * @inheritdoc
+     */
+    public function formatErrors(AnalysisResult $analysisResult, Output $output): int
+    {
+        if (!$analysisResult->hasErrors()) {
+            $style = $output->getStyle();
+            $style->success('No errors');
+            return self::NO_ERRORS;
+        }
+
+        $fileSpecificErrorsWithoutIgnoredErrors = $this->clearIgnoredErrors(
+            $analysisResult->getFileSpecificErrors()
+        );
+
+        $clearedAnalysisResult = new AnalysisResult(
+            $fileSpecificErrorsWithoutIgnoredErrors,
+            $analysisResult->getNotFileSpecificErrors(),
+            $analysisResult->isDefaultLevelUsed(),
+            $analysisResult->hasInferrablePropertyTypesFromConstructor(),
+            $analysisResult->getProjectConfigFile()
+        );
+
+        return parent::formatErrors($clearedAnalysisResult, $output);
+    }
+
+    /**
+     * Filters error list.
+     *
+     * @param array $fileSpecificErrors
+     * @return array
+     */
+    private function clearIgnoredErrors(array $fileSpecificErrors): array
+    {
+        foreach ($fileSpecificErrors as $index => $error) {
+            $fileName = $error->getFile();
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            if (!file_exists($fileName)) {
+                continue;
+            }
+
+            $line = $error->getLine() ? $this->getLineWithMuteErrorAnnotation($error->getLine(), $fileName) : null;
+            if ($line === null) {
+                continue;
+            }
+
+            $extractErrorPattern = '@' . self::MUTE_ERROR_ANNOTATION . '\s+"(.*?)"@';
+            $errorPattern = preg_match($extractErrorPattern, $line, $result) ? $this->preparePattern($result[1]) : '';
+            if ($errorPattern && !preg_match('@' . $errorPattern . '@i', $error->getMessage())) {
+                continue;
+            }
+
+            unset($fileSpecificErrors[$index]);
+        }
+
+        return $fileSpecificErrors;
+    }
+
+    /**
+     * Returns context of the line with mute error annotation.
+     *
+     * @param int $errorLine
+     * @param string $fileName
+     * @return string|null
+     */
+    private function getLineWithMuteErrorAnnotation(int $errorLine, string $fileName): ?string
+    {
+        $file = new \SplFileObject($fileName);
+        $lineNumbersToCheck = [
+            $errorLine - 2, // the line above to the line that caused the error
+            $errorLine - 1, // the line that caused the error
+            $errorLine - 3, // the line two lines above to the line that caused the error
+        ];
+
+        foreach ($lineNumbersToCheck as $lineNumber) {
+            $file->seek($lineNumber > 0 ? $lineNumber : 0);
+            $line = $file->current();
+            if (strpos($line, self::MUTE_ERROR_ANNOTATION) !== false) {
+                return $line;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Prepares error pattern.
+     *
+     * @param string $errorDescription
+     * @return string
+     */
+    private function preparePattern(string $errorDescription)
+    {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        return str_replace('*', '(?:.*?)', addcslashes(trim($errorDescription), '\()[]'));
+    }
+}
diff --git a/dev/tests/static/framework/Magento/PhpStan/autoload.php b/dev/tests/static/framework/Magento/PhpStan/autoload.php
new file mode 100644
index 0000000000000..baf44b2381759
--- /dev/null
+++ b/dev/tests/static/framework/Magento/PhpStan/autoload.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// phpcs:disable
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Code\Generator\Io;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\TestFramework\Unit\Autoloader\ExtensionAttributesGenerator;
+use Magento\Framework\TestFramework\Unit\Autoloader\ExtensionAttributesInterfaceGenerator;
+use Magento\Framework\TestFramework\Unit\Autoloader\FactoryGenerator;
+use Magento\Framework\TestFramework\Unit\Autoloader\GeneratedClassesAutoloader;
+
+if (!defined('TESTS_TEMP_DIR')) {
+    //phpcs:ignore Magento2.Functions.DiscouragedFunction
+    define('TESTS_TEMP_DIR', dirname(__DIR__) . '/../../tmp');
+}
+
+$generatorIo = new Io(
+    new File(),
+    TESTS_TEMP_DIR . '/' . DirectoryList::getDefaultConfig()[DirectoryList::GENERATED_CODE][DirectoryList::PATH]
+);
+$generatedCodeAutoloader = new GeneratedClassesAutoloader(
+    [
+        new ExtensionAttributesGenerator(),
+        new ExtensionAttributesInterfaceGenerator(),
+        new FactoryGenerator(),
+    ],
+    $generatorIo
+);
+spl_autoload_register([$generatedCodeAutoloader, 'load']);
diff --git a/dev/tests/static/framework/Magento/Sniffs/Html/HtmlDirectiveSniff.php b/dev/tests/static/framework/Magento/Sniffs/Html/HtmlDirectiveSniff.php
new file mode 100644
index 0000000000000..33ffdf29dca93
--- /dev/null
+++ b/dev/tests/static/framework/Magento/Sniffs/Html/HtmlDirectiveSniff.php
@@ -0,0 +1,257 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Html;
+
+use Magento\Framework\Filter\Template;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Sniff for invalid directive usage in HTML templates
+ */
+class HtmlDirectiveSniff implements Sniff
+{
+    /**
+     * @var array
+     */
+    private $usedVariables = [];
+
+    /**
+     * @var array
+     */
+    private $unfilteredVariables = [];
+
+    /**
+     * @inheritDoc
+     */
+    public function register()
+    {
+        return [T_INLINE_HTML];
+    }
+
+    /**
+     * Detect invalid usage of template filter directives
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return int|void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        $this->usedVariables = [];
+        $this->unfilteredVariables = [];
+        if ($stackPtr !== 0) {
+            return;
+        }
+
+        $html = $phpcsFile->getTokensAsString($stackPtr, count($phpcsFile->getTokens()));
+
+        if (empty($html)) {
+            return;
+        }
+
+        $html = $this->processIfDirectives($html, $phpcsFile);
+        $html = $this->processDependDirectives($html, $phpcsFile);
+        $html = $this->processForDirectives($html, $phpcsFile);
+        $html = $this->processVarDirectivesAndParams($html, $phpcsFile);
+
+        $this->validateDefinedVariables($phpcsFile, $html);
+    }
+
+    /**
+     * Process the {{if}} directives in the file
+     *
+     * @param string $html
+     * @param File $phpcsFile
+     * @return string The processed template
+     */
+    private function processIfDirectives(string $html, File $phpcsFile): string
+    {
+        if (preg_match_all(Template::CONSTRUCTION_IF_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
+            foreach ($constructions as $construction) {
+                // validate {{if <var>}}
+                $this->validateVariableUsage($phpcsFile, $construction[1]);
+                $html = str_replace($construction[0], $construction[2] . ($construction[4] ?? ''), $html);
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Process the {{depend}} directives in the file
+     *
+     * @param string $html
+     * @param File $phpcsFile
+     * @return string The processed template
+     */
+    private function processDependDirectives(string $html, File $phpcsFile): string
+    {
+        if (preg_match_all(Template::CONSTRUCTION_DEPEND_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
+            foreach ($constructions as $construction) {
+                // validate {{depend <var>}}
+                $this->validateVariableUsage($phpcsFile, $construction[1]);
+                $html = str_replace($construction[0], $construction[2], $html);
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Process the {{for}} directives in the file
+     *
+     * @param string $html
+     * @param File $phpcsFile
+     * @return string The processed template
+     */
+    private function processForDirectives(string $html, File $phpcsFile): string
+    {
+        if (preg_match_all(Template::LOOP_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
+            foreach ($constructions as $construction) {
+                // validate {{for in <var>}}
+                $this->validateVariableUsage($phpcsFile, $construction['loopData']);
+                $html = str_replace($construction[0], $construction['loopBody'], $html);
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Process the all var directives and var directive params in the file
+     *
+     * @param string $html
+     * @param File $phpcsFile
+     * @return string The processed template
+     */
+    private function processVarDirectivesAndParams(string $html, File $phpcsFile): string
+    {
+        if (preg_match_all(Template::CONSTRUCTION_PATTERN, $html, $constructions, PREG_SET_ORDER)) {
+            foreach ($constructions as $construction) {
+                if (empty($construction[2])) {
+                    continue;
+                }
+
+                if ($construction[1] === 'var') {
+                    $this->validateVariableUsage($phpcsFile, $construction[2]);
+                } else {
+                    $this->validateDirectiveBody($phpcsFile, $construction[2]);
+                }
+            }
+        }
+
+        return $html;
+    }
+
+    /**
+     * Validate directive body is valid. e.g. {{somedir <directive body>}}
+     *
+     * @param File $phpcsFile
+     * @param string $body
+     */
+    private function validateDirectiveBody(File $phpcsFile, string $body): void
+    {
+        $parameterTokenizer = new Template\Tokenizer\Parameter();
+        $parameterTokenizer->setString($body);
+        $params = $parameterTokenizer->tokenize();
+
+        foreach ($params as $param) {
+            if (substr($param, 0, 1) === '$') {
+                $this->validateVariableUsage($phpcsFile, substr($param, 1));
+            }
+        }
+    }
+
+    /**
+     * Validate directive variable usage is valid. e.g. {{var <variable body>}} or {{somedir some_param="$foo.bar()"}}
+     *
+     * @param File $phpcsFile
+     * @param string $body
+     */
+    private function validateVariableUsage(File $phpcsFile, string $body): void
+    {
+        $this->usedVariables[] = 'var ' . trim($body);
+        if (strpos($body, '|') !== false) {
+            $this->unfilteredVariables[] = 'var ' . trim(explode('|', $body, 2)[0]);
+        }
+        $variableTokenizer = new Template\Tokenizer\Variable();
+        $variableTokenizer->setString($body);
+        $stack = $variableTokenizer->tokenize();
+
+        if (empty($stack)) {
+            return;
+        }
+
+        foreach ($stack as $token) {
+            // As a static analyzer there are no data types to know if this is a DataObject so allow all get* methods
+            if ($token['type'] === 'method' && substr($token['name'], 0, 3) !== 'get') {
+                $phpcsFile->addError(
+                    'Template directives may not invoke methods. Only scalar array access is allowed.' . PHP_EOL
+                    . 'Found "' . trim($body) . '"',
+                    null,
+                    'HtmlTemplates.DirectiveUsage.ProhibitedMethodCall'
+                );
+            }
+        }
+    }
+
+    /**
+     * Validate the variables defined in the template comment block match the variables actually used in the template
+     *
+     * @param File $phpcsFile
+     * @param string $templateText
+     */
+    private function validateDefinedVariables(File $phpcsFile, string $templateText): void
+    {
+        preg_match('/<!--@vars\s*((?:.)*?)\s*@-->/us', $templateText, $matches);
+
+        $definedVariables = [];
+
+        if (!empty($matches[1])) {
+            $definedVariables = json_decode(str_replace("\n", '', $matches[1]), true);
+            if (json_last_error()) {
+                $phpcsFile->addError(
+                    'Template @vars comment block contains invalid JSON.',
+                    null,
+                    'HtmlTemplates.DirectiveUsage.InvalidVarsJSON'
+                );
+                return;
+            }
+
+            foreach ($definedVariables as $var => $label) {
+                if (empty($label)) {
+                    $phpcsFile->addError(
+                        'Template @vars comment block contains invalid label.' . PHP_EOL
+                        . 'Label for variable "' . $var . '" is empty.',
+                        null,
+                        'HtmlTemplates.DirectiveUsage.InvalidVariableLabel'
+                    );
+                }
+            }
+
+            $definedVariables = array_keys($definedVariables);
+            foreach ($definedVariables as $definedVariable) {
+                if (strpos($definedVariable, '|') !== false) {
+                    $definedVariables[] = trim(explode('|', $definedVariable, 2)[0]);
+                }
+            }
+        }
+
+        $undefinedVariables = array_diff($this->usedVariables, $definedVariables, $this->unfilteredVariables);
+        foreach ($undefinedVariables as $undefinedVariable) {
+            $phpcsFile->addError(
+                'Template @vars comment block is missing a variable used in the template.' . PHP_EOL
+                 . 'Missing variable: ' . $undefinedVariable,
+                null,
+                'HtmlTemplates.DirectiveUsage.UndefinedVariable'
+            );
+        }
+    }
+}
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/GraphQlWrapper.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/GraphQlWrapper.php
new file mode 100644
index 0000000000000..311b2b8f72164
--- /dev/null
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/GraphQlWrapper.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\CodingStandard\Tool\CodeSniffer;
+
+/**
+ * Add GraphQl files extension to config.
+ */
+class GraphQlWrapper extends Wrapper
+{
+    const FILE_EXTENSION = 'graphqls';
+
+    private const TOKENIZER = 'GraphQL';
+
+    /**
+     * @inheritDoc
+     */
+    public function init()
+    {
+        parent::init();
+
+        $this->config->extensions += [self::FILE_EXTENSION => self::TOKENIZER];
+    }
+}
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CompatibilityInterface.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CompatibilityInterface.php
new file mode 100644
index 0000000000000..63afaacf33817
--- /dev/null
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CompatibilityInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\CodingStandard\Tool;
+
+/**
+ * Defines an interface for compatibility checks against a specific version.
+ */
+interface CompatibilityInterface
+{
+    /**
+     * Sets the version against which to test code.
+     *
+     * @param string $version
+     * @return void
+     */
+    public function setTestVersion(string $version): void;
+}
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/PhpCompatibility.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/PhpCompatibility.php
new file mode 100644
index 0000000000000..1c45297a7c642
--- /dev/null
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/PhpCompatibility.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\CodingStandard\Tool;
+
+/**
+ * Implements a wrapper around `phpcs` for usage with the `PHPCompatibility` sniffs against a specific PHP version.
+ */
+class PhpCompatibility extends CodeSniffer implements CompatibilityInterface
+{
+    /**
+     * Sets the version against which to test code.
+     *
+     * @param string $version
+     * @return void
+     */
+    public function setTestVersion(string $version): void
+    {
+        \PHP_CodeSniffer\Config::setConfigData('testVersion', $version);
+    }
+}
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/PhpStan.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/PhpStan.php
new file mode 100644
index 0000000000000..9048262722d48
--- /dev/null
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/PhpStan.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\CodingStandard\Tool;
+
+use Magento\TestFramework\CodingStandard\ToolInterface;
+
+/**
+ * PhpStan tool wrapper.
+ */
+class PhpStan implements ToolInterface
+{
+    /**
+     * Rule level to be used.
+     *
+     * @see https://github.com/phpstan/phpstan#rule-levels
+     */
+    private const RULE_LEVEL = 0;
+
+    /**
+     * Memory limit required by PHPStan for full Magento project scan.
+     */
+    private const MEMORY_LIMIT = '4G';
+
+    /**
+     * Error formatter to be used.
+     *
+     * @see https://github.com/phpstan/phpstan#existing-error-formatters-to-be-used
+     */
+    private const ERROR_FORMAT = 'filtered';
+
+    /**
+     * Report file.
+     *
+     * @var string
+     */
+    private $reportFile;
+
+    /**
+     * PHPStan configuration file in neon format.
+     *
+     * @var string
+     */
+    private $confFile;
+
+    /**
+     * @param string $confFile
+     * @param string $reportFile
+     */
+    public function __construct(string $confFile, string $reportFile)
+    {
+        $this->reportFile = $reportFile;
+        $this->confFile = $confFile;
+    }
+
+    /**
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    public function canRun(): bool
+    {
+        // phpcs:disable Magento2.Security.InsecureFunction
+        exec($this->getCommand() . ' --version', $output, $exitCode);
+        return $exitCode === 0;
+    }
+
+    /**
+     * @inheritdoc
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    public function run(array $whiteList): int
+    {
+        if (empty($whiteList)) {
+            return 0;
+        }
+
+        $command = $this->getCommand() . ' analyse' .
+            ' --level ' . self::RULE_LEVEL .
+            ' --no-progress' .
+            ' --error-format=' . self::ERROR_FORMAT .
+            ' --memory-limit=' . self::MEMORY_LIMIT .
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            ' --configuration ' . escapeshellarg($this->confFile) .
+            ' ' . implode(' ', $whiteList) .
+            ' > ' . $this->reportFile;
+
+        // phpcs:disable Magento2.Security.InsecureFunction
+        exec($command, $output, $exitCode);
+
+        return $exitCode;
+    }
+
+    /**
+     * Get PHPStan CLI command
+     *
+     * @return string
+     */
+    private function getCommand(): string
+    {
+        // phpcs:ignore Magento2.Security.IncludeFile
+        $vendorDir = require BP . '/app/etc/vendor_path.php';
+        return 'php ' . BP . '/' . $vendorDir . '/bin/phpstan';
+    }
+}
diff --git a/dev/tests/static/framework/Magento/ruleset.xml b/dev/tests/static/framework/Magento/ruleset.xml
index 89020150035bb..70d1810d1eb2f 100644
--- a/dev/tests/static/framework/Magento/ruleset.xml
+++ b/dev/tests/static/framework/Magento/ruleset.xml
@@ -15,25 +15,4 @@
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Files.LineLength.MaxExceeded">
-        <exclude-pattern>*.phtml</exclude-pattern>
-    </rule>
-    <rule ref="Squiz.Operators.IncrementDecrementUsage">
-        <exclude-pattern>*.phtml</exclude-pattern>
-    </rule>
-    <rule ref="PEAR.ControlStructures.ControlSignature">
-        <exclude-pattern>*.phtml</exclude-pattern>
-    </rule>
-    <rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
-        <exclude-pattern>*.phtml</exclude-pattern>
-    </rule>
-    <rule ref="PEAR.Functions.FunctionCallSignature">
-        <exclude-pattern>*.phtml</exclude-pattern>
-    </rule>
-    <rule ref="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace">
-        <exclude-pattern>*.phtml</exclude-pattern>
-    </rule>
-    <rule ref="Magento2.Security.LanguageConstruct.DirectOutput">
-        <exclude-pattern>*.phtml</exclude-pattern>
-    </rule>
 </ruleset>
diff --git a/dev/tests/static/framework/autoload.php b/dev/tests/static/framework/autoload.php
index 21b3734e22726..4f04f4fbb0246 100644
--- a/dev/tests/static/framework/autoload.php
+++ b/dev/tests/static/framework/autoload.php
@@ -14,7 +14,14 @@
 require $baseDir . '/vendor/squizlabs/php_codesniffer/autoload.php';
 $testsBaseDir = $baseDir . '/dev/tests/static';
 $autoloadWrapper = \Magento\Framework\Autoload\AutoloaderRegistry::getAutoloader();
-$autoloadWrapper->addPsr4('Magento\\', $testsBaseDir . '/testsuite/Magento/');
+$autoloadWrapper->addPsr4(
+    'Magento\\',
+    [
+        $testsBaseDir . '/testsuite/Magento/',
+        $testsBaseDir . '/framework/Magento/',
+        $testsBaseDir . '/framework/tests/unit/testsuite/Magento',
+    ]
+);
 $autoloadWrapper->addPsr4(
     'Magento\\TestFramework\\',
     [
diff --git a/dev/tests/static/framework/bootstrap.php b/dev/tests/static/framework/bootstrap.php
index 5e3336ebc28de..e43337cf06026 100644
--- a/dev/tests/static/framework/bootstrap.php
+++ b/dev/tests/static/framework/bootstrap.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable
+
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Component\DirSearch;
@@ -15,7 +17,7 @@
 require __DIR__ . '/autoload.php';
 
 if (!defined('TESTS_TEMP_DIR')) {
-    define('TESTS_TEMP_DIR', __DIR__ . DIRECTORY_SEPARATOR . 'tmp');
+    define('TESTS_TEMP_DIR', dirname(__DIR__) . '/tmp');
 }
 
 setCustomErrorHandler();
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Formatters/FilteredErrorFormatterTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Formatters/FilteredErrorFormatterTest.php
new file mode 100644
index 0000000000000..8512f311f15a2
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Formatters/FilteredErrorFormatterTest.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento\PhpStan\Formatters;
+
+use PHPStan\Analyser\Error;
+use PHPStan\Command\AnalysisResult;
+use PHPStan\File\FuzzyRelativePathHelper;
+use PHPStan\ShouldNotHappenException;
+use PHPStan\Testing\ErrorFormatterTestCase;
+
+/**
+ * Tests filter error formatter.
+ */
+class FilteredErrorFormatterTest extends ErrorFormatterTestCase
+{
+    protected const DIRECTORY_PATH = __DIR__ . '/Fixtures';
+
+    /**
+     * Tests errors filtering.
+     *
+     * @param string $message
+     * @param int $exitCode
+     * @param array $fileErrors
+     * @param string $expected
+     * @throws ShouldNotHappenException
+     *
+     * @dataProvider dataFormatterOutputProvider
+     */
+    public function testFormatErrors(
+        string $message,
+        int $exitCode,
+        array $fileErrors,
+        string $expected
+    ): void {
+        $formatter = new FilteredErrorFormatter(
+            new FuzzyRelativePathHelper(self::DIRECTORY_PATH, '/', []),
+            false,
+            false,
+            false,
+            true
+        );
+
+        $analysisResult = new AnalysisResult(
+            $fileErrors,
+            [],
+            false,
+            false,
+            null
+        );
+
+        $this->assertSame(
+            $exitCode,
+            $formatter->formatErrors(
+                $analysisResult,
+                $this->getOutput()
+            ),
+            sprintf('%s: response code do not match', $message)
+        );
+        $this->assertEquals(
+            $expected,
+            $this->getOutputContent(),
+            sprintf('%s: output do not match', $message)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function dataFormatterOutputProvider(): array
+    {
+        // phpcs:disable Generic.Files.LineLength.TooLong
+        $errorMessage = 'Method Magento\PhpStan\Formatters\Fixtures\ClassWithIgnoreAnnotation::testMethod() invoked with 2 parameters, 1 required.';
+        // phpcs:enable Generic.Files.LineLength.TooLong
+
+        return [
+            [
+                'No errors',
+                0,
+                [],
+                "\n [OK] No errors\n\n",
+            ],
+            [
+                'All errors are suppressed by ignore annotations',
+                0,
+                [
+                    new Error(
+                        'Method level error',
+                        self::DIRECTORY_PATH . '/ClassWithIgnoreAnnotation.php',
+                        22
+                    ),
+                    new Error(
+                        $errorMessage,
+                        self::DIRECTORY_PATH . '/ClassWithIgnoreAnnotation.php',
+                        25
+                    ),
+                    new Error(
+                        $errorMessage,
+                        self::DIRECTORY_PATH . '/ClassWithIgnoreAnnotation.php',
+                        28
+                    ),
+                    new Error(
+                        $errorMessage,
+                        self::DIRECTORY_PATH . '/ClassWithIgnoreAnnotation.php',
+                        31
+                    ),
+                    new Error(
+                        $errorMessage,
+                        self::DIRECTORY_PATH . '/ClassWithIgnoreAnnotation.php',
+                        33
+                    ),
+                ],
+                "\n [OK] No errors\n\n",
+            ],
+            [
+                'Errors aren\'t suppressed by ignore annotations',
+                1,
+                [
+                    new Error(
+                        $errorMessage,
+                        self::DIRECTORY_PATH . '/ClassWithoutIgnoreAnnotation.php',
+                        21
+                    ),
+                ],
+                // phpcs:disable Generic.Files.LineLength.TooLong
+                ' ------ ---------------------------------------------------------------------------------------------------------------------------
+  Line   ClassWithoutIgnoreAnnotation.php
+ ------ ---------------------------------------------------------------------------------------------------------------------------
+  21     Method Magento\PhpStan\Formatters\Fixtures\ClassWithIgnoreAnnotation::testMethod() invoked with 2 parameters, 1 required.
+ ------ ---------------------------------------------------------------------------------------------------------------------------
+
+ [ERROR] Found 1 error
+
+',
+                // phpcs:enable Generic.Files.LineLength.TooLong
+            ]
+        ];
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Formatters/Fixtures/ClassWithIgnoreAnnotation.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Formatters/Fixtures/ClassWithIgnoreAnnotation.php
new file mode 100644
index 0000000000000..dc0637704ec82
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Formatters/Fixtures/ClassWithIgnoreAnnotation.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PhpStan\Formatters\Fixtures;
+
+/**
+ * Class ClassWithIgnoreAnnotation
+ *
+ * phpcs:ignoreFile
+ */
+class ClassWithIgnoreAnnotation
+{
+    /**
+     * Test method.
+     * phpstan:ignore "Method level error"
+     */
+    public function getProductList()
+    {
+        // phpstan:ignore "Method Magento\PhpStan\Formatters\Fixtures\ClassWithIgnoreAnnotation::testMethod() invoked with 2 parameters, 1 required."
+        $this->testMethod('test1', 'test2');
+
+        // phpstan:ignore "Method * invoked with 2 parameters, 1 required."
+        $this->testMethod('test1', 'test2');
+
+        // phpstan:ignore
+        $this->testMethod('test1', 'test2');
+
+        $this->testMethod('test1', 'test2'); // phpstan:ignore
+    }
+
+    /**
+     * @param string $arg1
+     * @return string
+     */
+    private function testMethod(string $arg1)
+    {
+        return $arg1;
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Formatters/Fixtures/ClassWithoutIgnoreAnnotation.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Formatters/Fixtures/ClassWithoutIgnoreAnnotation.php
new file mode 100644
index 0000000000000..d46ba7c63d86a
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Formatters/Fixtures/ClassWithoutIgnoreAnnotation.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PhpStan\Formatters\Fixtures;
+
+/**
+ * Class ClassWithoutIgnoreAnnotation
+ * phpcs:ignoreFile
+ */
+class ClassWithoutIgnoreAnnotation
+{
+    /**
+     * Test method.
+     */
+    public function getProductList()
+    {
+        $this->testMethod('test1', 'test2');
+    }
+
+    /**
+     * @param string $arg1
+     * @return string
+     */
+    private function testMethod(string $arg1)
+    {
+        return $arg1;
+    }
+}
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
index b12cb1fbfcbd3..afe559fdd6759 100644
--- 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
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
+
 namespace Magento\Sniffs\Annotation;
 
 class ClassAnnotationStructureSniffTest extends \PHPUnit\Framework\TestCase
@@ -63,8 +64,8 @@ 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
+            __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR,
+            TESTS_TEMP_DIR . DIRECTORY_SEPARATOR
         );
         $codeSniffer = new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer(
             'Magento',
@@ -72,11 +73,11 @@ public function testProcess($fileUnderTest, $expectedReportFile)
             new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper()
         );
         $result = $codeSniffer->run(
-            [TESTS_TEMP_DIR . $fileUnderTest]
+            [TESTS_TEMP_DIR . DIRECTORY_SEPARATOR . $fileUnderTest]
         );
         $actual = file_get_contents($reportFile);
         $expected = file_get_contents(
-            TESTS_TEMP_DIR . $expectedReportFile
+            TESTS_TEMP_DIR . DIRECTORY_SEPARATOR . $expectedReportFile
         );
         unlink($reportFile);
         $this->assertEquals(2, $result);
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
index b56239f4df8a5..d471597565077 100644
--- 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
@@ -54,7 +54,7 @@ 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
+            TESTS_TEMP_DIR . DIRECTORY_SEPARATOR
         );
         $codeSniffer = new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer(
             'Magento',
@@ -62,11 +62,11 @@ public function testProcess($fileUnderTest, $expectedReportFile)
             new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper()
         );
         $result = $codeSniffer->run(
-            [TESTS_TEMP_DIR . $fileUnderTest]
+            [TESTS_TEMP_DIR . DIRECTORY_SEPARATOR . $fileUnderTest]
         );
         $actual = file_get_contents($reportFile);
         $expected = file_get_contents(
-            TESTS_TEMP_DIR . $expectedReportFile
+            TESTS_TEMP_DIR . DIRECTORY_SEPARATOR . $expectedReportFile
         );
         unlink($reportFile);
         $this->assertEquals(2, $result);
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/AbstractHtmlSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/AbstractHtmlSniffTest.php
new file mode 100644
index 0000000000000..1b4512eb4cdd7
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/AbstractHtmlSniffTest.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Html;
+
+use Magento\TestFramework\CodingStandard\Tool\CodeSniffer\HtmlWrapper;
+use PHPUnit\Framework\TestCase;
+use Magento\TestFramework\CodingStandard\Tool\CodeSniffer;
+
+/**
+ * Test an html sniff on real files.
+ */
+abstract class AbstractHtmlSniffTest extends TestCase
+{
+    /**
+     * Run CS on provided files.
+     *
+     * @param string $fileUnderTest
+     * @param string $expectedReportFile
+     * @return void
+     * @dataProvider processDataProvider
+     */
+    public function testProcess(string $fileUnderTest, string $expectedReportFile): void
+    {
+        $reportFile = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'phpcs_report.txt';
+        $ruleSetDir = __DIR__ . DIRECTORY_SEPARATOR . '_files';
+        $wrapper = new HtmlWrapper();
+        $codeSniffer = new CodeSniffer($ruleSetDir, $reportFile, $wrapper);
+        $codeSniffer->setExtensions([HtmlWrapper::FILE_EXTENSION]);
+        $result = $codeSniffer->run(
+            [__DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $fileUnderTest]
+        );
+        // Remove the absolute path to the file from the output
+        //phpcs:ignore
+        $actual = preg_replace('/^.+\n/', '', ltrim(file_get_contents($reportFile)));
+        //phpcs:ignore
+        $expected = file_get_contents(
+            __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $expectedReportFile
+        );
+        //phpcs:ignore
+        unlink($reportFile);
+        $this->assertEquals(1, $result);
+        $this->assertEquals($expected, $actual);
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/HtmlBindingSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/HtmlBindingSniffTest.php
index 564b28086eeb1..a75e229bd5fba 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/HtmlBindingSniffTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/HtmlBindingSniffTest.php
@@ -8,14 +8,10 @@
 
 namespace Magento\Sniffs\Html;
 
-use Magento\TestFramework\CodingStandard\Tool\CodeSniffer\HtmlWrapper;
-use PHPUnit\Framework\TestCase;
-use Magento\TestFramework\CodingStandard\Tool\CodeSniffer;
-
 /**
  * Test the html binding sniff on real files.
  */
-class HtmlBindingSniffTest extends TestCase
+class HtmlBindingSniffTest extends AbstractHtmlSniffTest
 {
     /**
      * Files to sniff and expected reports.
@@ -31,35 +27,4 @@ public function processDataProvider(): array
             ]
         ];
     }
-
-    /**
-     * Run CS on provided files.
-     *
-     * @param string $fileUnderTest
-     * @param string $expectedReportFile
-     * @return void
-     * @dataProvider processDataProvider
-     */
-    public function testProcess(string $fileUnderTest, string $expectedReportFile): void
-    {
-        $reportFile = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'phpcs_report.txt';
-        $ruleSetDir = __DIR__ . DIRECTORY_SEPARATOR . '_files';
-        $wrapper = new HtmlWrapper();
-        $codeSniffer = new CodeSniffer($ruleSetDir, $reportFile, $wrapper);
-        $codeSniffer->setExtensions([HtmlWrapper::FILE_EXTENSION]);
-        $result = $codeSniffer->run(
-            [__DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $fileUnderTest]
-        );
-        // Remove the absolute path to the file from the output
-        //phpcs:ignore
-        $actual = preg_replace('/^.+\n/', '', ltrim(file_get_contents($reportFile)));
-        //phpcs:ignore
-        $expected = file_get_contents(
-            __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $expectedReportFile
-        );
-        //phpcs:ignore
-        unlink($reportFile);
-        $this->assertEquals(1, $result);
-        $this->assertEquals($expected, $actual);
-    }
 }
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/HtmlDirectiveSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/HtmlDirectiveSniffTest.php
new file mode 100644
index 0000000000000..e8c015d7c2d5d
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/HtmlDirectiveSniffTest.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sniffs\Html;
+
+/**
+ * Test the html directive sniff on real files.
+ */
+class HtmlDirectiveSniffTest extends AbstractHtmlSniffTest
+{
+    /**
+     * Files to sniff and expected reports.
+     *
+     * @return array
+     */
+    public function processDataProvider(): array
+    {
+        return [
+            [
+                'test-html-directive.html',
+                'test-html-directive-errors.txt'
+            ],
+            [
+                'test-html-directive-invalid-json.html',
+                'test-html-directive-invalid-json-errors.txt'
+            ]
+        ];
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/_files/test-html-directive-errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/_files/test-html-directive-errors.txt
new file mode 100644
index 0000000000000..36f9a1112af31
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/_files/test-html-directive-errors.txt
@@ -0,0 +1,46 @@
+------------------------------------------------------------------------------------------------------------------------------------
+FOUND 20 ERRORS AFFECTING 1 LINE
+------------------------------------------------------------------------------------------------------------------------------------
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.badif().bad"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.badif3()"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.badDepend().bad"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.badForLoop()"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.bad()"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.bad()|alsobad"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.bad($bad.param())"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.bad.baz()"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.bad.trans()"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "bad.bad()"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "bad.multiline()"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.badif2()"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.badif4()"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.badif5()"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.baddepend2()"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.badFor()"
+ 1 | ERROR | Template directives may not invoke methods. Only scalar array access is allowed.
+   |       | Found "foo.badFor()|alsobad"
+ 1 | ERROR | Template @vars comment block contains invalid label.
+   |       | Label for variable "var bad.multiline()" is empty.
+ 1 | ERROR | Template @vars comment block is missing a variable used in the template.
+   |       | Missing variable: var foo.undeclared.baz
+ 1 | ERROR | Template @vars comment block is missing a variable used in the template.
+   |       | Missing variable: var undeclared.var.error
+------------------------------------------------------------------------------------------------------------------------------------
+
+
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/_files/test-html-directive-invalid-json-errors.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/_files/test-html-directive-invalid-json-errors.txt
new file mode 100644
index 0000000000000..f3846c05f0375
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/_files/test-html-directive-invalid-json-errors.txt
@@ -0,0 +1,7 @@
+-------------------------------------------------------------------------------------------------------------------------------------------------
+FOUND 1 ERROR AFFECTING 1 LINE
+-------------------------------------------------------------------------------------------------------------------------------------------------
+ 1 | ERROR | Template @vars comment block contains invalid JSON.
+-------------------------------------------------------------------------------------------------------------------------------------------------
+
+
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/_files/test-html-directive-invalid-json.html b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/_files/test-html-directive-invalid-json.html
new file mode 100644
index 0000000000000..6a6b222c38d3b
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/_files/test-html-directive-invalid-json.html
@@ -0,0 +1,12 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<!--@vars {
+"var foo.good":"Some variable",
+"var foo.good|stillfine""Some variable"
+} @-->
+
+Template content doesn't matter. The JSON is invalid.
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/_files/test-html-directive.html b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/_files/test-html-directive.html
new file mode 100644
index 0000000000000..b6b4e15480143
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Html/_files/test-html-directive.html
@@ -0,0 +1,117 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<!--@vars {
+"var foo.good":"Some variable",
+"var foo.good|stillfine":"Some variable",
+"var foo.bad()":"Some variable",
+"var foo.bad()|alsobad":"Some variable",
+"var foo.getGood()":"Some variable",
+"var foo.foo.getGood()":"Some variable",
+"var foo.getGood().fine":"Some variable",
+"var foo.getGood().fine|alsofine":"Some variable",
+"var foo.bad($bad.param())":"Some variable",
+"var foo.bad.baz()":"Some variable",
+"var foo.good.trans":"Some variable",
+"var extra.var.getOhNo()":"Uh Oh, Error time!",
+"var foo.bad.trans()":"Some variable",
+"var bad.bad()":"Some variable",
+"var foo.goodif":"Some Variable",
+"var foo.goodif":"Some Variable",
+"var foo.badif().bad":"Some Variable",
+"var foo.badif3()":"Some Variable",
+"var foo.gooddepend":"Some Variable",
+"var foo.badDepend().bad":"Some Variable",
+"var foo.goodFor":"Some Variable",
+"var foo.getGoodFor()":"Some Variable",
+"var foo.badForLoop()":"Some Variable",
+"var foo.goodif2":"Some Variable",
+"var foo.goodif2":"Some Variable",
+"var foo.goodif3":"Some Variable",
+"var foo.badif2()":"Some Variable",
+"var foo.badif4()":"Some Variable",
+"var foo.badif5()":"Some Variable",
+"var foo.gooddepend2":"Some Variable",
+"var foo.baddepend2()":"Some Variable",
+"var foo.goodFor":"Some Variable",
+"var foo.goodFor|stillfine":"Some Variable",
+"var foo.badFor()":"Some Variable",
+"var foo.badFor()|alsobad":"Some Variable",
+"foobar baz":"Some other directive as a variable",
+"var iusefilterslater|raw":"Some Variable",
+"var bad.multiline()":""
+} @-->
+
+<div>{{var foo.good}}</div>
+<div>{{var foo.good|stillfine}}</div>
+<div>{{var foo.bad()}}</div>
+<div>{{var foo.bad()|alsobad}}</div>
+<div>{{var foo.getGood()}}</div>
+<div>{{var foo.foo.getGood()}}</div>
+<div>{{var foo.getGood().fine}}</div>
+<div>{{var foo.getGood().fine|alsofine}}</div>
+<div>{{var foo.bad($bad.param())}}</div>
+<div>{{var foo.bad.baz()}}</div>
+<div>{{var foo.undeclared.baz}}</div>
+<div>{{trans "foo %bar" bar=$foo.good.trans}}</div>
+<div>{{trans "foo %bar" bar=$foo.bad.trans()}}</div>
+<div>{{trans "foo %bar" bar="something"}}</div>
+<div>{{trans "foo %bar" bar="something" bad="$bad.bad()" something=$undeclared.var.error}}</div>
+<div>{{something "
+    <blah>foo %bar</blah>blah
+    " bar="something"
+}}</div>
+<div>{{something "
+    <blah>foo %bar</blah>blah
+    " bar="something" bad=$bad.multiline()
+}}</div>
+
+{{if foo.goodif}}
+<div>{{var foo.goodif2}}</div>
+{{/if}}
+
+{{if foo.goodif}}
+<div>{{var foo.goodif2}}</div>
+{{else}}
+<div>{{var foo.goodif3}}</div>
+{{/if}}
+
+{{if foo.badif().bad}}
+<div>{{var foo.badif2()}}</div>
+{{/if}}
+
+{{if foo.badif3()}}
+<div>{{var foo.badif4()}}</div>
+{{else}}
+<div>{{var foo.badif5()}}</div>
+{{/if}}
+
+{{depend foo.gooddepend}}
+<div>{{var foo.gooddepend2}}</div>
+{{/depend}}
+
+{{depend foo.badDepend().bad}}
+<div>{{var foo.baddepend2()}}</div>
+{{/depend}}
+
+{{for item in foo.goodFor}}
+<div>{{var foo.goodFor}}</div>
+<div>{{var foo.goodFor|stillfine}}</div>
+<div>{{var foo.badFor()}}</div>
+<div>{{var foo.badFor()|alsobad}}</div>
+{{/for}}
+
+{{for item in foo.getGoodFor()}}
+<div>loopy</div>
+{{/for}}
+
+{{for item in foo.badForLoop()}}
+<div>this loop has a bad variable</div>
+{{/for}}
+
+{{depend iusefilterslater}}
+    {{var iusefilterslater|raw}}
+{{/depend}}
diff --git a/dev/tests/static/phpunit.xml.dist b/dev/tests/static/phpunit.xml.dist
index d6db407fb5264..c85b2d2a0bdfb 100644
--- a/dev/tests/static/phpunit.xml.dist
+++ b/dev/tests/static/phpunit.xml.dist
@@ -21,6 +21,9 @@
         <testsuite name="HTML Static Code Analysis">
             <file>testsuite/Magento/Test/Html/LiveCodeTest.php</file>
         </testsuite>
+        <testsuite name="GraphQL Static Code Analysis">
+            <file>testsuite/Magento/Test/GraphQl/LiveCodeTest.php</file>
+        </testsuite>
         <testsuite name="PHP Coding Standard Verification">
             <file>testsuite/Magento/Test/Php/LiveCodeTest.php</file>
         </testsuite>
diff --git a/dev/tests/static/testsuite/Magento/Test/GraphQl/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/GraphQl/LiveCodeTest.php
new file mode 100644
index 0000000000000..97d134517a5a6
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/GraphQl/LiveCodeTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Test\GraphQl;
+
+use Magento\TestFramework\CodingStandard\Tool\CodeSniffer;
+use Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper;
+use Magento\Test\Php\LiveCodeTest as PHPCodeTest;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Set of tests for static code style
+ */
+class LiveCodeTest extends TestCase
+{
+    /**
+     * @var string
+     */
+    private static $reportDir = '';
+
+    /**
+     * Setup basics for all tests
+     */
+    public static function setUpBeforeClass(): void
+    {
+        self::$reportDir = BP . '/dev/tests/static/report';
+        if (!is_dir(self::$reportDir)) {
+            mkdir(self::$reportDir, 0770);
+        }
+    }
+
+    /**
+     * Test GraphQL schema files code style using phpcs
+     */
+    public function testCodeStyle(): void
+    {
+        $reportFile = self::$reportDir . '/graphql_phpcs_report.txt';
+        $codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper());
+        $codeSniffer->setExtensions([CodeSniffer\GraphQlWrapper::FILE_EXTENSION]);
+        $result = $codeSniffer->run(PHPCodeTest::getWhitelist([CodeSniffer\GraphQlWrapper::FILE_EXTENSION]));
+        $report = file_exists($reportFile) ? file_get_contents($reportFile) : '';
+        $this->assertEquals(
+            0,
+            $result,
+            "PHP Code Sniffer detected {$result} violation(s): " . PHP_EOL . $report
+        );
+    }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php
index cf7a0cb310ddd..876944e0027b4 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php
@@ -45,13 +45,17 @@ public static function setUpBeforeClass()
             } else {
                 //get current minor branch name
                 preg_match('|^(\d+\.\d+)|', $branchName, $minorBranch);
-                $branchName = $minorBranch[0];
+                if (isset($minorBranch[0])) {
+                    $branchName = $minorBranch[0];
 
-                //get all version branches
-                preg_match_all('|^(\d+\.\d+)|m', file_get_contents($branchesFile), $matches);
+                    //get all version branches
+                    preg_match_all('|^(\d+\.\d+)|m', file_get_contents($branchesFile), $matches);
 
-                //check is this a latest release branch
-                self::$actualBranch = ($branchName == max($matches[0]));
+                    //check is this a latest release branch
+                    self::$actualBranch = ($branchName == max($matches[0]));
+                } else {
+                    self::$actualBranch = true;
+                }
             }
         }
 
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 8e1a99e655315..af785c28db414 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -4242,4 +4242,5 @@
     ['Zend_Uri', 'Zend\Uri\Uri'],
     ['Zend_Mime', 'Magento\Framework\HTTP\Mime'],
     ['Magento\Framework\Encryption\Crypt', 'Magento\Framework\Encryption\EncryptionAdapterInterface'],
+    ['Magento\Wishlist\Setup\Patch\Schema\AddProductIdConstraint'],
 ];
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 9417baea67ba9..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
@@ -1982,8 +1982,8 @@
     ['_escapeDefaultValue', 'Magento\Framework\Code\Generator\EntityAbstract'],
     ['urlEncode', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Url\EncoderInterface::encode'],
     ['urlDecode', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Url\DecoderInterface::decode'],
-    ['isModuleEnabled', 'Magento\Framework\App\Helper\AbstractHelper', '\Magento\Framework\Module\ModuleManagerInterface::isEnabled()'],
-    ['isModuleOutputEnabled', 'Magento\Framework\App\Helper\AbstractHelper', '\Magento\Framework\Module\ModuleManagerInterface::isOutputEnabled()'],
+    ['isModuleEnabled', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Module\Manager::isEnabled()'],
+    ['isModuleOutputEnabled', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Module\Manager::isOutputEnabled()'],
     ['_packToTar', 'Magento\Framework\Archive\Tar'],
     ['_parseHeader', 'Magento\Framework\Archive\Tar'],
     ['getIdentities', 'Magento\Wishlist\Block\Link'],
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index 76c0d047bcbbf..8ccda77a25191 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -8,11 +8,12 @@
 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;
 use Magento\TestFramework\CodingStandard\Tool\CopyPasteDetector;
+use Magento\TestFramework\CodingStandard\Tool\PhpCompatibility;
+use Magento\TestFramework\CodingStandard\Tool\PhpStan;
 use PHPMD\TextUI\Command;
 
 /**
@@ -164,6 +165,7 @@ private static function getFilesFromListFile($listsBaseDir, $listFilePattern, $n
         $listFiles = glob($globFilesListPattern);
         if (!empty($listFiles)) {
             foreach ($listFiles as $listFile) {
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge.ForeachArrayMerge
                 $filesDefinedInList = array_merge(
                     $filesDefinedInList,
                     file($listFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
@@ -218,9 +220,12 @@ private static function filterFiles(array $files, array $allowedFileTypes, array
             };
         } else {
             $allowedDirectories = array_map('realpath', $allowedDirectories);
-            usort($allowedDirectories, function ($dir1, $dir2) {
-                return strlen($dir1) - strlen($dir2);
-            });
+            usort(
+                $allowedDirectories,
+                function ($dir1, $dir2) {
+                    return strlen($dir1) - strlen($dir2);
+                }
+            );
             $fileIsInAllowedDirectory = function ($file) use ($allowedDirectories) {
                 foreach ($allowedDirectories as $directory) {
                     if (strpos($file, $directory) === 0) {
@@ -260,18 +265,70 @@ private function getFullWhitelist()
         }
     }
 
+    /**
+     * Retrieves the lowest PHP version specified in <kbd>composer.json</var> of project.
+     *
+     * @return string
+     */
+    private function getLowestPhpVersion(): string
+    {
+        $composerJson = json_decode(file_get_contents(BP . '/composer.json'), true);
+        $phpVersion   = '7.0';
+
+        if (isset($composerJson['require']['php'])) {
+            $versions = explode('||', $composerJson['require']['php']);
+
+            //normalize version constraints
+            foreach ($versions as $key => $version) {
+                $version = ltrim($version, '^~');
+                $version = str_replace('*', '999', $version);
+
+                $versions[$key] = $version;
+            }
+
+            //sort versions
+            usort($versions, 'version_compare');
+
+            $lowestVersion = array_shift($versions);
+            $versionParts  = explode('.', $lowestVersion);
+            $phpVersion    = sprintf('%s.%s', $versionParts[0], $versionParts[1] ?? '0');
+        }
+
+        return $phpVersion;
+    }
+
+    /**
+     * Returns whether a full scan was requested.
+     *
+     * This can be set in the `phpunit.xml` used to run these test cases, by setting the constant
+     * `TESTCODESTYLE_IS_FULL_SCAN` to `1`, e.g.:
+     * ```xml
+     * <php>
+     *     <!-- 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>
+     * ```
+     *
+     * @return bool
+     */
+    private function isFullScan(): bool
+    {
+        return defined('TESTCODESTYLE_IS_FULL_SCAN') && TESTCODESTYLE_IS_FULL_SCAN === '1';
+    }
+
     /**
      * Test code quality using phpcs
      */
     public function testCodeStyle()
     {
-        $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($isFullScan ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml']));
+        $result = $codeSniffer->run(
+            $this->isFullScan() ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml'])
+        );
         $report = file_get_contents($reportFile);
         $this->assertEquals(
             0,
@@ -325,6 +382,7 @@ public function testCopyPaste()
 
         $blackList = [];
         foreach (glob(__DIR__ . '/_files/phpcpd/blacklist/*.txt') as $list) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge.ForeachArrayMerge
             $blackList = array_merge($blackList, file($list, FILE_IGNORE_NEW_LINES));
         }
 
@@ -380,4 +438,67 @@ public function testStrictTypes()
             . implode(PHP_EOL, $filesMissingStrictTyping)
         );
     }
+
+    /**
+     * Test for compatibility to lowest PHP version declared in <kbd>composer.json</kbd>.
+     */
+    public function testPhpCompatibility()
+    {
+        $targetVersion = $this->getLowestPhpVersion();
+        $reportFile    = self::$reportDir . '/phpcompatibility_report.txt';
+        $rulesetDir    = __DIR__ . '/_files/PHPCompatibilityMagento';
+
+        if (!file_exists($reportFile)) {
+            touch($reportFile);
+        }
+
+        $codeSniffer = new PhpCompatibility($rulesetDir, $reportFile, new Wrapper());
+        $codeSniffer->setTestVersion($targetVersion);
+
+        $result = $codeSniffer->run(
+            $this->isFullScan() ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml'])
+        );
+        $report = file_get_contents($reportFile);
+
+        $this->assertEquals(
+            0,
+            $result,
+            'PHP Compatibility detected violation(s):' . PHP_EOL . $report
+        );
+    }
+
+    /**
+     * Test code quality using PHPStan
+     *
+     * @throws \Exception
+     */
+    public function testPhpStan()
+    {
+        $reportFile = self::$reportDir . '/phpstan_report.txt';
+        $confFile = __DIR__ . '/_files/phpstan/phpstan.neon';
+
+        if (!file_exists($reportFile)) {
+            touch($reportFile);
+        }
+
+        $fileList = self::getWhitelist(['php']);
+        $blackList = Files::init()->readLists(__DIR__ . '/_files/phpstan/blacklist/*.txt');
+        if ($blackList) {
+            $blackListPattern = sprintf('#(%s)#i', implode('|', $blackList));
+            $fileList = array_filter(
+                $fileList,
+                function ($path) use ($blackListPattern) {
+                    return !preg_match($blackListPattern, $path);
+                }
+            );
+        }
+
+        $phpStan = new PhpStan($confFile, $reportFile);
+        $exitCode = $phpStan->run($fileList);
+        $report = file_get_contents($reportFile);
+
+        $errorMessage = empty($report) ?
+            'PHPStan command run failed.' : 'PHPStan detected violation(s):' . PHP_EOL . $report;
+        $this->assertEquals(0, $exitCode, $errorMessage);
+    }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/PHPCompatibilityMagento/ruleset.xml b/dev/tests/static/testsuite/Magento/Test/Php/_files/PHPCompatibilityMagento/ruleset.xml
new file mode 100644
index 0000000000000..579a6d2416f20
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/PHPCompatibilityMagento/ruleset.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<ruleset name="PHPCompatibilityMagento">
+    <description>Magento 2 specific ruleset which checks for PHP cross version compatibility.</description>
+    <rule ref="PHPCompatibility">
+        <exclude name="PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound" />
+    </rule>
+</ruleset>
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 e65a9a089da9e..0e3b5fa3d341c 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
@@ -45,6 +45,5 @@
     <!-- Magento Specific Rules -->
     <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/AllPurposeAction" />
     <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/CookieAndSessionMisuse" />
-    <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/SerializationAware" />
 
 </ruleset>
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt
new file mode 100644
index 0000000000000..34965bda0dba6
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt
@@ -0,0 +1,14 @@
+# Format: path to directory or path to file
+#
+# Example:
+# app/code/Magento/Catalog
+# dev/tests/static/framework/bootstrap.php
+lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
+lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
+dev/tests/integration/framework/deployTestModules.php
+dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
+dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
+dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.php
+dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php
+dev/tests/api-functional/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php
+dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
new file mode 100644
index 0000000000000..f4f6ff87f8175
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
@@ -0,0 +1,38 @@
+parameters:
+	checkExplicitMixedMissingReturn: true
+	checkPhpDocMissingReturn: true
+	reportUnmatchedIgnoredErrors: false
+	excludes_analyse:
+		- %rootDir%/../../../lib/internal/Magento/Framework/ObjectManager/Test/Unit/*
+		- %rootDir%/../../../*/_files/*
+		- %rootDir%/../../../dev/tests/functional/*
+		- %rootDir%/../../../dev/tests/*/Fixtures/*
+		- %rootDir%/../../../dev/tests/*/tmp/*
+		- %rootDir%/../../../dev/tests/*/_generated/*
+		- %rootDir%/../../../pub/*
+	autoload_directories:
+		- %rootDir%/../../../dev/tests/static/framework/tests/unit/testsuite/Magento
+		- %rootDir%/../../../dev/tests/integration/framework/tests/unit/testsuite/Magento
+		- %rootDir%/../../../dev/tests/api-functional/_files/Magento
+	autoload_files:
+			- %rootDir%/../../../dev/tests/static/framework/autoload.php
+			- %rootDir%/../../../dev/tests/integration/framework/autoload.php
+			- %rootDir%/../../../dev/tests/api-functional/framework/autoload.php
+			- %rootDir%/../../../dev/tests/setup-integration/framework/autoload.php
+			- %rootDir%/../../../dev/tests/static/framework/Magento/PhpStan/autoload.php
+	ignoreErrors:
+	    # Ignore PHPStan\Rules\Classes\UnusedConstructorParametersRule
+		- '#Constructor of class [a-zA-Z0-9\\_]+ has an unused parameter#'
+		# Ignore setCustomErrorHandler function not found in bootstrap files
+		- '#Function setCustomErrorHandler not found#'
+		# Ignore 'return statement is missing' error when 'void' is present in return type list
+		- '#Method (?:.*?) should return (?:.*?)void(?:.*?) but return statement is missing.#'
+
+services:
+	errorFormatter.filtered:
+		class: Magento\PhpStan\Formatters\FilteredErrorFormatter
+		arguments:
+			showTipsOfTheDay: false
+			checkThisOnly: false
+			inferPrivatePropertyTypeFromConstructor: true
+			checkMissingTypehints: %checkMissingTypehints%
diff --git a/dev/tools/grunt/configs/clean.js b/dev/tools/grunt/configs/clean.js
index 2edf358670473..6e5512ab8a69d 100644
--- a/dev/tools/grunt/configs/clean.js
+++ b/dev/tools/grunt/configs/clean.js
@@ -38,7 +38,6 @@ var cleanOptions = {
                 "dot": true,
                 "src": [
                     "<%= path.tmp %>/cache/**/*",
-                    "<%= path.tmp %>/generation/**/*",
                     "<%= path.tmp %>/log/**/*",
                     "<%= path.tmp %>/maps/**/*",
                     "<%= path.tmp %>/page_cache/**/*",
@@ -89,7 +88,6 @@ var cleanOptions = {
                 "dot": true,
                 "src": [
                     "<%= path.tmp %>/cache/**/*",
-                    "<%= path.tmp %>/generation/**/*",
                     "<%= path.tmp %>/view_preprocessed/html/**/*",
                     "<%= path.tmp %>/page_cache/**/*"
                 ]
@@ -110,6 +108,19 @@ var cleanOptions = {
                 ]
             }
         ]
+    },
+    "generation": {
+        "force": true,
+        "files": [
+            {
+                "force": true,
+                "dot": true,
+                "src": [
+                    "<%= path.generation %>code/**/*",
+                    "<%= path.generation %>metadata/**/*"
+                ]
+            }
+        ]
     }
 };
 
diff --git a/dev/tools/grunt/configs/path.js b/dev/tools/grunt/configs/path.js
index 5a9a4f6ad1598..e2320d702441e 100644
--- a/dev/tools/grunt/configs/path.js
+++ b/dev/tools/grunt/configs/path.js
@@ -32,5 +32,6 @@ module.exports = {
         whitelist: 'dev/tests/static/testsuite/Magento/Test/Js/_files/whitelist/',
         blacklist: 'dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/',
         tmp: 'validation-files.txt'
-    }
+    },
+    generation: 'generated/'
 };
diff --git a/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php b/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
index af781e19d045d..567216c29dcad 100644
--- a/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
+++ b/lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php
@@ -8,7 +8,7 @@
 namespace Magento\Framework\Acl\Loader;
 
 use Magento\Framework\Acl;
-use Magento\Framework\Acl\AclResource as AclResource;
+use Magento\Framework\Acl\AclResource;
 use Magento\Framework\Acl\AclResource\ProviderInterface;
 use Magento\Framework\Acl\AclResourceFactory;
 
diff --git a/lib/internal/Magento/Framework/Amqp/composer.json b/lib/internal/Magento/Framework/Amqp/composer.json
index 8c0a3e3070aaf..aacb6d05ca374 100644
--- a/lib/internal/Magento/Framework/Amqp/composer.json
+++ b/lib/internal/Magento/Framework/Amqp/composer.json
@@ -12,7 +12,7 @@
     "require": {
         "magento/framework": "*",
         "php": "~7.1.3||~7.2.0||~7.3.0",
-        "php-amqplib/php-amqplib": "~2.7.0|~2.10.0"
+        "php-amqplib/php-amqplib": "~2.7.0||~2.10.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessor.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessor.php
index 28f053e1afa84..4135a2338e64e 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessor.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessor.php
@@ -7,7 +7,7 @@
 namespace Magento\Framework\Api\ExtensionAttribute;
 
 use Magento\Framework\Api\ExtensionAttribute\Config;
-use Magento\Framework\Api\ExtensionAttribute\Config\Converter as Converter;
+use Magento\Framework\Api\ExtensionAttribute\Config\Converter;
 use Magento\Framework\Data\Collection\AbstractDb as DbCollection;
 use Magento\Framework\Reflection\TypeProcessor;
 use Magento\Framework\Api\ExtensibleDataInterface;
@@ -61,7 +61,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(DbCollection $collection, $extensibleEntityClass = null)
     {
@@ -95,7 +95,7 @@ private function getReferenceTableAlias($attributeCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function extractExtensionAttributes($extensibleEntityClass, array $data)
     {
@@ -127,10 +127,9 @@ public function extractExtensionAttributes($extensibleEntityClass, array $data)
      *
      * @param string $attributeCode
      * @param array $directive
-     * @param array &$data
-     * @param array &$extensionData
+     * @param array $data
+     * @param array $extensionData
      * @param string $extensibleEntityClass
-     * @return void
      */
     private function populateAttributeCodeWithDirective(
         $attributeCode,
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorHelper.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorHelper.php
index f49c1fd0b5154..24d04dfa01db9 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorHelper.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorHelper.php
@@ -7,7 +7,7 @@
 namespace Magento\Framework\Api\ExtensionAttribute;
 
 use Magento\Framework\Api\ExtensionAttribute\Config;
-use Magento\Framework\Api\ExtensionAttribute\Config\Converter as Converter;
+use Magento\Framework\Api\ExtensionAttribute\Config\Converter;
 use Magento\Framework\Api\SimpleDataObjectConverter;
 
 /**
diff --git a/lib/internal/Magento/Framework/App/AreaList/Proxy.php b/lib/internal/Magento/Framework/App/AreaList/Proxy.php
index 105ddd3727906..56d0a59f6b3f2 100644
--- a/lib/internal/Magento/Framework/App/AreaList/Proxy.php
+++ b/lib/internal/Magento/Framework/App/AreaList/Proxy.php
@@ -61,9 +61,6 @@ public function __construct(
      * Remove links to other objects.
      *
      * @return array
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -74,9 +71,6 @@ public function __sleep()
      * Retrieve ObjectManager from global scope
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/Reader.php b/lib/internal/Magento/Framework/App/DeploymentConfig/Reader.php
index ff7077213c5c3..a53ea9423d449 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/Reader.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/Reader.php
@@ -16,7 +16,6 @@
 /**
  * Deployment configuration reader.
  * Loads the merged configuration from config files.
- *
  * @see FileReader The reader for specific configuration file
  */
 class Reader
@@ -107,11 +106,9 @@ public function load($fileKey = null)
                 }
             }
         } else {
-            $configFiles = $this->configFilePool->getPaths();
-            $allFilesData = [];
-            $result = [];
-            foreach (array_keys($configFiles) as $fileKey) {
-                $configFile = $path . '/' . $this->configFilePool->getPath($fileKey);
+            $configFiles = $this->getFiles();
+            foreach ($configFiles as $file) {
+                $configFile = $path . '/' . $file;
                 if ($fileDriver->isExists($configFile)) {
                     $fileData = include $configFile;
                     if (!is_array($fileData)) {
@@ -120,7 +117,6 @@ public function load($fileKey = null)
                 } else {
                     continue;
                 }
-                $allFilesData[$configFile] = $fileData;
                 if ($fileData) {
                     $result = array_replace_recursive($result, $fileData);
                 }
@@ -136,6 +132,8 @@ public function load($fileKey = null)
      * @param string $pathConfig The path config
      * @param bool $ignoreInitialConfigFiles Whether ignore custom pools
      * @return array
+     * @throws FileSystemException
+     * @throws RuntimeException
      * @deprecated 100.2.0 Magento does not support custom config file pools since 2.2.0 version
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
diff --git a/lib/internal/Magento/Framework/App/FrontController.php b/lib/internal/Magento/Framework/App/FrontController.php
index ba23e010e3e3f..2e6ce65970b97 100644
--- a/lib/internal/Magento/Framework/App/FrontController.php
+++ b/lib/internal/Magento/Framework/App/FrontController.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Front controller responsible for dispatching application requests
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -17,6 +15,8 @@
 use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
+ * Front controller responsible for dispatching application requests
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FrontController implements FrontControllerInterface
@@ -116,6 +116,8 @@ public function dispatch(RequestInterface $request)
     }
 
     /**
+     * Process (validate and dispatch) the incoming request
+     *
      * @param HttpRequest $request
      * @param ActionInterface $actionInstance
      * @throws NotFoundException
@@ -141,7 +143,8 @@ private function processRequest(
                 //Validation failed - processing validation results.
                 $this->logger->debug(
                     'Request validation failed for action "'
-                    .get_class($actionInstance) .'"'
+                    . get_class($actionInstance) . '"',
+                    ["exception" => $exception]
                 );
                 $result = $exception->getReplaceResult();
                 if ($messages = $exception->getMessages()) {
diff --git a/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php b/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
index 7875e0c8885f5..1a76610bc0811 100644
--- a/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
+++ b/lib/internal/Magento/Framework/App/Helper/AbstractHelper.php
@@ -27,7 +27,7 @@ abstract class AbstractHelper
     protected $_request;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $_moduleManager;
 
@@ -125,7 +125,7 @@ protected function _getModuleName()
      *
      * @param string $moduleName Full module name
      * @return boolean
-     * use \Magento\Framework\Module\ModuleManagerInterface::isOutputEnabled()
+     * use \Magento\Framework\Module\Manager::isOutputEnabled()
      */
     public function isModuleOutputEnabled($moduleName = null)
     {
diff --git a/lib/internal/Magento/Framework/App/Helper/Context.php b/lib/internal/Magento/Framework/App/Helper/Context.php
index cc57f109cc8ec..5b90df8c55205 100644
--- a/lib/internal/Magento/Framework/App/Helper/Context.php
+++ b/lib/internal/Magento/Framework/App/Helper/Context.php
@@ -21,7 +21,7 @@
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     protected $_moduleManager;
 
@@ -79,7 +79,7 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
      * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
      * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Framework\Module\ModuleManagerInterface $moduleManager
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Framework\App\RequestInterface $httpRequest
      * @param \Magento\Framework\Cache\ConfigInterface $cacheConfig
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -94,7 +94,7 @@ public function __construct(
         \Magento\Framework\Url\EncoderInterface $urlEncoder,
         \Magento\Framework\Url\DecoderInterface $urlDecoder,
         \Psr\Log\LoggerInterface $logger,
-        \Magento\Framework\Module\ModuleManagerInterface $moduleManager,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Framework\App\RequestInterface $httpRequest,
         \Magento\Framework\Cache\ConfigInterface $cacheConfig,
         \Magento\Framework\Event\ManagerInterface $eventManager,
@@ -119,7 +119,7 @@ public function __construct(
     /**
      * Get module manager.
      *
-     * @return \Magento\Framework\Module\ModuleManagerInterface
+     * @return \Magento\Framework\Module\Manager
      */
     public function getModuleManager()
     {
diff --git a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
index 1c05c58473602..b781a92b4714a 100644
--- a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
+++ b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
@@ -106,7 +106,10 @@ public function __construct(DirectoryList $directoryList, DriverPool $driverPool
     public function create(array $arguments)
     {
         $writeFactory = new \Magento\Framework\Filesystem\Directory\WriteFactory($this->driverPool);
-        $generatedFiles = new GeneratedFiles($this->directoryList, $writeFactory);
+        /** @var \Magento\Framework\Filesystem\Driver\File $fileDriver */
+        $fileDriver = $this->driverPool->getDriver(DriverPool::FILE);
+        $lockManager = new \Magento\Framework\Lock\Backend\FileLock($fileDriver, BP);
+        $generatedFiles = new GeneratedFiles($this->directoryList, $writeFactory, $lockManager);
         $generatedFiles->cleanGeneratedFiles();
 
         $deploymentConfig = $this->createDeploymentConfig($this->directoryList, $this->configFilePool, $arguments);
diff --git a/lib/internal/Magento/Framework/App/ProductMetadata.php b/lib/internal/Magento/Framework/App/ProductMetadata.php
index 631dba8273bcd..55e98bb085d41 100644
--- a/lib/internal/Magento/Framework/App/ProductMetadata.php
+++ b/lib/internal/Magento/Framework/App/ProductMetadata.php
@@ -13,9 +13,7 @@
 use Magento\Framework\Composer\ComposerInformation;
 
 /**
- * Class ProductMetadata
- *
- * @package Magento\Framework\App
+ * Magento application product metadata
  */
 class ProductMetadata implements ProductMetadataInterface
 {
@@ -30,9 +28,9 @@ class ProductMetadata implements ProductMetadataInterface
     const PRODUCT_NAME  = 'Magento';
 
     /**
-     * Cache key for Magento product version
+     * Magento version cache key
      */
-    private const MAGENTO_PRODUCT_VERSION_CACHE_KEY = 'magento-product-version';
+    const VERSION_CACHE_KEY = 'mage-version';
 
     /**
      * Product version
@@ -58,11 +56,14 @@ class ProductMetadata implements ProductMetadataInterface
     private $cache;
 
     /**
+     * ProductMetadata constructor.
      * @param ComposerJsonFinder $composerJsonFinder
-     * @param CacheInterface|null $cache
+     * @param \Magento\Framework\App\CacheInterface $cache
      */
-    public function __construct(ComposerJsonFinder $composerJsonFinder, CacheInterface $cache = null)
-    {
+    public function __construct(
+        ComposerJsonFinder $composerJsonFinder,
+        CacheInterface $cache = null
+    ) {
         $this->composerJsonFinder = $composerJsonFinder;
         $this->cache = $cache ?: ObjectManager::getInstance()->get(CacheInterface::class);
     }
@@ -74,9 +75,7 @@ public function __construct(ComposerJsonFinder $composerJsonFinder, CacheInterfa
      */
     public function getVersion()
     {
-        if ($cachedVersion = $this->cache->load(self::MAGENTO_PRODUCT_VERSION_CACHE_KEY)) {
-            $this->version = $cachedVersion;
-        }
+        $this->version = $this->version ?: $this->cache->load(self::VERSION_CACHE_KEY);
         if (!$this->version) {
             if (!($this->version = $this->getSystemPackageVersion())) {
                 if ($this->getComposerInformation()->isMagentoRoot()) {
@@ -85,7 +84,7 @@ public function getVersion()
                     $this->version = 'UNKNOWN';
                 }
             }
-            $this->cache->save($this->version, self::MAGENTO_PRODUCT_VERSION_CACHE_KEY);
+            $this->cache->save($this->version, self::VERSION_CACHE_KEY, [Config::CACHE_TAG]);
         }
         return $this->version;
     }
diff --git a/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
index f15ce494e9bb4..e15a5151942f0 100644
--- a/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
+++ b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
@@ -32,7 +32,7 @@ class InvalidRequestException extends RuntimeException
     /**
      * @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.
+     * if NotFoundException is given the default 404 mechanism will be triggered.
      * @param Phrase[]|null $messages Messages to show to client
      * as error messages.
      */
@@ -45,6 +45,8 @@ public function __construct($replaceResult, ?array $messages = null)
     }
 
     /**
+     * Return replaced result
+     *
      * @return ResponseInterface|ResultInterface|NotFoundException
      */
     public function getReplaceResult()
@@ -53,6 +55,8 @@ public function getReplaceResult()
     }
 
     /**
+     * Return messages
+     *
      * @return Phrase[]|null
      */
     public function getMessages(): ?array
diff --git a/lib/internal/Magento/Framework/App/Response/Http.php b/lib/internal/Magento/Framework/App/Response/Http.php
index 279ae9d9649f6..a88c6d2f052c4 100644
--- a/lib/internal/Magento/Framework/App/Response/Http.php
+++ b/lib/internal/Magento/Framework/App/Response/Http.php
@@ -185,9 +185,6 @@ public function representJson($content)
      *
      * @return string[]
      * @codeCoverageIgnore
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -199,9 +196,6 @@ public function __sleep()
      *
      * @return void
      * @codeCoverageIgnore
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php b/lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php
index 863a6d7d836d4..a8d27231c49de 100644
--- a/lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php
+++ b/lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php
@@ -63,9 +63,6 @@ public function __construct(
      * Remove links to other objects.
      *
      * @return array
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -76,9 +73,6 @@ public function __sleep()
      * Retrieve ObjectManager from global scope
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/App/Router/Base.php b/lib/internal/Magento/Framework/App/Router/Base.php
index fcce821858eb3..9c0d1633e8bba 100644
--- a/lib/internal/Magento/Framework/App/Router/Base.php
+++ b/lib/internal/Magento/Framework/App/Router/Base.php
@@ -184,7 +184,7 @@ protected function parseRequest(\Magento\Framework\App\RequestInterface $request
             $output[$paramName] = array_shift($params);
         }
 
-        for ($i = 0, $l = sizeof($params); $i < $l; $i += 2) {
+        for ($i = 0, $l = count($params); $i < $l; $i += 2) {
             $output['variables'][$params[$i]] = isset($params[$i + 1]) ? urldecode($params[$i + 1]) : '';
         }
         return $output;
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 8f8399263384c..8a8bebb4d2f81 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/ReaderTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/ReaderTest.php
@@ -43,17 +43,18 @@ protected function setUp()
             ->willReturn(__DIR__ . '/_files');
         $this->fileDriver = $this->createMock(File::class);
         $this->fileDriver
-            ->expects($this->any())
             ->method('isExists')
-            ->will($this->returnValueMap([
-                [__DIR__ . '/_files/config.php', true],
-                [__DIR__ . '/_files/custom.php', true],
-                [__DIR__ . '/_files/duplicateConfig.php', true],
-                [__DIR__ . '/_files/env.php', true],
-                [__DIR__ . '/_files/mergeOne.php', true],
-                [__DIR__ . '/_files/mergeTwo.php', true],
-                [__DIR__ . '/_files/nonexistent.php', false]
-            ]));
+            ->willReturnMap(
+                [
+                    [__DIR__.'/_files/config.php', true],
+                    [__DIR__.'/_files/custom.php', true],
+                    [__DIR__.'/_files/duplicateConfig.php', true],
+                    [__DIR__.'/_files/env.php', true],
+                    [__DIR__.'/_files/mergeOne.php', true],
+                    [__DIR__.'/_files/mergeTwo.php', true],
+                    [__DIR__.'/_files/nonexistent.php', false]
+                ]
+            );
         $this->driverPool = $this->createMock(DriverPool::class);
         $this->driverPool
             ->expects($this->any())
@@ -152,8 +153,9 @@ public function testLoadInvalidConfigurationFileWithFileKey()
      * @expectedException \Magento\Framework\Exception\RuntimeException
      * @expectedExceptionMessageRegExp /Invalid configuration file: \'.*\/\_files\/emptyConfig\.php\'/
      * @return void
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
-    public function testLoadInvalidConfigurationFile()
+    public function testLoadInvalidConfigurationFile(): void
     {
         $fileDriver = $this->getMockBuilder(File::class)
             ->disableOriginalConstructor()
@@ -173,7 +175,7 @@ public function testLoadInvalidConfigurationFile()
         $configFilePool = $this->getMockBuilder(ConfigFilePool::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $configFilePool->expects($this->exactly(2))
+        $configFilePool->expects($this->once())
             ->method('getPaths')
             ->willReturn(
                 [
@@ -181,15 +183,6 @@ public function testLoadInvalidConfigurationFile()
                     '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();
     }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php
index e7500e78f7b97..e088bb92c8782 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/FrontControllerTest.php
@@ -3,10 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\App\Test\Unit;
 
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\Request\ValidatorInterface;
 use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Message\ManagerInterface as MessageManager;
+use Psr\Log\LoggerInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class FrontControllerTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -34,6 +42,21 @@ class FrontControllerTest extends \PHPUnit\Framework\TestCase
      */
     protected $response;
 
+    /**
+     * @var \PHPUnit\Framework\MockObject\MockObject|ValidatorInterface
+     */
+    private $requestValidator;
+
+    /**
+     * @var \PHPUnit\Framework\MockObject\MockObject|\MessageManager
+     */
+    private $messages;
+
+    /**
+     * @var \PHPUnit\Framework\MockObject\MockObject|\LoggerInterface
+     */
+    private $logger;
+
     protected function setUp()
     {
         $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
@@ -44,7 +67,16 @@ protected function setUp()
         $this->router = $this->createMock(\Magento\Framework\App\RouterInterface::class);
         $this->routerList = $this->createMock(\Magento\Framework\App\RouterList::class);
         $this->response = $this->createMock(\Magento\Framework\App\Response\Http::class);
-        $this->model = new \Magento\Framework\App\FrontController($this->routerList, $this->response);
+        $this->requestValidator = $this->createMock(ValidatorInterface::class);
+        $this->messages = $this->createMock(MessageManager::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->model = new \Magento\Framework\App\FrontController(
+            $this->routerList,
+            $this->response,
+            $this->requestValidator,
+            $this->messages,
+            $this->logger
+        );
     }
 
     /**
@@ -55,7 +87,8 @@ public function testDispatchThrowException()
     {
         $validCounter = 0;
         $callbackValid = function () use (&$validCounter) {
-            return $validCounter++%10 ? false : true;
+            $validCounter++;
+            return $validCounter % 10 ? false : true;
         };
         $this->routerList->expects($this->any())->method('valid')->will($this->returnCallback($callbackValid));
 
@@ -73,6 +106,54 @@ public function testDispatchThrowException()
         $this->model->dispatch($this->request);
     }
 
+    /**
+     * Check adding validation failure message to debug log.
+     */
+    public function testAddingValidationFailureMessageToDebugLog()
+    {
+        $exceptionMessage = 'exception_message';
+        $exception = new InvalidRequestException($exceptionMessage);
+
+        $this->routerList->expects($this->any())
+            ->method('valid')
+            ->will($this->returnValue(true));
+
+        $response = $this->createMock(\Magento\Framework\App\Response\Http::class);
+        $controllerInstance = $this->getMockBuilder(\Magento\Framework\App\Action\Action::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $controllerInstance->expects($this->any())
+            ->method('dispatch')
+            ->with($this->request)
+            ->will($this->returnValue($response));
+        $this->router->expects($this->at(0))
+            ->method('match')
+            ->with($this->request)
+            ->will($this->returnValue(false));
+        $this->router->expects($this->at(1))
+            ->method('match')
+            ->with($this->request)
+            ->will($this->returnValue($controllerInstance));
+
+        $this->routerList->expects($this->any())
+            ->method('current')
+            ->will($this->returnValue($this->router));
+
+        $this->request->expects($this->at(0))->method('isDispatched')->will($this->returnValue(false));
+        $this->request->expects($this->at(1))->method('setDispatched')->with(true);
+        $this->request->expects($this->at(2))->method('isDispatched')->will($this->returnValue(true));
+
+        $this->requestValidator->expects($this->once())
+            ->method('validate')->with($this->request, $controllerInstance)->willThrowException($exception);
+        $this->logger->expects($this->once())->method('debug')->with(
+            'Request validation failed for action "'
+            . get_class($controllerInstance) . '"',
+            ["exception" => $exception]
+        );
+
+        $this->assertEquals($exceptionMessage, $this->model->dispatch($this->request));
+    }
+
     public function testDispatched()
     {
         $this->routerList->expects($this->any())
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php
index 8e1acc89437e2..c504c5f480669 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ProductMetadataTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\App\Test\Unit;
 
+use Magento\Framework\App\CacheInterface;
 use Magento\Framework\App\ProductMetadata;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
@@ -20,13 +21,20 @@ class ProductMetadataTest extends \PHPUnit\Framework\TestCase
      */
     private $composerInformationMock;
 
+    /**
+     * @var CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cacheMock;
+
     protected function setUp()
     {
         $this->composerInformationMock = $this->getMockBuilder(\Magento\Framework\Composer\ComposerInformation::class)
             ->disableOriginalConstructor()->getMock();
 
+        $this->cacheMock = $this->getMockBuilder(CacheInterface::class)->getMock();
+
         $objectManager = new ObjectManager($this);
-        $this->productMetadata = $objectManager->getObject(ProductMetadata::class);
+        $this->productMetadata = $objectManager->getObject(ProductMetadata::class, ['cache' => $this->cacheMock]);
         $reflectionProperty = new \ReflectionProperty($this->productMetadata, 'composerInformation');
         $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($this->productMetadata, $this->composerInformationMock);
@@ -40,11 +48,22 @@ protected function setUp()
     public function testGetVersion($packageList, $expectedVersion)
     {
         $this->composerInformationMock->expects($this->any())->method('getSystemPackages')->willReturn($packageList);
+        $this->cacheMock->expects($this->once())->method('save')->with($expectedVersion);
         $productVersion = $this->productMetadata->getVersion();
         $this->assertNotEmpty($productVersion, 'Empty product version');
         $this->assertEquals($expectedVersion, $productVersion);
     }
 
+    public function testGetVersionCached()
+    {
+        $expectedVersion = '1.2.3';
+        $this->composerInformationMock->expects($this->never())->method('getSystemPackages');
+        $this->cacheMock->expects($this->once())->method('load')->willReturn($expectedVersion);
+        $this->cacheMock->expects($this->never())->method('save');
+        $productVersion = $this->productMetadata->getVersion();
+        $this->assertEquals($expectedVersion, $productVersion);
+    }
+
     /**
      * @return array
      */
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 9be68b379900a..efb35b7321c3b 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
@@ -290,6 +290,45 @@ public function testRepresentJson()
         $this->assertEquals('json_string', $this->model->getBody('default'));
     }
 
+    /**
+     *
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage ObjectManager isn't initialized
+     */
+    public function testWakeUpWithException()
+    {
+        /* ensure that the test preconditions are met */
+        $objectManagerClass = new \ReflectionClass(\Magento\Framework\App\ObjectManager::class);
+        $instanceProperty = $objectManagerClass->getProperty('_instance');
+        $instanceProperty->setAccessible(true);
+        $instanceProperty->setValue(null);
+
+        $this->model->__wakeup();
+        $this->assertNull($this->cookieMetadataFactoryMock);
+        $this->assertNull($this->cookieManagerMock);
+    }
+
+    /**
+     * Test for the magic method __wakeup
+     *
+     * @covers \Magento\Framework\App\Response\Http::__wakeup
+     */
+    public function testWakeUpWith()
+    {
+        $objectManagerMock = $this->createMock(\Magento\Framework\App\ObjectManager::class);
+        $objectManagerMock->expects($this->once())
+            ->method('create')
+            ->with(\Magento\Framework\Stdlib\CookieManagerInterface::class)
+            ->will($this->returnValue($this->cookieManagerMock));
+        $objectManagerMock->expects($this->at(1))
+            ->method('get')
+            ->with(\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory::class)
+            ->will($this->returnValue($this->cookieMetadataFactoryMock));
+
+        \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);
+        $this->model->__wakeup();
+    }
+
     public function testSetXFrameOptions()
     {
         $value = 'DENY';
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/_files/test.composer.json b/lib/internal/Magento/Framework/App/Test/Unit/_files/test.composer.json
index ae4eb6880df65..fd3b9089e8345 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/_files/test.composer.json
+++ b/lib/internal/Magento/Framework/App/Test/Unit/_files/test.composer.json
@@ -8,7 +8,7 @@
         "AFL-3.0"
     ],
     "require": {
-        "php": "~5.6.0|7.0.2|^7.0.6",
+        "php": "~5.6.0||7.0.2||^7.0.6",
         "ext-openssl": "*"
     },
     "require-dev": {
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
index 3460faf854bac..d329a7db029e4 100644
--- a/lib/internal/Magento/Framework/App/Utility/Files.php
+++ b/lib/internal/Magento/Framework/App/Utility/Files.php
@@ -24,44 +24,20 @@
  */
 class Files
 {
-    /**
-     * Include app code
-     */
     const INCLUDE_APP_CODE = 1;
 
-    /**
-     * Include tests
-     */
     const INCLUDE_TESTS = 2;
 
-    /**
-     * Include dev tools
-     */
     const INCLUDE_DEV_TOOLS = 4;
 
-    /**
-     * Include templates
-     */
     const INCLUDE_TEMPLATES = 8;
 
-    /**
-     * Include lib files
-     */
     const INCLUDE_LIBS = 16;
 
-    /**
-     * Include pub code
-     */
     const INCLUDE_PUB_CODE = 32;
 
-    /**
-     * Include non classes
-     */
     const INCLUDE_NON_CLASSES = 64;
 
-    /**
-     * Include setup
-     */
     const INCLUDE_SETUP = 128;
 
     /**
@@ -395,11 +371,11 @@ public function getMainConfigFiles($asDataSet = true)
             }
             $globPaths = [BP . '/app/etc/config.xml', BP . '/app/etc/*/config.xml'];
             $configXmlPaths = array_merge($globPaths, $configXmlPaths);
-            $files = [];
+            $files = [[]];
             foreach ($configXmlPaths as $xmlPath) {
-                $files = array_merge($files, glob($xmlPath, GLOB_NOSORT));
+                $files[] = glob($xmlPath, GLOB_NOSORT);
             }
-            self::$_cache[$cacheKey] = $files;
+            self::$_cache[$cacheKey] = array_merge(...$files);
         }
         if ($asDataSet) {
             return self::composeDataSets(self::$_cache[$cacheKey]);
@@ -679,6 +655,7 @@ private function collectModuleLayoutFiles(array $params, $location)
                         }
                     }
                 } else {
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                     $files = array_merge($files, $moduleFiles);
                 }
             }
@@ -713,8 +690,10 @@ private function collectThemeLayoutFiles(array $params, $location)
                 );
 
                 if ($params['with_metainfo']) {
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                     $files = array_merge($this->parseThemeFiles($themeFiles, $currentThemePath, $theme));
                 } else {
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                     $files = array_merge($files, $themeFiles);
                 }
             }
@@ -925,14 +904,12 @@ public function getStaticPreProcessingFiles($filePattern = '*')
         $area = '*';
         $locale = '*';
         $result = [];
-        $moduleWebPath = [];
         $moduleLocalePath = [];
         foreach ($this->componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleDir) {
-            $moduleWebPath[] = $moduleDir . "/view/{$area}/web";
             $moduleLocalePath[] = $moduleDir . "/view/{$area}/web/i18n/{$locale}";
         }
 
-        $this->_accumulateFilesByPatterns($moduleWebPath, $filePattern, $result, '_parseModuleStatic');
+        $this->accumulateStaticFiles($area, $filePattern, $result);
         $this->_accumulateFilesByPatterns($moduleLocalePath, $filePattern, $result, '_parseModuleLocaleStatic');
         $this->accumulateThemeStaticFiles($area, $locale, $filePattern, $result);
         self::$_cache[$key] = $result;
@@ -1043,6 +1020,8 @@ protected function _accumulateFilesByPatterns(array $patterns, $filePattern, arr
     /**
      * Parse meta-info of a static file in module
      *
+     * @deprecated Replaced with method accumulateStaticFiles()
+     *
      * @param string $file
      * @return array
      */
@@ -1062,6 +1041,29 @@ protected function _parseModuleStatic($file)
         return [];
     }
 
+    /**
+     * Search static files from all modules by the specified pattern and accumulate meta-info
+     *
+     * @param string $area
+     * @param string $filePattern
+     * @param array $result
+     * @return void
+     */
+    private function accumulateStaticFiles($area, $filePattern, array &$result)
+    {
+        foreach ($this->componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleName => $moduleDir) {
+            $moduleWebPath = $moduleDir . "/view/{$area}/web";
+
+            foreach (self::getFiles([$moduleWebPath], $filePattern) as $absolutePath) {
+                $localPath = substr($absolutePath, strlen($moduleDir) + 1);
+                if (preg_match('/^view\/([a-z]+)\/web\/(.+)$/i', $localPath, $matches) === 1) {
+                    list(, $parsedArea, $parsedPath) = $matches;
+                    $result[] = [$parsedArea, '', '', $moduleName, $parsedPath, $absolutePath];
+                }
+            }
+        }
+    }
+
     /**
      * Parse meta-info of a localized (translated) static file in module
      *
diff --git a/lib/internal/Magento/Framework/Archive/Zip.php b/lib/internal/Magento/Framework/Archive/Zip.php
index c41f8b28ce348..20f408a605c10 100644
--- a/lib/internal/Magento/Framework/Archive/Zip.php
+++ b/lib/internal/Magento/Framework/Archive/Zip.php
@@ -53,10 +53,10 @@ public function unpack($source, $destination)
     {
         $zip = new \ZipArchive();
         if ($zip->open($source) === true) {
-            $filename = $this->filterRelativePaths($zip->getNameIndex(0) ?: '');
+            $zip->renameIndex(0, basename($destination));
+            $filename = $zip->getNameIndex(0) ?: '';
             if ($filename) {
                 $zip->extractTo(dirname($destination), $filename);
-                rename(dirname($destination).'/'.$filename, $destination);
             } else {
                 $destination = '';
             }
@@ -67,19 +67,4 @@ public function unpack($source, $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/Code/GeneratedFiles.php b/lib/internal/Magento/Framework/Code/GeneratedFiles.php
index bc44b361c57ea..28301f7a1fb85 100644
--- a/lib/internal/Magento/Framework/Code/GeneratedFiles.php
+++ b/lib/internal/Magento/Framework/Code/GeneratedFiles.php
@@ -3,24 +3,36 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Code;
 
-use Magento\Framework\App\DeploymentConfig\Writer\PhpFormatter;
 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\Directory\WriteFactory;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Lock\LockManagerInterface;
 
 /**
- * Regenerates generated code and DI configuration
+ * Clean generated code, DI configuration and cache folders
  */
 class GeneratedFiles
 {
     /**
-     * Separator literal to assemble timer identifier from timer names
+     * Regenerate flag file name
      */
     const REGENERATE_FLAG = '/var/.regenerate';
 
+    /**
+     * Regenerate lock file name
+     */
+    const REGENERATE_LOCK = self::REGENERATE_FLAG . '.lock';
+
+    /**
+     * Acquire regenerate lock timeout
+     */
+    const REGENERATE_LOCK_TIMEOUT = 5;
+
     /**
      * @var DirectoryList
      */
@@ -32,19 +44,39 @@ class GeneratedFiles
     private $write;
 
     /**
-     * Constructor
+     * @var LockManagerInterface
+     */
+    private $lockManager;
+
+    /**
+     * GeneratedFiles constructor.
      *
      * @param DirectoryList $directoryList
      * @param WriteFactory $writeFactory
+     * @param LockManagerInterface $lockManager
      */
-    public function __construct(DirectoryList $directoryList, WriteFactory $writeFactory)
-    {
+    public function __construct(
+        DirectoryList $directoryList,
+        WriteFactory $writeFactory,
+        LockManagerInterface $lockManager
+    ) {
         $this->directoryList = $directoryList;
         $this->write = $writeFactory->create(BP);
+        $this->lockManager = $lockManager;
     }
 
     /**
-     * Clean generated code and DI configuration
+     * Create flag for cleaning up generated content
+     *
+     * @return void
+     */
+    public function requestRegeneration()
+    {
+        $this->write->touch(self::REGENERATE_FLAG);
+    }
+
+    /**
+     * Clean generated code, generated metadata and cache directories
      *
      * @return void
      *
@@ -57,156 +89,75 @@ public function regenerate()
     }
 
     /**
-     * Clean generated/code, generated/metadata and var/cache
+     * Clean generated code, generated metadata and cache directories
      *
      * @return void
      */
     public function cleanGeneratedFiles()
     {
-        if ($this->write->isExist(self::REGENERATE_FLAG)) {
-            $enabledCacheTypes = [];
-
-            //TODO: to be removed in scope of MAGETWO-53476
-            $deploymentConfig = $this->directoryList->getPath(DirectoryList::CONFIG);
-            $configPool = new ConfigFilePool();
-            $envPath = $deploymentConfig . '/' . $configPool->getPath(ConfigFilePool::APP_ENV);
-            if ($this->write->isExist($this->write->getRelativePath($envPath))) {
-                $enabledCacheTypes = $this->getEnabledCacheTypes();
-                $this->disableAllCacheTypes();
-            }
-            //TODO: Till here
-
-            $cachePath = $this->write->getRelativePath($this->directoryList->getPath(DirectoryList::CACHE));
-            $generationPath = $this->write->getRelativePath(
-                $this->directoryList->getPath(DirectoryList::GENERATED_CODE)
-            );
-            $diPath = $this->write->getRelativePath($this->directoryList->getPath(DirectoryList::GENERATED_METADATA));
-
-            // Clean generated/code dir
-            if ($this->write->isDirectory($generationPath)) {
-                $this->write->delete($generationPath);
-            }
-
-            // Clean generated/metadata
-            if ($this->write->isDirectory($diPath)) {
-                $this->write->delete($diPath);
+        if ($this->isCleanGeneratedFilesAllowed() && $this->acquireLock()) {
+            try {
+                $this->write->delete(self::REGENERATE_FLAG);
+                $this->deleteFolder(DirectoryList::GENERATED_CODE);
+                $this->deleteFolder(DirectoryList::GENERATED_METADATA);
+                $this->deleteFolder(DirectoryList::CACHE);
+            } catch (FileSystemException $exception) {
+                // A filesystem error occurred, possible concurrency error while trying
+                // to delete a generated folder being used by another process.
+                // Request regeneration for the next and unlock
+                $this->requestRegeneration();
+            } finally {
+                $this->lockManager->unlock(self::REGENERATE_LOCK);
             }
-
-            // Clean var/cache
-            if ($this->write->isDirectory($cachePath)) {
-                $this->write->delete($cachePath);
-            }
-            $this->write->delete(self::REGENERATE_FLAG);
-            $this->enableCacheTypes($enabledCacheTypes);
         }
     }
 
     /**
-     * Create flag for cleaning up generated/code, generated/metadata and var/cache directories for subsequent
-     * regeneration of this content
+     * Clean generated files is allowed if requested and not locked
      *
-     * @return void
+     * @return bool
      */
-    public function requestRegeneration()
+    private function isCleanGeneratedFilesAllowed(): bool
     {
-        $this->write->touch(self::REGENERATE_FLAG);
-    }
-
-    /**
-     * Reads Cache configuration from env.php and returns indexed array containing all the enabled cache types.
-     *
-     * @return string[]
-     */
-    private function getEnabledCacheTypes()
-    {
-        $enabledCacheTypes = [];
-        $envPath = $this->getEnvPath();
-        if ($this->write->isReadable($this->write->getRelativePath($envPath))) {
-            $envData = include $envPath;
-            if (isset($envData['cache_types'])) {
-                $cacheStatus = $envData['cache_types'];
-                $enabledCacheTypes = array_filter($cacheStatus, function ($value) {
-                    return $value;
-                });
-                $enabledCacheTypes = array_keys($enabledCacheTypes);
-            }
+        try {
+            $isAllowed = $this->write->isExist(self::REGENERATE_FLAG)
+                && !$this->lockManager->isLocked(self::REGENERATE_LOCK);
+        } catch (FileSystemException | RuntimeException $e) {
+            // Possible filesystem problem
+            $isAllowed = false;
         }
-        return $enabledCacheTypes;
-    }
 
-    /**
-     * Returns path to env.php file
-     *
-     * @return string
-     * @throws \Exception
-     */
-    private function getEnvPath()
-    {
-        $deploymentConfig = $this->directoryList->getPath(DirectoryList::CONFIG);
-        $configPool = new ConfigFilePool();
-        $envPath = $deploymentConfig . '/' . $configPool->getPath(ConfigFilePool::APP_ENV);
-        return $envPath;
+        return $isAllowed;
     }
 
     /**
-     * Disables all cache types by updating env.php.
+     * Acquire lock for performing operations
      *
-     * @return void
+     * @return bool
      */
-    private function disableAllCacheTypes()
+    private function acquireLock(): bool
     {
-        $envPath = $this->getEnvPath();
-        if ($this->write->isWritable($this->write->getRelativePath($envPath))) {
-            $envData = include $envPath;
-
-            if (isset($envData['cache_types'])) {
-                $cacheTypes = array_keys($envData['cache_types']);
-
-                foreach ($cacheTypes as $cacheType) {
-                    $envData['cache_types'][$cacheType] = 0;
-                }
-
-                $formatter = new PhpFormatter();
-                $contents = $formatter->format($envData);
-
-                $this->write->writeFile($this->write->getRelativePath($envPath), $contents);
-                if (function_exists('opcache_invalidate')) {
-                    opcache_invalidate(
-                        $this->write->getAbsolutePath($envPath)
-                    );
-                }
-            }
+        try {
+            $lockAcquired = $this->lockManager->lock(self::REGENERATE_LOCK, self::REGENERATE_LOCK_TIMEOUT);
+        } catch (RuntimeException $exception) {
+            // Lock not acquired due to possible filesystem problem
+            $lockAcquired = false;
         }
+
+        return $lockAcquired;
     }
 
     /**
-     * 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
+     * Delete folder by path
      *
-     * @param string[] $cacheTypes
+     * @param string $pathType
      * @return void
      */
-    private function enableCacheTypes($cacheTypes)
+    private function deleteFolder(string $pathType): void
     {
-        if (empty($cacheTypes)) {
-            return;
-        }
-        $envPath = $this->getEnvPath();
-        if ($this->write->isReadable($this->write->getRelativePath($envPath))) {
-            $envData = include $envPath;
-            foreach ($cacheTypes as $cacheType) {
-                if (isset($envData['cache_types'][$cacheType])) {
-                    $envData['cache_types'][$cacheType] = 1;
-                }
-            }
-
-            $formatter = new PhpFormatter();
-            $contents = $formatter->format($envData);
-
-            $this->write->writeFile($this->write->getRelativePath($envPath), $contents);
-            if (function_exists('opcache_invalidate')) {
-                opcache_invalidate($this->write->getAbsolutePath($envPath));
-            }
+        $relativePath = $this->write->getRelativePath($this->directoryList->getPath($pathType));
+        if ($this->write->isDirectory($relativePath)) {
+            $this->write->delete($relativePath);
         }
     }
 }
diff --git a/lib/internal/Magento/Framework/Code/Reader/ClassReader.php b/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
index fe96e9cc742aa..1f14d5e2db8dc 100644
--- a/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
+++ b/lib/internal/Magento/Framework/Code/Reader/ClassReader.php
@@ -5,12 +5,19 @@
  */
 namespace Magento\Framework\Code\Reader;
 
+/**
+ * Class ClassReader
+ *
+ * @package Magento\Framework\Code\Reader
+ */
 class ClassReader implements ClassReaderInterface
 {
+    private $parentsCache = [];
+
     /**
      * Read class constructor signature
      *
-     * @param string $className
+     * @param  string $className
      * @return array|null
      * @throws \ReflectionException
      */
@@ -28,7 +35,8 @@ public function getConstructor($className)
                         $parameter->getName(),
                         $parameter->getClass() !== null ? $parameter->getClass()->getName() : null,
                         !$parameter->isOptional() && !$parameter->isDefaultValueAvailable(),
-                        $parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : null,
+                        $this->getReflectionParameterDefaultValue($parameter),
+                        $parameter->isVariadic(),
                     ];
                 } catch (\ReflectionException $e) {
                     $message = $e->getMessage();
@@ -40,6 +48,21 @@ public function getConstructor($className)
         return $result;
     }
 
+    /**
+     * Get reflection parameter default value
+     *
+     * @param  \ReflectionParameter $parameter
+     * @return array|mixed|null
+     */
+    private function getReflectionParameterDefaultValue(\ReflectionParameter $parameter)
+    {
+        if ($parameter->isVariadic()) {
+            return [];
+        }
+
+        return $parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : null;
+    }
+
     /**
      * Retrieve parent relation information for type in a following format
      * array(
@@ -49,11 +72,15 @@ public function getConstructor($className)
      *     ...
      * )
      *
-     * @param string $className
+     * @param  string $className
      * @return string[]
      */
     public function getParents($className)
     {
+        if (isset($this->parentsCache[$className])) {
+            return $this->parentsCache[$className];
+        }
+
         $parentClass = get_parent_class($className);
         if ($parentClass) {
             $result = [];
@@ -75,6 +102,9 @@ public function getParents($className)
                 $result = [];
             }
         }
+
+        $this->parentsCache[$className] = $result;
+
         return $result;
     }
 }
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratedFilesTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratedFilesTest.php
index 31462fad14579..9b901005622de 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratedFilesTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratedFilesTest.php
@@ -8,110 +8,390 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Code\GeneratedFiles;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Filesystem\Directory\WriteFactory;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Lock\Backend\FileLock;
 
+/**
+ * Class GeneratedFilesTest
+ */
 class GeneratedFilesTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\App\Filesystem\DirectoryList | \PHPUnit_Framework_MockObject_MockObject
+     * @var DirectoryList|\PHPUnit_Framework_MockObject_MockObject
      */
     private $directoryList;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\WriteInterface | \PHPUnit_Framework_MockObject_MockObject
+     * @var WriteInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $writeInterface;
 
+    /**
+     * @var WriteFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $writeFactory;
+
+    /**
+     * @var FileLock|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $lockManager;
+
     /**
      * @var \Magento\Framework\Code\GeneratedFiles
      */
     private $model;
 
+    /**
+     * @var string
+     */
+    private $pathGeneratedCode = '/var/www/magento/generated/code';
+
+    /**
+     * @var string
+     */
+    private $pathGeneratedMetadata = '/var/www/magento/generated/metadata';
+
+    /**
+     * @var string
+     */
+    private $pathVarCache = '/var/www/magento/generated/var/cache';
+
+    /**
+     * Setup mocks for tests
+     *
+     * @return void
+     */
     protected function setUp()
     {
-        $this->directoryList =
-            $this->createPartialMock(\Magento\Framework\App\Filesystem\DirectoryList::class, ['getPath']);
-        $writeFactory = $this->createMock(\Magento\Framework\Filesystem\Directory\WriteFactory::class);
-        $this->writeInterface = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\WriteInterface::class)
-            ->setMethods(['getPath', 'delete'])
-            ->getMockForAbstractClass();
-        $writeFactory->expects($this->once())->method('create')->willReturn($this->writeInterface);
-        $this->model = new GeneratedFiles($this->directoryList, $writeFactory);
+        $this->directoryList = $this->createMock(DirectoryList::class);
+        $this->writeFactory = $this->createMock(WriteFactory::class);
+        $this->lockManager = $this->createMock(FileLock::class);
+        $this->writeInterface = $this->getMockForAbstractClass(WriteInterface::class);
+
+        $this->directoryList->expects($this->any())->method('getPath')->willReturnMap(
+            [
+                [DirectoryList::GENERATED_CODE, $this->pathGeneratedCode],
+                [DirectoryList::GENERATED_METADATA, $this->pathGeneratedMetadata],
+                [DirectoryList::CACHE, $this->pathVarCache],
+            ]
+        );
+        $this->writeInterface->expects($this->any())->method('getRelativePath')->willReturnMap(
+            [
+                [$this->pathGeneratedCode, $this->pathGeneratedCode],
+                [$this->pathGeneratedMetadata, $this->pathGeneratedMetadata],
+                [$this->pathVarCache, $this->pathVarCache],
+            ]
+        );
+        $this->writeInterface->expects($this->any())->method('isDirectory')->willReturnMap(
+            [
+                [$this->pathGeneratedCode, true],
+                [$this->pathGeneratedMetadata, true],
+                [$this->pathVarCache, true],
+            ]
+        );
+
+        $this->writeFactory->expects($this->once())->method('create')->willReturn($this->writeInterface);
+
+        $this->model = new GeneratedFiles(
+            $this->directoryList,
+            $this->writeFactory,
+            $this->lockManager
+        );
     }
 
     /**
-     * @param array $getPathMap
-     * @param array $isDirectoryMap
-     * @param array $deleteMap
-     * @dataProvider cleanGeneratedFilesDataProvider
+     * Expect regeneration requested
+     *
+     * @param int $times
+     * @return void
      */
-    public function testCleanGeneratedFiles($getPathMap, $isDirectoryMap, $deleteMap)
+    private function expectRegenerationRequested(int $times): void
     {
+        $this->writeInterface->expects($this->exactly($times))->method('touch')->with(GeneratedFiles::REGENERATE_FLAG);
+    }
 
-        $this->writeInterface
-            ->expects($this->any())
+    /**
+     * Expect delete not requested
+     *
+     * @return void
+     */
+    private function expectDeleteNotRequested(): void
+    {
+        $this->writeInterface->expects($this->never())->method('delete');
+    }
+
+    /**
+     * Expect flag present
+     *
+     * @param int $times
+     * @param bool $flagPresent
+     * @return void
+     */
+    private function expectFlagPresent(int $times, bool $flagPresent): void
+    {
+        $this->writeInterface->expects($this->exactly($times))
             ->method('isExist')
-            ->with()
-            ->willReturnMap([
-                [GeneratedFiles::REGENERATE_FLAG, true],
-                ['path/to/di', false]
-            ]);
-        $this->directoryList->expects($this->any())->method('getPath')->willReturnMap($getPathMap);
-        $this->writeInterface->expects($this->any())->method('getRelativePath')->willReturnMap($getPathMap);
-        $this->writeInterface->expects($this->any())->method('isDirectory')->willReturnMap($isDirectoryMap);
-        $this->writeInterface->expects($this->exactly(1))->method('delete')->willReturnMap($deleteMap);
+            ->with(GeneratedFiles::REGENERATE_FLAG)
+            ->willReturn($flagPresent);
+    }
+
+    /**
+     * Expect process locked
+     *
+     * @param int $times
+     * @param bool|null $processLocked
+     * @return void
+     */
+    private function expectProcessLocked(int $times, bool $processLocked = null): void
+    {
+        $this->lockManager->expects($this->exactly($times))
+            ->method('isLocked')
+            ->with(GeneratedFiles::REGENERATE_LOCK)
+            ->willReturn($processLocked);
+
+        if ($processLocked) {
+            $this->expectLockOperation(0);
+            $this->expectUnlockOperation(0);
+        }
+    }
+
+    /**
+     * Expect lock operation
+     *
+     * @param int $times
+     * @param bool|null $lockResult
+     * @return void
+     */
+    private function expectLockOperation(int $times, bool $lockResult = null): void
+    {
+        $invocationMocker = $this->lockManager->expects($this->exactly($times))
+            ->method('lock')
+            ->with(GeneratedFiles::REGENERATE_LOCK, GeneratedFiles::REGENERATE_LOCK_TIMEOUT);
+
+        if (null !== $lockResult) {
+            $invocationMocker->willReturn($lockResult);
+        }
+    }
+
+    /**
+     * Expect unlock operation
+     *
+     * @param int $times
+     * @param bool|null $unlockResult
+     * @return void
+     */
+    private function expectUnlockOperation(int $times, bool $unlockResult = null): void
+    {
+        $invocationMocker = $this->lockManager->expects($this->exactly($times))
+            ->method('unlock')
+            ->with(GeneratedFiles::REGENERATE_LOCK);
+
+        if (null !== $unlockResult) {
+            $invocationMocker->willReturn($unlockResult);
+        }
+    }
+
+    /**
+     * Expect no action performed, it does not execute any statement inside if condition
+     *
+     * @return void
+     */
+    private function expectNoActionPerformed(): void
+    {
+        $this->expectDeleteNotRequested();
+        $this->expectRegenerationRequested(0);
+        $this->expectUnlockOperation(0);
+    }
+
+    /**
+     * Test request regeneration
+     *
+     * @test
+     * @return void
+     */
+    public function itRequestsRegenerationProperly()
+    {
+        $this->expectRegenerationRequested(1);
+        $this->model->requestRegeneration();
+    }
+
+    /**
+     * It does not clean generated files if no flag is present
+     *
+     * @test
+     * @return void
+     */
+    public function itDoesNotCleanGeneratedFilesIfNoFlagIsPresent()
+    {
+        $this->expectFlagPresent(1, false);
+        $this->expectProcessLocked(0);
+        $this->expectNoActionPerformed();
         $this->model->cleanGeneratedFiles();
     }
 
     /**
-     * @return array
+     * It does not clean generated files if process is locked
+     *
+     * @test
+     * @return void
      */
-    public function cleanGeneratedFilesDataProvider()
+    public function itDoesNotCleanGeneratedFilesIfProcessIsLocked()
     {
-        $pathToGeneration = 'path/to/generation';
-        $pathToDi = 'path/to/di';
-        $pathToCache = 'path/to/di';
-        $pathToConfig = 'path/to/config';
+        $this->expectFlagPresent(1, true);
+        $this->expectProcessLocked(1, true);
+        $this->expectNoActionPerformed();
+        $this->model->cleanGeneratedFiles();
+    }
 
-        $getPathMap =     [
-            [DirectoryList::GENERATED_CODE, $pathToGeneration],
-            [DirectoryList::GENERATED_METADATA, $pathToDi],
-            [DirectoryList::CACHE, $pathToCache],
-            [DirectoryList::CONFIG, $pathToConfig],
-        ];
+    /**
+     * It does not clean generated files when checking flag exists due to exceptions
+     *
+     * @test
+     * @param string $exceptionClassName
+     * @return void
+     *
+     * @dataProvider itDoesNotCleanGeneratedFilesDueToExceptionsDataProvider
+     */
+    public function itDoesNotCleanGeneratedFilesWhenCheckingFlagExistsDueToExceptions(
+        string $exceptionClassName
+    ) {
+        // Configure write interface to throw exception upon flag existence check
+        $this->writeInterface->expects($this->any())
+            ->method('isExist')
+            ->with(GeneratedFiles::REGENERATE_FLAG)
+            ->willThrowException(new $exceptionClassName(__('Some error has occurred.')));
 
-        $deleteMap = [[BP . '/' . $pathToGeneration, true],
-            [BP . '/' . $pathToDi, true],
-            [BP . GeneratedFiles::REGENERATE_FLAG, true],
-        ];
+        $this->expectProcessLocked(0);
+        $this->expectNoActionPerformed();
+        $this->model->cleanGeneratedFiles();
+    }
+
+    /**
+     * It does not clean generated files when checking process lock due to exceptions
+     *
+     * @test
+     * @param string $exceptionClassName
+     * @return void
+     *
+     * @dataProvider itDoesNotCleanGeneratedFilesDueToExceptionsDataProvider
+     */
+    public function itDoesNotCleanGeneratedFilesWhenCheckingProcessLockDueToExceptions(
+        string $exceptionClassName
+    ) {
+        $this->expectFlagPresent(1, true);
 
+        // Configure lock to throw exception upon process lock check
+        $this->lockManager->expects($this->any())
+            ->method('isLocked')
+            ->with(GeneratedFiles::REGENERATE_LOCK)
+            ->willThrowException(new $exceptionClassName(__('Some error has occurred.')));
+
+        $this->expectNoActionPerformed();
+        $this->model->cleanGeneratedFiles();
+    }
+
+    /**
+     * It does not clean generated files due to exceptions in allowed check data provider
+     *
+     * @return array
+     */
+    public function itDoesNotCleanGeneratedFilesDueToExceptionsDataProvider()
+    {
         return [
-            'runAll' => [ $getPathMap, [[BP . '/' . $pathToGeneration, true],
-                [BP . '/' . $pathToDi, true]], $deleteMap ],
-            'noDIfolder' => [ $getPathMap, [[BP . '/' . $pathToGeneration, true],
-                [BP . '/' . $pathToDi, false]], $deleteMap],
-            'noGenerationfolder' => [$getPathMap, [[BP . '/' . $pathToGeneration, false],
-                [BP . '/' . $pathToDi, true]], $deleteMap],
-            'nofolders' => [ $getPathMap, [[BP . '/' . $pathToGeneration, false],
-                [BP . '/' . $pathToDi, false]], $deleteMap],
+            RuntimeException::class => [RuntimeException::class],
+            FileSystemException::class => [FileSystemException::class],
         ];
     }
 
-    public function testCleanGeneratedFilesWithNoFlag()
+    /**
+     * It does not clean generated files if process lock is not acquired
+     *
+     * @test
+     * @return void
+     */
+    public function itDoesNotCleanGeneratedFilesIfProcessLockIsNotAcquired()
+    {
+        $this->expectFlagPresent(1, true);
+        $this->expectProcessLocked(1, false);
+
+        // Expect lock manager try to lock, but fail without exception
+        $this->lockManager->expects($this->once())->method('lock')->with(
+            GeneratedFiles::REGENERATE_LOCK,
+            GeneratedFiles::REGENERATE_LOCK_TIMEOUT
+        )->willReturn(false);
+
+        $this->expectNoActionPerformed();
+        $this->model->cleanGeneratedFiles();
+    }
+
+    /**
+     * It does not clean generated files if process lock is not acquired due to exception
+     *
+     * @test
+     * @return void
+     */
+    public function itDoesNotCleanGeneratedFilesIfProcessLockIsNotAcquiredDueToException()
     {
-        $this->writeInterface
-            ->expects($this->once())
-            ->method('isExist')
-            ->with(GeneratedFiles::REGENERATE_FLAG)
-            ->willReturn(false);
-        $this->directoryList->expects($this->never())->method('getPath');
-        $this->writeInterface->expects($this->never())->method('getPath');
-        $this->writeInterface->expects($this->never())->method('delete');
+        $this->expectFlagPresent(1, true);
+        $this->expectProcessLocked(1, false);
+
+        // Expect lock manager try to lock, but fail with runtime exception
+        $this->lockManager->expects($this->once())->method('lock')->with(
+            GeneratedFiles::REGENERATE_LOCK,
+            GeneratedFiles::REGENERATE_LOCK_TIMEOUT
+        )->willThrowException(new RuntimeException(__('Cannot acquire a lock.')));
+
+        $this->expectNoActionPerformed();
+        $this->model->cleanGeneratedFiles();
+    }
+
+    /**
+     * It cleans generated files properly, when no errors or exceptions raised
+     *
+     * @test
+     * @return void
+     */
+    public function itCleansGeneratedFilesProperly()
+    {
+        $this->expectFlagPresent(1, true);
+        $this->expectProcessLocked(1, false);
+        $this->expectLockOperation(1, true);
+
+        $this->writeInterface->expects($this->exactly(4))->method('delete')->withConsecutive(
+            [GeneratedFiles::REGENERATE_FLAG],
+            [$this->pathGeneratedCode],
+            [$this->pathGeneratedMetadata],
+            [$this->pathVarCache]
+        );
+
+        $this->expectRegenerationRequested(0);
+        $this->expectUnlockOperation(1, true);
+
         $this->model->cleanGeneratedFiles();
     }
 
-    public function testRequestRegeneration()
+    /**
+     * It requests regeneration and unlock upon FileSystemException
+     *
+     * @test
+     * @return void
+     */
+    public function itRequestsRegenerationAndUnlockUponFileSystemException()
     {
-        $this->writeInterface->expects($this->once())->method("touch");
-        $this->model->requestRegeneration();
+        $this->expectFlagPresent(1, true);
+        $this->expectProcessLocked(1, false);
+        $this->expectLockOperation(1, true);
+
+        $this->writeInterface->expects($this->any())->method('delete')->willThrowException(
+            new FileSystemException(__('Some error has occurred.'))
+        );
+
+        $this->expectRegenerationRequested(1);
+        $this->expectUnlockOperation(1, true);
+
+        $this->model->cleanGeneratedFiles();
     }
 }
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ClassReaderTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ClassReaderTest.php
new file mode 100644
index 0000000000000..e2786bffc10fe
--- /dev/null
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Reader/ClassReaderTest.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Code\Test\Unit\Reader;
+
+use Magento\Framework\Code\Reader\ClassReader;
+use PHPUnit\Framework\TestCase;
+
+require_once __DIR__ . '/_files/ClassesForArgumentsReader.php';
+
+class ClassReaderTest extends TestCase
+{
+
+    /**
+     * @var ClassReader $model
+     */
+    private $model;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $this->model = new ClassReader();
+    }
+
+    /**
+     * Get constructor test
+     *
+     * @param array $testData
+     * @dataProvider getTestData
+     * @throws \ReflectionException
+     */
+    public function testGetConstructor(array $testData)
+    {
+        $this->assertEquals(
+            $testData,
+            $this->model->getConstructor('FirstClassForParentCall')
+        );
+    }
+
+    /**
+     * Ensure that if we have cached class then returns this class
+     */
+    public function testGetParents()
+    {
+        $model = new ClassReader();
+        $this->assertEquals([0 => 'FirstClassForParentCall'], $model->getParents('ThirdClassForParentCall'));
+        $reflection = new \ReflectionClass(ClassReader::class);
+        $expectedClass = $reflection->getProperty('parentsCache');
+        $expectedClass->setAccessible(true);
+        $this->assertEquals(
+            $expectedClass->getValue($model)['ThirdClassForParentCall'],
+            $model->getParents('ThirdClassForParentCall')
+        );
+    }
+
+    /**
+     * Data provider
+     *
+     * @return array
+     */
+    public function getTestData()
+    {
+        return
+            [
+                [
+                    [
+                        0 => [
+                            0 => 'stdClassObject',
+                            1 => 'stdClass',
+                            2 => true,
+                            3 => null,
+                            4 => false,
+                        ],
+                        1 => [
+                            0 => 'runeTimeException',
+                            1 => 'ClassExtendsDefaultPhpType',
+                            2 => true,
+                            3 => null,
+                            4 => false
+                        ],
+                        2 => [
+                            0 => 'arrayVariable',
+                            1 => null,
+                            2 => false,
+                            3 => [
+                                'key' => 'value',
+                            ],
+                            4 => false
+                        ]
+                    ]
+                ]
+            ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php b/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
index ab32504baaa0e..775611c63a9f7 100644
--- a/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
+++ b/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
@@ -80,7 +80,11 @@ class ConfigOptionsListConstants
     const KEY_CACHE_FRONTEND = 'cache/frontend';
     const CONFIG_PATH_BACKEND_OPTIONS = 'backend_options';
 
-    /** @deprecated */
+    /**
+     * @deprecated
+     *
+     * Definition format constant.
+     */
     const INPUT_KEY_DEFINITION_FORMAT = 'definition-format';
 
     /**#@+
@@ -118,6 +122,7 @@ class ConfigOptionsListConstants
     const KEY_MYSQL_SSL_KEY = \PDO::MYSQL_ATTR_SSL_KEY;
     const KEY_MYSQL_SSL_CERT = \PDO::MYSQL_ATTR_SSL_CERT;
     const KEY_MYSQL_SSL_CA = \PDO::MYSQL_ATTR_SSL_CA;
+
     /**
      * Constant \PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT cannot be used as it was introduced in PHP 7.1.4
      * and Magento 2 is currently supporting PHP 7.1.3.
@@ -147,6 +152,8 @@ class ConfigOptionsListConstants
 
     /**
      * Size of random string generated for store's encryption key
+     * phpcs:disable
      */
     const STORE_KEY_RANDOM_STRING_SIZE = SODIUM_CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES;
+    //phpcs:enable
 }
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/ValidationState/ConfigurableTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/ValidationState/ConfigurableTest.php
new file mode 100644
index 0000000000000..cbd9e43632489
--- /dev/null
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/ValidationState/ConfigurableTest.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\Config\Test\Unit\ValidationState;
+
+use Magento\Framework\Config\ValidationState\Configurable;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests for configurable validation state
+ */
+class ConfigurableTest extends TestCase
+{
+    public function testTrue()
+    {
+        $state = new Configurable(true);
+        self::assertTrue($state->isValidationRequired());
+    }
+
+    public function testFalse()
+    {
+        $state = new Configurable(false);
+        self::assertFalse($state->isValidationRequired());
+    }
+}
diff --git a/lib/internal/Magento/Framework/Config/ValidationState/Configurable.php b/lib/internal/Magento/Framework/Config/ValidationState/Configurable.php
new file mode 100644
index 0000000000000..c996b2a3e135d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Config/ValidationState/Configurable.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\Config\ValidationState;
+
+use Magento\Framework\Config\ValidationStateInterface;
+
+/**
+ * A configurable validation state
+ */
+class Configurable implements ValidationStateInterface
+{
+    /**
+     * @var bool
+     */
+    private $required;
+
+    /**
+     * @param bool $required
+     */
+    public function __construct(bool $required)
+    {
+        $this->required = $required;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isValidationRequired(): bool
+    {
+        return $this->required;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Controller/Test/Unit/Router/Route/FactoryTest.php b/lib/internal/Magento/Framework/Controller/Test/Unit/Router/Route/FactoryTest.php
index 87adadbd34e3b..df08e77762628 100644
--- a/lib/internal/Magento/Framework/Controller/Test/Unit/Router/Route/FactoryTest.php
+++ b/lib/internal/Magento/Framework/Controller/Test/Unit/Router/Route/FactoryTest.php
@@ -9,7 +9,7 @@
 use \Magento\Framework\Controller\Router\Route\Factory;
 
 use Magento\Framework\Controller\Router\Route\Factory as RouteFactory;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class FactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/DB/Helper/Mysql/Fulltext.php b/lib/internal/Magento/Framework/DB/Helper/Mysql/Fulltext.php
index 5c50faf71a854..1493e89e08645 100644
--- a/lib/internal/Magento/Framework/DB/Helper/Mysql/Fulltext.php
+++ b/lib/internal/Magento/Framework/DB/Helper/Mysql/Fulltext.php
@@ -19,7 +19,7 @@ class Fulltext
      *
      * @var string
      */
-    const SPECIAL_CHARACTERS = '-+<>*()~';
+    const SPECIAL_CHARACTERS = '-+<>*()~?';
 
     /**
      * FULLTEXT search in MySQL search mode "natural language"
diff --git a/lib/internal/Magento/Framework/DB/Select.php b/lib/internal/Magento/Framework/DB/Select.php
index c0aa06f2d11da..ceeed40787123 100644
--- a/lib/internal/Magento/Framework/DB/Select.php
+++ b/lib/internal/Magento/Framework/DB/Select.php
@@ -513,9 +513,6 @@ public function assemble()
      *
      * @return string[]
      * @since 100.0.11
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -535,9 +532,6 @@ public function __sleep()
      *
      * @return void
      * @since 100.0.11
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/DB/Select/RendererProxy.php b/lib/internal/Magento/Framework/DB/Select/RendererProxy.php
index f3029a7ac2bd0..377b60ed3f883 100644
--- a/lib/internal/Magento/Framework/DB/Select/RendererProxy.php
+++ b/lib/internal/Magento/Framework/DB/Select/RendererProxy.php
@@ -59,9 +59,6 @@ public function __construct(
      * Remove links to other objects.
      *
      * @return array
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -72,9 +69,6 @@ public function __sleep()
      * Retrieve ObjectManager from global scope
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
index cd5e6bd0a2f59..c497c4de5a5e4 100644
--- a/lib/internal/Magento/Framework/Data/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Collection.php
@@ -538,7 +538,7 @@ public function each($objMethod, $args = [])
             }
         }
     }
-    
+
     /**
      * Setting data for all collection items
      *
@@ -889,9 +889,6 @@ public function hasFlag($flag)
      *
      * @return string[]
      * @since 100.0.11
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -910,9 +907,6 @@ public function __sleep()
      *
      * @return void
      * @since 100.0.11
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
index dc4b71caf5bee..8a22c9a1ce4fc 100644
--- a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
@@ -896,9 +896,6 @@ private function getMainTableAlias()
     /**
      * @inheritdoc
      * @since 100.0.11
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -911,9 +908,6 @@ public function __sleep()
     /**
      * @inheritdoc
      * @since 100.0.11
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index b5f2017501c01..08a5edd09bf35 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -310,7 +310,7 @@ protected function _getPluginButtonsHtml($visible = true)
                         if (isset($buttonOptions['style'])) {
                             $configStyle = $buttonOptions['style'];
                         }
-                        $buttonOptions = array_merge($buttonOptions, ['style' => 'display:none;' . $configStyle]);
+                        $buttonOptions['style'] = 'display:none; ' . $configStyle;
                     }
                     $buttonsHtml .= $this->_getButtonHtml($buttonOptions);
                 }
@@ -409,7 +409,7 @@ protected function _getButtonHtml($data)
     protected function _wrapIntoContainer($html)
     {
         if (!$this->getConfig('use_container')) {
-            return '<div class="admin__control-wysiwig">' .$html . '</div>';
+            return '<div class="admin__control-wysiwig">' . $html . '</div>';
         }
 
         $html = '<div id="editor' . $this->getHtmlId() . '"'
@@ -533,10 +533,6 @@ protected function getInlineJs($jsSetupObject, $forceLoad)
             $jsSetupObject .
             '));
                     varienGlobalEvents.attachEventHandler("formSubmit", editorFormValidationHandler);
-                    varienGlobalEvents.clearEventHandlers("open_browser_callback");
-                    varienGlobalEvents.attachEventHandler("open_browser_callback", ' .
-            $jsSetupObject .
-            '.openFileBrowser);
                 //]]>
                 });
                 </script>';
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Password.php b/lib/internal/Magento/Framework/Data/Form/Element/Password.php
index 8d330e1a810ab..df95133b4abf2 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Password.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Password.php
@@ -13,6 +13,11 @@
 
 use Magento\Framework\Escaper;
 
+/**
+ * Class Password
+ *
+ * Password input type
+ */
 class Password extends AbstractElement
 {
     /**
@@ -33,11 +38,14 @@ public function __construct(
     }
 
     /**
+     * Get field html
+     *
      * @return mixed
      */
     public function getHtml()
     {
-        $this->addClass('input-text');
+        $this->addClass('input-text admin__control-text');
+
         return parent::getHtml();
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/PasswordTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/PasswordTest.php
index d8de658d6813a..8ceac46c6404b 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/PasswordTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/PasswordTest.php
@@ -53,6 +53,6 @@ public function testGetHtml()
     {
         $html = $this->_model->getHtml();
         $this->assertContains('type="password"', $html);
-        $this->assertTrue(preg_match('/class=\".*input-text.*\"/i', $html) > 0);
+        $this->assertTrue(preg_match('/class=\"* input-text admin__control-text.*\"/i', $html) > 0);
     }
 }
diff --git a/lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php b/lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php
index 42d58daec2c93..410629a24d9e7 100644
--- a/lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php
+++ b/lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php
@@ -60,9 +60,6 @@ public function __construct(
      * Remove links to other objects.
      *
      * @return array
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -73,9 +70,6 @@ public function __sleep()
      * Retrieve ObjectManager from global scope
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/Encryption/Encryptor.php b/lib/internal/Magento/Framework/Encryption/Encryptor.php
index 3e501bdd601b7..c5caf39152607 100644
--- a/lib/internal/Magento/Framework/Encryption/Encryptor.php
+++ b/lib/internal/Magento/Framework/Encryption/Encryptor.php
@@ -273,11 +273,12 @@ public function isValidHash($password, $hash)
     {
         try {
             $this->explodePasswordHash($hash);
+            $recreated = $password;
             foreach ($this->getPasswordVersion() as $hashVersion) {
                 if ($hashVersion === self::HASH_VERSION_ARGON2ID13) {
-                    $recreated = $this->getArgonHash($password, $this->getPasswordSalt());
+                    $recreated = $this->getArgonHash($recreated, $this->getPasswordSalt());
                 } else {
-                    $recreated = $this->generateSimpleHash($this->getPasswordSalt() . $password, $hashVersion);
+                    $recreated = $this->generateSimpleHash($this->getPasswordSalt() . $recreated, $hashVersion);
                 }
                 $hash = $this->getPasswordHash();
             }
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php
index 452357003630c..4fc9ec992a3ef 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/Adapter/McryptTest.php
@@ -28,6 +28,11 @@ protected function setUp()
         $this->key = substr(__CLASS__, -32, 32);
     }
 
+    /**
+     * @param int $length
+     *
+     * @return string
+     */
     protected function getRandomString(int $length): string
     {
         $result = '';
@@ -48,18 +53,33 @@ private function requireCipherInfo()
         }
     }
 
+    /**
+     * @param string $cipherName
+     * @param string $modeName
+     *
+     * @return int
+     */
     private function getKeySize(string $cipherName, string $modeName): int
     {
         $this->requireCipherInfo();
         return self::$cipherInfo[$cipherName][$modeName]['key_size'];
     }
 
+    /**
+     * @param string $cipherName
+     * @param string $modeName
+     *
+     * @return int
+     */
     private function getInitVectorSize(string $cipherName, string $modeName): int
     {
         $this->requireCipherInfo();
         return self::$cipherInfo[$cipherName][$modeName]['iv_size'];
     }
 
+    /**
+     * @return array
+     */
     public function getCipherModeCombinations(): array
     {
         $result = [];
@@ -87,6 +107,9 @@ public function testConstructor(string $cipher, string $mode)
         $this->assertEquals($initVector, $crypt->getInitVector());
     }
 
+    /**
+     * @return array
+     */
     public function getConstructorExceptionData(): array
     {
         $key = substr(__CLASS__, -32, 32);
@@ -130,6 +153,9 @@ public function testConstructorDefaults()
         $this->assertEquals($cryptExpected->getInitVector(), $cryptActual->getInitVector());
     }
 
+    /**
+     * @return array
+     */
     public function getCryptData(): array
     {
         $fixturesFilename = __DIR__ . '/../Crypt/_files/_crypt_fixtures.php';
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
index 602d7d5c59b95..c87982ff5e3e6 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
@@ -135,8 +135,11 @@ public function testGetHashRandomSaltSpecifiedLength(): void
      *
      * @dataProvider validateHashDataProvider
      */
-    public function testValidateHash($password, $hash, $expected): void
+    public function testValidateHash($password, $hash, $expected, int $requiresVersion): void
     {
+        if ($requiresVersion > $this->encryptor->getLatestHashVersion()) {
+            $this->markTestSkipped('On current installation encryptor does not support algo #' .$requiresVersion);
+        }
         $actual = $this->encryptor->validateHash($password, $hash);
         $this->assertEquals($expected, $actual);
     }
@@ -149,9 +152,14 @@ public function testValidateHash($password, $hash, $expected): void
     public function validateHashDataProvider(): array
     {
         return [
-            ['password', 'hash:salt:1', false],
-            ['password', '67a1e09bb1f83f5007dc119c14d663aa:salt:0', true],
-            ['password', '13601bda4ea78e55a07b98866d2be6be0744e3866f13c00c811cab608a28f322:salt:1', true],
+            ['password', 'hash:salt:1', false, 1],
+            ['password', '67a1e09bb1f83f5007dc119c14d663aa:salt:0', true, 0],
+            ['password', '13601bda4ea78e55a07b98866d2be6be0744e3866f13c00c811cab608a28f322:salt:1', true, 1],
+            //Hashes after customer:hash:upgrade command issued
+            //Upgraded from version #1 to #2
+            ['password', 'c6aad9e058f6c4b06187c06d2b69bf506a786af030f81fb6d83778422a68205e:salt:1:2', true, 2],
+            //From #0 to #1
+            ['password', '3b68ca4706cbae291455e4340478076c1e1618e742b6144cfcc3e50f648903e4:salt:0:1', true, 1]
         ];
     }
 
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/KeyValidatorTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/KeyValidatorTest.php
index 85faa0aa4676f..b7a9ae3bc1e38 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/KeyValidatorTest.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/KeyValidatorTest.php
@@ -33,6 +33,9 @@ public function testIsValid($key, $expected = true)
         $this->assertEquals($expected, $this->keyValidator->isValid($key));
     }
 
+    /**
+     * @return array
+     */
     public function isValidDataProvider() : array
     {
         return [
diff --git a/lib/internal/Magento/Framework/EntityManager/TypeResolver.php b/lib/internal/Magento/Framework/EntityManager/TypeResolver.php
index 79cdbae126d7a..1f559c01f11b6 100644
--- a/lib/internal/Magento/Framework/EntityManager/TypeResolver.php
+++ b/lib/internal/Magento/Framework/EntityManager/TypeResolver.php
@@ -6,7 +6,7 @@
 namespace Magento\Framework\EntityManager;
 
 /**
- * Class TypeResolver
+ * Resolves types.
  */
 class TypeResolver
 {
@@ -20,7 +20,9 @@ class TypeResolver
      */
     private $typeMapping = [
         \Magento\SalesRule\Model\Rule::class => \Magento\SalesRule\Api\Data\RuleInterface::class,
+        // phpstan:ignore "Class Magento\SalesRule\Model\Rule\Interceptor not found."
         \Magento\SalesRule\Model\Rule\Interceptor::class => \Magento\SalesRule\Api\Data\RuleInterface::class,
+        // phpstan:ignore "Class Magento\SalesRule\Model\Rule\Proxy not found."
         \Magento\SalesRule\Model\Rule\Proxy::class => \Magento\SalesRule\Api\Data\RuleInterface::class
     ];
 
@@ -34,6 +36,8 @@ public function __construct(MetadataPool $metadataPool)
     }
 
     /**
+     * Resolves type.
+     *
      * @param object $type
      * @return string
      * @throws \Exception
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
index 68a18964d3428..1b766dea2105c 100644
--- a/lib/internal/Magento/Framework/Escaper.php
+++ b/lib/internal/Magento/Framework/Escaper.php
@@ -28,6 +28,11 @@ class Escaper
      */
     private $logger;
 
+    /**
+     * @var \Magento\Framework\Translate\InlineInterface
+     */
+    private $translateInline;
+
     /**
      * @var string[]
      */
@@ -80,7 +85,7 @@ public function escapeHtml($data, $allowedTags = null)
                 set_error_handler(
                     function ($errorNumber, $errorString) {
                         // phpcs:ignore Magento2.Exceptions.DirectThrow
-                        throw new \Exception($errorString, $errorNumber);
+                        throw new \InvalidArgumentException($errorString, $errorNumber);
                     }
                 );
                 $data = $this->prepareUnescapedCharacters($data);
@@ -95,6 +100,7 @@ function ($errorNumber, $errorString) {
                 }
                 restore_error_handler();
 
+                $this->removeComments($domDocument);
                 $this->removeNotAllowedTags($domDocument, $allowedTags);
                 $this->removeNotAllowedAttributes($domDocument);
                 $this->escapeText($domDocument);
@@ -141,7 +147,7 @@ private function removeNotAllowedTags(\DOMDocument $domDocument, array $allowedT
             . '\']'
         );
         foreach ($nodes as $node) {
-            if ($node->nodeName != '#text' && $node->nodeName != '#comment') {
+            if ($node->nodeName != '#text') {
                 $node->parentNode->replaceChild($domDocument->createTextNode($node->textContent), $node);
             }
         }
@@ -164,6 +170,21 @@ private function removeNotAllowedAttributes(\DOMDocument $domDocument)
         }
     }
 
+    /**
+     * Remove comments
+     *
+     * @param \DOMDocument $domDocument
+     * @return void
+     */
+    private function removeComments(\DOMDocument $domDocument)
+    {
+        $xpath = new \DOMXPath($domDocument);
+        $nodes = $xpath->query('//comment()');
+        foreach ($nodes as $node) {
+            $node->parentNode->removeChild($node);
+        }
+    }
+
     /**
      * Escape text
      *
@@ -318,8 +339,11 @@ public function escapeJsQuote($data, $quote = '\'')
      */
     public function escapeXssInUrl($data)
     {
+        $data = html_entity_decode((string)$data);
+        $this->getTranslateInline()->processResponseBody($data);
+
         return htmlspecialchars(
-            $this->escapeScriptIdentifiers(html_entity_decode((string)$data)),
+            $this->escapeScriptIdentifiers($data),
             $this->htmlSpecialCharsFlag | ENT_HTML5 | ENT_HTML401,
             'UTF-8',
             false
@@ -421,4 +445,19 @@ private function filterProhibitedTags(array $allowedTags): array
 
         return $allowedTags;
     }
+
+    /**
+     * Resolve inline translator.
+     *
+     * @return \Magento\Framework\Translate\InlineInterface
+     */
+    private function getTranslateInline()
+    {
+        if ($this->translateInline === null) {
+            $this->translateInline = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Framework\Translate\InlineInterface::class);
+        }
+
+        return $this->translateInline;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Event/Observer/Cron.php b/lib/internal/Magento/Framework/Event/Observer/Cron.php
index b1abb90f984e9..ebff693595fcd 100644
--- a/lib/internal/Magento/Framework/Event/Observer/Cron.php
+++ b/lib/internal/Magento/Framework/Event/Observer/Cron.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Framework\Event\Observer;
 
+/**
+ * Event cron observer object
+ */
 class Cron extends \Magento\Framework\Event\Observer
 {
     /**
@@ -25,7 +28,7 @@ class Cron extends \Magento\Framework\Event\Observer
     public function isValidFor(\Magento\Framework\Event $event)
     {
         $e = preg_split('#\s+#', $this->getCronExpr(), null, PREG_SPLIT_NO_EMPTY);
-        if (sizeof($e) !== 5) {
+        if (count($e) !== 5) {
             return false;
         }
 
@@ -50,6 +53,8 @@ public function isValidFor(\Magento\Framework\Event $event)
     }
 
     /**
+     * Return current time
+     *
      * @return int
      */
     public function getNow()
@@ -61,6 +66,8 @@ public function getNow()
     }
 
     /**
+     * Match cron expression with current time (minutes, hours, day of the month, month, day of the week)
+     *
      * @param string $expr
      * @param int $num
      * @return bool
@@ -87,7 +94,7 @@ public function matchCronExpression($expr, $num)
         // handle modulus
         if (strpos($expr, '/') !== false) {
             $e = explode('/', $expr);
-            if (sizeof($e) !== 2) {
+            if (count($e) !== 2) {
                 return false;
             }
             $expr = $e[0];
@@ -102,7 +109,7 @@ public function matchCronExpression($expr, $num)
         // handle range
         if (strpos($expr, '-') !== false) {
             $e = explode('-', $expr);
-            if (sizeof($e) !== 2) {
+            if (count($e) !== 2) {
                 return false;
             }
 
@@ -118,6 +125,8 @@ public function matchCronExpression($expr, $num)
     }
 
     /**
+     * Return month number
+     *
      * @param int|string $value
      * @return bool|string
      */
diff --git a/lib/internal/Magento/Framework/File/Test/Unit/UploaderTest.php b/lib/internal/Magento/Framework/File/Test/Unit/UploaderTest.php
new file mode 100644
index 0000000000000..d0aa658184457
--- /dev/null
+++ b/lib/internal/Magento/Framework/File/Test/Unit/UploaderTest.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\File\Test\Unit;
+
+/**
+ * Unit Test class for \Magento\Framework\File\Uploader
+ */
+class UploaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @param string $fileName
+     * @param string|bool $expectedCorrectedFileName
+     *
+     * @dataProvider getCorrectFileNameProvider
+     */
+    public function testGetCorrectFileName($fileName, $expectedCorrectedFileName)
+    {
+        $isExceptionExpected = $expectedCorrectedFileName === true;
+
+        if ($isExceptionExpected) {
+            $this->expectException(\InvalidArgumentException::class);
+        }
+
+        $this->assertEquals(
+            $expectedCorrectedFileName,
+            \Magento\Framework\File\Uploader::getCorrectFileName($fileName)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getCorrectFileNameProvider()
+    {
+        return [
+            [
+                '^&*&^&*^$$$$()',
+                'file.'
+            ],
+            [
+                '^&*&^&*^$$$$().png',
+                'file.png'
+            ],
+            [
+                '_',
+                'file.'
+            ],
+            [
+                '_.jpg',
+                'file.jpg'
+            ],
+            [
+                'a.' . str_repeat('b', 88),
+                'a.' . str_repeat('b', 88)
+            ],
+            [
+                'a.' . str_repeat('b', 89),
+                true
+            ]
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
index 328a748cfd5df..f9b41709ec7c8 100644
--- a/lib/internal/Magento/Framework/File/Uploader.php
+++ b/lib/internal/Magento/Framework/File/Uploader.php
@@ -5,12 +5,18 @@
  */
 namespace Magento\Framework\File;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Validation\ValidationException;
+
 /**
  * File upload class
  *
  * ATTENTION! This class must be used like abstract class and must added
  * validation by protected file extension list to extended class
  *
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ *
  * @api
  */
 class Uploader
@@ -75,7 +81,7 @@ class Uploader
     protected $_allowRenameFiles = false;
 
     /**
-     * If this variable is set to TRUE, files dispertion will be supported.
+     * If this variable is set to TRUE, files dispersion will be supported.
      *
      * @var bool
      * @access protected
@@ -157,21 +163,31 @@ class Uploader
      */
     protected $_result;
 
+    /**
+     * @var DirectoryList
+     */
+    private $directoryList;
+
     /**
      * Init upload
      *
      * @param string|array $fileId
      * @param \Magento\Framework\File\Mime|null $fileMime
-     * @throws \Exception
+     * @param DirectoryList|null $directoryList
+     * @throws \DomainException
      */
     public function __construct(
         $fileId,
-        Mime $fileMime = null
+        Mime $fileMime = null,
+        DirectoryList $directoryList = null
     ) {
+        $this->directoryList= $directoryList ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(DirectoryList::class);
+
         $this->_setUploadFileId($fileId);
         if (!file_exists($this->_file['tmp_name'])) {
             $code = empty($this->_file['tmp_name']) ? self::TMP_NAME_EMPTY : 0;
-            throw new \Exception('The file was not uploaded.', $code);
+            throw new \DomainException('The file was not uploaded.', $code);
         } else {
             $this->_fileExists = true;
         }
@@ -256,7 +272,7 @@ public function save($destinationFolder, $newFileName = null)
      *
      * @param string $destinationFolder
      * @return void
-     * @throws \Exception
+     * @throws FileSystemException
      */
     private function validateDestination($destinationFolder)
     {
@@ -265,7 +281,7 @@ private function validateDestination($destinationFolder)
         }
 
         if (!is_writable($destinationFolder)) {
-            throw new \Exception('Destination folder is not writable or does not exists.');
+            throw new FileSystemException(__('Destination folder is not writable or does not exists.'));
         }
     }
 
@@ -302,7 +318,7 @@ protected function _moveFile($tmpPath, $destPath)
      * Validate file before save
      *
      * @return void
-     * @throws \Exception
+     * @throws ValidationException
      */
     protected function _validateFile()
     {
@@ -312,7 +328,7 @@ protected function _validateFile()
 
         //is file extension allowed
         if (!$this->checkAllowedExtension($this->getFileExtension())) {
-            throw new \Exception('Disallowed file type.');
+            throw new ValidationException(__('Disallowed file type.'));
         }
         //run validate callbacks
         foreach ($this->_validateCallbacks as $params) {
@@ -366,19 +382,27 @@ public function removeValidateCallback($callbackName)
     }
 
     /**
-     * Correct filename with special chars and spaces
+     * Correct filename with special chars and spaces; also trim excessively long filenames
      *
      * @param string $fileName
      * @return string
+     * @throws \InvalidArgumentException
      */
     public static function getCorrectFileName($fileName)
     {
         $fileName = preg_replace('/[^a-z0-9_\\-\\.]+/i', '_', $fileName);
         $fileInfo = pathinfo($fileName);
+        $fileInfo['extension'] = $fileInfo['extension'] ?? '';
+
+        // account for excessively long filenames that cannot be stored completely in database
+        if (strlen($fileInfo['basename']) > 90) {
+            throw new \InvalidArgumentException('Filename is too long; must be 90 characters or less');
+        }
 
         if (preg_match('/^_+$/', $fileInfo['filename'])) {
             $fileName = 'file.' . $fileInfo['extension'];
         }
+
         return $fileName;
     }
 
@@ -533,17 +557,19 @@ private function _getMimeType()
      *
      * @param string|array $fileId
      * @return void
-     * @throws \Exception
+     * @throws \DomainException
+     * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function _setUploadFileId($fileId)
     {
         if (is_array($fileId)) {
+            $this->validateFileId($fileId);
             $this->_uploadType = self::MULTIPLE_STYLE;
             $this->_file = $fileId;
         } else {
             if (empty($_FILES)) {
-                throw new \Exception('$_FILES array is empty');
+                throw new \DomainException('$_FILES array is empty');
             }
 
             preg_match("/^(.*?)\[(.*?)\]$/", $fileId, $file);
@@ -565,17 +591,68 @@ private function _setUploadFileId($fileId)
                 $this->_uploadType = self::SINGLE_STYLE;
                 $this->_file = $_FILES[$fileId];
             } elseif ($fileId == '') {
-                throw new \Exception('Invalid parameter given. A valid $_FILES[] identifier is expected.');
+                throw new \InvalidArgumentException(
+                    'Invalid parameter given. A valid $_FILES[] identifier is expected.'
+                );
             }
         }
     }
 
+    /**
+     * Validates explicitly given uploaded file data.
+     *
+     * @param array $fileId
+     * @return void
+     * @throws \InvalidArgumentException
+     */
+    private function validateFileId(array $fileId): void
+    {
+        $isValid = false;
+        if (isset($fileId['tmp_name'])) {
+            $tmpName = trim($fileId['tmp_name']);
+
+            if (preg_match('/\.\.(\\\|\/)/', $tmpName) !== 1) {
+                $allowedFolders = [
+                    sys_get_temp_dir(),
+                    $this->directoryList->getPath(DirectoryList::MEDIA),
+                    $this->directoryList->getPath(DirectoryList::VAR_DIR),
+                    $this->directoryList->getPath(DirectoryList::TMP),
+                    $this->directoryList->getPath(DirectoryList::UPLOAD),
+                ];
+
+                $disallowedFolders = [
+                    $this->directoryList->getPath(DirectoryList::LOG),
+                ];
+
+                foreach ($allowedFolders as $allowedFolder) {
+                    if (stripos($tmpName, $allowedFolder) === 0) {
+                        $isValid = true;
+                        break;
+                    }
+                }
+
+                foreach ($disallowedFolders as $disallowedFolder) {
+                    if (stripos($tmpName, $disallowedFolder) === 0) {
+                        $isValid = false;
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (!$isValid) {
+            throw new \InvalidArgumentException(
+                __('Invalid parameter given. A valid $fileId[tmp_name] is expected.')
+            );
+        }
+    }
+
     /**
      * Create destination folder
      *
      * @param string $destinationFolder
      * @return \Magento\Framework\File\Uploader
-     * @throws \Exception
+     * @throws FileSystemException
      */
     private function _createDestinationFolder($destinationFolder)
     {
@@ -590,7 +667,7 @@ private function _createDestinationFolder($destinationFolder)
         if (!(@is_dir($destinationFolder)
             || @mkdir($destinationFolder, 0777, true)
         )) {
-            throw new \Exception("Unable to create directory '{$destinationFolder}'.");
+            throw new FileSystemException(__('Unable to create directory %1.', $destinationFolder));
         }
         return $this;
     }
@@ -620,7 +697,7 @@ public static function getNewFileName($destinationFile)
     }
 
     /**
-     * Get dispertion path
+     * Get dispersion path
      *
      * @param string $fileName
      * @return string
@@ -632,7 +709,7 @@ public static function getDispretionPath($fileName)
     }
 
     /**
-     * Get dispertion path
+     * Get dispersion path
      *
      * @param string $fileName
      * @return string
@@ -640,17 +717,17 @@ public static function getDispretionPath($fileName)
     public static function getDispersionPath($fileName)
     {
         $char = 0;
-        $dispertionPath = '';
+        $dispersionPath = '';
         while ($char < 2 && $char < strlen($fileName)) {
-            if (empty($dispertionPath)) {
-                $dispertionPath = '/' . ('.' == $fileName[$char] ? '_' : $fileName[$char]);
+            if (empty($dispersionPath)) {
+                $dispersionPath = '/' . ('.' == $fileName[$char] ? '_' : $fileName[$char]);
             } else {
-                $dispertionPath = self::_addDirSeparator(
-                    $dispertionPath
+                $dispersionPath = self::_addDirSeparator(
+                    $dispersionPath
                 ) . ('.' == $fileName[$char] ? '_' : $fileName[$char]);
             }
             $char++;
         }
-        return $dispertionPath;
+        return $dispersionPath;
     }
 }
diff --git a/lib/internal/Magento/Framework/Filter/DirectiveProcessor/DependDirective.php b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/DependDirective.php
new file mode 100644
index 0000000000000..f557f7465b5f5
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/DependDirective.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\Filter\DirectiveProcessor;
+
+use Magento\Framework\Filter\DirectiveProcessorInterface;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\VariableResolverInterface;
+
+/**
+ * Will only render the the content of the directive if the condition is truthy
+ */
+class DependDirective implements DirectiveProcessorInterface
+{
+    /**
+     * @var VariableResolverInterface
+     */
+    private $variableResolver;
+
+    /**
+     * @param VariableResolverInterface $variableResolver
+     */
+    public function __construct(
+        VariableResolverInterface $variableResolver
+    ) {
+        $this->variableResolver = $variableResolver;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(array $construction, Template $filter, array $templateVariables): string
+    {
+        if (empty($templateVariables)) {
+            // If template processing
+            return $construction[0];
+        }
+
+        if ($this->variableResolver->resolve($construction[1], $filter, $templateVariables) == '') {
+            return '';
+        } else {
+            return $filter->filter($construction[2]);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getRegularExpression(): string
+    {
+        return Template::CONSTRUCTION_DEPEND_PATTERN;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/DirectiveProcessor/Filter/EscapeFilter.php b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/Filter/EscapeFilter.php
new file mode 100644
index 0000000000000..a3e662ac14c6f
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/Filter/EscapeFilter.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\Filter\DirectiveProcessor\Filter;
+
+use Magento\Framework\Escaper;
+use Magento\Framework\Filter\DirectiveProcessor\FilterInterface;
+
+/**
+ * EscapesInput
+ */
+class EscapeFilter implements FilterInterface
+{
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @param Escaper $escaper
+     */
+    public function __construct(Escaper $escaper)
+    {
+        $this->escaper = $escaper;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function filterValue(string $value, array $params): string
+    {
+        $type = $params[0] ?? 'html';
+
+        switch ($type) {
+            case 'html':
+                return $this->escaper->escapeHtml($value);
+
+            case 'htmlentities':
+                return htmlentities($value, ENT_QUOTES);
+
+            case 'url':
+                return rawurlencode($value);
+        }
+        return $value;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string
+    {
+        return 'escape';
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/DirectiveProcessor/Filter/FilterApplier.php b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/Filter/FilterApplier.php
new file mode 100644
index 0000000000000..e15b1d24f7be1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/Filter/FilterApplier.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\Filter\DirectiveProcessor\Filter;
+
+/**
+ * Applies filters to a directive value
+ */
+class FilterApplier
+{
+    /**
+     * @var FilterPool
+     */
+    private $filterPool;
+
+    /**
+     * @param FilterPool $filterPool
+     */
+    public function __construct(FilterPool $filterPool)
+    {
+        $this->filterPool = $filterPool;
+    }
+
+    /**
+     * Apply the filters based on the raw directive value
+     *
+     * For example: applyFromRawParam('|escape:html|nl2br', 'a value', ['escape']);
+     *
+     * @param string $param The raw directive filters
+     * @param string $value The input to filter
+     * @param string[] $defaultFilters The default filters that should be applied if none are parsed
+     * @return string The filtered string
+     */
+    public function applyFromRawParam(string $param, string $value, array $defaultFilters = []): string
+    {
+        $filters = array_filter(explode('|', ltrim($param, '|')));
+
+        if (empty($filters)) {
+            $filters = $defaultFilters;
+        }
+
+        return $this->applyFromArray($filters, $value);
+    }
+
+    /**
+     * Apply a given list of named filters
+     *
+     * For example: applyFromArray(['escape:html','nl2br], 'a value');
+     *
+     * @param string[] $filters The list of filter names to apply
+     * @param string $value The input to filter
+     * @return string The filtered string
+     */
+    public function applyFromArray(array $filters, string $value): string
+    {
+        $filters = array_filter($filters);
+
+        foreach ($filters as $filter) {
+            $params = explode(':', $filter);
+            $filterName = array_shift($params);
+            try {
+                $filter = $this->filterPool->get($filterName);
+            } catch (\InvalidArgumentException $e) {
+                continue;
+            }
+
+            $value = $filter->filterValue($value, $params);
+        }
+
+        return $value;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/DirectiveProcessor/Filter/FilterPool.php b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/Filter/FilterPool.php
new file mode 100644
index 0000000000000..50c24d8ec9fb8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/Filter/FilterPool.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\Filter\DirectiveProcessor\Filter;
+
+use Magento\Framework\Filter\DirectiveProcessor\FilterInterface;
+
+/**
+ * Container for directive output filters
+ */
+class FilterPool
+{
+    /**
+     * @var array
+     */
+    private $filters;
+
+    /**
+     * @param array $filters
+     */
+    public function __construct(array $filters = [])
+    {
+        foreach ($filters as $filter) {
+            if (!$filter instanceof FilterInterface) {
+                throw new \InvalidArgumentException('Directive filters must implement ' . FilterInterface::class);
+            }
+        }
+
+        $this->filters = $filters;
+    }
+
+    /**
+     * Return a filter from the pool
+     *
+     * @param string $name
+     * @return FilterInterface
+     */
+    public function get(string $name): FilterInterface
+    {
+        if (empty($this->filters[$name])) {
+            throw new \InvalidArgumentException('Filter with key "' . $name . '" has not been defined');
+        }
+
+        return $this->filters[$name];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/DirectiveProcessor/Filter/NewlineToBreakFilter.php b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/Filter/NewlineToBreakFilter.php
new file mode 100644
index 0000000000000..961813bc730c9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/Filter/NewlineToBreakFilter.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\Filter\DirectiveProcessor\Filter;
+
+use Magento\Framework\Filter\DirectiveProcessor\FilterInterface;
+
+/**
+ * Inserts HTML line breaks before all newlines in a string
+ */
+class NewlineToBreakFilter implements FilterInterface
+{
+    /**
+     * @inheritDoc
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function filterValue(string $value, array $params): string
+    {
+        return nl2br($value);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string
+    {
+        return 'nl2br';
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/DirectiveProcessor/FilterInterface.php b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/FilterInterface.php
new file mode 100644
index 0000000000000..6512ecfbf6c90
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/FilterInterface.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter\DirectiveProcessor;
+
+/**
+ * Transforms the output of a directive processor
+ */
+interface FilterInterface
+{
+    /**
+     * Transform or manipulate value
+     *
+     * @param string $value
+     * @param string[] $params
+     * @return string
+     */
+    public function filterValue(string $value, array $params): string;
+
+    /**
+     * This filter's unique name.
+     *
+     * @return string
+     */
+    public function getName(): string;
+}
diff --git a/lib/internal/Magento/Framework/Filter/DirectiveProcessor/ForDirective.php b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/ForDirective.php
new file mode 100644
index 0000000000000..2b51185b1b5f5
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/ForDirective.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter\DirectiveProcessor;
+
+use Magento\Framework\DataObject;
+use Magento\Framework\Filter\DirectiveProcessorInterface;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\VariableResolverInterface;
+
+/**
+ * Allows a a directive to iterate content with the value of variables
+ *
+ * @example syntax {{for item in order.items}} name: {{var item.name}} {{/for}} order items collection.
+ * @example syntax {{for thing in things}} {{var thing.whatever}} {{/for}} e.g.:custom collection.
+ */
+class ForDirective implements DirectiveProcessorInterface
+{
+    /**
+     * @var VariableResolverInterface
+     */
+    private $variableResolver;
+
+    /**
+     * @param VariableResolverInterface $variableResolver
+     */
+    public function __construct(
+        VariableResolverInterface $variableResolver
+    ) {
+        $this->variableResolver = $variableResolver;
+    }
+
+    /**
+     * Filter the string as template.
+     *
+     * @param array $construction
+     * @param Template $filter
+     * @param array $templateVariables
+     * @return string
+     */
+    public function process(array $construction, Template $filter, array $templateVariables): string
+    {
+        if (!$this->isValidLoop($construction)) {
+            return $construction[0];
+        }
+
+        $loopData = $this->variableResolver->resolve($construction['loopData'], $filter, $templateVariables);
+
+        $loopTextToReplace = $construction['loopBody'];
+        $loopItemVariableName = preg_replace('/\s+/', '', $construction['loopItem']);
+
+        if (is_array($loopData) || $loopData instanceof \Traversable) {
+            return $this->getLoopReplacementText(
+                $loopData,
+                $loopItemVariableName,
+                $loopTextToReplace,
+                $filter,
+                $templateVariables
+            );
+        }
+
+        return $construction[0];
+    }
+
+    /**
+     * Check if the matched construction is valid.
+     *
+     * @param array $construction
+     * @return bool
+     */
+    private function isValidLoop(array $construction)
+    {
+        $requiredFields = ['loopBody', 'loopItem', 'loopData'];
+        $validFields = array_filter(
+            $requiredFields,
+            function ($field) use ($construction) {
+                return isset($construction[$field]) && strlen(trim($construction[$field]));
+            }
+        );
+        return count($requiredFields) == count($validFields);
+    }
+
+    /**
+     * Process loop text to replace.
+     *
+     * @param array $loopData
+     * @param string $loopItemVariableName
+     * @param string $loopTextToReplace
+     * @param Template $filter
+     * @param array $templateVariables
+     * @return string
+     */
+    private function getLoopReplacementText(
+        array $loopData,
+        string $loopItemVariableName,
+        string $loopTextToReplace,
+        Template $filter,
+        array $templateVariables
+    ): string {
+        $loopText = [];
+        $loopIndex = 0;
+        $loopDataObject = new DataObject();
+
+        foreach ($loopData as $loopItemDataObject) {
+            // Loop item can be an array or DataObject.
+            // If loop item is an array, convert it to DataObject
+            // to have unified interface if the collection
+            if (!$loopItemDataObject instanceof DataObject) {
+                if (!is_array($loopItemDataObject)) {
+                    continue;
+                }
+                $loopItemDataObject = new DataObject($loopItemDataObject);
+            }
+
+            $loopDataObject->setData('index', $loopIndex++);
+            $templateVariables['loop'] = $loopDataObject;
+            $templateVariables[$loopItemVariableName] = $loopItemDataObject;
+
+            // Current structure prohibits recursively calling template filter inside "for" directives
+            if (preg_match_all(
+                Template::CONSTRUCTION_PATTERN,
+                $loopTextToReplace,
+                $attributes,
+                PREG_SET_ORDER
+            )
+            ) {
+                $subText = $loopTextToReplace;
+                foreach ($attributes as $attribute) {
+                    $text = $this->variableResolver->resolve($attribute[2], $filter, $templateVariables);
+                    $subText = str_replace($attribute[0], $text, $subText);
+                }
+                $loopText[] = $subText;
+            }
+
+            unset($templateVariables[$loopItemVariableName]);
+        }
+        $replaceText = implode('', $loopText);
+
+        return $replaceText;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getRegularExpression(): string
+    {
+        return Template::LOOP_PATTERN;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/DirectiveProcessor/IfDirective.php b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/IfDirective.php
new file mode 100644
index 0000000000000..7fedc7946f21d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/IfDirective.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\Filter\DirectiveProcessor;
+
+use Magento\Framework\Filter\DirectiveProcessorInterface;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\VariableResolverInterface;
+
+/**
+ * Will only render the the content of the directive if the condition is truthy
+ */
+class IfDirective implements DirectiveProcessorInterface
+{
+    /**
+     * @var VariableResolverInterface
+     */
+    private $variableResolver;
+
+    /**
+     * @param VariableResolverInterface $variableResolver
+     */
+    public function __construct(
+        VariableResolverInterface $variableResolver
+    ) {
+        $this->variableResolver = $variableResolver;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(array $construction, Template $filter, array $templateVariables): string
+    {
+        if (empty($templateVariables)) {
+            return $construction[0];
+        }
+
+        if ($this->variableResolver->resolve($construction[1], $filter, $templateVariables) == '') {
+            if (isset($construction[3]) && isset($construction[4])) {
+                return $filter->filter($construction[4]);
+            }
+            return '';
+        } else {
+            return $filter->filter($construction[2]);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getRegularExpression(): string
+    {
+        return Template::CONSTRUCTION_IF_PATTERN;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/DirectiveProcessor/LegacyDirective.php b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/LegacyDirective.php
new file mode 100644
index 0000000000000..7f17bc7237351
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/LegacyDirective.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\Filter\DirectiveProcessor;
+
+use Magento\Framework\Filter\DirectiveProcessorInterface;
+use Magento\Framework\Filter\Template;
+
+/**
+ * Backwards compatibility directive processor for old directives that still extend from Template
+ */
+class LegacyDirective implements DirectiveProcessorInterface
+{
+    /**
+     * @var SimpleDirective
+     */
+    private $simpleDirective;
+
+    /**
+     * @param SimpleDirective $simpleDirective
+     */
+    public function __construct(SimpleDirective $simpleDirective)
+    {
+        $this->simpleDirective = $simpleDirective;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(array $construction, Template $filter, array $templateVariables): string
+    {
+        try {
+            $reflectionClass = new \ReflectionClass($filter);
+            $method = $reflectionClass->getMethod($construction[1] . 'Directive');
+            $method->setAccessible(true);
+
+            return (string)$method->invokeArgs($filter, [$construction]);
+        } catch (\ReflectionException $e) {
+            // The legacy parser may be the only parser loaded so make sure the simple directives still process
+            preg_match($this->simpleDirective->getRegularExpression(), $construction[0], $simpleConstruction);
+
+            return $this->simpleDirective->process($simpleConstruction, $filter, $templateVariables);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getRegularExpression(): string
+    {
+        return Template::CONSTRUCTION_PATTERN;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/DirectiveProcessor/SimpleDirective.php b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/SimpleDirective.php
new file mode 100644
index 0000000000000..9f4b30d0c96cb
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/SimpleDirective.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter\DirectiveProcessor;
+
+use Magento\Framework\Filter\DirectiveProcessor\Filter\FilterApplier;
+use Magento\Framework\Filter\DirectiveProcessorInterface;
+use Magento\Framework\Filter\SimpleDirective\ProcessorPool;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\Template\Tokenizer\Parameter;
+use Magento\Framework\Filter\Template\Tokenizer\ParameterFactory;
+use Magento\Framework\Filter\VariableResolverInterface;
+
+/**
+ * Serves as the default
+ */
+class SimpleDirective implements DirectiveProcessorInterface
+{
+    /**
+     * @var ProcessorPool
+     */
+    private $processorPool;
+
+    /**
+     * @var ParameterFactory
+     */
+    private $parameterTokenizerFactory;
+
+    /**
+     * @var VariableResolverInterface
+     */
+    private $variableResolver;
+    /**
+     * @var FilterApplier
+     */
+    private $filterApplier;
+
+    /**
+     * @param ProcessorPool $processorPool
+     * @param ParameterFactory $parameterTokenizerFactory
+     * @param VariableResolverInterface $variableResolver
+     * @param FilterApplier $filterApplier
+     */
+    public function __construct(
+        ProcessorPool $processorPool,
+        ParameterFactory $parameterTokenizerFactory,
+        VariableResolverInterface $variableResolver,
+        FilterApplier $filterApplier
+    ) {
+        $this->processorPool = $processorPool;
+        $this->parameterTokenizerFactory = $parameterTokenizerFactory;
+        $this->variableResolver = $variableResolver;
+        $this->filterApplier = $filterApplier;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(array $construction, Template $filter, array $templateVariables): string
+    {
+        try {
+            $directiveParser = $this->processorPool
+                ->get($construction['directiveName']);
+        } catch (\InvalidArgumentException $e) {
+            // This directive doesn't have a SimpleProcessor
+            return $construction[0];
+        }
+
+        $parameters = $this->extractParameters($construction, $filter, $templateVariables);
+
+        $value = $directiveParser->process(
+            $construction['value'] ?? null,
+            $parameters,
+            !empty($construction['content']) ? $filter->filter($construction['content']) : null
+        );
+
+        $value = $this->filterApplier->applyFromRawParam(
+            $construction['filters'] ?? '',
+            $value,
+            $directiveParser->getDefaultFilters() ?? []
+        );
+
+        return $value;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getRegularExpression(): string
+    {
+        return '/{{'
+        . '(?P<directiveName>[a-z]+)(?:[\s\t]*)'
+        . '(?:\s*(?P<quoteType>[\'"])(?P<value>(?:(?!\k\'quoteType\').)*?)(?<!\\\)\k\'quoteType\')?'
+        . '(?P<parameters>.*?)'
+        . '(?P<filters>(?:\|[a-z0-9:_-]+)+)?'
+        . '}}'
+        . '(?:(?P<content>.*?){{\/(?P=directiveName)}})?'
+        . '/si';
+    }
+
+    /**
+     * Extract and parse parameters from construction
+     *
+     * @param array $construction
+     * @param Template $filter
+     * @param array $templateVariables
+     * @return array
+     */
+    private function extractParameters(array $construction, Template $filter, array $templateVariables): array
+    {
+        if (empty($construction['parameters'])) {
+            return [];
+        }
+
+        /** @var Parameter $tokenizer */
+        $tokenizer = $this->parameterTokenizerFactory->create();
+        $tokenizer->setString($construction['parameters']);
+        $parameters = $tokenizer->tokenize();
+
+        if (!$filter->isStrictMode()) {
+            foreach ($parameters as $key => $value) {
+                if (substr($value, 0, 1) === '$') {
+                    $parameters[$key] = $this->variableResolver->resolve(
+                        substr($value, 1),
+                        $filter,
+                        $templateVariables
+                    );
+                }
+            }
+        }
+
+        return $parameters;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/DirectiveProcessor/TemplateDirective.php b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/TemplateDirective.php
new file mode 100644
index 0000000000000..84f9089dab6f6
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/TemplateDirective.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter\DirectiveProcessor;
+
+use Magento\Framework\Filter\DirectiveProcessorInterface;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\Template\Tokenizer\ParameterFactory;
+use Magento\Framework\Filter\VariableResolverInterface;
+
+/**
+ * Allows templates to be included inside other templates
+ *
+ * Usage:
+ *
+ *     {{template config_path="<PATH>"}}
+ *
+ * <PATH> equals the XPATH to the system configuration value that contains the value of the template.
+ * This directive is useful to include things like a global header/footer.
+ */
+class TemplateDirective implements DirectiveProcessorInterface
+{
+    /**
+     * @var VariableResolverInterface
+     */
+    private $variableResolver;
+
+    /**
+     * @var ParameterFactory
+     */
+    private $parameterFactory;
+
+    /**
+     * @param VariableResolverInterface $variableResolver
+     * @param ParameterFactory $parameterFactory
+     */
+    public function __construct(
+        VariableResolverInterface $variableResolver,
+        ParameterFactory $parameterFactory
+    ) {
+        $this->variableResolver = $variableResolver;
+        $this->parameterFactory = $parameterFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(array $construction, Template $filter, array $templateVariables): string
+    {
+        // Processing of {template config_path=... [...]} statement
+        $templateParameters = $this->getParameters($construction[2], $filter, $templateVariables);
+        if (!isset($templateParameters['config_path']) || !$filter->getTemplateProcessor()) {
+            // Not specified template or not set include processor
+            $replacedValue = '{Error in template processing}';
+        } else {
+            // Including of template
+            $configPath = $templateParameters['config_path'];
+            unset($templateParameters['config_path']);
+            $templateParameters = array_merge_recursive($templateParameters, $templateVariables);
+            $replacedValue = call_user_func($filter->getTemplateProcessor(), $configPath, $templateParameters);
+        }
+
+        return $replacedValue;
+    }
+
+    /**
+     * Return associative array of parameters.
+     *
+     * @param string $value raw parameters
+     * @param Template $filter
+     * @param array $templateVariables
+     * @return array
+     */
+    private function getParameters($value, Template $filter, array $templateVariables): array
+    {
+        $tokenizer = new Template\Tokenizer\Parameter();
+        $tokenizer->setString($value);
+        $params = $tokenizer->tokenize();
+        foreach ($params as $key => $value) {
+            if (substr($value, 0, 1) === '$') {
+                $params[$key] = $this->variableResolver->resolve(substr($value, 1), $filter, $templateVariables);
+            }
+        }
+
+        return $params;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getRegularExpression(): string
+    {
+        return Template::CONSTRUCTION_TEMPLATE_PATTERN;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/DirectiveProcessor/VarDirective.php b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/VarDirective.php
new file mode 100644
index 0000000000000..f2fe398c38488
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/DirectiveProcessor/VarDirective.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\Filter\DirectiveProcessor;
+
+use Magento\Framework\Filter\DirectiveProcessor\Filter\FilterApplier;
+use Magento\Framework\Filter\DirectiveProcessorInterface;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\VariableResolverInterface;
+
+/**
+ * Resolves var directives
+ */
+class VarDirective implements DirectiveProcessorInterface
+{
+    /**
+     * @var VariableResolverInterface
+     */
+    private $variableResolver;
+
+    /**
+     * @var FilterApplier
+     */
+    private $filterApplier;
+
+    /**
+     * @param VariableResolverInterface $variableResolver
+     * @param FilterApplier $filterApplier
+     */
+    public function __construct(
+        VariableResolverInterface $variableResolver,
+        FilterApplier $filterApplier
+    ) {
+        $this->variableResolver = $variableResolver;
+        $this->filterApplier = $filterApplier;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process(array $construction, Template $filter, array $templateVariables): string
+    {
+        if (empty($construction[2])) {
+            return $construction[0];
+        }
+
+        $result = (string)$this->variableResolver->resolve($construction[2], $filter, $templateVariables);
+
+        if (isset($construction['filters']) && strpos($construction['filters'], '|') !== false) {
+            $result = $this->filterApplier->applyFromRawParam($construction['filters'], $result);
+        }
+
+        return $result;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getRegularExpression(): string
+    {
+        return '/{{(var)(.*?)(?P<filters>(?:\|[a-z0-9:_-]+)+)?}}/si';
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/DirectiveProcessorInterface.php b/lib/internal/Magento/Framework/Filter/DirectiveProcessorInterface.php
new file mode 100644
index 0000000000000..e8fd00bb3cee1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/DirectiveProcessorInterface.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\Filter;
+
+/**
+ * Responsible for converting a directive data structure to relevant template output
+ */
+interface DirectiveProcessorInterface
+{
+    /**
+     * Handle the directive from the template
+     *
+     * @param array $construction The result of the regular expression match
+     * @param Template $filter The filter that is processing the template
+     * @param array $templateVariables The dataset available to the template
+     * @return string The rendered directive content
+     */
+    public function process(array $construction, Template $filter, array $templateVariables): string;
+
+    /**
+     * Return the regular expression that will be used to determine if this processor can process a directive
+     *
+     * @return string The regular expression including markers and flags. E.g. /foo/i
+     */
+    public function getRegularExpression(): string;
+}
diff --git a/lib/internal/Magento/Framework/Filter/SimpleDirective/ProcessorInterface.php b/lib/internal/Magento/Framework/Filter/SimpleDirective/ProcessorInterface.php
new file mode 100644
index 0000000000000..e16991ba50b28
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/SimpleDirective/ProcessorInterface.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\Filter\SimpleDirective;
+
+use Magento\Framework\Filter\Template;
+
+/**
+ * An easier mechanism to implement custom directives rather than parsing the whole directive manually
+ */
+interface ProcessorInterface
+{
+    /**
+     * Unique name of this directive.
+     *
+     * @return string
+     */
+    public function getName(): string;
+
+    /**
+     * Process values given to the directory and return rendered result.
+     *
+     * @param mixed $value Template var, scalar or null if nothing has been passed to the directive.
+     * @param string[] $parameters Additional parameters.
+     * @param string|null $html HTML inside the directive.
+     * @return string
+     */
+    public function process(
+        $value,
+        array $parameters,
+        ?string $html
+    ): string;
+
+    /**
+     * Default filters to apply if none provided in a template.
+     *
+     * @return string[]|null
+     */
+    public function getDefaultFilters(): ?array;
+}
diff --git a/lib/internal/Magento/Framework/Filter/SimpleDirective/ProcessorPool.php b/lib/internal/Magento/Framework/Filter/SimpleDirective/ProcessorPool.php
new file mode 100644
index 0000000000000..e75b96adadcc8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/SimpleDirective/ProcessorPool.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\Filter\SimpleDirective;
+
+/**
+ * Container for defined list of simple processors
+ */
+class ProcessorPool
+{
+    /**
+     * @var array|ProcessorInterface[]
+     */
+    private $processors;
+
+    /**
+     * @param ProcessorInterface[] $processors
+     */
+    public function __construct(array $processors = [])
+    {
+        foreach ($processors as $processor) {
+            if (!$processor instanceof ProcessorInterface) {
+                throw new \InvalidArgumentException(
+                    'Simple processors must implement ' . ProcessorInterface::class
+                );
+            }
+        }
+
+        $this->processors = $processors;
+    }
+
+    /**
+     * Retrieve a defined processor from the pool by name
+     *
+     * @param string $name
+     * @return ProcessorInterface
+     */
+    public function get(string $name): ProcessorInterface
+    {
+        if (empty($this->processors[$name])) {
+            throw new \InvalidArgumentException('Processor with key "' . $name . '" has not been defined');
+        }
+
+        return $this->processors[$name];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
index 6a04e8e8c6953..1ac024d505fc3 100644
--- a/lib/internal/Magento/Framework/Filter/Template.php
+++ b/lib/internal/Magento/Framework/Filter/Template.php
@@ -9,38 +9,55 @@
  */
 namespace Magento\Framework\Filter;
 
-use Magento\Framework\Model\AbstractExtensibleModel;
-use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filter\DirectiveProcessor\DependDirective;
+use Magento\Framework\Filter\DirectiveProcessor\ForDirective;
+use Magento\Framework\Filter\DirectiveProcessor\IfDirective;
+use Magento\Framework\Filter\DirectiveProcessor\LegacyDirective;
+use Magento\Framework\Filter\DirectiveProcessor\TemplateDirective;
+use Magento\Framework\Filter\DirectiveProcessor\VarDirective;
+use Magento\Framework\Stdlib\StringUtils;
 
 /**
  * Template filter
  *
  * @api
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Template implements \Zend_Filter_Interface
 {
     /**
      * Construction regular expression
+     *
+     * @deprecated Use the new Directive processors
      */
-    const CONSTRUCTION_PATTERN = '/{{([a-z]{0,10})(.*?)}}/si';
+    const CONSTRUCTION_PATTERN = '/{{([a-z]{0,10})(.*?)}}(?:(.*?)(?:{{\/(?:\\1)}}))?/si';
 
     /**
      * Construction `depend` regular expression
+     *
+     * @deprecated Use the new Directive processors
      */
     const CONSTRUCTION_DEPEND_PATTERN = '/{{depend\s*(.*?)}}(.*?){{\\/depend\s*}}/si';
 
     /**
      * Construction `if` regular expression
+     *
+     * @deprecated Use the new Directive processors
      */
     const CONSTRUCTION_IF_PATTERN = '/{{if\s*(.*?)}}(.*?)({{else}}(.*?))?{{\\/if\s*}}/si';
 
     /**
      * Construction `template` regular expression
+     *
+     * @deprecated Use the new Directive processors
      */
     const CONSTRUCTION_TEMPLATE_PATTERN = '/{{(template)(.*?)}}/si';
 
     /**
      * Construction `for` regular expression
+     *
+     * @deprecated Use the new Directive processors
      */
     const LOOP_PATTERN = '/{{for(?P<loopItem>.*? )(in)(?P<loopData>.*?)}}(?P<loopBody>.*?){{\/for}}/si';
 
@@ -62,40 +79,55 @@ class Template implements \Zend_Filter_Interface
     protected $templateProcessor = null;
 
     /**
-     * @var \Magento\Framework\Stdlib\StringUtils
+     * @var StringUtils
      */
     protected $string;
 
     /**
-     * @var string[]
+     * @var DirectiveProcessorInterface[]
+     */
+    private $directiveProcessors;
+
+    /**
+     * @var bool
+     */
+    private $strictMode = false;
+
+    /**
+     * @var VariableResolverInterface|null
      */
-    private $restrictedMethods = [
-        'addafterfiltercallback',
-        'getresourcecollection',
-        'load',
-        'save',
-        'getcollection',
-        'getresource',
-        'getconfig',
-        'setvariables',
-        'settemplateprocessor',
-        'gettemplateprocessor',
-        'vardirective',
-        'delete'
-    ];
+    private $variableResolver;
 
     /**
-     * @param \Magento\Framework\Stdlib\StringUtils $string
+     * @param StringUtils $string
      * @param array $variables
+     * @param DirectiveProcessorInterface[] $directiveProcessors
+     * @param VariableResolverInterface|null $variableResolver
      */
-    public function __construct(\Magento\Framework\Stdlib\StringUtils $string, $variables = [])
-    {
+    public function __construct(
+        StringUtils $string,
+        $variables = [],
+        $directiveProcessors = [],
+        VariableResolverInterface $variableResolver = null
+    ) {
         $this->string = $string;
         $this->setVariables($variables);
+        $this->directiveProcessors = $directiveProcessors;
+        $this->variableResolver = $variableResolver ?? ObjectManager::getInstance()
+                ->get(VariableResolverInterface::class);
+
+        if (empty($directiveProcessors)) {
+            $this->directiveProcessors = [
+                'depend' => ObjectManager::getInstance()->get(DependDirective::class),
+                'if' => ObjectManager::getInstance()->get(IfDirective::class),
+                'template' => ObjectManager::getInstance()->get(TemplateDirective::class),
+                'legacy' => ObjectManager::getInstance()->get(LegacyDirective::class),
+            ];
+        }
     }
 
     /**
-     * Sets template variables that's can be called through {var ...} statement
+     * Set the template variables available to be resolved in this template via variable resolver directives
      *
      * @param array $variables
      * @return \Magento\Framework\Filter\Template
@@ -136,103 +168,30 @@ public function getTemplateProcessor()
      * @param string $value
      * @return string
      * @throws \Exception
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function filter($value)
     {
-        // "depend", "if", and "template" directives should be first
-        foreach ([
-                     self::CONSTRUCTION_DEPEND_PATTERN => 'dependDirective',
-                     self::CONSTRUCTION_IF_PATTERN => 'ifDirective',
-                     self::CONSTRUCTION_TEMPLATE_PATTERN => 'templateDirective',
-                 ] as $pattern => $directive) {
-            if (preg_match_all($pattern, $value, $constructions, PREG_SET_ORDER)) {
-                foreach ($constructions as $construction) {
-                    $callback = [$this, $directive];
-                    if (!is_callable($callback)) {
-                        continue;
-                    }
-                    try {
-                        $replacedValue = call_user_func($callback, $construction);
-                    } catch (\Exception $e) {
-                        throw $e;
-                    }
-                    $value = str_replace($construction[0], $replacedValue, $value);
-                }
+        foreach ($this->directiveProcessors as $directiveProcessor) {
+            if (!$directiveProcessor instanceof DirectiveProcessorInterface) {
+                throw new \InvalidArgumentException(
+                    'Directive processors must implement ' . DirectiveProcessorInterface::class
+                );
             }
-        }
 
-        $value = $this->filterFor($value);
+            if (preg_match_all($directiveProcessor->getRegularExpression(), $value, $constructions, PREG_SET_ORDER)) {
+                foreach ($constructions as $construction) {
+                    $replacedValue = $directiveProcessor->process($construction, $this, $this->templateVars);
 
-        if (preg_match_all(self::CONSTRUCTION_PATTERN, $value, $constructions, PREG_SET_ORDER)) {
-            foreach ($constructions as $construction) {
-                $callback = [$this, $construction[1] . 'Directive'];
-                if (!is_callable($callback)) {
-                    continue;
-                }
-                try {
-                    $replacedValue = call_user_func($callback, $construction);
-                } catch (\Exception $e) {
-                    throw $e;
+                    $value = str_replace($construction[0], $replacedValue, $value);
                 }
-                $value = str_replace($construction[0], $replacedValue, $value);
             }
         }
 
         $value = $this->afterFilter($value);
-        return $value;
-    }
-
-    /**
-     * Filter the string as template.
-     *
-     * @param string $value
-     * @example syntax {{for item in order.items}} name: {{var item.name}} {{/for}} order items collection.
-     * @example syntax {{for thing in things}} {{var thing.whatever}} {{/for}} e.g.:custom collection.
-     * @return string
-     */
-    private function filterFor($value)
-    {
-        if (preg_match_all(self::LOOP_PATTERN, $value, $constructions, PREG_SET_ORDER)) {
-            foreach ($constructions as $construction) {
-                if (!$this->isValidLoop($construction)) {
-                    return $value;
-                }
-
-                $fullTextToReplace = $construction[0];
-                $loopData = $this->getVariable($construction['loopData'], '');
-
-                $loopTextToReplace = $construction['loopBody'];
-                $loopItemVariableName = preg_replace('/\s+/', '', $construction['loopItem']);
-
-                if (is_array($loopData) || $loopData instanceof \Traversable) {
-                    $replaceText = $this->getLoopReplacementText($loopData, $loopItemVariableName, $loopTextToReplace);
-                    $value = str_replace($fullTextToReplace, $replaceText, $value);
-                }
-            }
-        }
 
         return $value;
     }
 
-    /**
-     * Check if the matched construction is valid.
-     *
-     * @param array $construction
-     * @return bool
-     */
-    private function isValidLoop(array $construction)
-    {
-        $requiredFields = ['loopBody', 'loopItem', 'loopData'];
-        $validFields = array_filter(
-            $requiredFields,
-            function ($field) use ($construction) {
-                return isset($construction[$field]) && strlen(trim($construction[$field]));
-            }
-        );
-        return count($requiredFields) == count($validFields);
-    }
-
     /**
      * Runs callbacks that have been added to filter content after directive processing is finished.
      *
@@ -281,20 +240,35 @@ protected function resetAfterFilterCallbacks()
     }
 
     /**
-     * Get var directive
+     * Process {{var}} directive regex match
      *
      * @param string[] $construction
      * @return string
+     * @deprecated Use the directive interfaces instead
      */
     public function varDirective($construction)
     {
-        if (count($this->templateVars) == 0) {
-            // If template prepossessing
-            return $construction[0];
-        }
+        $directive = $this->directiveProcessors['var'] ?? ObjectManager::getInstance()
+            ->get(VarDirective::class);
+
+        return $directive->process($construction, $this, $this->templateVars);
+    }
+
+    /**
+     * Process {{for}} directive regex match
+     *
+     * @param string[] $construction
+     * @return string
+     * @deprecated Use the directive interfaces instead
+     */
+    public function forDirective($construction)
+    {
+        $directive = $this->directiveProcessors['for'] ?? ObjectManager::getInstance()
+            ->get(ForDirective::class);
+
+        preg_match($directive->getRegularExpression(), $construction[0], $specificConstruction);
 
-        $replacedValue = $this->getVariable($construction[2], '');
-        return $replacedValue;
+        return $directive->process($specificConstruction, $this, $this->templateVars);
     }
 
     /**
@@ -309,22 +283,14 @@ public function varDirective($construction)
      *
      * @param string[] $construction
      * @return mixed
+     * @deprecated Use the directive interfaces instead
      */
     public function templateDirective($construction)
     {
-        // Processing of {template config_path=... [...]} statement
-        $templateParameters = $this->getParameters($construction[2]);
-        if (!isset($templateParameters['config_path']) || !$this->getTemplateProcessor()) {
-            // Not specified template or not set include processor
-            $replacedValue = '{Error in template processing}';
-        } else {
-            // Including of template
-            $configPath = $templateParameters['config_path'];
-            unset($templateParameters['config_path']);
-            $templateParameters = array_merge_recursive($templateParameters, $this->templateVars);
-            $replacedValue = call_user_func($this->getTemplateProcessor(), $configPath, $templateParameters);
-        }
-        return $replacedValue;
+        $directive = $this->directiveProcessors['template'] ?? ObjectManager::getInstance()
+            ->get(TemplateDirective::class);
+
+        return $directive->process($construction, $this, $this->templateVars);
     }
 
     /**
@@ -332,19 +298,16 @@ public function templateDirective($construction)
      *
      * @param string[] $construction
      * @return string
+     * @deprecated Use the directive interfaces instead
      */
     public function dependDirective($construction)
     {
-        if (count($this->templateVars) == 0) {
-            // If template processing
-            return $construction[0];
-        }
+        $directive = $this->directiveProcessors['depend'] ?? ObjectManager::getInstance()
+            ->get(DependDirective::class);
 
-        if ($this->getVariable($construction[1], '') == '') {
-            return '';
-        } else {
-            return $construction[2];
-        }
+        preg_match($directive->getRegularExpression(), $construction[0], $specificConstruction);
+
+        return $directive->process($specificConstruction, $this, $this->templateVars);
     }
 
     /**
@@ -352,21 +315,16 @@ public function dependDirective($construction)
      *
      * @param string[] $construction
      * @return string
+     * @deprecated Use the directive interfaces instead
      */
     public function ifDirective($construction)
     {
-        if (count($this->templateVars) == 0) {
-            return $construction[0];
-        }
+        $directive = $this->directiveProcessors['if'] ?? ObjectManager::getInstance()
+            ->get(IfDirective::class);
 
-        if ($this->getVariable($construction[1], '') == '') {
-            if (isset($construction[3]) && isset($construction[4])) {
-                return $construction[4];
-            }
-            return '';
-        } else {
-            return $construction[2];
-        }
+        preg_match($directive->getRegularExpression(), $construction[0], $specificConstruction);
+
+        return $directive->process($specificConstruction, $this, $this->templateVars);
     }
 
     /**
@@ -374,6 +332,7 @@ public function ifDirective($construction)
      *
      * @param string $value raw parameters
      * @return array
+     * @deprecated Use the directive interfaces instead
      */
     protected function getParameters($value)
     {
@@ -389,114 +348,19 @@ protected function getParameters($value)
     }
 
     /**
-     * Validate method call initiated in a template.
-     *
-     * Deny calls for methods that may disrupt template processing.
-     *
-     * @param object $object
-     * @param string $method
-     * @return void
-     * @throws \InvalidArgumentException
-     */
-    private function validateVariableMethodCall($object, string $method): void
-    {
-        if ($object === $this) {
-            if (in_array(mb_strtolower($method), $this->restrictedMethods)) {
-                throw new \InvalidArgumentException("Method $method cannot be called from template.");
-            }
-        }
-    }
-
-    /**
-     * Check allowed methods for data objects.
-     *
-     * Deny calls for methods that may disrupt template processing.
-     *
-     * @param object $object
-     * @param string $method
-     * @return bool
-     * @throws \InvalidArgumentException
-     */
-    private function isAllowedDataObjectMethod($object, string $method): bool
-    {
-        if ($object instanceof AbstractExtensibleModel || $object instanceof AbstractModel) {
-            if (in_array(mb_strtolower($method), $this->restrictedMethods)) {
-                throw new \InvalidArgumentException("Method $method cannot be called from template.");
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Return variable value for var construction
+     * Resolve a variable's value for a given var directive construction
      *
      * @param string $value raw parameters
      * @param string $default default value
      * @return string
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @deprecated Use \Magento\Framework\Filter\VariableResolverInterface instead
      */
     protected function getVariable($value, $default = '{no_value_defined}')
     {
         \Magento\Framework\Profiler::start('email_template_processing_variables');
-        $tokenizer = new Template\Tokenizer\Variable();
-        $tokenizer->setString($value);
-        $stackVars = $tokenizer->tokenize();
-        $result = $default;
-        $last = 0;
-        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']];
-            } elseif (isset($stackVars[$i - 1]['variable'])
-                    && $stackVars[$i - 1]['variable'] instanceof \Magento\Framework\DataObject
-            ) {
-                // If data object calling methods or getting properties
-                if ($stackVars[$i]['type'] == 'property') {
-                    $caller = 'get' . $this->string->upperCaseWords($stackVars[$i]['name'], '_', '');
-                    $stackVars[$i]['variable'] = method_exists(
-                        $stackVars[$i - 1]['variable'],
-                        $caller
-                    ) ? $stackVars[$i - 1]['variable']->{$caller}() : $stackVars[$i - 1]['variable']->getData(
-                        $stackVars[$i]['name']
-                    );
-                } elseif ($stackVars[$i]['type'] == 'method') {
-                    // Calling of data object method
-                    if (method_exists($stackVars[$i - 1]['variable'], $stackVars[$i]['name'])
-                            || substr($stackVars[$i]['name'], 0, 3) == 'get'
-                    ) {
-                        $stackVars[$i]['args'] = $this->getStackArgs($stackVars[$i]['args']);
-
-                        if ($this->isAllowedDataObjectMethod($stackVars[$i - 1]['variable'], $stackVars[$i]['name'])) {
-                            $stackVars[$i]['variable'] = call_user_func_array(
-                                [$stackVars[$i - 1]['variable'], $stackVars[$i]['name']],
-                                $stackVars[$i]['args']
-                            );
-                        }
-                    }
-                }
-                $last = $i;
-            } elseif (isset($stackVars[$i - 1]['variable'])
-                && is_object($stackVars[$i - 1]['variable'])
-                && $stackVars[$i]['type'] == 'method'
-            ) {
-                // Calling object methods
-                $object = $stackVars[$i - 1]['variable'];
-                $method = $stackVars[$i]['name'];
-                if (method_exists($object, $method)) {
-                    $args = $this->getStackArgs($stackVars[$i]['args']);
-                    $this->validateVariableMethodCall($object, $method);
-                    $stackVars[$i]['variable'] = call_user_func_array([$object, $method], $args);
-                }
-                $last = $i;
-            }
-        }
-
-        if (isset($stackVars[$last]['variable'])) {
-            // If value for construction exists set it
-            $result = $stackVars[$last]['variable'];
-        }
+        $result = $this->variableResolver->resolve($value, $this, $this->templateVars) ?? $default;
         \Magento\Framework\Profiler::stop('email_template_processing_variables');
+
         return $result;
     }
 
@@ -505,6 +369,7 @@ protected function getVariable($value, $default = '{no_value_defined}')
      *
      * @param array $stack
      * @return array
+     * @deprecated Use new directive processor interfaces
      */
     protected function getStackArgs($stack)
     {
@@ -519,51 +384,34 @@ protected function getStackArgs($stack)
     }
 
     /**
-     * Process loop text to replace.
+     * Change the operating mode for filtering and return the previous mode
      *
-     * @param array $loopData
-     * @param string $loopItemVariableName
-     * @param string $loopTextToReplace
-     * @return string
+     * Returning the previous value makes it easy to perform single operations in a single mode:
+     *
+     * <code>
+     * $previousMode = $filter->setStrictMode(true);
+     * $filter->filter($value);
+     * $filter->setStrictMode($previousMode);
+     * </code>
+     *
+     * @param bool $strictMode Enable strict parsing of directives
+     * @return bool The previous mode from before the change
      */
-    private function getLoopReplacementText(array $loopData, $loopItemVariableName, $loopTextToReplace)
+    public function setStrictMode(bool $strictMode): bool
     {
-        $loopText = [];
-        $loopIndex = 0;
-        $loopDataObject = new \Magento\Framework\DataObject();
-
-        foreach ($loopData as $loopItemDataObject) {
-            // Loop item can be an array or DataObject.
-            // If loop item is an array, convert it to DataObject
-            // to have unified interface if the collection
-            if (!$loopItemDataObject instanceof \Magento\Framework\DataObject) {
-                if (!is_array($loopItemDataObject)) {
-                    continue;
-                }
-                $loopItemDataObject = new \Magento\Framework\DataObject($loopItemDataObject);
-            }
+        $current = $this->strictMode;
+        $this->strictMode = $strictMode;
 
-            $loopDataObject->setData('index', $loopIndex++);
-            $this->templateVars['loop'] = $loopDataObject;
-            $this->templateVars[$loopItemVariableName] = $loopItemDataObject;
-
-            if (preg_match_all(
-                self::CONSTRUCTION_PATTERN,
-                $loopTextToReplace,
-                $attributes,
-                PREG_SET_ORDER
-            )
-            ) {
-                $subText = $loopTextToReplace;
-                foreach ($attributes as $attribute) {
-                    $text = $this->getVariable($attribute[2], '');
-                    $subText = str_replace($attribute[0], $text, $subText);
-                }
-                $loopText[] = $subText;
-            }
-            unset($this->templateVars[$loopItemVariableName]);
-        }
-        $replaceText = implode('', $loopText);
-        return $replaceText;
+        return $current;
+    }
+
+    /**
+     * Return if the template is rendered with strict directive processing
+     *
+     * @return bool
+     */
+    public function isStrictMode(): bool
+    {
+        return $this->strictMode;
     }
 }
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/DirectiveProcessor/SimpleDirective.php b/lib/internal/Magento/Framework/Filter/Test/Unit/DirectiveProcessor/SimpleDirective.php
new file mode 100644
index 0000000000000..4d079ac716342
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/DirectiveProcessor/SimpleDirective.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter\Test\Unit\DirectiveProcessor;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+/**
+ *
+ */
+class SimpleDirective extends TestCase
+{
+    private $regex;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $directive = $objectManager->getObject(\Magento\Framework\Filter\DirectiveProcessor\SimpleDirective::class);
+        $this->regex = $directive->getRegularExpression();
+    }
+
+    /**
+     * @dataProvider matchesProvider
+     */
+    public function testMatches($input, $expected)
+    {
+        preg_match($this->regex, $input, $matches);
+
+        $toAssert = [];
+        foreach ($matches as $key => $value) {
+            if (!is_numeric($key)) {
+                $toAssert[$key] = $value;
+            }
+        }
+        $this->assertEquals($expected, $toAssert);
+    }
+
+    public function matchesProvider()
+    {
+        return [
+            [
+                '{{dir param}}',
+                [
+                    'directiveName' => 'dir',
+                    'quoteType' => '',
+                    'value' => '',
+                    'parameters' => 'param',
+                ]
+            ],
+            [
+                '{{dir param|foo}}',
+                [
+                    'directiveName' => 'dir',
+                    'quoteType' => '',
+                    'value' => '',
+                    'parameters' => 'param',
+                    'filters' => '|foo',
+                ]
+            ],
+            [
+                '{{dir foo bar baz}}',
+                [
+                    'directiveName' => 'dir',
+                    'quoteType' => '',
+                    'value' => '',
+                    'parameters' => 'foo bar baz',
+                ]
+            ],
+            [
+                '{{dir \'foo %var "is" my name\' bar baz="bash" bash=\'bash\'}}',
+                [
+                    'directiveName' => 'dir',
+                    'quoteType' => '\'',
+                    'value' => 'foo %var "is" my name',
+                    'parameters' => ' bar baz="bash" bash=\'bash\'',
+                ]
+            ],
+            [
+                '{{dir "foo %var is m\'name. a + b=\\\'c\\\'" some nonsense !@#$%^&*()_+abc.,;\'}}',
+                [
+                    'directiveName' => 'dir',
+                    'quoteType' => '"',
+                    'value' => 'foo %var is m\'name. a + b=\\\'c\\\'',
+                    'parameters' => ' some nonsense !@#$%^&*()_+abc.,;\'',
+                ]
+            ],
+            [
+                '{{dir "blah" some nonsense !=@#$%^&*()_+abc.,;\'|foo|bar:_123|ridiculous-filter}}' . "\n\t"
+                . '<content>' . "\n\t\t"
+                . '{{foo bar}}</content>{{/dir}}',
+                [
+                    'directiveName' => 'dir',
+                    'quoteType' => '"',
+                    'value' => 'blah',
+                    'parameters' => ' some nonsense !=@#$%^&*()_+abc.,;\'',
+                    'content' => "\n\t" . '<content>' . "\n\t\t" . '{{foo bar}}</content>',
+                    'filters' => '|foo|bar:_123|ridiculous-filter',
+                ]
+            ],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
index 0ee3a06ce5420..97fad446ebadc 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
@@ -30,57 +30,6 @@ protected function setUp()
         $this->store = $objectManager->getObject(Store::class);
     }
 
-    public function testFilter()
-    {
-        $this->templateFilter->setVariables(
-            [
-                'customer' => new \Magento\Framework\DataObject(['firstname' => 'Felicia', 'lastname' => 'Henry']),
-                'company' => 'A. L. Price',
-                'street1' => '687 Vernon Street',
-                'city' => 'Parker Dam',
-                'region' => 'CA',
-                'postcode' => '92267',
-                'telephone' => '760-663-5876',
-            ]
-        );
-
-        $template = <<<TEMPLATE
-{{var customer.firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var customer.getLastname()}}
-{{depend company}}{{var company}}{{/depend}}
-{{if street1}}{{var street1}}
-{{/if}}
-{{depend street2}}{{var street2}}{{/depend}}
-{{depend street3}}{{var street3}}{{/depend}}
-{{depend street4}}{{var street4}}{{/depend}}
-{{if city}}{{var city}},  {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}
-{{var country}}
-{{depend telephone}}T: {{var telephone}}{{/depend}}
-{{depend fax}}F: {{var fax}}{{/depend}}
-{{depend vat_id}}VAT: {{var vat_id}}{{/depend}}
-TEMPLATE;
-
-        $expectedResult = <<<EXPECTED_RESULT
-Felicia Henry
-A. L. Price
-687 Vernon Street
-
-
-
-
-Parker Dam,  CA, 92267
-
-T: 760-663-5876
-
-
-EXPECTED_RESULT;
-
-        $this->assertEquals(
-            $expectedResult,
-            $this->templateFilter->filter($template),
-            'Template was processed incorrectly'
-        );
-    }
-
     /**
      * @covers \Magento\Framework\Filter\Template::afterFilter
      * @covers \Magento\Framework\Filter\Template::addAfterFilterCallback
@@ -137,128 +86,6 @@ public function testAfterFilterCallbackReset()
         $this->assertEquals($value, $this->templateFilter->filter($value));
     }
 
-    /**
-     * @covers \Magento\Framework\Filter\Template::varDirective
-     * @covers \Magento\Framework\Filter\Template::getVariable
-     * @covers \Magento\Framework\Filter\Template::getStackArgs
-     * @dataProvider varDirectiveDataProvider
-     */
-    public function testVarDirective($construction, $variables, $expectedResult)
-    {
-        $this->templateFilter->setVariables($variables);
-        $this->assertEquals($expectedResult, $this->templateFilter->filter($construction));
-    }
-
-    /**
-     * @return array
-     */
-    public function varDirectiveDataProvider()
-    {
-        /* @var $dataObjectVariable \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject */
-        $dataObjectVariable = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-            ->disableOriginalConstructor()
-            ->disableProxyingToOriginalMethods()
-            ->setMethods(['bar'])
-            ->getMock();
-        $dataObjectVariable->expects($this->once())
-            ->method('bar')
-            ->willReturn('DataObject Method Return');
-
-        /* @var $nonDataObjectVariable \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject */
-        $nonDataObjectVariable = $this->getMockBuilder(\Magento\Framework\Escaper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $nonDataObjectVariable->expects($this->once())
-            ->method('escapeHtml')
-            ->willReturnArgument(0);
-
-        return [
-            'no variables' => [
-                '{{var}}',
-                [],
-                '{{var}}',
-            ],
-            'invalid variable' => [
-                '{{var invalid}}',
-                ['foobar' => 'barfoo'],
-                '',
-            ],
-            'string variable' => [
-                '{{var foobar}}',
-                ['foobar' => 'barfoo'],
-                'barfoo',
-            ],
-            'array argument to method' => [
-                '{{var foo.bar([param_1:value_1, param_2:$value_2, param_3:[a:$b, c:$d]])}}',
-                [
-                    'foo' => $dataObjectVariable,
-                    'value_2' => 'lorem',
-                    'b' => 'bee',
-                    'd' => 'dee',
-                ],
-                'DataObject Method Return'
-            ],
-            'non DataObject method call' => [
-                '{{var foo.escapeHtml($value)}}',
-                [
-                    'foo' => $nonDataObjectVariable,
-                    'value' => 'lorem'
-                ],
-                'lorem'
-            ],
-            'non DataObject undefined method call' => [
-                '{{var foo.undefinedMethod($value)}}',
-                [
-                    'foo' => $nonDataObjectVariable,
-                    'value' => 'lorem'
-                ],
-                ''
-            ],
-        ];
-    }
-
-    /**
-     * @covers \Magento\Framework\Filter\Template::filterFor
-     * @dataProvider loopPatternDataProvider
-     */
-    public function testLoopPattern($construction, $variables, $expectedResult)
-    {
-        $this->templateFilter->setVariables($variables);
-        $this->assertEquals($expectedResult, $this->invokeMethod($this->templateFilter, 'filterFor', [$construction]));
-    }
-
-    /**
-     * @return array
-     */
-    public function loopPatternDataProvider()
-    {
-        return [
-            'no loop tag' => $this->getTemplateAndExpectedResults('noLoopTag'),
-            'no loop body tag' => $this->getTemplateAndExpectedResults('noBodyTag'),
-            'no item tag' =>  $this->getTemplateAndExpectedResults('noItemTag'),
-            'no item, no body tags' => $this->getTemplateAndExpectedResults('noItemNoBodyTag'),
-            'no item, no data, no body tags' => $this->getTemplateAndExpectedResults('noItemNoDataNoBodyTag'),
-        ];
-    }
-
-    /**
-     * Call protected/private method of a class.
-     *
-     * @param object &$object
-     * @param string $methodName
-     * @param array  $parameters
-     *
-     * @return mixed Method return.
-     */
-    private function invokeMethod(&$object, $methodName, array $parameters = [])
-    {
-        $reflection = new \ReflectionClass(get_class($object));
-        $method = $reflection->getMethod($methodName);
-        $method->setAccessible(true);
-
-        return $method->invokeArgs($object, $parameters);
-    }
-
     /**
      * @param $type
      * @return array
@@ -295,7 +122,7 @@ public function getTemplateAndExpectedResults($type)
 <ul>
 {{for in order.all_visible_items}}
     <li>
-        {{var loop.index}} name: {{var thing.name}}, lastname: {{var thing.lastname}}, age: {{var thing.age}}
+         name: , lastname: , age: 
     </li>
 {{/for}}
 </ul>
@@ -391,61 +218,4 @@ private function getObjectData()
         $dataObject->setAllVisibleItems($visibleItems);
         return $dataObject;
     }
-
-    /**
-     * Check that if calling a method of an object fails expected result is returned.
-     */
-    public function testInvalidMethodCall()
-    {
-        $this->templateFilter->setVariables(['dateTime' => '\DateTime']);
-        $this->assertEquals(
-            '\DateTime',
-            $this->templateFilter->filter('{{var dateTime.createFromFormat(\'d\',\'1548201468\')}}')
-        );
-    }
-
-    /**
-     * Test adding callbacks when already filtering.
-     *
-     * @expectedException \InvalidArgumentException
-     */
-    public function testInappropriateCallbacks()
-    {
-        $this->templateFilter->setVariables(['filter' => $this->templateFilter]);
-        $this->templateFilter->filter('Test {{var filter.addAfterFilterCallback(\'mb_strtolower\')}}');
-    }
-
-    /**
-     * Test adding callbacks when already filtering.
-     *
-     * @expectedException \InvalidArgumentException
-     * @dataProvider disallowedMethods
-     */
-    public function testDisallowedMethods($method)
-    {
-        $this->templateFilter->setVariables(['store' => $this->store, 'filter' => $this->templateFilter]);
-        $this->templateFilter->filter('{{var store.'.$method.'()}} {{var filter.' .$method .'()}}');
-    }
-
-    /**
-     * Data for testDisallowedMethods method
-     *
-     * @return array
-     */
-    public function disallowedMethods()
-    {
-        return [
-            ['getResourceCollection'],
-            ['load'],
-            ['save'],
-            ['getCollection'],
-            ['getResource'],
-            ['getConfig'],
-            ['setVariables'],
-            ['setTemplateProcessor'],
-            ['getTemplateProcessor'],
-            ['varDirective'],
-            ['delete']
-        ];
-    }
 }
diff --git a/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php b/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php
new file mode 100644
index 0000000000000..179f36e1683d1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php
@@ -0,0 +1,216 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter\VariableResolver;
+
+use Magento\Framework\DataObject;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\Template\Tokenizer\VariableFactory;
+use Magento\Framework\Filter\VariableResolverInterface;
+use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Stdlib\StringUtils;
+
+/**
+ * Resolves variables the way that they have traditionally been resolved and allows method execution
+ */
+class LegacyResolver implements VariableResolverInterface
+{
+    /**
+     * @var StringUtils
+     */
+    private $stringUtils;
+
+    /**
+     * @var VariableFactory
+     */
+    private $variableTokenizerFactory;
+
+    /**
+     * @param StringUtils $stringUtils
+     * @param VariableFactory $variableTokenizerFactory
+     */
+    public function __construct(StringUtils $stringUtils, VariableFactory $variableTokenizerFactory)
+    {
+        $this->stringUtils = $stringUtils;
+        $this->variableTokenizerFactory = $variableTokenizerFactory;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolve(string $value, Template $filter, array $templateVariables)
+    {
+        if (empty($value)) {
+            return null;
+        }
+
+        $tokenizer = $this->variableTokenizerFactory->create();
+        $tokenizer->setString($value);
+        $stackArgs = $tokenizer->tokenize();
+        $result = null;
+        $last = 0;
+        for ($i = 0, $count = count($stackArgs); $i < $count; $i++) {
+            if ($i == 0 && isset($templateVariables[$stackArgs[$i]['name']])) {
+                // Getting of template value
+                $stackArgs[$i]['variable'] = &$templateVariables[$stackArgs[$i]['name']];
+            } elseif ($this->shouldHandleDataAccess($i, $stackArgs)) {
+                $this->handleDataAccess($i, $filter, $templateVariables, $stackArgs);
+                $last = $i;
+            } elseif ($this->shouldHandleAsObjectAccess($i, $stackArgs)) {
+                $this->handleObjectMethod($filter, $templateVariables, $i, $stackArgs);
+                $last = $i;
+            }
+        }
+
+        if (isset($stackArgs[$last]['variable'])) {
+            // If value for construction exists set it
+            $result = $stackArgs[$last]['variable'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Loops over a set of stack args to process variables into array argument values
+     *
+     * @param array $stack
+     * @param Template $filter
+     * @param array $templateVariables
+     * @return array
+     */
+    private function getStackArgs($stack, Template $filter, array $templateVariables): array
+    {
+        foreach ($stack as $i => $value) {
+            if (is_array($value)) {
+                $stack[$i] = $this->getStackArgs($value, $filter, $templateVariables);
+            } elseif (substr((string)$value, 0, 1) === '$') {
+                $stack[$i] = $this->resolve(substr($value, 1), $filter, $templateVariables);
+            }
+        }
+
+        return $stack;
+    }
+
+    /**
+     * Handle the access of a variable's property at an index
+     *
+     * @param int $i
+     * @param array $stackArgs
+     */
+    private function handlePropertyAccess(int $i, array &$stackArgs): void
+    {
+        if (is_array($stackArgs[$i - 1]['variable'])) {
+            $stackArgs[$i]['variable'] = $stackArgs[$i - 1]['variable'][$stackArgs[$i]['name']];
+        } else {
+            $caller = 'get' . $this->stringUtils->upperCaseWords($stackArgs[$i]['name'], '_', '');
+            $stackArgs[$i]['variable'] = method_exists(
+                $stackArgs[$i - 1]['variable'],
+                $caller
+            ) ? $stackArgs[$i - 1]['variable']->{$caller}() : $stackArgs[$i - 1]['variable']->getData(
+                $stackArgs[$i]['name']
+            );
+        }
+    }
+
+    /**
+     * Handle the calling of a DataObject's method at an index
+     *
+     * @param Template $filter
+     * @param array $templateVariables
+     * @param int $i
+     * @param array $stackArgs
+     */
+    private function handleDataObjectMethod(
+        Template $filter,
+        array $templateVariables,
+        int $i,
+        array &$stackArgs
+    ): void {
+        if (method_exists($stackArgs[$i - 1]['variable'], $stackArgs[$i]['name'])
+            || substr($stackArgs[$i]['name'], 0, 3) == 'get'
+        ) {
+            $stackArgs[$i]['args'] = $this->getStackArgs(
+                $stackArgs[$i]['args'],
+                $filter,
+                $templateVariables
+            );
+
+            $stackArgs[$i]['variable'] = call_user_func_array(
+                [$stackArgs[$i - 1]['variable'], $stackArgs[$i]['name']],
+                $stackArgs[$i]['args']
+            );
+        }
+    }
+
+    /**
+     * Handle the calling of an arbitrary object method
+     *
+     * @param Template $filter
+     * @param array $templateVariables
+     * @param int $i
+     * @param array $stackArgs
+     */
+    private function handleObjectMethod(Template $filter, array $templateVariables, int $i, array &$stackArgs): void
+    {
+        $object = $stackArgs[$i - 1]['variable'];
+        $method = $stackArgs[$i]['name'];
+        if (method_exists($object, $method)) {
+            $args = $this->getStackArgs($stackArgs[$i]['args'], $filter, $templateVariables);
+            $stackArgs[$i]['variable'] = call_user_func_array([$object, $method], $args);
+        }
+    }
+
+    /**
+     * Return if the given index should be processed for data access
+     *
+     * @param int $i
+     * @param array $stackArgs
+     * @return bool
+     */
+    private function shouldHandleDataAccess(int $i, array &$stackArgs): bool
+    {
+        return isset($stackArgs[$i - 1]['variable'])
+            && (
+                $stackArgs[$i - 1]['variable'] instanceof DataObject
+                || is_array($stackArgs[$i - 1]['variable'])
+            );
+    }
+
+    /**
+     * Return if the given index should be processed for object access
+     *
+     * @param int $i
+     * @param array $stackArgs
+     * @return bool
+     */
+    private function shouldHandleAsObjectAccess(int $i, array &$stackArgs): bool
+    {
+        return isset($stackArgs[$i - 1]['variable'])
+            && is_object($stackArgs[$i - 1]['variable'])
+            && $stackArgs[$i]['type'] == 'method';
+    }
+
+    /**
+     * Handle the intended access of data at the given stack arg index
+     *
+     * @param int $i
+     * @param Template $filter
+     * @param array $templateVariables
+     * @param array $stackArgs
+     */
+    private function handleDataAccess(int $i, Template $filter, array $templateVariables, array &$stackArgs): void
+    {
+        // If data object calling methods or getting properties
+        if ($stackArgs[$i]['type'] == 'property') {
+            $this->handlePropertyAccess($i, $stackArgs);
+        } elseif ($stackArgs[$i]['type'] == 'method') {
+            $this->handleDataObjectMethod($filter, $templateVariables, $i, $stackArgs);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/VariableResolver/StrategyResolver.php b/lib/internal/Magento/Framework/Filter/VariableResolver/StrategyResolver.php
new file mode 100644
index 0000000000000..b4fdb90ab69b0
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/VariableResolver/StrategyResolver.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\Filter\VariableResolver;
+
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\VariableResolverInterface;
+
+/**
+ * Responsible for resolving variables based on the mode of the template
+ */
+class StrategyResolver implements VariableResolverInterface
+{
+    /**
+     * @var LegacyResolver
+     */
+    private $legacyResolver;
+
+    /**
+     * @var StrictResolver
+     */
+    private $strictResolver;
+
+    /**
+     * @param LegacyResolver $legacyResolver
+     * @param StrictResolver $strictResolver
+     */
+    public function __construct(LegacyResolver $legacyResolver, StrictResolver $strictResolver)
+    {
+        $this->legacyResolver = $legacyResolver;
+        $this->strictResolver = $strictResolver;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolve(string $value, Template $filter, array $templateVariables)
+    {
+        if ($filter->isStrictMode()) {
+            return $this->strictResolver->resolve($value, $filter, $templateVariables);
+        } else {
+            return $this->legacyResolver->resolve($value, $filter, $templateVariables);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/VariableResolver/StrictResolver.php b/lib/internal/Magento/Framework/Filter/VariableResolver/StrictResolver.php
new file mode 100644
index 0000000000000..4915c6346503b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/VariableResolver/StrictResolver.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Filter\VariableResolver;
+
+use Magento\Email\Model\AbstractTemplate;
+use Magento\Framework\DataObject;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\Template\Tokenizer\VariableFactory;
+use Magento\Framework\Filter\VariableResolverInterface;
+
+/**
+ * Resolves variables allowing only scalar values
+ */
+class StrictResolver implements VariableResolverInterface
+{
+    /**
+     * @var VariableFactory
+     */
+    private $variableTokenizerFactory;
+
+    /**
+     * @param VariableFactory $variableTokenizerFactory
+     */
+    public function __construct(VariableFactory $variableTokenizerFactory)
+    {
+        $this->variableTokenizerFactory = $variableTokenizerFactory;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolve(string $value, Template $filter, array $templateVariables)
+    {
+        if (empty($value)) {
+            return null;
+        }
+
+        $tokenizer = $this->variableTokenizerFactory->create();
+        $tokenizer->setString($value);
+        $stackArgs = $tokenizer->tokenize();
+        $result = null;
+        $last = 0;
+        for ($i = 0, $count = count($stackArgs); $i < $count; $i++) {
+            if ($i === 0 && isset($templateVariables[$stackArgs[$i]['name']])) {
+                // Getting of template value
+                $stackArgs[$i]['variable'] = &$templateVariables[$stackArgs[$i]['name']];
+            } elseif ($this->shouldHandleDataAccess($i, $stackArgs)) {
+                $this->handleDataAccess($i, $filter, $templateVariables, $stackArgs);
+
+                $last = $i;
+            }
+        }
+
+        if (isset($stackArgs[$last]['variable'])
+            && (is_scalar($stackArgs[$last]['variable']) || is_array($stackArgs[$last]['variable']))
+        ) {
+            // If value for construction exists set it
+            $result = $stackArgs[$last]['variable'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Handle variable access at a given index
+     *
+     * @param int $i
+     * @param Template $filter
+     * @param array $templateVariables
+     * @param array $stackArgs
+     */
+    private function handleDataAccess(int $i, Template $filter, array $templateVariables, array &$stackArgs): void
+    {
+        // If data object calling methods or getting properties
+        if ($stackArgs[$i]['type'] == 'property') {
+            if (is_array($stackArgs[$i - 1]['variable'])) {
+                $stackArgs[$i]['variable'] = $stackArgs[$i - 1]['variable'][$stackArgs[$i]['name']];
+            } else {
+                // Strict mode should not call getter methods except DataObject's getData
+                $stackArgs[$i]['variable'] = $stackArgs[$i - 1]['variable']
+                    ->getData($stackArgs[$i]['name']);
+            }
+        } elseif ($stackArgs[$i]['type'] == 'method' && substr($stackArgs[$i]['name'], 0, 3) == 'get') {
+            $this->handleGetterMethod($i, $filter, $templateVariables, $stackArgs);
+        }
+    }
+
+    /**
+     * Handle getter method access at a given stack index
+     *
+     * @param int $i
+     * @param Template $filter
+     * @param array $templateVariables
+     * @param array $stackArgs
+     */
+    private function handleGetterMethod(int $i, Template $filter, array $templateVariables, array &$stackArgs): void
+    {
+        if ($stackArgs[$i]['name'] === 'getUrl'
+            && $stackArgs[$i - 1]['variable'] instanceof AbstractTemplate
+        ) {
+            $stackArgs[$i]['args'] = $this->getStackArgs(
+                $stackArgs[$i]['args'],
+                $filter,
+                $templateVariables
+            );
+
+            $stackArgs[$i]['args'][0] = $templateVariables['store'];
+            $stackArgs[$i]['variable'] = $stackArgs[$i - 1]['variable']->getUrl(
+                ...$stackArgs[$i]['args']
+            );
+        } else {
+            $dataKey = $this->extractDataKeyFromGetter($stackArgs[$i]['name']);
+            $stackArgs[$i]['variable'] = $stackArgs[$i - 1]['variable']->getData($dataKey);
+        }
+    }
+
+    /**
+     * Loops over a set of stack args to process variables into array argument values
+     *
+     * @param array $stack
+     * @param Template $filter
+     * @param array $templateVariables
+     * @return array
+     */
+    private function getStackArgs($stack, Template $filter, array $templateVariables): array
+    {
+        foreach ($stack as $i => $value) {
+            if (is_array($value)) {
+                $stack[$i] = $this->getStackArgs($value, $filter, $templateVariables);
+            } elseif (substr((string)$value, 0, 1) === '$') {
+                $stack[$i] = $this->resolve(substr($value, 1), $filter, $templateVariables);
+            }
+        }
+
+        return $stack;
+    }
+
+    /**
+     * Extract the DataObject key name from a getter method name in the same way as DataObject does internally
+     *
+     * @param string $method
+     * @return string
+     */
+    private function extractDataKeyFromGetter(string $method)
+    {
+        return strtolower(ltrim(trim(preg_replace('/([A-Z]|[0-9]+)/', '_$1', substr($method, 3))), '_'));
+    }
+
+    /**
+     * Return if the given index should be processed for data access
+     *
+     * @param int $i
+     * @param array $stackArgs
+     * @return bool
+     */
+    private function shouldHandleDataAccess(int $i, array &$stackArgs): bool
+    {
+        return isset($stackArgs[$i - 1]['variable'])
+            && (
+                $stackArgs[$i - 1]['variable'] instanceof DataObject
+                || $stackArgs[$i - 1]['variable'] instanceof AbstractTemplate
+                || is_array($stackArgs[$i - 1]['variable'])
+            );
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filter/VariableResolverInterface.php b/lib/internal/Magento/Framework/Filter/VariableResolverInterface.php
new file mode 100644
index 0000000000000..486a66f1ec1b0
--- /dev/null
+++ b/lib/internal/Magento/Framework/Filter/VariableResolverInterface.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\Filter;
+
+/**
+ * Responsible for obtaining the value of variables defined in the template
+ */
+interface VariableResolverInterface
+{
+    /**
+     * Resolve a template variable's value based on some raw input
+     *
+     * @param string $value e.g. customer.name or $this.foo() or address.format('html')
+     * @param Template $filter
+     * @param array $templateVariables The dataset that is available as variables to the template
+     * @return string|array|null Should be null if the input cannot be resolved
+     */
+    public function resolve(string $value, Template $filter, array $templateVariables);
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config.php b/lib/internal/Magento/Framework/GraphQl/Config.php
index ec22b742b1d6c..fa0a5cf1cd1eb 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config.php
@@ -62,13 +62,9 @@ public function getConfigElement(string $configElementName) : ConfigElementInter
         $fieldsInQuery = $this->queryFields->getFieldsUsedInQuery();
         if (isset($data['fields'])) {
             if (!empty($fieldsInQuery)) {
-                foreach (array_keys($data['fields']) as $fieldName) {
-                    if (!isset($fieldsInQuery[$fieldName])) {
-                        unset($data['fields'][$fieldName]);
-                    }
-                }
+                $data['fieldsInQuery'] = array_intersect_key($data['fields'], $fieldsInQuery);
+                ksort($data['fieldsInQuery']);
             }
-
             ksort($data['fields']);
         }
 
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceFactory.php
index ebf70478d4e43..d057408e3fbfa 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceFactory.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceFactory.php
@@ -47,11 +47,15 @@ public function __construct(
 
     /**
      * Instantiate an object representing 'interface' GraphQL config element.
+     *
+     * @param array $data
+     * @return ConfigElementInterface
      */
     public function createFromConfigData(array $data): ConfigElementInterface
     {
+        $fieldsData = $data['fieldsInQuery'] ?? ($data['fields'] ?? []);
         $fields = [];
-        foreach ($data['fields'] as $field) {
+        foreach ($fieldsData as $field) {
             $arguments = [];
             foreach ($field['arguments'] as $argument) {
                 $arguments[$argument['name']] = $this->argumentFactory->createFromConfigData($argument);
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
index 5dd477a050890..33a6bbd7b6983 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
@@ -46,7 +46,8 @@ public function __construct(
      */
     public function createFromConfigData(array $data): ConfigElementInterface
     {
-        $fields = isset($data['fields']) ? $this->fieldsFactory->createFromConfigData($data['fields']) : [];
+        $fieldsData = $data['fieldsInQuery'] ?? ($data['fields'] ?? []);
+        $fields = $this->fieldsFactory->createFromConfigData($fieldsData);
 
         return $this->create(
             $data,
diff --git a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php
index 429b7c04b7475..28b91c753c7e7 100644
--- a/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php
+++ b/lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php
@@ -7,13 +7,15 @@
 
 namespace Magento\Framework\GraphQl\Exception;
 
-use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\AggregateExceptionInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Phrase;
+use GraphQL\Error\ClientAware;
 
 /**
  * Exception for GraphQL to be thrown when user supplies invalid input
  */
-class GraphQlInputException extends InputException implements \GraphQL\Error\ClientAware
+class GraphQlInputException extends LocalizedException implements AggregateExceptionInterface, ClientAware
 {
     const EXCEPTION_CATEGORY = 'graphql-input';
 
@@ -22,6 +24,13 @@ class GraphQlInputException extends InputException implements \GraphQL\Error\Cli
      */
     private $isSafe;
 
+    /**
+     * The array of errors that have been added via the addError() method
+     *
+     * @var \Magento\Framework\Exception\LocalizedException[]
+     */
+    private $errors = [];
+
     /**
      * Initialize object
      *
@@ -51,4 +60,26 @@ public function getCategory() : string
     {
         return self::EXCEPTION_CATEGORY;
     }
+
+    /**
+     * Add child error if used as aggregate exception
+     *
+     * @param LocalizedException $exception
+     * @return $this
+     */
+    public function addError(LocalizedException $exception): self
+    {
+        $this->errors[] = $exception;
+        return $this;
+    }
+
+    /**
+     * Get child errors if used as aggregate exception
+     *
+     * @return LocalizedException[]
+     */
+    public function getErrors(): array
+    {
+        return $this->errors;
+    }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/BatchContractResolverWrapper.php b/lib/internal/Magento/Framework/GraphQl/Query/BatchContractResolverWrapper.php
new file mode 100644
index 0000000000000..f2f440a8a78d4
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/BatchContractResolverWrapper.php
@@ -0,0 +1,163 @@
+<?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\Field;
+use Magento\Framework\GraphQl\Query\Resolver\BatchServiceContractResolverInterface;
+use Magento\Framework\GraphQl\Query\Resolver\ResolveRequest;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Default logic to make batch contract resolvers work.
+ */
+class BatchContractResolverWrapper implements ResolverInterface
+{
+    /**
+     * @var BatchServiceContractResolverInterface
+     */
+    private $resolver;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var callable|null
+     */
+    private $contract;
+
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @var array
+     */
+    private $arguments = [];
+
+    /**
+     * @var ResolveRequest[]
+     */
+    private $requests = [];
+
+    /**
+     * @var array|null
+     */
+    private $result;
+
+    /**
+     * BatchContractResolverWrapper constructor.
+     * @param BatchServiceContractResolverInterface $resolver
+     * @param ObjectManagerInterface $objectManager
+     * @param ValueFactory $valueFactory
+     */
+    public function __construct(
+        BatchServiceContractResolverInterface $resolver,
+        ObjectManagerInterface $objectManager,
+        ValueFactory $valueFactory
+    ) {
+        $this->resolver = $resolver;
+        $this->objectManager = $objectManager;
+        $this->valueFactory = $valueFactory;
+    }
+
+    /**
+     * Get batch service contract instance.
+     *
+     * @return callable
+     */
+    private function getContact(): callable
+    {
+        if (!$this->contract) {
+            $contractData = $this->resolver->getServiceContract();
+            $this->contract = [$this->objectManager->get($contractData[0]), $contractData[1]];
+            $this->objectManager = null;
+        }
+
+        return $this->contract;
+    }
+
+    /**
+     * Clear aggregated data.
+     *
+     * @return void
+     */
+    private function clearAggregated(): void
+    {
+        $this->result = null;
+        $this->arguments = [];
+        $this->requests = [];
+    }
+
+    /**
+     * Get resolved branch/leaf for given request.
+     *
+     * @param int $i
+     * @throws \Throwable
+     * @return mixed
+     */
+    private function getResolvedFor(int $i)
+    {
+        try {
+            return $this->resolveForIndex($i);
+        } catch (\Throwable  $exception) {
+            $this->clearAggregated();
+            throw $exception;
+        }
+    }
+
+    /**
+     * Resolve for specified request.
+     *
+     * @param int $i
+     * @return mixed|\Magento\Framework\GraphQl\Query\Resolver\Value
+     * @throws \Magento\Framework\GraphQl\Exception\GraphQlInputException
+     */
+    private function resolveForIndex(int $i)
+    {
+        if (!array_key_exists($i, $this->requests)) {
+            throw new \RuntimeException('No such resolve request.');
+        }
+
+        if ($this->result === null) {
+            $this->result = call_user_func($this->getContact(), $this->arguments);
+        }
+
+        if (!array_key_exists($i, $this->result)) {
+            throw new \RuntimeException('Service contract returned insufficient result');
+        }
+
+        return $this->resolver->convertFromServiceResult($this->result[$i], $this->requests[$i]);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if ($this->result !== null) {
+            $this->clearAggregated();
+        }
+
+        //Add argument.
+        $i = count($this->arguments);
+        $request = new ResolveRequest($field, $context, $info, $value, $args);
+        $this->arguments[$i] = $this->resolver->convertToServiceArgument($request);
+        $this->requests[$i] = $request;
+
+        return $this->valueFactory->create(
+            function () use ($i) {
+                return $this->getResolvedFor($i);
+            }
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/BatchResolverWrapper.php b/lib/internal/Magento/Framework/GraphQl/Query/BatchResolverWrapper.php
new file mode 100644
index 0000000000000..82938100c3d12
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/BatchResolverWrapper.php
@@ -0,0 +1,134 @@
+<?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\Field;
+use Magento\Framework\GraphQl\Query\Resolver\BatchRequestItemInterface;
+use Magento\Framework\GraphQl\Query\Resolver\BatchResolverInterface;
+use Magento\Framework\GraphQl\Query\Resolver\BatchResponse;
+use Magento\Framework\GraphQl\Query\Resolver\ResolveRequest;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Wrapper containing batching logic for BatchResolverInterface.
+ */
+class BatchResolverWrapper implements ResolverInterface
+{
+    /**
+     * @var BatchResolverInterface
+     */
+    private $resolver;
+
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @var \Magento\Framework\GraphQl\Query\Resolver\ContextInterface|null
+     */
+    private $context;
+
+    /**
+     * @var Field|null
+     */
+    private $field;
+
+    /**
+     * @var BatchRequestItemInterface[]
+     */
+    private $request = [];
+
+    /**
+     * @var BatchResponse|null
+     */
+    private $response;
+
+    /**
+     * BatchResolverWrapper constructor.
+     * @param BatchResolverInterface $resolver
+     * @param ValueFactory $valueFactory
+     */
+    public function __construct(BatchResolverInterface $resolver, ValueFactory $valueFactory)
+    {
+        $this->resolver = $resolver;
+        $this->valueFactory = $valueFactory;
+    }
+
+    /**
+     * Clear aggregated data.
+     *
+     * @return void
+     */
+    private function clearAggregated(): void
+    {
+        $this->response = null;
+        $this->request = null;
+        $this->context = null;
+        $this->field = null;
+    }
+
+    /**
+     * Find resolved data for given request.
+     *
+     * @param BatchRequestItemInterface $item
+     * @throws \Throwable
+     * @return mixed
+     */
+    private function findResolvedFor(BatchRequestItemInterface $item)
+    {
+        try {
+            return $this->resolveFor($item);
+        } catch (\Throwable $exception) {
+            $this->clearAggregated();
+            throw $exception;
+        }
+    }
+
+    /**
+     * Resolve branch/leaf for given item.
+     *
+     * @param BatchRequestItemInterface $item
+     * @return mixed|\Magento\Framework\GraphQl\Query\Resolver\Value
+     * @throws \Throwable
+     */
+    private function resolveFor(BatchRequestItemInterface $item)
+    {
+        if (!$this->request) {
+            throw new \RuntimeException('Unknown batch request item');
+        }
+
+        if (!$this->response) {
+            $this->response = $this->resolver->resolve($this->context, $this->field, $this->request);
+        }
+
+        return $this->response->findResponseFor($item);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if ($this->response) {
+            $this->clearAggregated();
+        }
+
+        $item = new ResolveRequest($field, $context, $info, $value, $args);
+        $this->request[] = $item;
+        $this->context = $context;
+        $this->field = $field;
+
+        return $this->valueFactory->create(
+            function () use ($item) {
+                return $this->findResolvedFor($item);
+            }
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/ErrorHandler.php b/lib/internal/Magento/Framework/GraphQl/Query/ErrorHandler.php
index 2661034116f9d..b3d78790892f1 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/ErrorHandler.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/ErrorHandler.php
@@ -7,7 +7,7 @@
 
 namespace Magento\Framework\GraphQl\Query;
 
-use GraphQL\Error\ClientAware;
+use Magento\Framework\Exception\AggregateExceptionInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -36,13 +36,20 @@ public function __construct(
      */
     public function handle(array $errors, callable $formatter): array
     {
-        return array_map(
-            function (ClientAware $error) use ($formatter) {
-                $this->logger->error($error);
-
-                return $formatter($error);
-            },
-            $errors
-        );
+        $formattedErrors = [];
+        foreach ($errors as $error) {
+            $this->logger->error($error);
+            $previousError = $error->getPrevious();
+            if ($previousError instanceof AggregateExceptionInterface && !empty($previousError->getErrors())) {
+                $aggregatedErrors = $previousError->getErrors();
+                foreach ($aggregatedErrors as $aggregatedError) {
+                    $this->logger->error($aggregatedError);
+                    $formattedErrors[] = $formatter($aggregatedError);
+                }
+            } else {
+                $formattedErrors[] = $formatter($error);
+            }
+        }
+        return $formattedErrors;
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Fields.php b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
index a34c0a9d42187..78062effe3d41 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
@@ -46,10 +46,12 @@ public function setQuery($query, array $variables = null)
             if (isset($variables)) {
                 $queryFields = array_merge($queryFields, $this->extractVariables($variables));
             }
+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
         } catch (\Exception $e) {
             // If a syntax error is encountered do not collect fields
         }
-        if (isset($queryFields['IntrospectionQuery'])) {
+        if (isset($queryFields['IntrospectionQuery']) || (isset($queryFields['__schema'])) ||
+            (isset($queryFields['__type']))) {
             // It must be possible to query any fields during introspection query
             $queryFields = [];
         }
@@ -80,6 +82,7 @@ private function extractVariables(array $variables): array
         $fields = [];
         foreach ($variables as $key => $value) {
             if (is_array($value)) {
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $fields = array_merge($fields, $this->extractVariables($value));
             }
             $fields[$key] = $key;
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php b/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
index 2fdb3df5f6d71..2c498b0b7fd03 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
@@ -31,7 +31,7 @@ public function __construct(
     }
 
     /**
-     * Check the the environment config to determine if introspection should be disabled.
+     * Check the environment config to determine if introspection should be disabled.
      *
      * @return bool
      */
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/BatchRequestItemInterface.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/BatchRequestItemInterface.php
new file mode 100644
index 0000000000000..a3152496024af
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/BatchRequestItemInterface.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\Query\Resolver;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * One of requests for a batch resolver to process.
+ */
+interface BatchRequestItemInterface
+{
+    /**
+     * Meta for current branch/leaf.
+     *
+     * @return ResolveInfo
+     */
+    public function getInfo(): ResolveInfo;
+
+    /**
+     * Values passed from parent resolvers.
+     *
+     * @return array|null
+     */
+    public function getValue(): ?array;
+
+    /**
+     * GraphQL request arguments.
+     *
+     * @return array|null
+     */
+    public function getArgs(): ?array;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/BatchResolverInterface.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/BatchResolverInterface.php
new file mode 100644
index 0000000000000..d0b4779f74b39
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/BatchResolverInterface.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\GraphQl\Query\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+
+/**
+ * Resolve multiple requests of the same field gathered by GraphQL.
+ */
+interface BatchResolverInterface
+{
+    /**
+     * Resolve multiple requests.
+     *
+     * @param ContextInterface $context GraphQL context.
+     * @param Field $field FIeld metadata.
+     * @param BatchRequestItemInterface[] $requests Requests to the field.
+     * @return BatchResponse Aggregated response.
+     * @throws \Throwable
+     */
+    public function resolve(ContextInterface $context, Field $field, array $requests): BatchResponse;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/BatchResponse.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/BatchResponse.php
new file mode 100644
index 0000000000000..887db448c039e
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/BatchResponse.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;
+
+/**
+ * Contains responses for batch requests.
+ */
+class BatchResponse
+{
+    /**
+     * @var \SplObjectStorage
+     */
+    private $responses;
+
+    /**
+     * BatchResponse constructor.
+     */
+    public function __construct()
+    {
+        $this->responses = new \SplObjectStorage();
+    }
+
+    /**
+     * Match response with request.
+     *
+     * @param BatchRequestItemInterface $request
+     * @param array|int|string|float|Value $response
+     * @return void
+     */
+    public function addResponse(BatchRequestItemInterface $request, $response): void
+    {
+        $this->responses[$request] = $response;
+    }
+
+    /**
+     * Get response assigned to the request.
+     *
+     * @param BatchRequestItemInterface $item
+     * @return mixed|Value
+     * @throws \InvalidArgumentException
+     */
+    public function findResponseFor(BatchRequestItemInterface $item)
+    {
+        if (!$this->responses->offsetExists($item)) {
+            throw new \InvalidArgumentException('Response does not exist');
+        }
+
+        return $this->responses[$item];
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/BatchServiceContractResolverInterface.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/BatchServiceContractResolverInterface.php
new file mode 100644
index 0000000000000..cb983e69bc638
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/BatchServiceContractResolverInterface.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\Resolver;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Resolve multiple brunches/leaves by executing a batch service contract.
+ */
+interface BatchServiceContractResolverInterface
+{
+    /**
+     * Service contract to use, 1st element - class, 2nd - method.
+     *
+     * @return array
+     */
+    public function getServiceContract(): array;
+
+    /**
+     * Convert GraphQL arguments into a batch service contract argument item.
+     *
+     * @param ResolveRequestInterface $request
+     * @return object
+     * @throws GraphQlInputException
+     */
+    public function convertToServiceArgument(ResolveRequestInterface $request);
+
+    /**
+     * Convert service contract result item into resolved brunch/leaf.
+     *
+     * @param object $result Result item returned from service contract.
+     * @param ResolveRequestInterface $request Initial request.
+     * @return mixed|Value Resolved response.
+     * @throws GraphQlInputException
+     */
+    public function convertFromServiceResult($result, ResolveRequestInterface $request);
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Factory.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Factory.php
new file mode 100644
index 0000000000000..3b046ec452277
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Factory.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\Query\Resolver;
+
+use Magento\Framework\GraphQl\Query\BatchContractResolverWrapper;
+use Magento\Framework\GraphQl\Query\BatchResolverWrapper;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Creates GraphQL resolvers based on configurations.
+ */
+class Factory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * Factory constructor.
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create resolver by class name.
+     *
+     * @param string $class
+     * @return ResolverInterface
+     */
+    public function createByClass(string $class): ResolverInterface
+    {
+        $resolverInstance = $this->objectManager->get($class);
+        if ($resolverInstance instanceof BatchResolverInterface) {
+            $resolver = $this->objectManager->create(BatchResolverWrapper::class, ['resolver' => $resolverInstance]);
+        } elseif ($resolverInstance instanceof BatchServiceContractResolverInterface) {
+            $resolver = $this->objectManager->create(
+                BatchContractResolverWrapper::class,
+                ['resolver' => $resolverInstance]
+            );
+        } elseif ($resolverInstance instanceof ResolverInterface) {
+            $resolver = $resolverInstance;
+        } else {
+            throw new \RuntimeException($class .' cannot function as a GraphQL resolver');
+        }
+
+        return $resolver;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ResolveRequest.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ResolveRequest.php
new file mode 100644
index 0000000000000..3652ffc1cd7f5
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ResolveRequest.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\Query\Resolver;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+
+/**
+ * Request made to a resolver.
+ */
+class ResolveRequest implements BatchRequestItemInterface, ResolveRequestInterface
+{
+    /**
+     * @var Field
+     */
+    private $field;
+
+    /**
+     * @var ContextInterface
+     */
+    private $context;
+
+    /**
+     * @var ResolveInfo
+     */
+    private $info;
+
+    /**
+     * @var array|null
+     */
+    private $value;
+
+    /**
+     * @var array|null
+     */
+    private $args;
+
+    /**
+     * ResolverRequest constructor.
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     */
+    public function __construct(
+        Field $field,
+        ContextInterface $context,
+        ResolveInfo $info,
+        ?array $value,
+        ?array $args
+    ) {
+        $this->field = $field;
+        $this->context = $context;
+        $this->info = $info;
+        $this->value = $value;
+        $this->args = $args;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getField(): Field
+    {
+        return $this->field;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getContext(): ContextInterface
+    {
+        return $this->context;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getInfo(): ResolveInfo
+    {
+        return $this->info;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getValue(): ?array
+    {
+        return $this->value;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getArgs(): ?array
+    {
+        return $this->args;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ResolveRequestInterface.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ResolveRequestInterface.php
new file mode 100644
index 0000000000000..cf5e216f5f9de
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/ResolveRequestInterface.php
@@ -0,0 +1,52 @@
+<?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\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+
+/**
+ * Request for a resolver.
+ */
+interface ResolveRequestInterface
+{
+    /**
+     * Field metadata.
+     *
+     * @return Field
+     */
+    public function getField(): Field;
+
+    /**
+     * GraphQL context.
+     *
+     * @return ContextInterface
+     */
+    public function getContext(): ContextInterface;
+
+    /**
+     * Information associated with the request.
+     *
+     * @return ResolveInfo
+     */
+    public function getInfo(): ResolveInfo;
+
+    /**
+     * Value passed from parent resolvers.
+     *
+     * @return array|null
+     */
+    public function getValue(): ?array;
+
+    /**
+     * Arguments from GraphQL request.
+     *
+     * @return array|null
+     */
+    public function getArgs(): ?array;
+}
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
index e3f0945cb8dfd..ad9fb675a6d70 100644
--- 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
@@ -10,7 +10,6 @@
 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;
@@ -18,6 +17,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ScalarTypes;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfoFactory;
+use Magento\Framework\GraphQl\Query\Resolver\Factory as ResolverFactory;
 
 /**
  * Convert fields of the given 'type' config element to the objects compatible with GraphQL schema generator.
@@ -54,6 +54,11 @@ class Fields implements FormatterInterface
      */
     private $resolveInfoFactory;
 
+    /**
+     * @var ResolverFactory
+     */
+    private $resolverFactory;
+
     /**
      * @param ObjectManagerInterface $objectManager
      * @param OutputMapper $outputMapper
@@ -61,6 +66,7 @@ class Fields implements FormatterInterface
      * @param ScalarTypes $scalarTypes
      * @param WrappedTypeProcessor $wrappedTypeProcessor
      * @param ResolveInfoFactory $resolveInfoFactory
+     * @param ResolverFactory $resolverFactory
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
@@ -68,7 +74,8 @@ public function __construct(
         InputMapper $inputMapper,
         ScalarTypes $scalarTypes,
         WrappedTypeProcessor $wrappedTypeProcessor,
-        ResolveInfoFactory $resolveInfoFactory
+        ResolveInfoFactory $resolveInfoFactory,
+        ?ResolverFactory $resolverFactory = null
     ) {
         $this->objectManager = $objectManager;
         $this->outputMapper = $outputMapper;
@@ -76,6 +83,7 @@ public function __construct(
         $this->scalarTypes = $scalarTypes;
         $this->wrappedTypeProcessor = $wrappedTypeProcessor;
         $this->resolveInfoFactory = $resolveInfoFactory;
+        $this->resolverFactory = $resolverFactory ?? $this->objectManager->get(ResolverFactory::class);
     }
 
     /**
@@ -149,8 +157,7 @@ private function getFieldConfig(
         }
 
         if ($field->getResolver() != null) {
-            /** @var ResolverInterface $resolver */
-            $resolver = $this->objectManager->get($field->getResolver());
+            $resolver = $this->resolverFactory->createByClass($field->getResolver());
 
             $fieldConfig['resolve'] =
                 function ($value, $args, $context, $info) use ($resolver, $field) {
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
index 17d7482607622..dc3e63fcc7df8 100644
--- a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
+++ b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\HTTP\PhpEnvironment;
 
 /**
@@ -181,4 +183,27 @@ public function __sleep()
     {
         return ['content', 'isRedirect', 'statusCode'];
     }
+
+    /**
+     * Sending provided headers.
+     *
+     * Had to be overridden because the original did not work correctly with multi-headers.
+     */
+    public function sendHeaders()
+    {
+        if ($this->headersSent()) {
+            return $this;
+        }
+
+        $status  = $this->renderStatusLine();
+        header($status);
+
+        /** @var \Zend\Http\Header\HeaderInterface $header */
+        foreach ($this->getHeaders() as $header) {
+            header($header->toString(), false);
+        }
+
+        $this->headersSent = true;
+        return $this;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
index 42f7e42960eff..b06f2f9e62397 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Framework\Image\Adapter;
@@ -175,7 +174,7 @@ abstract public function open($fileName);
     /**
      * Save image to specific path.
      *
-     * If some folders of path does not exist they will be created
+     * If some folders of the path do not exist they will be created.
      *
      * @param null|string $destination
      * @param null|string $newName
@@ -292,7 +291,7 @@ public function getMimeType()
         if ($this->_fileMimeType) {
             return $this->_fileMimeType;
         } else {
-            $this->_fileMimeType = image_type_to_mime_type($this->getImageType());
+            $this->_fileMimeType = image_type_to_mime_type((int) $this->getImageType());
             return $this->_fileMimeType;
         }
     }
@@ -524,7 +523,7 @@ public function backgroundColor($value = null)
      */
     protected function _getFileAttributes()
     {
-        $pathinfo = pathinfo($this->_fileName);
+        $pathinfo = pathinfo((string) $this->_fileName);
 
         $this->_fileSrcPath = $pathinfo['dirname'];
         $this->_fileSrcName = $pathinfo['basename'];
@@ -626,6 +625,7 @@ protected function _checkDimensions($frameWidth, $frameHeight)
             $frameHeight !== null && $frameHeight <= 0 ||
             empty($frameWidth) && empty($frameHeight)
         ) {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \InvalidArgumentException('Invalid image dimensions.');
         }
     }
@@ -675,7 +675,7 @@ protected function _prepareDestination($destination = null, $newName = null)
             $destination = $this->_fileSrcPath;
         } else {
             if (empty($newName)) {
-                $info = pathinfo($destination);
+                $info = pathinfo((string) $destination);
                 $newName = $info['basename'];
                 $destination = $info['dirname'];
             }
@@ -693,6 +693,7 @@ protected function _prepareDestination($destination = null, $newName = null)
                 $this->directoryWrite->create($this->directoryWrite->getRelativePath($destination));
             } catch (\Magento\Framework\Exception\FileSystemException $e) {
                 $this->logger->critical($e);
+                //phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw new \DomainException(
                     'Unable to write file into directory ' . $destination . '. Access forbidden.'
                 );
@@ -726,14 +727,23 @@ protected function _canProcess()
     public function validateUploadFile($filePath)
     {
         if (!file_exists($filePath)) {
-            throw new \InvalidArgumentException("File '{$filePath}' does not exists.");
+            throw new \InvalidArgumentException('Upload file does not exist.');
         }
+
         if (filesize($filePath) === 0) {
             throw new \InvalidArgumentException('Wrong file size.');
         }
-        if (!getimagesize($filePath)) {
+
+        try {
+            $imageSize = getimagesize($filePath);
+        } catch (\Exception $e) {
+            $imageSize = false;
+        }
+
+        if (!$imageSize) {
             throw new \InvalidArgumentException('Disallowed file type.');
         }
+
         $this->checkDependencies();
         $this->open($filePath);
 
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
index d52e70ef56a11..7e92b336cfdc0 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -296,8 +296,9 @@ private function _fillBackgroundColor(&$imageResourceTo)
                     imagecolortransparent($imageResourceTo, $transparentColor);
                     return $transparentColor;
                 }
+                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
             } catch (\Exception $e) {
-                throw new \DomainException('Failed to fill image.');
+                // fallback to default background color
             }
         }
         list($r, $g, $b) = $this->_backgroundColor;
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/MultiDimensionProviderTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/MultiDimensionProviderTest.php
index b55ace9bdec3d..60bbc092469c6 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/MultiDimensionProviderTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/MultiDimensionProviderTest.php
@@ -210,6 +210,11 @@ public function testMultiDimensionProviderWithMixedDataProvider()
         }
     }
 
+    /**
+     * @param $dimensions
+     *
+     * @return \PHPUnit\Framework\MockObject\MockObject
+     */
     private function getDimensionProviderMock($dimensions)
     {
         $dimensionProviderMock = $this->getMockBuilder(DimensionProviderInterface::class)
@@ -233,6 +238,12 @@ function () use ($dimensions) {
         return $dimensionProviderMock;
     }
 
+    /**
+     * @param string $name
+     * @param string $value
+     *
+     * @return \PHPUnit\Framework\MockObject\MockObject
+     */
     private function getDimensionMock(string $name, string $value)
     {
         $dimensionMock = $this->getMockBuilder(Dimension::class)
diff --git a/lib/internal/Magento/Framework/Indexer/etc/indexer.xsd b/lib/internal/Magento/Framework/Indexer/etc/indexer.xsd
index fc38a5206e855..ca14e5d56fb76 100644
--- a/lib/internal/Magento/Framework/Indexer/etc/indexer.xsd
+++ b/lib/internal/Magento/Framework/Indexer/etc/indexer.xsd
@@ -14,19 +14,19 @@
         </xs:annotation>
         <xs:sequence>
             <xs:choice minOccurs="0" maxOccurs="unbounded">
-                <xs:element name="title" type="translatableType" />
-                <xs:element name="description" type="translatableType" />
-                <xs:element name="saveHandler" type="saveHandlerType" />
-                <xs:element name="structure" type="structureType" />
+                <xs:element name="title" type="translatableType"/>
+                <xs:element name="description" type="translatableType"/>
+                <xs:element name="saveHandler" type="saveHandlerType"/>
+                <xs:element name="structure" type="structureType"/>
                 <xs:group ref="fieldset"/>
             </xs:choice>
             <xs:group ref="dependencies"/>
         </xs:sequence>
-        <xs:attribute name="id" type="xs:string" use="required" />
-        <xs:attribute name="primary" type="nameType" use="optional" />
-        <xs:attribute name="view_id" type="viewIdType" use="optional" />
-        <xs:attribute name="class" type="classType" use="optional" />
-        <xs:attribute name="shared_index" type="xs:string" use="optional" />
+        <xs:attribute name="id" type="xs:string" use="required"/>
+        <xs:attribute name="primary" type="nameType"/>
+        <xs:attribute name="view_id" type="viewIdType"/>
+        <xs:attribute name="class" type="classType"/>
+        <xs:attribute name="shared_index" type="xs:string"/>
     </xs:complexType>
 
     <xs:group name="fieldset">
@@ -48,7 +48,7 @@
     <xs:complexType name="translatableType">
         <xs:simpleContent>
             <xs:extension base="xs:string">
-                <xs:attribute name="translate" use="optional" fixed="true" type="xs:boolean"/>
+                <xs:attribute name="translate" fixed="true" type="xs:boolean"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
@@ -60,7 +60,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:restriction>
     </xs:simpleType>
 
@@ -71,7 +71,7 @@
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[a-zA-Z|\\]+[a-zA-Z0-9\\]+" />
+            <xs:pattern value="[a-zA-Z|\\]+[a-zA-Z0-9\\]+"/>
         </xs:restriction>
     </xs:simpleType>
 
@@ -82,7 +82,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:restriction>
     </xs:simpleType>
 
@@ -93,7 +93,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:restriction>
     </xs:simpleType>
 
@@ -104,7 +104,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:restriction>
     </xs:simpleType>
 
@@ -115,7 +115,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:restriction>
     </xs:simpleType>
 
@@ -126,8 +126,8 @@
             </xs:documentation>
         </xs:annotation>
         <xs:attribute name="name" type="nameType" use="required"/>
-        <xs:attribute name="handler" type="classType" use="optional"/>
-        <xs:attribute name="origin" type="originType" use="optional"/>
+        <xs:attribute name="handler" type="classType"/>
+        <xs:attribute name="origin" type="originType"/>
     </xs:complexType>
 
     <xs:complexType name="fieldsetType" mixed="true">
@@ -137,11 +137,11 @@
             </xs:documentation>
         </xs:annotation>
         <xs:sequence>
-            <xs:element type="referenceType" name="reference" minOccurs="0" maxOccurs="unbounded" />
+            <xs:element type="referenceType" name="reference" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="field" type="fieldType" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
-        <xs:attribute name="source" type="classType" use="optional"/>
-        <xs:attribute name="provider" type="classType" use="optional"/>
+        <xs:attribute name="source" type="classType"/>
+        <xs:attribute name="provider" type="classType"/>
         <xs:attribute name="name" type="nameType" use="required"/>
     </xs:complexType>
 
@@ -149,9 +149,9 @@
         <xs:complexContent>
             <xs:extension base="fieldTypeAbstract">
                 <xs:choice>
-                    <xs:element type="filterType" name="filter" minOccurs="0" maxOccurs="1" />
+                    <xs:element type="filterType" name="filter" minOccurs="0" maxOccurs="1"/>
                 </xs:choice>
-                <xs:attribute type="dataType" name="dataType" use="optional" />
+                <xs:attribute type="dataType" name="dataType"/>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
@@ -190,20 +190,20 @@
             </xs:documentation>
         </xs:annotation>
         <xs:attribute name="fieldset" type="nameType" use="required"/>
-        <xs:attribute name="from" type="fromType" use="optional"/>
-        <xs:attribute name="to" type="toType" use="optional"/>
+        <xs:attribute name="from" type="fromType"/>
+        <xs:attribute name="to" type="toType"/>
     </xs:complexType>
 
     <xs:simpleType name="dataType">
         <xs:restriction base="xs:string">
-            <xs:enumeration value="int" />
-            <xs:enumeration value="float" />
-            <xs:enumeration value="varchar" />
-            <xs:enumeration value="text" />
-            <xs:enumeration value="mediumtext" />
-            <xs:enumeration value="timestamp" />
-            <xs:enumeration value="datetime" />
-            <xs:enumeration value="date" />
+            <xs:enumeration value="int"/>
+            <xs:enumeration value="float"/>
+            <xs:enumeration value="varchar"/>
+            <xs:enumeration value="text"/>
+            <xs:enumeration value="mediumtext"/>
+            <xs:enumeration value="timestamp"/>
+            <xs:enumeration value="datetime"/>
+            <xs:enumeration value="date"/>
         </xs:restriction>
     </xs:simpleType>
 
@@ -226,8 +226,8 @@
                     Indexer Id must be unique.
                 </xs:documentation>
             </xs:annotation>
-            <xs:selector xpath="indexer" />
-            <xs:field xpath="@id" />
+            <xs:selector xpath="indexer"/>
+            <xs:field xpath="@id"/>
         </xs:unique>
         <xs:unique name="uniqueViewId">
             <xs:annotation>
@@ -235,8 +235,8 @@
                     Indexer Id must be unique.
                 </xs:documentation>
             </xs:annotation>
-            <xs:selector xpath="indexer" />
-            <xs:field xpath="@view_id" />
+            <xs:selector xpath="indexer"/>
+            <xs:field xpath="@view_id"/>
         </xs:unique>
     </xs:element>
     <xs:complexType name="configType">
@@ -266,8 +266,8 @@
                             Related indexer id must be unique.
                         </xs:documentation>
                     </xs:annotation>
-                    <xs:selector xpath="indexer" />
-                    <xs:field xpath="@id" />
+                    <xs:selector xpath="indexer"/>
+                    <xs:field xpath="@id"/>
                 </xs:unique>
             </xs:element>
         </xs:choice>
@@ -287,7 +287,7 @@
                             Indexer dependency that represents another indexer.
                         </xs:documentation>
                     </xs:annotation>
-                    <xs:attribute name="id" type="xs:string" use="required" />
+                    <xs:attribute name="id" type="xs:string" use="required"/>
                 </xs:complexType>
             </xs:element>
         </xs:sequence>
diff --git a/lib/internal/Magento/Framework/Interception/Interceptor.php b/lib/internal/Magento/Framework/Interception/Interceptor.php
index ccc311c5b3426..07600c5168181 100644
--- a/lib/internal/Magento/Framework/Interception/Interceptor.php
+++ b/lib/internal/Magento/Framework/Interception/Interceptor.php
@@ -62,9 +62,6 @@ public function ___callParent($method, array $arguments)
      * Calls parent class sleep if defined, otherwise provides own implementation
      *
      * @return array
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -81,9 +78,6 @@ public function __sleep()
      * Causes Interceptor to be initialized
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index a4f728454a524..bf1372dc007a1 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -138,7 +138,7 @@ public function __construct(
     protected function _inheritPlugins($type)
     {
         $type = ltrim($type, '\\');
-        if (!array_key_exists($type, $this->_inherited)) {
+        if (!isset($this->_inherited[$type])) {
             $realType = $this->_omConfig->getOriginalInstanceType($type);
 
             if ($realType !== $type) {
@@ -292,28 +292,7 @@ protected function _loadScopedData()
                     $this->_loadedScopes[$scopeCode] = true;
                 }
             } else {
-                $virtualTypes = [];
-                foreach ($this->_scopePriorityScheme as $scopeCode) {
-                    if (false == isset($this->_loadedScopes[$scopeCode])) {
-                        $data = $this->_reader->read($scopeCode) ?: [];
-                        unset($data['preferences']);
-                        if (count($data) > 0) {
-                            $this->_inherited = [];
-                            $this->_processed = [];
-                            $this->merge($data);
-                            foreach ($data as $class => $config) {
-                                if (isset($config['type'])) {
-                                    $virtualTypes[] = $class;
-                                }
-                            }
-                        }
-                        $this->_loadedScopes[$scopeCode] = true;
-                    }
-                    if ($this->isCurrentScope($scopeCode)) {
-                        break;
-                    }
-                }
-                foreach ($virtualTypes as $class) {
+                foreach ($this->_loadScopedVirtualTypes() as $class) {
                     $this->_inheritPlugins($class);
                 }
                 foreach ($this->getClassDefinitions() as $class) {
@@ -328,6 +307,37 @@ protected function _loadScopedData()
         }
     }
 
+    /**
+     * Load virtual types for current scope
+     *
+     * @return array
+     */
+    private function _loadScopedVirtualTypes()
+    {
+        $virtualTypes = [];
+        foreach ($this->_scopePriorityScheme as $scopeCode) {
+            if (!isset($this->_loadedScopes[$scopeCode])) {
+                $data = $this->_reader->read($scopeCode) ?: [];
+                unset($data['preferences']);
+                if (count($data) > 0) {
+                    $this->_inherited = [];
+                    $this->_processed = [];
+                    $this->merge($data);
+                    foreach ($data as $class => $config) {
+                        if (isset($config['type'])) {
+                            $virtualTypes[] = $class;
+                        }
+                    }
+                }
+                $this->_loadedScopes[$scopeCode] = true;
+            }
+            if ($this->isCurrentScope($scopeCode)) {
+                break;
+            }
+        }
+        return $virtualTypes;
+    }
+
     /**
      * Whether scope code is current scope code
      *
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 61eb2e62091ea..98bac47e8e1b0 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Framework\Interception\Test\Unit\Config;
 
-use Magento\Framework\Serialize\SerializerInterface;
-
 require_once __DIR__ . '/../Custom/Module/Model/Item.php';
 require_once __DIR__ . '/../Custom/Module/Model/Item/Enhanced.php';
 require_once __DIR__ . '/../Custom/Module/Model/ItemContainer.php';
@@ -89,48 +87,52 @@ public function testHasPluginsWhenDataIsNotCached($expectedResult, $type, $entit
             ->will($this->returnValue(null));
         $this->omConfigMock->expects($this->any())
             ->method('getOriginalInstanceType')
-            ->will($this->returnValueMap(
-                [
-                    [
-                        \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer::class,
-                        \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer::class,
-                    ],
-                    [
-                        \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item::class,
-                        \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item::class,
-                    ],
-                    [
-                        \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item\Enhanced::class,
-                        \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item\Enhanced::class,
-                    ],
-                    [
-                        \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer\Enhanced::class,
-                        \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer\Enhanced::class,
-                    ],
-                    [
-                        \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer\Proxy::class,
-                        \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer\Proxy::class,
-                    ],
+            ->will(
+                $this->returnValueMap(
                     [
-                        \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemProxy::class,
-                        \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemProxy::class,
-                    ],
-                    [
-                        \Magento\Framework\Interception\Custom\Module\Model\Backslash\ItemProxy::class,
-                        \Magento\Framework\Interception\Custom\Module\Model\Backslash\ItemProxy::class
-                    ],
-                    [
-                        'virtual_custom_item',
-                        \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item::class
-                    ],
+                        [
+                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer::class,
+                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer::class,
+                        ],
+                        [
+                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item::class,
+                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item::class,
+                        ],
+                        [
+                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item\Enhanced::class,
+                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item\Enhanced::class,
+                        ],
+                        [
+                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer\Enhanced::class,
+                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer\Enhanced::class,
+                        ],
+                        [
+                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer\Proxy::class,
+                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer\Proxy::class,
+                        ],
+                        [
+                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item\Proxy::class,
+                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item\Proxy::class,
+                        ],
+                        [
+                            \Magento\Framework\Interception\Custom\Module\Model\Backslash\Item\Proxy::class,
+                            \Magento\Framework\Interception\Custom\Module\Model\Backslash\Item\Proxy::class
+                        ],
+                        [
+                            'virtual_custom_item',
+                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item::class
+                        ],
+                    ]
+                )
+            );
+        $this->definitionMock->expects($this->any())->method('getClasses')->will(
+            $this->returnValue(
+                [
+                    \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item\Proxy::class,
+                    \Magento\Framework\Interception\Custom\Module\Model\Backslash\Item\Proxy::class
                 ]
-            ));
-        $this->definitionMock->expects($this->any())->method('getClasses')->will($this->returnValue(
-            [
-                \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemProxy::class,
-                \Magento\Framework\Interception\Custom\Module\Model\Backslash\ItemProxy::class
-            ]
-        ));
+            )
+        );
         $this->relationsMock->expects($this->any())->method('has')->will($this->returnValue($expectedResult));
         $this->relationsMock->expects($this->any())->method('getParents')->will($this->returnValue($entityParents));
 
@@ -163,7 +165,7 @@ public function testHasPluginsWhenDataIsCached($expectedResult, $type)
             \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item\Enhanced::class => true,
             \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer\Enhanced::class => true,
             \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer\Proxy::class => true,
-            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemProxy::class => false,
+            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item\Proxy::class => false,
             'virtual_custom_item' => true
         ];
         $this->readerMock->expects($this->never())->method('read');
@@ -221,7 +223,7 @@ public function hasPluginsDataProvider()
                 [\Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer::class]
             ],
             [
-                false, \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemProxy::class,
+                false, \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item\Proxy::class,
                 []
             ],
             [
diff --git a/lib/internal/Magento/Framework/Locale/Config.php b/lib/internal/Magento/Framework/Locale/Config.php
index f02ba78ccc3e0..c2d0147c7fdc8 100644
--- a/lib/internal/Magento/Framework/Locale/Config.php
+++ b/lib/internal/Magento/Framework/Locale/Config.php
@@ -129,7 +129,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
         'BHD', /*Bahraini Dinar*/
         'BDT', /*Bangladesh Taka*/
         'BBD', /*Barbados Dollar*/
-        'BYR', /*Belarussian Ruble*/
+        'BYN', /*Belarussian Ruble*/
         'BZD', /*Belize Dollar*/
         'BMD', /*Bermudan Dollar*/
         'BTN', /*Bhutan Ngultrum*/
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/ConfigTest.php
index 149f6b5e33b6e..20731ee34558e 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/ConfigTest.php
@@ -6,7 +6,11 @@
 
 namespace Magento\Framework\Locale\Test\Unit;
 
-class ConfigTest extends \PHPUnit\Framework\TestCase
+use Magento\Framework\Locale\Config;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+class ConfigTest extends TestCase
 {
     private static $allAllowedLocales = [
         'af_ZA', 'ar_DZ', 'ar_EG', 'ar_KW', 'ar_MA', 'ar_SA', 'az_Latn_AZ', 'be_BY', 'bg_BG', 'bn_BD',
@@ -22,7 +26,7 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
 
     private static $allAllowedCurrencies = [
         'AFN', 'ALL', 'AZN', 'DZD', 'AOA', 'ARS', 'AMD', 'AWG', 'AUD', 'BSD',
-        'BHD', 'BDT', 'BBD', 'BYR', 'BZD', 'BMD', 'BTN', 'BOB', 'BAM', 'BWP',
+        'BHD', 'BDT', 'BBD', 'BYN', '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',
@@ -67,13 +71,14 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
         'QED', 'PNP', 'EJN', 'MTO', 'EBY',
     ];
 
-    /** @var  \Magento\Framework\Locale\Config */
+    /**
+     * @var Config
+     */
     private $configObject;
 
     public function testGetAllowedLocalesNoDataArray()
     {
-        $this->configObject = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
-            ->getObject(\Magento\Framework\Locale\Config::class);
+        $this->configObject = (new ObjectManager($this))->getObject(Config::class);
 
         $retrievedLocales = $this->configObject->getAllowedLocales();
 
@@ -88,9 +93,9 @@ public function testGetAllowedLocalesNoDataArray()
 
     public function testGetAllowedLocalesGivenDataArray()
     {
-        $this->configObject = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
+        $this->configObject = (new ObjectManager($this))
             ->getObject(
-                \Magento\Framework\Locale\Config::class,
+                Config::class,
                 [
                     'data' => [
                         'allowedLocales' => $this::$sampleAdditionalLocales,
@@ -114,9 +119,9 @@ public function testGetAllowedLocalesGivenDataArray()
 
     public function testGetAllowedLocalesGivenRedundantDataArray()
     {
-        $this->configObject = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
+        $this->configObject = (new ObjectManager($this))
             ->getObject(
-                \Magento\Framework\Locale\Config::class,
+                Config::class,
                 [
                     'data' => [
                         'allowedLocales' => $this::$samplePresentLocales,
@@ -140,8 +145,8 @@ public function testGetAllowedLocalesGivenRedundantDataArray()
 
     public function testGetAllowedCurrenciesNoDataArray()
     {
-        $this->configObject = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
-            ->getObject(\Magento\Framework\Locale\Config::class);
+        $this->configObject = (new ObjectManager($this))
+            ->getObject(Config::class);
 
         $retrievedCurrencies = $this->configObject->getAllowedCurrencies();
 
@@ -156,9 +161,9 @@ public function testGetAllowedCurrenciesNoDataArray()
 
     public function testGetAllowedCurrenciesGivenDataArray()
     {
-        $this->configObject = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
+        $this->configObject = (new ObjectManager($this))
             ->getObject(
-                \Magento\Framework\Locale\Config::class,
+                Config::class,
                 [
                     'data' => [
                         'allowedCurrencies' => $this::$sampleAdditionalCurrencies,
@@ -182,9 +187,9 @@ public function testGetAllowedCurrenciesGivenDataArray()
 
     public function testGetAllowedCurrenciesGivenRedundantDataArray()
     {
-        $this->configObject = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
+        $this->configObject = (new ObjectManager($this))
             ->getObject(
-                \Magento\Framework\Locale\Config::class,
+                Config::class,
                 [
                     'data' => [
                         'allowedCurrencies' => $this::$samplePresentCurrencies,
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/TranslatedListsTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/TranslatedListsTest.php
index 0d51d6fbda305..1d15d2de9f161 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/TranslatedListsTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/TranslatedListsTest.php
@@ -44,24 +44,36 @@ class TranslatedListsTest extends TestCase
      * @var array
      */
     private $expectedLocales = [
-        'en_US' => 'English (United States)',
-        'en_GB' => 'English (United Kingdom)',
-        'uk_UA' => 'Ukrainian (Ukraine)',
-        'de_DE' => 'German (Germany)',
-        'sr_Cyrl_RS' => 'Serbian (Cyrillic, Serbia)',
-        'sr_Latn_RS' => 'Serbian (Latin, Serbia)'
+        'en_US',
+        'en_GB',
+        'uk_UA',
+        'de_DE',
+        'sr_Cyrl_RS',
+        'sr_Latn_RS'
     ];
 
     /**
-     * @var array
+     * @var string[]
+     */
+    private $languages = [
+        'en_US' => 'English',
+        'en_GB' => 'English',
+        'uk_UA' => 'Ukrainian',
+        'de_DE' => 'German',
+        'sr_Cyrl_RS' => 'Serbian',
+        'sr_Latn_RS' => 'Serbian'
+    ];
+
+    /**
+     * @var string[]
      */
-    private $expectedTranslatedLocales = [
-        'en_US' => 'English (United States) / English (United States)',
-        'en_GB' => 'English (United Kingdom) / English (United Kingdom)',
-        'uk_UA' => 'українська (Україна) / Ukrainian (Ukraine)',
-        'de_DE' => 'Deutsch (Deutschland) / German (Germany)',
-        'sr_Cyrl_RS' => 'српски (ћирилица, Србија) / Serbian (Cyrillic, Serbia)',
-        'sr_Latn_RS' => 'Srpski (latinica, Srbija) / Serbian (Latin, Serbia)'
+    private $countries = [
+        'en_US' => 'United States',
+        'en_GB' => 'United Kingdom',
+        'uk_UA' => 'Ukraine',
+        'de_DE' => 'Germany',
+        'sr_Cyrl_RS' => 'Serbia',
+        'sr_Latn_RS' => 'Serbia'
     ];
 
     protected function setUp()
@@ -168,20 +180,22 @@ public function testGetOptionTimezones()
 
     public function testGetOptionLocales()
     {
+        $expected = $this->getExpectedLocales();
         $locales = array_intersect(
-            $this->expectedLocales,
+            $expected,
             $this->convertOptionLocales($this->listsModel->getOptionLocales())
         );
-        $this->assertEquals($this->expectedLocales, $locales);
+        $this->assertEquals($expected, $locales);
     }
 
     public function testGetTranslatedOptionLocales()
     {
+        $expected = $this->getExpectedTranslatedLocales();
         $locales = array_intersect(
-            $this->expectedTranslatedLocales,
+            $expected,
             $this->convertOptionLocales($this->listsModel->getTranslatedOptionLocales())
         );
-        $this->assertEquals($this->expectedTranslatedLocales, $locales);
+        $this->assertEquals($expected, $locales);
     }
 
     /**
@@ -198,4 +212,42 @@ private function convertOptionLocales($optionLocales): array
 
         return $result;
     }
+
+    /**
+     * Expected translated locales list.
+     *
+     * @return string[]
+     */
+    private function getExpectedTranslatedLocales(): array
+    {
+        $expected = [];
+        foreach ($this->expectedLocales as $locale) {
+            $script = \Locale::getDisplayScript($locale);
+            $scriptTranslated = $script ? \Locale::getDisplayScript($locale, $locale) .', ' : '';
+            $expected[$locale] = ucwords(\Locale::getDisplayLanguage($locale, $locale))
+                . ' (' . $scriptTranslated
+                . \Locale::getDisplayRegion($locale, $locale) . ') / '
+                . $this->languages[$locale]
+                . ' (' . ($script ? $script .', ' : '') . $this->countries[$locale] . ')';
+        }
+
+        return $expected;
+    }
+
+    /**
+     * Expected locales list.
+     *
+     * @return string[]
+     */
+    private function getExpectedLocales(): array
+    {
+        $expected = [];
+        foreach ($this->expectedLocales as $locale) {
+            $script = \Locale::getScript($locale);
+            $scriptDisplayed = $script ? \Locale::getDisplayScript($locale) . ', ' : '';
+            $expected[$locale] = $this->languages[$locale] .' (' .$scriptDisplayed .$this->countries[$locale] .')';
+        }
+
+        return $expected;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Database.php b/lib/internal/Magento/Framework/Lock/Backend/Database.php
index a5a76ba60f4e2..aa872f9166b5c 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Database.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Database.php
@@ -11,8 +11,8 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\Exception\AlreadyExistsException;
-use Magento\Framework\Exception\InputException;
 use Magento\Framework\Phrase;
+use Magento\Framework\DB\ExpressionConverter;
 
 /**
  * Implementation of the lock manager on the basis of MySQL.
@@ -68,7 +68,6 @@ public function __construct(
      * @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
      * @throws \Zend_Db_Statement_Exception
      */
@@ -110,7 +109,6 @@ public function lock(string $name, int $timeout = -1): bool
      *
      * @param string $name lock name
      * @return bool
-     * @throws InputException
      * @throws \Zend_Db_Statement_Exception
      */
     public function unlock(string $name): bool
@@ -138,7 +136,6 @@ public function unlock(string $name): bool
      *
      * @param string $name lock name
      * @return bool
-     * @throws InputException
      * @throws \Zend_Db_Statement_Exception
      */
     public function isLocked(string $name): bool
@@ -162,15 +159,11 @@ public function isLocked(string $name): bool
      *
      * @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)]));
-        }
+        $prefix = $this->getPrefix() ? $this->getPrefix() . '|' : '';
+        $name = ExpressionConverter::shortenEntityName($prefix . $name, $prefix);
 
         return $name;
     }
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php
index e2a95030bbd1c..5da420f39a672 100644
--- a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php
@@ -86,7 +86,6 @@ protected function setUp()
 
     /**
      * @throws \Magento\Framework\Exception\AlreadyExistsException
-     * @throws \Magento\Framework\Exception\InputException
      * @throws \Zend_Db_Statement_Exception
      */
     public function testLock()
@@ -104,9 +103,7 @@ public function testLock()
 
     /**
      * @throws \Magento\Framework\Exception\AlreadyExistsException
-     * @throws \Magento\Framework\Exception\InputException
      * @throws \Zend_Db_Statement_Exception
-     * @expectedException \Magento\Framework\Exception\InputException
      */
     public function testlockWithTooLongName()
     {
@@ -114,12 +111,15 @@ public function testlockWithTooLongName()
             ->method('isDbAvailable')
             ->with()
             ->willReturn(true);
-        $this->database->lock('BbXbyf9rIY5xuAVdviQJmh76FyoeeVHTDpcjmcImNtgpO4Hnz4xk76ZGEyYALvrQu');
+            $this->statement->expects($this->once())
+            ->method('fetchColumn')
+            ->willReturn(true);
+
+        $this->assertTrue($this->database->lock('BbXbyf9rIY5xuAVdviQJmh76FyoeeVHTDpcjmcImNtgpO4Hnz4xk76ZGEyYALvrQu'));
     }
 
     /**
      * @throws \Magento\Framework\Exception\AlreadyExistsException
-     * @throws \Magento\Framework\Exception\InputException
      * @throws \Zend_Db_Statement_Exception
      * @expectedException \Magento\Framework\Exception\AlreadyExistsException
      */
@@ -139,7 +139,6 @@ public function testlockWithAlreadyAcquiredLockInSameSession()
 
     /**
      * @throws \Magento\Framework\Exception\AlreadyExistsException
-     * @throws \Magento\Framework\Exception\InputException
      * @throws \Zend_Db_Statement_Exception
      */
     public function testLockWithUnavailableDeploymentConfig()
@@ -153,7 +152,6 @@ public function testLockWithUnavailableDeploymentConfig()
     }
 
     /**
-     * @throws \Magento\Framework\Exception\InputException
      * @throws \Zend_Db_Statement_Exception
      */
     public function testUnlockWithUnavailableDeploymentConfig()
@@ -167,7 +165,6 @@ public function testUnlockWithUnavailableDeploymentConfig()
     }
 
     /**
-     * @throws \Magento\Framework\Exception\InputException
      * @throws \Zend_Db_Statement_Exception
      */
     public function testIsLockedWithUnavailableDB()
diff --git a/lib/internal/Magento/Framework/Mail/Address.php b/lib/internal/Magento/Framework/Mail/Address.php
index 18e1a8c72f214..73f0025458c55 100644
--- a/lib/internal/Magento/Framework/Mail/Address.php
+++ b/lib/internal/Magento/Framework/Mail/Address.php
@@ -8,7 +8,7 @@
 namespace Magento\Framework\Mail;
 
 /**
- * Class MailAddress
+ * Class Address
  */
 class Address
 {
@@ -23,7 +23,7 @@ class Address
     private $email;
 
     /**
-     * MailAddress constructor
+     * Address constructor
      *
      * @param string|null $email
      * @param string|null $name
@@ -49,9 +49,9 @@ public function getName(): ?string
     /**
      * Email getter
      *
-     * @return string
+     * @return string|null
      */
-    public function getEmail(): string
+    public function getEmail(): ?string
     {
         return $this->email;
     }
diff --git a/lib/internal/Magento/Framework/Mail/EmailMessage.php b/lib/internal/Magento/Framework/Mail/EmailMessage.php
index aaef97507518e..02c75977cd093 100644
--- a/lib/internal/Magento/Framework/Mail/EmailMessage.php
+++ b/lib/internal/Magento/Framework/Mail/EmailMessage.php
@@ -10,19 +10,13 @@
 use Magento\Framework\Mail\Exception\InvalidArgumentException;
 use Zend\Mail\Address as ZendAddress;
 use Zend\Mail\AddressList;
-use Zend\Mail\Message as ZendMessage;
 use Zend\Mime\Message as ZendMimeMessage;
 
 /**
- * Class EmailMessage
+ * Email message
  */
-class EmailMessage implements EmailMessageInterface
+class EmailMessage extends Message implements EmailMessageInterface
 {
-    /**
-     * @var ZendMessage
-     */
-    private $message;
-
     /**
      * @var MimeMessageInterfaceFactory
      */
@@ -64,38 +58,35 @@ public function __construct(
         ?array $replyTo = null,
         ?Address $sender = null,
         ?string $subject = '',
-        ?string $encoding = ''
+        ?string $encoding = 'utf-8'
     ) {
-        $this->message = new ZendMessage();
+        parent::__construct($encoding);
         $mimeMessage = new ZendMimeMessage();
         $mimeMessage->setParts($body->getParts());
-        $this->message->setBody($mimeMessage);
-        if ($encoding) {
-            $this->message->setEncoding($encoding);
-        }
+        $this->zendMessage->setBody($mimeMessage);
         if ($subject) {
-            $this->message->setSubject($subject);
+            $this->zendMessage->setSubject($subject);
         }
         if ($sender) {
-            $this->message->setSender($sender->getEmail(), $sender->getName());
+            $this->zendMessage->setSender($sender->getEmail(), $sender->getName());
         }
         if (count($to) < 1) {
             throw new InvalidArgumentException('Email message must have at list one addressee');
         }
         if ($to) {
-            $this->message->setTo($this->convertAddressArrayToAddressList($to));
+            $this->zendMessage->setTo($this->convertAddressArrayToAddressList($to));
         }
         if ($replyTo) {
-            $this->message->setReplyTo($this->convertAddressArrayToAddressList($replyTo));
+            $this->zendMessage->setReplyTo($this->convertAddressArrayToAddressList($replyTo));
         }
         if ($from) {
-            $this->message->setFrom($this->convertAddressArrayToAddressList($from));
+            $this->zendMessage->setFrom($this->convertAddressArrayToAddressList($from));
         }
         if ($cc) {
-            $this->message->setCc($this->convertAddressArrayToAddressList($cc));
+            $this->zendMessage->setCc($this->convertAddressArrayToAddressList($cc));
         }
         if ($bcc) {
-            $this->message->setBcc($this->convertAddressArrayToAddressList($bcc));
+            $this->zendMessage->setBcc($this->convertAddressArrayToAddressList($bcc));
         }
         $this->mimeMessageFactory = $mimeMessageFactory;
         $this->addressFactory = $addressFactory;
@@ -106,7 +97,7 @@ public function __construct(
      */
     public function getEncoding(): string
     {
-        return $this->message->getEncoding();
+        return $this->zendMessage->getEncoding();
     }
 
     /**
@@ -114,7 +105,7 @@ public function getEncoding(): string
      */
     public function getHeaders(): array
     {
-        return $this->message->getHeaders()->toArray();
+        return $this->zendMessage->getHeaders()->toArray();
     }
 
     /**
@@ -122,7 +113,7 @@ public function getHeaders(): array
      */
     public function getFrom(): ?array
     {
-        return $this->convertAddressListToAddressArray($this->message->getFrom());
+        return $this->convertAddressListToAddressArray($this->zendMessage->getFrom());
     }
 
     /**
@@ -130,7 +121,7 @@ public function getFrom(): ?array
      */
     public function getTo(): array
     {
-        return $this->convertAddressListToAddressArray($this->message->getTo());
+        return $this->convertAddressListToAddressArray($this->zendMessage->getTo());
     }
 
     /**
@@ -138,7 +129,7 @@ public function getTo(): array
      */
     public function getCc(): ?array
     {
-        return $this->convertAddressListToAddressArray($this->message->getCc());
+        return $this->convertAddressListToAddressArray($this->zendMessage->getCc());
     }
 
     /**
@@ -146,7 +137,7 @@ public function getCc(): ?array
      */
     public function getBcc(): ?array
     {
-        return $this->convertAddressListToAddressArray($this->message->getBcc());
+        return $this->convertAddressListToAddressArray($this->zendMessage->getBcc());
     }
 
     /**
@@ -154,7 +145,7 @@ public function getBcc(): ?array
      */
     public function getReplyTo(): ?array
     {
-        return $this->convertAddressListToAddressArray($this->message->getReplyTo());
+        return $this->convertAddressListToAddressArray($this->zendMessage->getReplyTo());
     }
 
     /**
@@ -163,7 +154,7 @@ public function getReplyTo(): ?array
     public function getSender(): ?Address
     {
         /** @var ZendAddress $zendSender */
-        if (!$zendSender = $this->message->getSender()) {
+        if (!$zendSender = $this->zendMessage->getSender()) {
             return null;
         }
 
@@ -178,18 +169,10 @@ public function getSender(): ?Address
     /**
      * @inheritDoc
      */
-    public function getSubject(): ?string
-    {
-        return $this->message->getSubject();
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getBody(): MimeMessageInterface
+    public function getMessageBody(): MimeMessageInterface
     {
         return $this->mimeMessageFactory->create(
-            ['parts' => $this->message->getBody()->getParts()]
+            ['parts' => $this->zendMessage->getBody()->getParts()]
         );
     }
 
@@ -198,15 +181,7 @@ public function getBody(): MimeMessageInterface
      */
     public function getBodyText(): string
     {
-        return $this->message->getBodyText();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getRawMessage(): string
-    {
-        return $this->toString();
+        return $this->zendMessage->getBodyText();
     }
 
     /**
@@ -214,7 +189,7 @@ public function getRawMessage(): string
      */
     public function toString(): string
     {
-        return $this->message->toString();
+        return $this->zendMessage->toString();
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Mail/EmailMessageInterface.php b/lib/internal/Magento/Framework/Mail/EmailMessageInterface.php
index 95f83ff679cd6..93eaa4acde3a4 100644
--- a/lib/internal/Magento/Framework/Mail/EmailMessageInterface.php
+++ b/lib/internal/Magento/Framework/Mail/EmailMessageInterface.php
@@ -9,7 +9,7 @@
 /**
  * Interface EmailMessageInterface
  */
-interface EmailMessageInterface
+interface EmailMessageInterface extends MailMessageInterface
 {
     /**
      * Get the message encoding
@@ -72,14 +72,14 @@ public function getSender(): ?Address;
      *
      * @return null|string
      */
-    public function getSubject(): ?string;
+    public function getSubject();
 
     /**
      * Return the currently set message body
      *
      * @return MimeMessageInterface
      */
-    public function getBody(): MimeMessageInterface;
+    public function getMessageBody(): MimeMessageInterface;
 
     /**
      * Get the string-serialized message body text
diff --git a/lib/internal/Magento/Framework/Mail/MailMessageInterface.php b/lib/internal/Magento/Framework/Mail/MailMessageInterface.php
index da010be270255..5179e6057c4c9 100644
--- a/lib/internal/Magento/Framework/Mail/MailMessageInterface.php
+++ b/lib/internal/Magento/Framework/Mail/MailMessageInterface.php
@@ -9,6 +9,8 @@
  * Mail Message interface
  *
  * @api
+ * @deprecated
+ * @see \Magento\Framework\Mail\EmailMessageInterface
  */
 interface MailMessageInterface extends MessageInterface
 {
diff --git a/lib/internal/Magento/Framework/Mail/Message.php b/lib/internal/Magento/Framework/Mail/Message.php
index b15b75ca9ac63..0e4d79aac9331 100644
--- a/lib/internal/Magento/Framework/Mail/Message.php
+++ b/lib/internal/Magento/Framework/Mail/Message.php
@@ -10,13 +10,16 @@
 
 /**
  * Class Message for email transportation
+ *
+ * @deprecated
+ * @see \Magento\Framework\Mail\EmailMessage
  */
 class Message implements MailMessageInterface
 {
     /**
      * @var \Zend\Mail\Message
      */
-    private $zendMessage;
+    protected $zendMessage;
 
     /**
      * Message type
@@ -168,7 +171,6 @@ private function createMimeFromString($body, $messageType)
         $part = new Part($body);
         $part->setCharset($this->zendMessage->getEncoding());
         $part->setEncoding(Mime::ENCODING_QUOTEDPRINTABLE);
-        $part->setDisposition(Mime::DISPOSITION_INLINE);
         $part->setType($messageType);
         $mimeMessage = new \Zend\Mime\Message();
         $mimeMessage->addPart($part);
diff --git a/lib/internal/Magento/Framework/Mail/MimePart.php b/lib/internal/Magento/Framework/Mail/MimePart.php
index 9b9bb6eadbec3..a43ed4b36e072 100644
--- a/lib/internal/Magento/Framework/Mail/MimePart.php
+++ b/lib/internal/Magento/Framework/Mail/MimePart.php
@@ -15,6 +15,9 @@
  */
 class MimePart implements MimePartInterface
 {
+    /**
+     * UTF-8 charset
+     */
     public const CHARSET_UTF8 = 'utf-8';
 
     /**
@@ -47,7 +50,7 @@ public function __construct(
         $content,
         ?string $type = MimeInterface::TYPE_HTML,
         ?string $fileName = null,
-        ?string $disposition = MimeInterface::DISPOSITION_INLINE,
+        ?string $disposition = null,
         ?string $encoding = MimeInterface::ENCODING_QUOTED_PRINTABLE,
         ?string $description = null,
         ?array $filters = [],
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 4a8d6572faaf8..830d9b0f722e4 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -87,7 +87,7 @@ class TransportBuilder
     /**
      * Message
      *
-     * @var EmailMessageInterface
+     * @var MessageInterface
      */
     protected $message;
 
@@ -377,6 +377,7 @@ protected function prepareMessage()
     {
         $template = $this->getTemplate();
         $content = $template->processTemplate();
+
         switch ($template->getType()) {
             case TemplateTypesInterface::TYPE_TEXT:
                 $part['type'] = MimeInterface::TYPE_TEXT;
@@ -391,7 +392,10 @@ protected function prepareMessage()
                     new Phrase('Unknown template type')
                 );
         }
+
+        /** @var \Magento\Framework\Mail\MimePartInterface $mimePart */
         $mimePart = $this->mimePartInterfaceFactory->create(['content' => $content]);
+        $this->messageData['encoding'] = $mimePart->getCharset();
         $this->messageData['body'] = $this->mimeMessageInterfaceFactory->create(
             ['parts' => [$mimePart]]
         );
@@ -400,6 +404,7 @@ protected function prepareMessage()
             (string)$template->getSubject(),
             ENT_QUOTES
         );
+
         $this->message = $this->emailMessageInterfaceFactory->create($this->messageData);
 
         return $this;
@@ -427,6 +432,8 @@ private function addAddressByType(string $addressType, $email, ?string $name = n
                 $this->messageData[$addressType],
                 $convertedAddressArray
             );
+        } else {
+            $this->messageData[$addressType] = $convertedAddressArray;
         }
     }
 }
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/AddressTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/AddressTest.php
new file mode 100644
index 0000000000000..a0525dd2b7e19
--- /dev/null
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/AddressTest.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Mail\Test\Unit;
+
+use Magento\Framework\Mail\Address;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * test Magento\Framework\Mail\Address
+ */
+class AddressTest extends TestCase
+{
+    /**
+     * @var Address
+     */
+    protected $message;
+
+    /**
+     * Address object with nullable email parameter passed should not throw an exception.
+     *
+     * @return void
+     */
+    public function testGetEmailEmpty()
+    {
+        $address = new Address(null, "Test name");
+        $this->assertNull($address->getEmail());
+    }
+}
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php
index c29ca4d261cc4..6e5763714b88a 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/MessageTest.php
@@ -29,7 +29,6 @@ public function testSetBodyHtml()
         $this->assertEquals('quoted-printable', $part->getEncoding());
         $this->assertEquals('utf-8', $part->getCharset());
         $this->assertEquals('body', $part->getContent());
-        $this->assertEquals('inline', $part->getDisposition());
     }
 
     public function testSetBodyText()
@@ -41,6 +40,5 @@ public function testSetBodyText()
         $this->assertEquals('quoted-printable', $part->getEncoding());
         $this->assertEquals('utf-8', $part->getCharset());
         $this->assertEquals('body', $part->getContent());
-        $this->assertEquals('inline', $part->getDisposition());
     }
 }
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
index 448a8a3db7407..1eecf94558960 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
@@ -84,17 +84,17 @@ public function exemplarXmlDataProvider()
             ],
             '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="consumer1" queue="queue1" handler="handlerClass_One1::handlerMethod1" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer2" queue="queue2" handler="handlerClassOne2::handler_Method2" 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'.",
+                    "Element 'consumer', attribute 'handler': [facet 'pattern'] The value 'handlerClass_One1::handlerMethod1' is not accepted by the pattern '[a-zA-Z0-9\\\\]+::[a-zA-Z0-9]+'.",
+                    "Element 'consumer', attribute 'handler': 'handlerClass_One1::handlerMethod1' is not a valid value of the atomic type 'handlerType'.",
+                    "Element 'consumer', attribute 'handler': [facet 'pattern'] The value 'handlerClassOne2::handler_Method2' is not accepted by the pattern '[a-zA-Z0-9\\\\]+::[a-zA-Z0-9]+'.",
+                    "Element 'consumer', attribute 'handler': 'handlerClassOne2::handler_Method2' is not a valid value of the atomic type 'handlerType'.",
                 ],
             ],
             'invalid maxMessages format' => [
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd
index 52bfc77bbb511..7e3d501aaa46e 100644
--- a/lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd
@@ -32,7 +32,7 @@
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[a-zA-Z\\]+::[a-zA-Z]+" />
+            <xs:pattern value="[a-zA-Z0-9\\]+::[a-zA-Z0-9]+" />
             <xs:minLength value="5" />
         </xs:restriction>
     </xs:simpleType>
diff --git a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
index 69410b7757e44..949e002a14208 100644
--- a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
@@ -362,9 +362,6 @@ private function populateExtensionAttributes(array $extensionAttributesData = []
 
     /**
      * @inheritdoc
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -373,9 +370,6 @@ public function __sleep()
 
     /**
      * @inheritdoc
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/Model/AbstractModel.php b/lib/internal/Magento/Framework/Model/AbstractModel.php
index 534c25fce8d42..8018c6176390f 100644
--- a/lib/internal/Magento/Framework/Model/AbstractModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractModel.php
@@ -220,9 +220,6 @@ protected function _init($resourceModel)
      * Remove unneeded properties from serialization
      *
      * @return string[]
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -247,9 +244,6 @@ public function __sleep()
      * Init not serializable fields
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
index 0b44dc60c6504..626fc42a80778 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
@@ -157,9 +157,6 @@ public function __construct(
      * Provide variables to serialize
      *
      * @return array
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -172,9 +169,6 @@ public function __sleep()
      * Restore global dependencies
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
@@ -368,7 +362,7 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
         $object->afterLoad();
         $object->setOrigData();
         $object->setHasDataChanges(false);
-        
+
         return $this;
     }
 
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 1186326ab6525..cba5f133f53c8 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
@@ -607,9 +607,6 @@ public function save()
     /**
      * @inheritdoc
      * @since 100.0.11
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -622,9 +619,6 @@ public function __sleep()
     /**
      * @inheritdoc
      * @since 100.0.11
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/Module/Manager.php b/lib/internal/Magento/Framework/Module/Manager.php
index 659ada3c20ac8..b47349631a033 100644
--- a/lib/internal/Magento/Framework/Module/Manager.php
+++ b/lib/internal/Magento/Framework/Module/Manager.php
@@ -12,9 +12,14 @@
 namespace Magento\Framework\Module;
 
 /**
- * @inheritdoc
+ * Module status manager
+ *
+ * Usage:
+ * ```php
+ *  $manager->isEnabled('Vendor_Module');
+ * ```
  */
-class Manager implements ModuleManagerInterface
+class Manager
 {
     /**
      * @var Output\ConfigInterface
@@ -49,9 +54,12 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * Whether a module is enabled in the configuration or not
+     *
+     * @param string $moduleName Fully-qualified module name
+     * @return boolean
      */
-    public function isEnabled(string $moduleName): bool
+    public function isEnabled($moduleName)
     {
         return $this->moduleList->has($moduleName);
     }
diff --git a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
index 72421f793f131..b1d21a6db5f16 100644
--- a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
+++ b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
@@ -78,6 +78,8 @@ public function __construct(
     public function load(array $exclude = [])
     {
         $result = [];
+        $excludeSet = array_flip($exclude);
+
         foreach ($this->getModuleConfigs() as list($file, $contents)) {
             try {
                 $this->parser->loadXML($contents);
@@ -93,7 +95,7 @@ public function load(array $exclude = [])
 
             $data = $this->converter->convert($this->parser->getDom());
             $name = key($data);
-            if (!in_array($name, $exclude)) {
+            if (!isset($excludeSet[$name])) {
                 $result[$name] = $data[$name];
             }
         }
@@ -140,7 +142,7 @@ private function sortBySequence(array $origList): array
 
             $expanded[] = [
                 'name' => $moduleName,
-                'sequence' => $sequence,
+                'sequence_set' => array_flip($sequence),
             ];
         }
 
@@ -148,7 +150,7 @@ private function sortBySequence(array $origList): array
         $total = count($expanded);
         for ($i = 0; $i < $total - 1; $i++) {
             for ($j = $i; $j < $total; $j++) {
-                if (in_array($expanded[$j]['name'], $expanded[$i]['sequence'], true)) {
+                if (isset($expanded[$i]['sequence_set'][$expanded[$j]['name']])) {
                     $temp = $expanded[$i];
                     $expanded[$i] = $expanded[$j];
                     $expanded[$j] = $temp;
@@ -196,18 +198,19 @@ private function prearrangeModules(array $modules): array
      */
     private function expandSequence($list, $name, $accumulated = [])
     {
-        $accumulated[] = $name;
+        $accumulated[$name] = true;
         $result = $list[$name]['sequence'];
+        $allResults = [];
         foreach ($result as $relatedName) {
-            if (in_array($relatedName, $accumulated)) {
-                throw new \Exception("Circular sequence reference from '{$name}' to '{$relatedName}'.");
+            if (isset($accumulated[$relatedName])) {
+                throw new \LogicException("Circular sequence reference from '{$name}' to '{$relatedName}'.");
             }
             if (!isset($list[$relatedName])) {
                 continue;
             }
-            $relatedResult = $this->expandSequence($list, $relatedName, $accumulated);
-            $result = array_unique(array_merge($result, $relatedResult));
+            $allResults[] = $this->expandSequence($list, $relatedName, $accumulated);
         }
-        return $result;
+        $allResults[] = $result;
+        return array_unique(array_merge(...$allResults));
     }
 }
diff --git a/lib/internal/Magento/Framework/Module/ModuleManagerInterface.php b/lib/internal/Magento/Framework/Module/ModuleManagerInterface.php
deleted file mode 100644
index decc91200354d..0000000000000
--- a/lib/internal/Magento/Framework/Module/ModuleManagerInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\Module;
-
-/**
- * Module status manager
- *
- * Usage:
- * ```php
- *  $manager->isEnabled('Vendor_Module');
- * ```
- */
-interface ModuleManagerInterface
-{
-    /**
-     * Retrieve whether or not a module is enabled by configuration
-     *
-     * @param string $moduleName Fully-qualified module name, e.g. Magento_Config
-     * @return boolean Whether or not the module is enabled in the configuration
-     */
-    public function isEnabled(string $moduleName): bool;
-}
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
index e4cf4c41599e9..748474943a436 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
@@ -16,7 +16,7 @@ class ManagerTest extends \PHPUnit\Framework\TestCase
     const XML_PATH_OUTPUT_ENABLED = 'custom/is_module_output_enabled';
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     private $_model;
 
@@ -73,7 +73,6 @@ public function testIsEnabled()
 
     public function testIsOutputEnabledReturnsFalseForDisabledModule()
     {
-        $this->_moduleList->expects($this->once())->method('has')->with('Disabled_Module')->willReturn(false);
         $this->_outputConfig->expects($this->any())->method('isSetFlag')->will($this->returnValue(true));
         $this->assertFalse($this->_model->isOutputEnabled('Disabled_Module'));
     }
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php
index 7a631eed1adbf..bfd916dbfba5b 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php
@@ -35,7 +35,7 @@ class DbStatusValidatorTest extends \PHPUnit\Framework\TestCase
     protected $requestMock;
 
     /**
-     * @var \Magento\Framework\Module\ModuleManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
      */
     private $moduleManager;
 
diff --git a/lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php b/lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php
index cfa79f3e7ee60..bd04dbff457f3 100644
--- a/lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php
+++ b/lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php
@@ -58,9 +58,6 @@ public function __construct(
      * Remove links to objects.
      *
      * @return array
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -71,9 +68,6 @@ public function __sleep()
      * Retrieve ObjectManager from global scope
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
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 aaf7d72db161a..71b4dc7c17b74 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php
@@ -33,7 +33,6 @@ class ChangelogTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->connectionMock = $this->createMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class);
-
         $this->resourceMock = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
         $this->mockGetConnection($this->connectionMock);
 
@@ -98,14 +97,50 @@ public function testGetVersion()
         $this->mockIsTableExists($changelogTableName, true);
         $this->mockGetTableName();
 
+        $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->setMethods(['from', 'order', 'limit'])
+            ->getMock();
+        $selectMock->expects($this->any())->method('from')->willReturn($selectMock);
+        $selectMock->expects($this->any())->method('order')->willReturn($selectMock);
+        $selectMock->expects($this->any())->method('limit')->willReturn($selectMock);
+
+        $this->connectionMock->expects($this->any())->method('select')->willReturn($selectMock);
+
         $this->connectionMock->expects($this->once())
             ->method('fetchRow')
-            ->will($this->returnValue(['Auto_increment' => 11]));
+            ->will($this->returnValue(['version_id' => 10]));
 
         $this->model->setViewId('viewIdtest');
         $this->assertEquals(10, $this->model->getVersion());
     }
 
+    public function testGetVersionEmptyChangelog()
+    {
+        $changelogTableName = 'viewIdtest_cl';
+        $this->mockIsTableExists($changelogTableName, true);
+        $this->mockGetTableName();
+
+        $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->setMethods(['from', 'order', 'limit'])
+            ->getMock();
+        $selectMock->expects($this->any())->method('from')->willReturn($selectMock);
+        $selectMock->expects($this->any())->method('order')->willReturn($selectMock);
+        $selectMock->expects($this->any())->method('limit')->willReturn($selectMock);
+
+        $this->connectionMock->expects($this->any())->method('select')->willReturn($selectMock);
+
+        $this->connectionMock->expects($this->once())
+            ->method('fetchRow')
+            ->will($this->returnValue(false));
+
+        $this->model->setViewId('viewIdtest');
+        $this->assertEquals(0, $this->model->getVersion());
+    }
+
     /**
      * @expectedException \Magento\Framework\Exception\RuntimeException
      * @expectedExceptionMessage Table status for viewIdtest_cl is incorrect. Can`t fetch version id.
@@ -116,9 +151,20 @@ public function testGetVersionWithExceptionNoAutoincrement()
         $this->mockIsTableExists($changelogTableName, true);
         $this->mockGetTableName();
 
+        $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->setMethods(['from', 'order', 'limit'])
+            ->getMock();
+        $selectMock->expects($this->any())->method('from')->willReturn($selectMock);
+        $selectMock->expects($this->any())->method('order')->willReturn($selectMock);
+        $selectMock->expects($this->any())->method('limit')->willReturn($selectMock);
+
+        $this->connectionMock->expects($this->any())->method('select')->willReturn($selectMock);
+
         $this->connectionMock->expects($this->once())
             ->method('fetchRow')
-            ->will($this->returnValue([]));
+            ->will($this->returnValue(['no_version_column' => 'blabla']));
 
         $this->model->setViewId('viewIdtest');
         $this->model->getVersion();
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php
index 3f806b319ef48..ebd9896e62558 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php
@@ -5,44 +5,60 @@
  */
 namespace Magento\Framework\Mview\Test\Unit;
 
+use Magento\Framework\Mview\ActionFactory;
+use Magento\Framework\Mview\ActionInterface;
+use Magento\Framework\Mview\ConfigInterface;
 use \Magento\Framework\Mview\View;
+use Magento\Framework\Mview\View\Changelog;
+use Magento\Framework\Mview\View\StateInterface;
+use Magento\Framework\Mview\View\Subscription;
+use Magento\Framework\Mview\View\SubscriptionFactory;
+use Magento\Indexer\Model\Mview\View\State;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
-class ViewTest extends \PHPUnit\Framework\TestCase
+/**
+ * Class to test Mview functionality
+ */
+class ViewTest extends TestCase
 {
     /**
-     * @var \Magento\Framework\Mview\View
+     * @var View
      */
     protected $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Mview\ConfigInterface
+     * @var MockObject|ConfigInterface
      */
     protected $configMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Mview\ActionFactory
+     * @var MockObject|ActionFactory
      */
     protected $actionFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Indexer\Model\Mview\View\State
+     * @var MockObject|State
      */
     protected $stateMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Mview\View\Changelog
+     * @var MockObject|Changelog
      */
     protected $changelogMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Mview\View\SubscriptionFactory
+     * @var MockObject|SubscriptionFactory
      */
     protected $subscriptionFactoryMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->configMock = $this->getMockForAbstractClass(
-            \Magento\Framework\Mview\ConfigInterface::class,
+            ConfigInterface::class,
             [],
             '',
             false,
@@ -50,8 +66,11 @@ protected function setUp()
             true,
             ['getView']
         );
-        $this->actionFactoryMock = $this->createPartialMock(\Magento\Framework\Mview\ActionFactory::class, ['get']);
-        $this->stateMock = $this->createPartialMock(\Magento\Indexer\Model\Mview\View\State::class, ['getViewId',
+        $this->actionFactoryMock = $this->createPartialMock(ActionFactory::class, ['get']);
+        $this->stateMock = $this->createPartialMock(
+            State::class,
+            [
+                'getViewId',
                 'loadByView',
                 'getVersionId',
                 'setVersionId',
@@ -62,13 +81,14 @@ protected function setUp()
                 'setMode',
                 'save',
                 '__wakeup',
-            ]);
+            ]
+        );
         $this->changelogMock = $this->createPartialMock(
-            \Magento\Framework\Mview\View\Changelog::class,
+            Changelog::class,
             ['getViewId', 'setViewId', 'create', 'drop', 'getVersion', 'getList', 'clear']
         );
         $this->subscriptionFactoryMock = $this->createPartialMock(
-            \Magento\Framework\Mview\View\SubscriptionFactory::class,
+            SubscriptionFactory::class,
             ['create']
         );
         $this->model = new View(
@@ -80,24 +100,36 @@ protected function setUp()
         );
     }
 
+    /**
+     * Test to Return view action class
+     */
     public function testGetActionClass()
     {
         $this->model->setData('action_class', 'actionClass');
         $this->assertEquals('actionClass', $this->model->getActionClass());
     }
 
+    /**
+     * Test to Return view group
+     */
     public function testGetGroup()
     {
         $this->model->setData('group', 'some_group');
         $this->assertEquals('some_group', $this->model->getGroup());
     }
 
+    /**
+     * Test to Return view subscriptions
+     */
     public function testGetSubscriptions()
     {
         $this->model->setData('subscriptions', ['subscription']);
         $this->assertEquals(['subscription'], $this->model->getSubscriptions());
     }
 
+    /**
+     * Test to Fill view data from config
+     */
     public function testLoad()
     {
         $viewId = 'view_test';
@@ -110,10 +142,12 @@ public function testLoad()
         )->will(
             $this->returnValue($this->getViewData())
         );
-        $this->assertInstanceOf(\Magento\Framework\Mview\View::class, $this->model->load($viewId));
+        $this->assertInstanceOf(View::class, $this->model->load($viewId));
     }
 
     /**
+     * Test to Fill view data from config
+     *
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage view_id view does not exist.
      */
@@ -132,18 +166,21 @@ public function testLoadWithException()
         $this->model->load($viewId);
     }
 
+    /**
+     * Test to Create subscriptions
+     */
     public function testSubscribe()
     {
         $this->stateMock->expects($this->once())
             ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\Mview\View\StateInterface::MODE_DISABLED));
+            ->will($this->returnValue(StateInterface::MODE_DISABLED));
         $this->stateMock->expects($this->once())
             ->method('setMode')
-            ->with(\Magento\Framework\Mview\View\StateInterface::MODE_ENABLED)
+            ->with(StateInterface::MODE_ENABLED)
             ->will($this->returnSelf());
         $this->changelogMock->expects($this->once())
             ->method('create');
-        $subscriptionMock = $this->createPartialMock(\Magento\Framework\Mview\View\Subscription::class, ['create']);
+        $subscriptionMock = $this->createPartialMock(Subscription::class, ['create']);
         $subscriptionMock->expects($this->exactly(1))->method('create');
         $this->subscriptionFactoryMock->expects(
             $this->exactly(1)
@@ -156,11 +193,14 @@ public function testSubscribe()
         $this->model->subscribe();
     }
 
+    /**
+     * Test to Create subscriptions
+     */
     public function testSubscribeEnabled()
     {
         $this->stateMock->expects($this->once())
             ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\Mview\View\StateInterface::MODE_ENABLED));
+            ->will($this->returnValue(StateInterface::MODE_ENABLED));
         $this->stateMock->expects($this->never())
             ->method('setMode');
         $this->changelogMock->expects($this->never())
@@ -178,32 +218,35 @@ public function testSubscribeWithException()
     {
         $this->stateMock->expects($this->once())
             ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\Mview\View\StateInterface::MODE_DISABLED));
+            ->will($this->returnValue(StateInterface::MODE_DISABLED));
 
         $this->changelogMock->expects($this->once())
             ->method('create')
-            ->will($this->returnCallback(
+            ->willReturnCallback(
                 function () {
                     throw new \Exception();
                 }
-            ));
+            );
 
         $this->loadView();
         $this->model->subscribe();
     }
 
+    /**
+     * Test to Remove subscriptions
+     */
     public function testUnsubscribe()
     {
         $this->stateMock->expects($this->once())
             ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\Mview\View\StateInterface::MODE_ENABLED));
+            ->will($this->returnValue(StateInterface::MODE_ENABLED));
         $this->stateMock->expects($this->once())
             ->method('setMode')
-            ->with(\Magento\Framework\Mview\View\StateInterface::MODE_DISABLED)
+            ->with(StateInterface::MODE_DISABLED)
             ->will($this->returnSelf());
         $this->changelogMock->expects($this->never())
             ->method('drop');
-        $subscriptionMock = $this->createPartialMock(\Magento\Framework\Mview\View\Subscription::class, ['remove']);
+        $subscriptionMock = $this->createPartialMock(Subscription::class, ['remove']);
         $subscriptionMock->expects($this->exactly(1))->method('remove');
         $this->subscriptionFactoryMock->expects(
             $this->exactly(1)
@@ -216,11 +259,14 @@ public function testUnsubscribe()
         $this->model->unsubscribe();
     }
 
+    /**
+     * Test to Remove subscriptions
+     */
     public function testUnsubscribeDisabled()
     {
         $this->stateMock->expects($this->once())
             ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\Mview\View\StateInterface::MODE_DISABLED));
+            ->will($this->returnValue(StateInterface::MODE_DISABLED));
         $this->stateMock->expects($this->never())
             ->method('setVersionId');
         $this->stateMock->expects($this->never())
@@ -240,16 +286,16 @@ public function testUnsubscribeWithException()
     {
         $this->stateMock->expects($this->once())
             ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\Mview\View\StateInterface::MODE_ENABLED));
+            ->will($this->returnValue(StateInterface::MODE_ENABLED));
 
-        $subscriptionMock = $this->createPartialMock(\Magento\Framework\Mview\View\Subscription::class, ['remove']);
+        $subscriptionMock = $this->createPartialMock(Subscription::class, ['remove']);
         $subscriptionMock->expects($this->exactly(1))
             ->method('remove')
-            ->will($this->returnCallback(
+            ->willReturnCallback(
                 function () {
                     throw new \Exception();
                 }
-            ));
+            );
         $this->subscriptionFactoryMock->expects($this->exactly(1))
             ->method('create')
             ->will($this->returnValue($subscriptionMock));
@@ -258,6 +304,9 @@ function () {
         $this->model->unsubscribe();
     }
 
+    /**
+     * Test to Materialize view by IDs in changelog
+     */
     public function testUpdate()
     {
         $currentVersionId = 3;
@@ -273,9 +322,12 @@ public function testUpdate()
         $this->stateMock->expects($this->once())
             ->method('setVersionId')
             ->will($this->returnSelf());
+        $this->stateMock->expects($this->atLeastOnce())
+            ->method('getMode')
+            ->willReturn(StateInterface::MODE_ENABLED);
         $this->stateMock->expects($this->exactly(2))
             ->method('getStatus')
-            ->will($this->returnValue(\Magento\Framework\Mview\View\StateInterface::STATUS_IDLE));
+            ->will($this->returnValue(StateInterface::STATUS_IDLE));
         $this->stateMock->expects($this->exactly(2))
             ->method('setStatus')
             ->will($this->returnSelf());
@@ -301,7 +353,7 @@ public function testUpdate()
             $this->returnValue($listId)
         );
 
-        $actionMock = $this->createMock(\Magento\Framework\Mview\ActionInterface::class);
+        $actionMock = $this->createMock(ActionInterface::class);
         $actionMock->expects($this->once())->method('execute')->with($listId)->will($this->returnSelf());
         $this->actionFactoryMock->expects(
             $this->once()
@@ -318,6 +370,83 @@ public function testUpdate()
     }
 
     /**
+     * Test to Materialize view by IDs in changelog
+     */
+    public function testUpdateEx(): void
+    {
+        $currentVersionId = 200100;
+        $lastVersionId = 1;
+        $listIdBatchOne = $this->generateChangeLog(100000, 1, 100);
+        $listIdBatchTwo = $this->generateChangeLog(100000, 1, 50);
+        $listIdBatchThree = $this->generateChangeLog(100, 100, 150);
+
+        $this->stateMock->method('getViewId')->willReturn(1);
+        $this->stateMock->method('getVersionId')->willReturn($lastVersionId);
+        $this->stateMock->method('setVersionId')->willReturnSelf();
+        $this->stateMock->expects($this->atLeastOnce())
+            ->method('getMode')
+            ->willReturn(StateInterface::MODE_ENABLED);
+        $this->stateMock->expects($this->exactly(2))
+            ->method('getStatus')
+            ->willReturn(StateInterface::STATUS_IDLE);
+        $this->stateMock->expects($this->exactly(2))
+            ->method('setStatus')
+            ->willReturnSelf();
+        $this->stateMock->expects($this->exactly(2))
+            ->method('save')
+            ->willReturnSelf();
+        $this->changelogMock
+            ->expects($this->once())
+            ->method('getVersion')
+            ->willReturn($currentVersionId);
+
+        $this->changelogMock->method('getList')
+            ->willReturnMap(
+                [
+                    [$lastVersionId, 100001, $listIdBatchOne],
+                    [100001, 200001, $listIdBatchTwo],
+                    [200001, $currentVersionId, $listIdBatchThree],
+                ]
+            );
+
+        $actionMock = $this->createMock(ActionInterface::class);
+        $actionMock->expects($this->once())
+            ->method('execute')
+            ->with($this->generateChangeLog(150, 1, 150))
+            ->willReturnSelf();
+        $this->actionFactoryMock->method('get')->willReturn($actionMock);
+        $this->loadView();
+        $this->model->update();
+    }
+
+    /**
+     * Generate change log
+     *
+     * @param int $count
+     * @param int $idFrom
+     * @param int $idTo
+     * @return array
+     */
+    private function generateChangeLog(int $count, int $idFrom, int $idTo): array
+    {
+        $res = [];
+        $i = 0;
+        $id = $idFrom;
+        while ($i < $count) {
+            if ($id > $idTo) {
+                $id = $idFrom;
+            }
+            $res[] = $id;
+            $id++;
+            $i++;
+        }
+
+        return $res;
+    }
+
+    /**
+     * Test to Materialize view by IDs in changelog
+     *
      * @expectedException \Exception
      * @expectedExceptionMessage Test exception
      */
@@ -335,9 +464,12 @@ public function testUpdateWithException()
             ->will($this->returnValue($lastVersionId));
         $this->stateMock->expects($this->never())
             ->method('setVersionId');
+        $this->stateMock->expects($this->atLeastOnce())
+            ->method('getMode')
+            ->willReturn(StateInterface::MODE_ENABLED);
         $this->stateMock->expects($this->exactly(2))
             ->method('getStatus')
-            ->will($this->returnValue(\Magento\Framework\Mview\View\StateInterface::STATUS_IDLE));
+            ->will($this->returnValue(StateInterface::STATUS_IDLE));
         $this->stateMock->expects($this->exactly(2))
             ->method('setStatus')
             ->will($this->returnSelf());
@@ -363,7 +495,7 @@ public function testUpdateWithException()
             $this->returnValue($listId)
         );
 
-        $actionMock = $this->createPartialMock(\Magento\Framework\Mview\ActionInterface::class, ['execute']);
+        $actionMock = $this->createPartialMock(ActionInterface::class, ['execute']);
         $actionMock->expects($this->once())->method('execute')->with($listId)->will(
             $this->returnCallback(
                 function () {
@@ -385,18 +517,21 @@ function () {
         $this->model->update();
     }
 
+    /**
+     * Test to Suspend view updates and set version ID to changelog's end
+     */
     public function testSuspend()
     {
         $this->stateMock->expects($this->once())
             ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\Mview\View\StateInterface::MODE_ENABLED));
+            ->will($this->returnValue(StateInterface::MODE_ENABLED));
         $this->stateMock->expects($this->once())
             ->method('setVersionId')
             ->with(11)
             ->will($this->returnSelf());
         $this->stateMock->expects($this->once())
             ->method('setStatus')
-            ->with(\Magento\Framework\Mview\View\StateInterface::STATUS_SUSPENDED)
+            ->with(StateInterface::STATUS_SUSPENDED)
             ->will($this->returnSelf());
         $this->stateMock->expects($this->once())
             ->method('save')
@@ -410,11 +545,14 @@ public function testSuspend()
         $this->model->suspend();
     }
 
+    /**
+     * Suspend view updates and set version ID to changelog's end
+     */
     public function testSuspendDisabled()
     {
         $this->stateMock->expects($this->once())
             ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\Mview\View\StateInterface::MODE_DISABLED));
+            ->will($this->returnValue(StateInterface::MODE_DISABLED));
         $this->stateMock->expects($this->never())
             ->method('setVersionId');
         $this->stateMock->expects($this->never())
@@ -429,14 +567,17 @@ public function testSuspendDisabled()
         $this->model->suspend();
     }
 
+    /**
+     * Test to Resume view updates
+     */
     public function testResume()
     {
         $this->stateMock->expects($this->once())
             ->method('getStatus')
-            ->will($this->returnValue(\Magento\Framework\Mview\View\StateInterface::STATUS_SUSPENDED));
+            ->will($this->returnValue(StateInterface::STATUS_SUSPENDED));
         $this->stateMock->expects($this->once())
             ->method('setStatus')
-            ->with(\Magento\Framework\Mview\View\StateInterface::STATUS_IDLE)
+            ->with(StateInterface::STATUS_IDLE)
             ->will($this->returnSelf());
         $this->stateMock->expects($this->once())
             ->method('save')
@@ -447,6 +588,8 @@ public function testResume()
     }
 
     /**
+     * Test to Resume view updates
+     *
      * @param string $status
      * @dataProvider dataProviderResumeNotSuspended
      */
@@ -470,16 +613,19 @@ public function testResumeNotSuspended($status)
     public function dataProviderResumeNotSuspended()
     {
         return [
-            [\Magento\Framework\Mview\View\StateInterface::STATUS_IDLE],
-            [\Magento\Framework\Mview\View\StateInterface::STATUS_WORKING],
+            [StateInterface::STATUS_IDLE],
+            [StateInterface::STATUS_WORKING],
         ];
     }
 
+    /**
+     * Test to Clear precessed changelog entries
+     */
     public function testClearChangelog()
     {
         $this->stateMock->expects($this->once())
             ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\Mview\View\StateInterface::MODE_ENABLED));
+            ->will($this->returnValue(StateInterface::MODE_ENABLED));
         $this->stateMock->expects($this->once())
             ->method('getVersionId')
             ->will($this->returnValue(11));
@@ -491,11 +637,14 @@ public function testClearChangelog()
         $this->model->clearChangelog();
     }
 
+    /**
+     * Test to Clear precessed changelog entries
+     */
     public function testClearChangelogDisabled()
     {
         $this->stateMock->expects($this->once())
             ->method('getMode')
-            ->will($this->returnValue(\Magento\Framework\Mview\View\StateInterface::MODE_DISABLED));
+            ->will($this->returnValue(StateInterface::MODE_DISABLED));
         $this->stateMock->expects($this->never())
             ->method('getVersionId');
         $this->changelogMock->expects($this->never())
@@ -504,6 +653,9 @@ public function testClearChangelogDisabled()
         $this->model->clearChangelog();
     }
 
+    /**
+     * Test to Return related state object
+     */
     public function testSetState()
     {
         $this->model->setState($this->stateMock);
@@ -511,6 +663,8 @@ public function testSetState()
     }
 
     /**
+     * Test to Check whether view is enabled
+     *
      * @param string $mode
      * @param bool $result
      * @dataProvider dataProviderIsEnabled
@@ -529,12 +683,14 @@ public function testIsEnabled($mode, $result)
     public function dataProviderIsEnabled()
     {
         return [
-            [\Magento\Framework\Mview\View\StateInterface::MODE_ENABLED, true],
-            [\Magento\Framework\Mview\View\StateInterface::MODE_DISABLED, false],
+            [StateInterface::MODE_ENABLED, true],
+            [StateInterface::MODE_DISABLED, false],
         ];
     }
 
     /**
+     * Test to Check whether view is idle
+     *
      * @param string $status
      * @param bool $result
      * @dataProvider dataProviderIsIdle
@@ -553,13 +709,15 @@ public function testIsIdle($status, $result)
     public function dataProviderIsIdle()
     {
         return [
-            [\Magento\Framework\Mview\View\StateInterface::STATUS_IDLE, true],
-            [\Magento\Framework\Mview\View\StateInterface::STATUS_WORKING, false],
-            [\Magento\Framework\Mview\View\StateInterface::STATUS_SUSPENDED, false],
+            [StateInterface::STATUS_IDLE, true],
+            [StateInterface::STATUS_WORKING, false],
+            [StateInterface::STATUS_SUSPENDED, false],
         ];
     }
 
     /**
+     * Test to Check whether view is working
+     *
      * @param string $status
      * @param bool $result
      * @dataProvider dataProviderIsWorking
@@ -578,13 +736,15 @@ public function testIsWorking($status, $result)
     public function dataProviderIsWorking()
     {
         return [
-            [\Magento\Framework\Mview\View\StateInterface::STATUS_IDLE, false],
-            [\Magento\Framework\Mview\View\StateInterface::STATUS_WORKING, true],
-            [\Magento\Framework\Mview\View\StateInterface::STATUS_SUSPENDED, false],
+            [StateInterface::STATUS_IDLE, false],
+            [StateInterface::STATUS_WORKING, true],
+            [StateInterface::STATUS_SUSPENDED, false],
         ];
     }
 
     /**
+     * Test to Check whether view is suspended
+     *
      * @param string $status
      * @param bool $result
      * @dataProvider dataProviderIsSuspended
@@ -603,12 +763,15 @@ public function testIsSuspended($status, $result)
     public function dataProviderIsSuspended()
     {
         return [
-            [\Magento\Framework\Mview\View\StateInterface::STATUS_IDLE, false],
-            [\Magento\Framework\Mview\View\StateInterface::STATUS_WORKING, false],
-            [\Magento\Framework\Mview\View\StateInterface::STATUS_SUSPENDED, true],
+            [StateInterface::STATUS_IDLE, false],
+            [StateInterface::STATUS_WORKING, false],
+            [StateInterface::STATUS_SUSPENDED, true],
         ];
     }
 
+    /**
+     * Test to Return view updated datetime
+     */
     public function testGetUpdated()
     {
         $this->stateMock->expects($this->once())
@@ -617,6 +780,9 @@ public function testGetUpdated()
         $this->assertEquals('some datetime', $this->model->getUpdated());
     }
 
+    /**
+     * Fill view data from config
+     */
     protected function loadView()
     {
         $viewId = 'view_test';
diff --git a/lib/internal/Magento/Framework/Mview/View.php b/lib/internal/Magento/Framework/Mview/View.php
index e6f2d9fe03996..dade475a20482 100644
--- a/lib/internal/Magento/Framework/Mview/View.php
+++ b/lib/internal/Magento/Framework/Mview/View.php
@@ -240,7 +240,7 @@ public function unsubscribe()
      */
     public function update()
     {
-        if ($this->getState()->getStatus() !== View\StateInterface::STATUS_IDLE) {
+        if (!$this->isIdle() || !$this->isEnabled()) {
             return;
         }
 
@@ -291,16 +291,13 @@ public function update()
      */
     private function executeAction(ActionInterface $action, int $lastVersionId, int $currentVersionId)
     {
-        $versionBatchSize = self::$maxVersionQueryBatch;
         $batchSize = isset($this->changelogBatchSize[$this->getChangelog()->getViewId()])
-            ? $this->changelogBatchSize[$this->getChangelog()->getViewId()]
+            ? (int) $this->changelogBatchSize[$this->getChangelog()->getViewId()]
             : self::DEFAULT_BATCH_SIZE;
 
-        for ($vsFrom = $lastVersionId; $vsFrom < $currentVersionId; $vsFrom += $versionBatchSize) {
-            // Don't go past the current version for atomicity.
-            $versionTo = min($currentVersionId, $vsFrom + $versionBatchSize);
-            $ids = $this->getChangelog()->getList($vsFrom, $versionTo);
-
+        $vsFrom = $lastVersionId;
+        while ($vsFrom < $currentVersionId) {
+            $ids = $this->getBatchOfIds($vsFrom, $currentVersionId);
             // We run the actual indexer in batches.
             // Chunked AFTER loading to avoid duplicates in separate chunks.
             $chunks = array_chunk($ids, $batchSize);
@@ -310,6 +307,32 @@ private function executeAction(ActionInterface $action, int $lastVersionId, int
         }
     }
 
+    /**
+     * Get batch of entity ids
+     *
+     * @param int $lastVersionId
+     * @param int $currentVersionId
+     * @return array
+     */
+    private function getBatchOfIds(int &$lastVersionId, int $currentVersionId): array
+    {
+        $ids = [];
+        $versionBatchSize = self::$maxVersionQueryBatch;
+        $idsBatchSize = self::$maxVersionQueryBatch;
+        for ($vsFrom = $lastVersionId; $vsFrom < $currentVersionId; $vsFrom += $versionBatchSize) {
+            // Don't go past the current version for atomicity.
+            $versionTo = min($currentVersionId, $vsFrom + $versionBatchSize);
+            /** To avoid duplicate ids need to flip and merge the array */
+            $ids += array_flip($this->getChangelog()->getList($vsFrom, $versionTo));
+            $lastVersionId = $versionTo;
+            if (count($ids) >= $idsBatchSize) {
+                break;
+            }
+        }
+
+        return array_keys($ids);
+    }
+
     /**
      * Suspend view updates and set version ID to changelog's end
      *
diff --git a/lib/internal/Magento/Framework/Mview/View/Changelog.php b/lib/internal/Magento/Framework/Mview/View/Changelog.php
index d51f5b13f01a2..bdf960e614bed 100644
--- a/lib/internal/Magento/Framework/Mview/View/Changelog.php
+++ b/lib/internal/Magento/Framework/Mview/View/Changelog.php
@@ -178,13 +178,18 @@ public function getVersion()
         if (!$this->connection->isTableExists($changelogTableName)) {
             throw new ChangelogTableNotExistsException(new Phrase("Table %1 does not exist", [$changelogTableName]));
         }
-        $row = $this->connection->fetchRow('SHOW TABLE STATUS LIKE ?', [$changelogTableName]);
-        if (isset($row['Auto_increment'])) {
-            return (int)$row['Auto_increment'] - 1;
+        $select = $this->connection->select()->from($changelogTableName)->order('version_id DESC')->limit(1);
+        $row = $this->connection->fetchRow($select);
+        if ($row === false) {
+            return 0;
         } else {
-            throw new RuntimeException(
-                new Phrase("Table status for %1 is incorrect. Can`t fetch version id.", [$changelogTableName])
-            );
+            if (is_array($row) && array_key_exists('version_id', $row)) {
+                return (int)$row['version_id'];
+            } else {
+                throw new RuntimeException(
+                    new Phrase("Table status for %1 is incorrect. Can`t fetch version id.", [$changelogTableName])
+                );
+            }
         }
     }
 
diff --git a/lib/internal/Magento/Framework/ObjectManager/Definition/Runtime.php b/lib/internal/Magento/Framework/ObjectManager/Definition/Runtime.php
index 9bc023645eca3..6663732ec8d33 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Definition/Runtime.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Definition/Runtime.php
@@ -7,6 +7,11 @@
  */
 namespace Magento\Framework\ObjectManager\Definition;
 
+/**
+ * Class Runtime
+ *
+ * @package Magento\Framework\ObjectManager\Definition
+ */
 class Runtime implements \Magento\Framework\ObjectManager\DefinitionInterface
 {
     /**
@@ -45,7 +50,7 @@ public function __construct(\Magento\Framework\Code\Reader\ClassReaderInterface
      */
     public function getParameters($className)
     {
-        if (!array_key_exists($className, $this->_definitions)) {
+        if (!isset($this->_definitions[$className])) {
             $this->_definitions[$className] = $this->_reader->getConstructor($className);
         }
         return $this->_definitions[$className];
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
index 15c4cb098b84d..7094b116ead3f 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -11,6 +11,9 @@
 use Psr\Log\LoggerInterface;
 use Magento\Framework\App\ObjectManager;
 
+/**
+ * Class AbstractFactory
+ */
 abstract class AbstractFactory implements \Magento\Framework\ObjectManager\FactoryInterface
 {
     /**
@@ -49,10 +52,10 @@ abstract class AbstractFactory implements \Magento\Framework\ObjectManager\Facto
     protected $creationStack = [];
 
     /**
-     * @param \Magento\Framework\ObjectManager\ConfigInterface $config
-     * @param ObjectManagerInterface $objectManager
+     * @param \Magento\Framework\ObjectManager\ConfigInterface     $config
+     * @param ObjectManagerInterface                               $objectManager
      * @param \Magento\Framework\ObjectManager\DefinitionInterface $definitions
-     * @param array $globalArguments
+     * @param array                                                $globalArguments
      */
     public function __construct(
         \Magento\Framework\ObjectManager\ConfigInterface $config,
@@ -91,6 +94,8 @@ public function setArguments($arguments)
     }
 
     /**
+     * Get definitions
+     *
      * @return \Magento\Framework\ObjectManager\DefinitionInterface
      */
     public function getDefinitions()
@@ -105,7 +110,7 @@ public function getDefinitions()
      * Create object
      *
      * @param string $type
-     * @param array $args
+     * @param array  $args
      *
      * @return object
      * @throws RuntimeException
@@ -115,7 +120,9 @@ protected function createObject($type, $args)
         try {
             return new $type(...array_values($args));
         } catch (\TypeError $exception) {
-            /** @var LoggerInterface $logger */
+            /**
+             * @var LoggerInterface $logger
+             */
             $logger = ObjectManager::getInstance()->get(LoggerInterface::class);
             $logger->critical(
                 sprintf('Type Error occurred when creating object: %s, %s', $type, $exception->getMessage())
@@ -130,9 +137,9 @@ protected function createObject($type, $args)
     /**
      * Resolve an argument
      *
-     * @param array &$argument
+     * @param array  $argument
      * @param string $paramType
-     * @param mixed $paramDefault
+     * @param mixed  $paramDefault
      * @param string $paramName
      * @param string $requestedType
      *
@@ -214,8 +221,8 @@ protected function parseArray(&$array)
      * Resolve constructor arguments
      *
      * @param string $requestedType
-     * @param array $parameters
-     * @param array $arguments
+     * @param array  $parameters
+     * @param array  $arguments
      *
      * @return array
      *
@@ -226,27 +233,44 @@ protected function resolveArgumentsInRuntime($requestedType, array $parameters,
     {
         $resolvedArguments = [];
         foreach ($parameters as $parameter) {
-            list($paramName, $paramType, $paramRequired, $paramDefault) = $parameter;
-            $argument = null;
-            if (!empty($arguments) && (isset($arguments[$paramName]) || array_key_exists($paramName, $arguments))) {
-                $argument = $arguments[$paramName];
-            } elseif ($paramRequired) {
-                if ($paramType) {
-                    $argument = ['instance' => $paramType];
-                } else {
-                    $this->creationStack = [];
-                    throw new \BadMethodCallException(
-                        'Missing required argument $' . $paramName . ' of ' . $requestedType . '.'
-                    );
-                }
+            $resolvedArguments[] = $this->getResolvedArgument((string)$requestedType, $parameter, $arguments);
+        }
+
+        return empty($resolvedArguments) ? [] : array_merge(...$resolvedArguments);
+    }
+
+    /**
+     * Get resolved argument from parameter
+     *
+     * @param  string $requestedType
+     * @param  array  $parameter
+     * @param  array  $arguments
+     * @return array
+     */
+    private function getResolvedArgument(string $requestedType, array $parameter, array $arguments): array
+    {
+        list($paramName, $paramType, $paramRequired, $paramDefault, $isVariadic) = $parameter;
+        $argument = null;
+        if (!empty($arguments) && (isset($arguments[$paramName]) || array_key_exists($paramName, $arguments))) {
+            $argument = $arguments[$paramName];
+        } elseif ($paramRequired) {
+            if ($paramType) {
+                $argument = ['instance' => $paramType];
             } else {
-                $argument = $paramDefault;
+                $this->creationStack = [];
+                throw new \BadMethodCallException(
+                    'Missing required argument $' . $paramName . ' of ' . $requestedType . '.'
+                );
             }
+        } else {
+            $argument = $paramDefault;
+        }
 
-            $this->resolveArgument($argument, $paramType, $paramDefault, $paramName, $requestedType);
-
-            $resolvedArguments[] = $argument;
+        if ($isVariadic) {
+            return is_array($argument) ? $argument : [$argument];
         }
-        return $resolvedArguments;
+
+        $this->resolveArgument($argument, $paramType, $paramDefault, $paramName, $requestedType);
+        return [$argument];
     }
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php b/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php
index c1c1e7c17709a..90e014d5ee17d 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Profiler/Log.php
@@ -3,9 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\ObjectManager\Profiler;
 
-use Magento\Framework\ObjectManager\Profiler\Tree\Item as Item;
+use Magento\Framework\ObjectManager\Profiler\Tree\Item;
 
 /**
  * Class Log
@@ -133,17 +134,19 @@ public function display()
     {
         $this->stats['used'] = count($this->used);
         $this->stats['unused'] = $this->stats['total'] - $this->stats['used'];
+        //phpcs:disable
         echo '<table border="1" cellspacing="0" cellpadding="2">',
-            '<thead><tr><th>',
-            "Creation chain (Red items are never used) Total: {$this->stats['total']}\n",
-            "Used: {$this->stats['used']} Not used: {$this->stats['unused']}",
-            '</th></tr></thead>',
-            '<tbody>',
-            '<tr><th>Instance class</th></tr>';
+        '<thead><tr><th>',
+        "Creation chain (Red items are never used) Total: {$this->stats['total']}\n",
+        "Used: {$this->stats['used']} Not used: {$this->stats['unused']}",
+        '</th></tr></thead>',
+        '<tbody>',
+        '<tr><th>Instance class</th></tr>';
         foreach ($this->roots as $root) {
             $this->displayItem($root);
         }
         echo '</tbody></table>';
+        //phpcs:enable
     }
 
     /**
@@ -156,9 +159,10 @@ public function display()
     protected function displayItem(Item $item, $level = 0)
     {
         $colorStyle = isset($this->used[$item->getHash()]) ? '' : ' style="color:red" ';
-
+        //phpcs:disable
         echo "<tr><td $colorStyle>" . str_repeat('·&nbsp;', $level) . $item->getClass()
             . ' - ' . $item->getHash() . '</td></tr>';
+        //phpcs:enable
 
         foreach ($item->getChildren() as $child) {
             $this->displayItem($child, $level + 1);
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php
index 000e9fb529a68..e61d8f089065f 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Framework\ObjectManager\Test\Unit\Config;
 
 use Magento\Framework\ObjectManager\Config\Compiled;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class CompiledTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php
index 779a0d04ebc52..648a74b91495d 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php
@@ -38,6 +38,9 @@ class CompiledTest extends \PHPUnit\Framework\TestCase
     /** @var ObjectManager */
     private $objectManager;
 
+    /**
+     * Setup tests
+     */
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
@@ -57,6 +60,9 @@ protected function setUp()
         $this->objectManager->setBackwardCompatibleProperty($this->factory, 'definitions', $this->definitionsMock);
     }
 
+    /**
+     * Test create simple
+     */
     public function testCreateSimple()
     {
         $expectedConfig = $this->getSimpleConfig();
@@ -106,6 +112,9 @@ public function testCreateSimple()
         $this->assertNull($result->getNullValue());
     }
 
+    /**
+     * Test create simple configured arguments
+     */
     public function testCreateSimpleConfiguredArguments()
     {
         $expectedConfig = $this->getSimpleNestedConfig();
@@ -170,6 +179,9 @@ public function testCreateSimpleConfiguredArguments()
         $this->assertNull($result->getNullValue());
     }
 
+    /**
+     * Test create get arguments in runtime
+     */
     public function testCreateGetArgumentsInRuntime()
     {
         // Stub OM to create test assets
@@ -308,18 +320,21 @@ private function getRuntimeParameters()
                     1 => DependencyTesting::class,
                     2 => true,
                     3 => null,
+                    4 => false,
                 ],
             1 => [
                     0 => 'sharedDependency',
                     1 => DependencySharedTesting::class,
                     2 => true,
                     3 => null,
+                    4 => false,
                 ],
             2 => [
                     0 => 'value',
                     1 => null,
                     2 => false,
                     3 => 'value',
+                    4 => false,
                 ],
             3 => [
                     0 => 'valueArray',
@@ -329,18 +344,21 @@ private function getRuntimeParameters()
                             0 => 'default_value1',
                             1 => 'default_value2',
                         ],
+                    4 => false,
                 ],
             4 => [
                     0 => 'globalValue',
                     1 => null,
                     2 => false,
                     3 => '',
+                    4 => false,
                 ],
             5 => [
                     0 => 'nullValue',
                     1 => null,
                     2 => false,
                     3 => null,
+                    4 => false,
                 ],
         ];
     }
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 309bf48548ec7..cc86d794bd80a 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php
@@ -10,6 +10,9 @@
 use Magento\Framework\ObjectManager\Factory\Dynamic\Developer;
 use Magento\Framework\ObjectManager\ObjectManager;
 
+/**
+ * Class FactoryTest
+ */
 class FactoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -27,6 +30,9 @@ class FactoryTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * Setup tests
+     */
     protected function setUp()
     {
         $this->config = new Config();
@@ -35,28 +41,43 @@ protected function setUp()
         $this->factory->setObjectManager($this->objectManager);
     }
 
+    /**
+     * Test create without args
+     */
     public function testCreateNoArgs()
     {
         $this->assertInstanceOf('StdClass', $this->factory->create(\StdClass::class));
     }
 
     /**
-     * @expectedException \UnexpectedValueException
+     * @expectedException        \UnexpectedValueException
      * @expectedExceptionMessage Invalid parameter configuration provided for $firstParam argument
      */
     public function testResolveArgumentsException()
     {
         $configMock = $this->createMock(\Magento\Framework\ObjectManager\Config\Config::class);
-        $configMock->expects($this->once())->method('getArguments')
-            ->will($this->returnValue([
-                'firstParam' => 1,
-            ]));
+        $configMock->expects($this->once())->method('getArguments')->will(
+            $this->returnValue(
+                [
+                    'firstParam' => 1,
+                ]
+            )
+        );
 
         $definitionsMock = $this->createMock(\Magento\Framework\ObjectManager\DefinitionInterface::class);
-        $definitionsMock->expects($this->once())->method('getParameters')
-            ->will($this->returnValue([[
-                'firstParam', 'string', true, 'default_val',
-            ]]));
+        $definitionsMock->expects($this->once())->method('getParameters')->will(
+            $this->returnValue(
+                [
+                    [
+                        'firstParam',
+                        'string',
+                        true,
+                        'default_val',
+                        false
+                    ]
+                ]
+            )
+        );
 
         $this->factory = new Developer(
             $configMock,
@@ -71,9 +92,14 @@ public function testResolveArgumentsException()
         );
     }
 
+    /**
+     * Test create with one arg
+     */
     public function testCreateOneArg()
     {
-        /** @var \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\OneScalar $result */
+        /**
+         * @var \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\OneScalar $result
+         */
         $result = $this->factory->create(
             \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\OneScalar::class,
             ['foo' => 'bar']
@@ -82,6 +108,9 @@ public function testCreateOneArg()
         $this->assertEquals('bar', $result->getFoo());
     }
 
+    /**
+     * Test create with injectable
+     */
     public function testCreateWithInjectable()
     {
         // let's imitate that One is injectable by providing DI configuration for it
@@ -92,7 +121,9 @@ public function testCreateWithInjectable()
                 ],
             ]
         );
-        /** @var \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\Two $result */
+        /**
+         * @var \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\Two $result
+         */
         $result = $this->factory->create(\Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\Two::class);
         $this->assertInstanceOf(\Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\Two::class, $result);
         $this->assertInstanceOf(
@@ -104,8 +135,8 @@ public function testCreateWithInjectable()
     }
 
     /**
-     * @param string $startingClass
-     * @param string $terminationClass
+     * @param        string $startingClass
+     * @param        string $terminationClass
      * @dataProvider circularDataProvider
      */
     public function testCircular($startingClass, $terminationClass)
@@ -130,23 +161,30 @@ public function circularDataProvider()
         ];
     }
 
+    /**
+     * Test create using reflection
+     */
     public function testCreateUsingReflection()
     {
         $type = \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\Polymorphous::class;
         $definitions = $this->createMock(\Magento\Framework\ObjectManager\DefinitionInterface::class);
         // should be more than defined in "switch" of create() method
-        $definitions->expects($this->once())->method('getParameters')->with($type)->will($this->returnValue([
-            ['one', null, false, null],
-            ['two', null, false, null],
-            ['three', null, false, null],
-            ['four', null, false, null],
-            ['five', null, false, null],
-            ['six', null, false, null],
-            ['seven', null, false, null],
-            ['eight', null, false, null],
-            ['nine', null, false, null],
-            ['ten', null, false, null],
-        ]));
+        $definitions->expects($this->once())->method('getParameters')->with($type)->will(
+            $this->returnValue(
+                [
+                    ['one', null, false, null, false],
+                    ['two', null, false, null, false],
+                    ['three', null, false, null, false],
+                    ['four', null, false, null, false],
+                    ['five', null, false, null, false],
+                    ['six', null, false, null, false],
+                    ['seven', null, false, null, false],
+                    ['eight', null, false, null, false],
+                    ['nine', null, false, null, false],
+                    ['ten', null, false, null, false],
+                ]
+            )
+        );
         $factory = new Developer($this->config, null, $definitions);
         $result = $factory->create(
             $type,
@@ -165,4 +203,257 @@ public function testCreateUsingReflection()
         );
         $this->assertSame(10, $result->getArg(9));
     }
+
+    /**
+     * Test create objects with variadic argument in constructor
+     *
+     * @param        $createArgs
+     * @param        $expectedArg0
+     * @param        $expectedArg1
+     * @dataProvider testCreateUsingVariadicDataProvider
+     */
+    public function testCreateUsingVariadic(
+        $createArgs,
+        $expectedArg0,
+        $expectedArg1
+    ) {
+        $type = \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\Variadic::class;
+        $definitions = $this->createMock(\Magento\Framework\ObjectManager\DefinitionInterface::class);
+
+        $definitions->expects($this->once())->method('getParameters')->with($type)->will(
+            $this->returnValue(
+                [
+                    [
+                'oneScalars',
+                \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\OneScalar::class,
+                false,
+                [],
+                true
+                    ],
+                ]
+            )
+        );
+        $factory = new Developer($this->config, null, $definitions);
+
+        /**
+         * @var \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\Variadic $variadic
+         */
+        $variadic = is_null($createArgs)
+            ? $factory->create($type)
+            : $factory->create($type, $createArgs);
+
+        $this->assertSame($expectedArg0, $variadic->getOneScalarByKey(0));
+        $this->assertSame($expectedArg1, $variadic->getOneScalarByKey(1));
+    }
+
+    /**
+     * @return array
+     */
+    public function testCreateUsingVariadicDataProvider()
+    {
+        $oneScalar1 = $this->createMock(\Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\OneScalar::class);
+        $oneScalar2 = $this->createMock(\Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\OneScalar::class);
+
+        return [
+            'without_args'    => [
+                null,
+                null,
+                null,
+            ],
+            'with_empty_args' => [
+                [],
+                null,
+                null,
+            ],
+            'with_empty_args_value' => [
+                [
+                    'oneScalars' => []
+                ],
+                null,
+                null,
+            ],
+            'with_single_arg' => [
+                [
+                    'oneScalars' => $oneScalar1
+                ],
+                $oneScalar1,
+                null,
+            ],
+            'with_full_args' => [
+                [
+                    'oneScalars' => [
+                        $oneScalar1,
+                        $oneScalar2,
+                    ]
+                ],
+                $oneScalar1,
+                $oneScalar2,
+            ],
+        ];
+    }
+
+    /**
+     * Test data can be injected into variadic arguments from di config
+     */
+    public function testCreateVariadicFromDiConfig()
+    {
+        $oneScalar1 = $this->createMock(\Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\OneScalar::class);
+        $oneScalar2 = $this->createMock(\Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\OneScalar::class);
+
+        // let's imitate that Variadic is configured by providing DI configuration for it
+        $this->config->extend(
+            [
+                \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\Variadic::class => [
+                    'arguments' => [
+                        'oneScalars' => [
+                            $oneScalar1,
+                            $oneScalar2,
+                        ]
+                    ]
+                ],
+            ]
+        );
+        /**
+         * @var \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\Variadic $variadic
+         */
+        $variadic = $this->factory->create(\Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\Variadic::class);
+
+        $this->assertSame($oneScalar1, $variadic->getOneScalarByKey(0));
+        $this->assertSame($oneScalar2, $variadic->getOneScalarByKey(1));
+    }
+
+    /**
+     * Test create objects with non variadic and variadic argument in constructor
+     *
+     * @param        $createArgs
+     * @param        $expectedFooValue
+     * @param        $expectedArg0
+     * @param        $expectedArg1
+     * @dataProvider testCreateUsingSemiVariadicDataProvider
+     */
+    public function testCreateUsingSemiVariadic(
+        $createArgs,
+        $expectedFooValue,
+        $expectedArg0,
+        $expectedArg1
+    ) {
+        $type = \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic::class;
+        $definitions = $this->createMock(\Magento\Framework\ObjectManager\DefinitionInterface::class);
+
+        $definitions->expects($this->once())->method('getParameters')->with($type)->will(
+            $this->returnValue(
+                [
+                    [
+                        'foo',
+                        null,
+                        false,
+                        \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic::DEFAULT_FOO_VALUE,
+                        false
+                    ],
+                    [
+                        'oneScalars',
+                        \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\OneScalar::class,
+                        false,
+                        [],
+                        true
+                    ],
+                ]
+            )
+        );
+        $factory = new Developer($this->config, null, $definitions);
+
+        /**
+         * @var \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic $semiVariadic
+         */
+        $semiVariadic = is_null($createArgs)
+            ? $factory->create($type)
+            : $factory->create($type, $createArgs);
+
+        $this->assertSame($expectedFooValue, $semiVariadic->getFoo());
+        $this->assertSame($expectedArg0, $semiVariadic->getOneScalarByKey(0));
+        $this->assertSame($expectedArg1, $semiVariadic->getOneScalarByKey(1));
+    }
+
+    /**
+     * @return array
+     */
+    public function testCreateUsingSemiVariadicDataProvider()
+    {
+        $oneScalar1 = $this->createMock(\Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\OneScalar::class);
+        $oneScalar2 = $this->createMock(\Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\OneScalar::class);
+
+        return [
+            'without_args'    => [
+                null,
+                \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic::DEFAULT_FOO_VALUE,
+                null,
+                null,
+            ],
+            'with_empty_args' => [
+                [],
+                \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic::DEFAULT_FOO_VALUE,
+                null,
+                null,
+            ],
+            'only_with_foo_value' => [
+                [
+                    'foo' => 'baz'
+                ],
+                'baz',
+                null,
+                null,
+            ],
+            'only_with_oneScalars_empty_value' => [
+                [
+                    'oneScalars' => []
+                ],
+                \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic::DEFAULT_FOO_VALUE,
+                null,
+                null,
+            ],
+            'only_with_oneScalars_single_value' => [
+                [
+                    'oneScalars' => $oneScalar1
+                ],
+                \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic::DEFAULT_FOO_VALUE,
+                $oneScalar1,
+                null,
+            ],
+            'only_with_oneScalars_full_value' => [
+                [
+                    'oneScalars' => [
+                        $oneScalar1,
+                        $oneScalar2,
+                    ]
+                ],
+                \Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture\SemiVariadic::DEFAULT_FOO_VALUE,
+                $oneScalar1,
+                $oneScalar2,
+            ],
+            'with_all_values_defined_in_right_order' => [
+                [
+                    'foo' => 'baz',
+                    'oneScalars' => [
+                        $oneScalar1,
+                        $oneScalar2,
+                    ]
+                ],
+                'baz',
+                $oneScalar1,
+                $oneScalar2,
+            ],
+            'with_all_values_defined_in_reverse_order' => [
+                [
+                    'oneScalars' => [
+                        $oneScalar1,
+                        $oneScalar2,
+                    ],
+                    'foo' => 'baz',
+                ],
+                'baz',
+                $oneScalar1,
+                $oneScalar2,
+            ],
+        ];
+    }
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/SemiVariadic.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/SemiVariadic.php
new file mode 100644
index 0000000000000..8773dec1c48d6
--- /dev/null
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/SemiVariadic.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture;
+
+/**
+ * Constructor with non variadic and variadic argument in constructor
+ */
+class SemiVariadic
+{
+    const DEFAULT_FOO_VALUE = 'bar';
+
+    /**
+     * @var OneScalar[]
+     */
+    private $oneScalars;
+
+    /**
+     * @var string
+     */
+    private $foo;
+
+    /**
+     * SemiVariadic constructor.
+     *
+     * @param string      $foo
+     * @param OneScalar[] ...$oneScalars
+     */
+    public function __construct(
+        string $foo = self::DEFAULT_FOO_VALUE,
+        OneScalar ...$oneScalars
+    ) {
+        $this->foo = $foo;
+        $this->oneScalars = $oneScalars;
+    }
+
+    /**
+     * @param  mixed $key
+     * @return mixed
+     */
+    public function getOneScalarByKey($key)
+    {
+        return $this->oneScalars[$key] ?? null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFoo(): string
+    {
+        return $this->foo;
+    }
+}
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Variadic.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Variadic.php
new file mode 100644
index 0000000000000..af26f7456fdde
--- /dev/null
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Variadic.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\ObjectManager\Test\Unit\Factory\Fixture;
+
+/**
+ * Constructor with variadic argument in constructor
+ */
+class Variadic
+{
+    /**
+     * @var OneScalar[]
+     */
+    private $oneScalars;
+
+    /**
+     * Variadic constructor.
+     * @param OneScalar[] ...$oneScalars
+     */
+    public function __construct(OneScalar ...$oneScalars)
+    {
+        $this->oneScalars = $oneScalars;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function getOneScalarByKey($key)
+    {
+        return $this->oneScalars[$key] ?? null;
+    }
+}
diff --git a/lib/internal/Magento/Framework/RequireJs/Config.php b/lib/internal/Magento/Framework/RequireJs/Config.php
index ae45e29f38911..f158aa8b1ebce 100644
--- a/lib/internal/Magento/Framework/RequireJs/Config.php
+++ b/lib/internal/Magento/Framework/RequireJs/Config.php
@@ -196,11 +196,14 @@ public function getConfigFileRelativePath()
      */
     public function getMixinsFileRelativePath()
     {
-        $map = $this->getRepositoryFilesMap(Config::MIXINS_FILE_NAME, [
-            'area' => $this->staticContext->getAreaCode(),
-            'theme' => $this->staticContext->getThemePath(),
-            'locale' => $this->staticContext->getLocale(),
-        ]);
+        $map = $this->getRepositoryFilesMap(
+            Config::MIXINS_FILE_NAME,
+            [
+                'area' => $this->staticContext->getAreaCode(),
+                'theme' => $this->staticContext->getThemePath(),
+                'locale' => $this->staticContext->getLocale(),
+            ]
+        );
         if ($map) {
             $relativePath = implode('/', $map) . '/' . Config::MIXINS_FILE_NAME;
         } else {
@@ -254,11 +257,14 @@ public function getMinResolverRelativePath()
      */
     public function getUrlResolverFileRelativePath()
     {
-        $map = $this->getRepositoryFilesMap(Config::URL_RESOLVER_FILE_NAME, [
-            'area' => $this->staticContext->getAreaCode(),
-            'theme' => $this->staticContext->getThemePath(),
-            'locale' => $this->staticContext->getLocale(),
-        ]);
+        $map = $this->getRepositoryFilesMap(
+            Config::URL_RESOLVER_FILE_NAME,
+            [
+                'area' => $this->staticContext->getAreaCode(),
+                'theme' => $this->staticContext->getThemePath(),
+                'locale' => $this->staticContext->getLocale(),
+            ]
+        );
         if ($map) {
             $relativePath = implode('/', $map) . '/' . Config::URL_RESOLVER_FILE_NAME;
         } else {
@@ -278,6 +284,8 @@ public function getMapFileRelativePath()
     }
 
     /**
+     * Get path to configuration file
+     *
      * @return string
      */
     protected function getConfigFileName()
@@ -286,11 +294,13 @@ protected function getConfigFileName()
     }
 
     /**
+     * Get resolver code which RequireJS fetch minified files instead
+     *
      * @return string
      */
     public function getMinResolverCode()
     {
-        $excludes = [];
+        $excludes = ['url.indexOf(baseUrl) === 0'];
         foreach ($this->minification->getExcludes('js') as $expression) {
             $excludes[] = '!url.match(/' . str_replace('/', '\/', $expression) . '/)';
         }
@@ -298,7 +308,8 @@ public function getMinResolverCode()
 
         $result = <<<code
     var ctx = require.s.contexts._,
-        origNameToUrl = ctx.nameToUrl;
+        origNameToUrl = ctx.nameToUrl,
+        baseUrl = ctx.config.baseUrl;
 
     ctx.nameToUrl = function() {
         var url = origNameToUrl.apply(ctx, arguments);
@@ -317,6 +328,8 @@ public function getMinResolverCode()
     }
 
     /**
+     * Get map for given file.
+     *
      * @param string $fileId
      * @param array $params
      * @return array
diff --git a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
index 369449d1f046a..05f040e8f406d 100644
--- a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
@@ -101,9 +101,13 @@ public function testGetConfig()
     {
         $this->fileReader->expects($this->any())
             ->method('readAll')
-            ->will($this->returnCallback(function ($file) {
-                return $file . ' content';
-            }));
+            ->will(
+                $this->returnCallback(
+                    function ($file) {
+                        return $file . ' content';
+                    }
+                )
+            );
         $fileOne = $this->createMock(\Magento\Framework\View\File::class);
         $fileOne->expects($this->once())
             ->method('getFilename')
@@ -180,11 +184,12 @@ public function testGetMinResolverCode()
 
         $expected = <<<code
     var ctx = require.s.contexts._,
-        origNameToUrl = ctx.nameToUrl;
+        origNameToUrl = ctx.nameToUrl,
+        baseUrl = ctx.config.baseUrl;
 
     ctx.nameToUrl = function() {
         var url = origNameToUrl.apply(ctx, arguments);
-        if (!url.match(/\.min\./)) {
+        if (url.indexOf(baseUrl) === 0&&!url.match(/\.min\./)) {
             url = url.replace(/(\.min)?\.js$/, '.min.js');
         }
         return url;
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
index c867dced0fc6e..f6bf61708dd80 100644
--- a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
@@ -17,7 +17,7 @@ class JsonHexTagTest extends \PHPUnit\Framework\TestCase
      * @var \Magento\Framework\Serialize\Serializer\Json
      */
     private $json;
-    
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -37,6 +37,9 @@ public function testSerialize($value, $expected)
         );
     }
 
+    /**
+     * @return array
+     */
     public function serializeDataProvider()
     {
         $dataObject = new DataObject(['something']);
diff --git a/lib/internal/Magento/Framework/Session/SidResolver.php b/lib/internal/Magento/Framework/Session/SidResolver.php
index 1208aeb31eaee..041995d20fcd2 100644
--- a/lib/internal/Magento/Framework/Session/SidResolver.php
+++ b/lib/internal/Magento/Framework/Session/SidResolver.php
@@ -11,6 +11,7 @@
 
 /**
  * Class SidResolver
+ * @deprecated 2.3.3 SIDs in URLs are no longer used
  */
 class SidResolver implements SidResolverInterface
 {
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DefinitionAggregator.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DefinitionAggregator.php
index f9918a1b8d504..c1d3f9ebee751 100644
--- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DefinitionAggregator.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/DefinitionAggregator.php
@@ -6,13 +6,11 @@
 
 namespace Magento\Framework\Setup\Declaration\Schema\Db;
 
+use Magento\Framework\App\ResourceConnection;
 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
 {
@@ -21,14 +19,28 @@ class DefinitionAggregator implements DbDefinitionProcessorInterface
      */
     private $definitionProcessors;
 
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var string
+     */
+    private $dbVersion;
+
     /**
      * Constructor.
      *
+     * @param ResourceConnection $resourceConnection
      * @param DbDefinitionProcessorInterface[] $definitionProcessors
      */
-    public function __construct(array $definitionProcessors)
-    {
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        array $definitionProcessors
+    ) {
         $this->definitionProcessors = $definitionProcessors;
+        $this->resourceConnection = $resourceConnection;
     }
 
     /**
@@ -60,6 +72,61 @@ public function fromDefinition(array $data)
         }
 
         $definitionProcessor = $this->definitionProcessors[$type];
+        if (isset($data['default'])) {
+            $data['default'] = $this->processDefaultValue($data);
+        }
+
         return $definitionProcessor->fromDefinition($data);
     }
+
+    /**
+     * Get DB version
+     *
+     * @return string
+     */
+    private function getDatabaseVersion(): string
+    {
+        if (!$this->dbVersion) {
+            $this->dbVersion = $this->resourceConnection->getConnection('default')
+                ->fetchPairs("SHOW variables LIKE 'version'")['version'];
+        }
+
+        return $this->dbVersion;
+    }
+
+    /**
+     * Processes `$value` to be compatible with MySQL.
+     *
+     * @param array $data
+     * @return string|null|bool
+     */
+    protected function processDefaultValue(array $data)
+    {
+        $defaultValue = $data['default'];
+        if ($defaultValue === null || $data['default'] === false) {
+            return $defaultValue;
+        }
+        if ($defaultValue === "'NULL'") {
+            return "NULL";
+        }
+        if ($defaultValue === "NULL" && strpos($this->getDatabaseVersion(), 'MariaDB') !== false) {
+            return null;
+        }
+        /*
+         * MariaDB replaces some defaults by their respective functions, e.g. `DEFAULT CURRENT_TIMESTAMP` ends up being
+         * `current_timestamp()`  in the information schema.
+         */
+        $defaultValue = strtr(
+            $defaultValue,
+            [
+                'current_timestamp()' => 'CURRENT_TIMESTAMP',
+                'curdate()' => 'CURRENT_DATE',
+                'curtime()' => 'CURRENT_TIME'
+            ]
+        );
+        //replace escaped single quotes
+        $defaultValue = str_replace("'", "", $defaultValue);
+
+        return $defaultValue;
+    }
 }
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
index 1a57911d8ace1..a95b1812e68f9 100644
--- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaReader.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/DbSchemaReader.php
@@ -126,7 +126,7 @@ 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);
+        $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
@@ -147,9 +147,10 @@ public function readIndexes($tableName, $resource)
     }
 
     /**
+     * Read references (foreign keys) from Magento tables.
+     *
      * As MySQL has bug and do not show foreign keys during DESCRIBE and other directives required
-     * to take it from SHOW CREATE TABLE ...
-     * command
+     * to take it from "SHOW CREATE TABLE ..." command.
      *
      * @inheritdoc
      */
@@ -170,13 +171,14 @@ public function readReferences($tableName, $resource)
     public function getCreateTableSql($tableName, $resource)
     {
         $adapter = $this->resourceConnection->getConnection($resource);
-        $sql = sprintf('SHOW CREATE TABLE %s', $tableName);
+        $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
@@ -186,7 +188,7 @@ 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);
+        $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
diff --git a/lib/internal/Magento/Framework/Setup/Lists.php b/lib/internal/Magento/Framework/Setup/Lists.php
index 98c9b6cc0a4b4..4e0f7277b7b7d 100644
--- a/lib/internal/Magento/Framework/Setup/Lists.php
+++ b/lib/internal/Magento/Framework/Setup/Lists.php
@@ -96,9 +96,10 @@ public function getLocaleList()
         $languages = (new LanguageBundle())->get(Resolver::DEFAULT_LOCALE)['Languages'];
         $countries = (new RegionBundle())->get(Resolver::DEFAULT_LOCALE)['Countries'];
         $locales = \ResourceBundle::getLocales('') ?: [];
+        $allowedLocales = array_flip($this->allowedLocales);
         $list = [];
         foreach ($locales as $locale) {
-            if (!in_array($locale, $this->allowedLocales)) {
+            if (!isset($allowedLocales[$locale])) {
                 continue;
             }
             $language = \Locale::getPrimaryLanguage($locale);
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php b/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php
index bdaca77e5b4eb..e1b0e2842628d 100644
--- a/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchApplier.php
@@ -161,6 +161,9 @@ public function applyDataPatch($moduleName = null)
                     $this->moduleDataSetup->getConnection()->beginTransaction();
                     $dataPatch->apply();
                     $this->patchHistory->fixPatch(get_class($dataPatch));
+                    foreach ($dataPatch->getAliases() as $patchAlias) {
+                        $this->patchHistory->fixPatch($patchAlias);
+                    }
                     $this->moduleDataSetup->getConnection()->commit();
                 } catch (\Exception $e) {
                     $this->moduleDataSetup->getConnection()->rollBack();
@@ -237,6 +240,9 @@ public function applySchemaPatch($moduleName = null)
                 $schemaPatch = $this->patchFactory->create($schemaPatch, ['schemaSetup' => $this->schemaSetup]);
                 $schemaPatch->apply();
                 $this->patchHistory->fixPatch(get_class($schemaPatch));
+                foreach ($schemaPatch->getAliases() as $patchAlias) {
+                    $this->patchHistory->fixPatch($patchAlias);
+                }
             } catch (\Exception $e) {
                 throw new SetupException(
                     new Phrase(
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchHistory.php b/lib/internal/Magento/Framework/Setup/Patch/PatchHistory.php
index 34b7c226185e3..5579af1694d4a 100644
--- a/lib/internal/Magento/Framework/Setup/Patch/PatchHistory.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchHistory.php
@@ -56,9 +56,9 @@ public function __construct(ResourceConnection $resourceConnection)
      * Read and cache data patches from db
      *
      * All patches are store in patch_list table
-     * @see self::TABLE_NAME
      *
-     * @return array
+     * @see self::TABLE_NAME
+     * @return string[]
      */
     private function getAppliedPatches()
     {
@@ -87,12 +87,14 @@ public function fixPatch($patchName)
 
         $adapter = $this->resourceConnection->getConnection();
         $adapter->insert($this->resourceConnection->getTableName(self::TABLE_NAME), [self::CLASS_NAME => $patchName]);
+
+        $this->patchesRegistry[] = $patchName;
     }
 
     /**
      * Revert patch from history
      *
-     * @param $patchName
+     * @param string $patchName
      * @return void
      */
     public function revertPatchFromHistory($patchName)
diff --git a/lib/internal/Magento/Framework/Setup/Patch/PatchVersionInterface.php b/lib/internal/Magento/Framework/Setup/Patch/PatchVersionInterface.php
index fb2b0e2c379f4..c1f4439d692a4 100644
--- a/lib/internal/Magento/Framework/Setup/Patch/PatchVersionInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Patch/PatchVersionInterface.php
@@ -6,9 +6,10 @@
 namespace Magento\Framework\Setup\Patch;
 
 /**
- * For backward compatibility with versioned style module installation. Deprecated since creation.
+ * For backward compatibility with versioned style module installation.
+ * The interface should be used for migration from the legacy installation approach to the declarative installation
+ * mechanism. The usage of this interface prohibited for the new data or schema patches.
  *
- * @deprecated
  */
 interface PatchVersionInterface
 {
@@ -19,7 +20,6 @@ interface PatchVersionInterface
      * 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/SampleData/Executor.php b/lib/internal/Magento/Framework/Setup/SampleData/Executor.php
index de60f0378484d..43ad676e7f534 100644
--- a/lib/internal/Magento/Framework/Setup/SampleData/Executor.php
+++ b/lib/internal/Magento/Framework/Setup/SampleData/Executor.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Setup\SampleData;
 
+/**
+ * Performs sample data installations.
+ */
 class Executor
 {
     /**
@@ -39,6 +42,7 @@ public function __construct(
 
     /**
      * Execute SampleData module installation.
+     *
      * Catch exception if it appeared and continue installation
      *
      * @param InstallerInterface $installer
@@ -49,7 +53,7 @@ public function exec(InstallerInterface $installer)
         try {
             $this->appState->emulateAreaCode(\Magento\Framework\App\Area::AREA_GLOBAL, [$installer, 'install']);
             $this->state->setInstalled();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->state->setError();
             $this->logger->error('Sample Data error: ' . $e->getMessage());
         }
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php
index cb40845bcc488..b649f6f062e9e 100644
--- a/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchApplierTest.php
@@ -10,8 +10,11 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Module\ModuleResource;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Setup\Exception;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchBackwardCompatability;
+use Magento\Framework\Setup\Patch\PatchInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Setup\Patch\PatchApplier;
@@ -169,8 +172,10 @@ public function testApplyDataPatchForNewlyInstalledModule($moduleName, $dataPatc
 
         $patch1 = $this->createMock(\SomeDataPatch::class);
         $patch1->expects($this->once())->method('apply');
+        $patch1->expects($this->once())->method('getAliases')->willReturn([]);
         $patch2 = $this->createMock(\OtherDataPatch::class);
         $patch2->expects($this->once())->method('apply');
+        $patch2->expects($this->once())->method('getAliases')->willReturn([]);
         $this->objectManagerMock->expects($this->any())->method('create')->willReturnMap(
             [
                 ['\\' . \SomeDataPatch::class, ['moduleDataSetup' => $this->moduleDataSetupMock], $patch1],
@@ -188,6 +193,60 @@ public function testApplyDataPatchForNewlyInstalledModule($moduleName, $dataPatc
         $this->patchApllier->applyDataPatch($moduleName);
     }
 
+    /**
+     * @param $moduleName
+     * @param $dataPatches
+     * @param $moduleVersionInDb
+     *
+     * @dataProvider applyDataPatchDataNewModuleProvider()
+     *
+     * @expectedException Exception
+     * @expectedExceptionMessageRegExp "Unable to apply data patch .+ cannot be applied twice"
+     */
+    public function testApplyDataPatchForAlias($moduleName, $dataPatches, $moduleVersionInDb)
+    {
+        $this->dataPatchReaderMock->expects($this->once())
+            ->method('read')
+            ->with($moduleName)
+            ->willReturn($dataPatches);
+
+        $this->moduleResourceMock->expects($this->any())->method('getDataVersion')->willReturnMap(
+            [
+                [$moduleName, $moduleVersionInDb]
+            ]
+        );
+
+        $patch1 = $this->createMock(DataPatchInterface::class);
+        $patch1->expects($this->once())->method('getAliases')->willReturn(['PatchAlias']);
+        $patchClass = get_class($patch1);
+
+        $patchRegistryMock = $this->createAggregateIteratorMock(PatchRegistry::class, [$patchClass], ['registerPatch']);
+        $patchRegistryMock->expects($this->any())
+            ->method('registerPatch');
+
+        $this->patchRegistryFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($patchRegistryMock);
+
+        $this->objectManagerMock->expects($this->any())->method('create')->willReturnMap(
+            [
+                ['\\' . $patchClass, ['moduleDataSetup' => $this->moduleDataSetupMock], $patch1],
+            ]
+        );
+        $this->connectionMock->expects($this->exactly(1))->method('beginTransaction');
+        $this->connectionMock->expects($this->never())->method('commit');
+        $this->patchHistoryMock->expects($this->any())->method('fixPatch')->will(
+            $this->returnCallback(
+                function ($param1) {
+                    if ($param1 == 'PatchAlias') {
+                        throw new \LogicException(sprintf("Patch %s cannot be applied twice", $param1));
+                    }
+                }
+            )
+        );
+        $this->patchApllier->applyDataPatch($moduleName);
+    }
+
     /**
      * @return array
      */
@@ -243,8 +302,10 @@ public function testApplyDataPatchForInstalledModule($moduleName, $dataPatches,
 
         $patch1 = $this->createMock(\SomeDataPatch::class);
         $patch1->expects(self::never())->method('apply');
+        $patch1->expects(self::any())->method('getAliases')->willReturn([]);
         $patch2 = $this->createMock(\OtherDataPatch::class);
         $patch2->expects(self::once())->method('apply');
+        $patch2->expects(self::any())->method('getAliases')->willReturn([]);
         $this->objectManagerMock->expects(self::any())->method('create')->willReturnMap(
             [
                 ['\\' . \SomeDataPatch::class, ['moduleDataSetup' => $this->moduleDataSetupMock], $patch1],
@@ -279,7 +340,7 @@ public function applyDataPatchDataInstalledModuleProvider()
      * @param $dataPatches
      * @param $moduleVersionInDb
      *
-     * @expectedException \Magento\Framework\Setup\Exception
+     * @expectedException Exception
      * @expectedExceptionMessage Patch Apply Error
      *
      * @dataProvider applyDataPatchDataInstalledModuleProvider()
@@ -328,7 +389,7 @@ public function testApplyDataPatchRollback($moduleName, $dataPatches, $moduleVer
     }
 
     /**
-     * @expectedException \Magento\Framework\Setup\Exception
+     * @expectedException Exception
      * @expectedExceptionMessageRegExp "Patch [a-zA-Z0-9\_]+ should implement DataPatchInterface"
      */
     public function testNonDataPatchApply()
@@ -434,8 +495,10 @@ public function testSchemaPatchAplly($moduleName, $schemaPatches, $moduleVersion
 
         $patch1 = $this->createMock(\SomeSchemaPatch::class);
         $patch1->expects($this->never())->method('apply');
+        $patch1->expects($this->any())->method('getAliases')->willReturn([]);
         $patch2 = $this->createMock(\OtherSchemaPatch::class);
         $patch2->expects($this->once())->method('apply');
+        $patch2->expects($this->any())->method('getAliases')->willReturn([]);
         $this->patchFactoryMock->expects($this->any())->method('create')->willReturnMap(
             [
                 [\SomeSchemaPatch::class, ['schemaSetup' => $this->schemaSetupMock], $patch1],
@@ -448,6 +511,55 @@ public function testSchemaPatchAplly($moduleName, $schemaPatches, $moduleVersion
         $this->patchApllier->applySchemaPatch($moduleName);
     }
 
+    /**
+     * @param $moduleName
+     * @param $schemaPatches
+     * @param $moduleVersionInDb
+     *
+     * @dataProvider schemaPatchDataProvider()
+     *
+     * @expectedException Exception
+     * @expectedExceptionMessageRegExp "Unable to apply patch .+ cannot be applied twice"
+     */
+    public function testSchemaPatchApplyForPatchAlias($moduleName, $schemaPatches, $moduleVersionInDb)
+    {
+        $this->schemaPatchReaderMock->expects($this->once())
+            ->method('read')
+            ->with($moduleName)
+            ->willReturn($schemaPatches);
+
+        $this->moduleResourceMock->expects($this->any())->method('getDbVersion')->willReturnMap(
+            [
+                [$moduleName, $moduleVersionInDb]
+            ]
+        );
+
+        $patch1 = $this->createMock(PatchInterface::class);
+        $patch1->expects($this->once())->method('getAliases')->willReturn(['PatchAlias']);
+        $patchClass = get_class($patch1);
+
+        $patchRegistryMock = $this->createAggregateIteratorMock(PatchRegistry::class, [$patchClass], ['registerPatch']);
+        $patchRegistryMock->expects($this->any())
+            ->method('registerPatch');
+
+        $this->patchRegistryFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($patchRegistryMock);
+
+        $this->patchFactoryMock->expects($this->any())->method('create')->willReturn($patch1);
+        $this->patchHistoryMock->expects($this->any())->method('fixPatch')->will(
+            $this->returnCallback(
+                function ($param1) {
+                    if ($param1 == 'PatchAlias') {
+                        throw new \LogicException(sprintf("Patch %s cannot be applied twice", $param1));
+                    }
+                }
+            )
+        );
+
+        $this->patchApllier->applySchemaPatch($moduleName);
+    }
+
     public function testRevertDataPatches()
     {
         $patches = [\RevertableDataPatch::class];
@@ -534,33 +646,43 @@ private function createAggregateIteratorMock($className, array $items = [], arra
 
         $someIterator->expects($this->any())
             ->method('rewind')
-            ->willReturnCallback(function () use ($iterator) {
-                $iterator->rewind();
-            });
+            ->willReturnCallback(
+                function () use ($iterator) {
+                    $iterator->rewind();
+                }
+            );
 
         $someIterator->expects($this->any())
             ->method('current')
-            ->willReturnCallback(function () use ($iterator) {
-                return $iterator->current();
-            });
+            ->willReturnCallback(
+                function () use ($iterator) {
+                    return $iterator->current();
+                }
+            );
 
         $someIterator->expects($this->any())
             ->method('key')
-            ->willReturnCallback(function () use ($iterator) {
-                return $iterator->key();
-            });
+            ->willReturnCallback(
+                function () use ($iterator) {
+                    return $iterator->key();
+                }
+            );
 
         $someIterator->expects($this->any())
             ->method('next')
-            ->willReturnCallback(function () use ($iterator) {
-                $iterator->next();
-            });
+            ->willReturnCallback(
+                function () use ($iterator) {
+                    $iterator->next();
+                }
+            );
 
         $someIterator->expects($this->any())
             ->method('valid')
-            ->willReturnCallback(function () use ($iterator) {
-                return $iterator->valid();
-            });
+            ->willReturnCallback(
+                function () use ($iterator) {
+                    return $iterator->valid();
+                }
+            );
 
         return $mockIteratorAggregate;
     }
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchHistoryTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchHistoryTest.php
index 5d9631fe27f12..c4cd84f3f81bd 100644
--- a/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchHistoryTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/Patch/PatchHistoryTest.php
@@ -83,4 +83,28 @@ public function testFixAppliedPatch()
         $adapterMock->expects($this->never())->method('insert');
         $this->patchHistory->fixPatch(get_class($patch1));
     }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessageRegExp "Patch [a-zA-Z0-9\_]+ cannot be applied twice"
+     */
+    public function testFixPatchTwice()
+    {
+        /** @var PatchInterface|\PHPUnit_Framework_MockObject_MockObject $patch1 */
+        $patch = $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);
+        $this->resourceConnectionMock->expects($this->any())
+            ->method('getTableName')
+            ->willReturn(PatchHistory::TABLE_NAME);
+        $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([]);
+        $adapterMock->expects($this->once())->method('insert');
+
+        $this->patchHistory->fixPatch(get_class($patch));
+        $this->patchHistory->fixPatch(get_class($patch));
+    }
 }
diff --git a/lib/internal/Magento/Framework/Simplexml/Element.php b/lib/internal/Magento/Framework/Simplexml/Element.php
index 27e59b5442763..15602965de0a8 100644
--- a/lib/internal/Magento/Framework/Simplexml/Element.php
+++ b/lib/internal/Magento/Framework/Simplexml/Element.php
@@ -451,7 +451,7 @@ public function setNode($path, $value, $overwrite = true)
                 $arr[] = $v;
             }
         }
-        $last = sizeof($arr) - 1;
+        $last = count($arr) - 1;
         $node = $this;
         foreach ($arr as $i => $nodeName) {
             if ($last === $i) {
diff --git a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
index 629b81074e3fe..cde91cbda4891 100644
--- a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Escaper;
+use Magento\Framework\Translate\Inline;
 
 /**
  * \Magento\Framework\Escaper test case
@@ -16,26 +17,40 @@ class EscaperTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Framework\Escaper
      */
-    protected $escaper = null;
+    protected $escaper;
 
     /**
      * @var \Magento\Framework\ZendEscaper
      */
     private $zendEscaper;
 
+    /**
+     * @var Inline
+     */
+    private $translateInline;
+
     /**
      * @var \Psr\Log\LoggerInterface
      */
     private $loggerMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
+        $objectManagerHelper = new ObjectManager($this);
         $this->escaper = new Escaper();
         $this->zendEscaper = new \Magento\Framework\ZendEscaper();
+        $this->translateInline = $objectManagerHelper->getObject(Inline::class);
         $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);
+        $objectManagerHelper->setBackwardCompatibleProperty(
+            $this->escaper,
+            'translateInline',
+            $this->translateInline
+        );
     }
 
     /**
@@ -224,7 +239,12 @@ public function escapeHtmlDataProvider()
             ],
             'text with html comment' => [
                 'data' => 'Only <span><b>2</b></span> in stock <!-- HTML COMMENT -->',
-                'expected' => 'Only <span><b>2</b></span> in stock <!-- HTML COMMENT -->',
+                'expected' => 'Only <span><b>2</b></span> in stock ',
+                'allowedTags' => ['span', 'b'],
+            ],
+            'text with multi-line html comment' => [
+                'data' => "Only <span><b>2</b></span> in stock <!-- --!\n\n><img src=#>-->",
+                'expected' => 'Only <span><b>2</b></span> in stock ',
                 'allowedTags' => ['span', 'b'],
             ],
             'text with non ascii characters' => [
@@ -393,6 +413,10 @@ public function escapeDataProvider()
                 'http://test.com/?redirect=\x64\x61\x74\x61\x3a\x74\x65\x78\x74x2cCPHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg',
                 'http://test.com/?redirect=:\x74\x65\x78\x74x2cCPHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg',
             ],
+            [
+                'http://test.com/?{{{test}}{{test_translated}}{{tes_origin}}{{theme}}}',
+                'http://test.com/?test',
+            ],
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/FactoryGenerator.php b/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/FactoryGenerator.php
index df5b0b0e0ad0c..1a669ace443ec 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/FactoryGenerator.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/FactoryGenerator.php
@@ -43,6 +43,9 @@ public function generate($className)
      */
     private function isFactory($className)
     {
+        if (!preg_match('/[\\\A-Z]/', substr(ltrim($className), 0, 1))) {
+            return false;
+        }
         $sourceName = rtrim(substr($className, 0, -strlen('Factory')), '\\');
         return $sourceName . 'Factory' == $className;
     }
diff --git a/lib/internal/Magento/Framework/Translate/Inline/Proxy.php b/lib/internal/Magento/Framework/Translate/Inline/Proxy.php
index 62b3352e11b1a..5b900b91d41c3 100644
--- a/lib/internal/Magento/Framework/Translate/Inline/Proxy.php
+++ b/lib/internal/Magento/Framework/Translate/Inline/Proxy.php
@@ -58,9 +58,6 @@ public function __construct(
      * Remove links to other objects.
      *
      * @return array
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -71,9 +68,6 @@ public function __sleep()
      * Retrieve ObjectManager from global scope
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/Minification.php b/lib/internal/Magento/Framework/View/Asset/Minification.php
index 087d57ffa4162..40ac4dd1f3ba3 100644
--- a/lib/internal/Magento/Framework/View/Asset/Minification.php
+++ b/lib/internal/Magento/Framework/View/Asset/Minification.php
@@ -83,7 +83,7 @@ public function addMinifiedSign($filename)
     {
         $extension = pathinfo($filename, PATHINFO_EXTENSION);
 
-        if ($this->isEnabled($extension) &&
+        if ($this->isEnabledForArea($filename) &&
             !$this->isExcluded($filename) &&
             !$this->isMinifiedFilename($filename)
         ) {
@@ -102,7 +102,7 @@ public function removeMinifiedSign($filename)
     {
         $extension = pathinfo($filename, PATHINFO_EXTENSION);
 
-        if ($this->isEnabled($extension) &&
+        if ($this->isEnabledForArea($filename) &&
             !$this->isExcluded($filename) &&
             $this->isMinifiedFilename($filename)
         ) {
@@ -180,4 +180,49 @@ private function getMinificationExcludeValues($key)
         }
         return array_values($configValues);
     }
+
+    /**
+     * Check whether asset minification is on for specified content type and for area
+     *
+     * @param string $filename
+     * @return bool
+     */
+    private function isEnabledForArea(string $filename): bool
+    {
+        $area = $this->getAreaFromPath($filename);
+        $extension = pathinfo($filename, PATHINFO_EXTENSION);
+
+        if ($area !== 'adminhtml') {
+            $result = $this->isEnabled($extension);
+        } else {
+            $cacheConfigKey = $area . '_' . $extension;
+            if (!isset($this->configCache[self::XML_PATH_MINIFICATION_ENABLED][$cacheConfigKey])) {
+                $this->configCache[self::XML_PATH_MINIFICATION_ENABLED][$cacheConfigKey] =
+                    $this->appState->getMode() != State::MODE_DEVELOPER &&
+                    $this->scopeConfig->isSetFlag(
+                        sprintf(self::XML_PATH_MINIFICATION_ENABLED, $extension),
+                        'default'
+                    );
+            }
+
+            $result = $this->configCache[self::XML_PATH_MINIFICATION_ENABLED][$cacheConfigKey];
+        }
+        return $result;
+    }
+
+    /**
+     * Get area from the path
+     *
+     * @param string $filename
+     * @return string
+     */
+    private function getAreaFromPath(string $filename): string
+    {
+        $area = '';
+        $pathParts = explode('/', $filename);
+        if (!empty($pathParts) && isset($pathParts[0])) {
+            $area = $pathParts[0];
+        }
+        return $area;
+    }
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php
index 7016bbdb08ab2..b05a12deb3843 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php
@@ -6,9 +6,9 @@
 namespace Magento\Framework\View\Asset\PreProcessor;
 
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\Asset\ContentProcessorInterface;
 use Magento\Framework\View\Asset\File\FallbackContext;
 use Magento\Framework\View\Asset\LockerProcessInterface;
-use Magento\Framework\View\Asset\ContentProcessorInterface;
 use Magento\Framework\View\Asset\PreProcessor\AlternativeSource\AssetBuilder;
 
 /**
@@ -139,11 +139,13 @@ private function processContent($path, $content, $module, FallbackContext $conte
                 ->setTheme($context->getThemePath())
                 ->setLocale($context->getLocale())
                 ->setModule($module)
-                ->setPath(preg_replace(
-                    '#\.' . preg_quote(pathinfo($path, PATHINFO_EXTENSION)) . '$#',
-                    '.' . $name,
-                    $path
-                ))->build();
+                ->setPath(
+                    preg_replace(
+                        '#\.' . preg_quote(pathinfo($path, PATHINFO_EXTENSION)) . '$#',
+                        '.' . $name,
+                        $path
+                    )
+                )->build();
 
             $processor = $this->objectManager->get($alternative[self::PROCESSOR_CLASS]);
             if (!$processor  instanceof ContentProcessorInterface) {
@@ -168,4 +170,15 @@ public function getAlternativesExtensionsNames()
     {
         return array_keys($this->alternatives);
     }
+
+    /**
+     * Check if file extension supported
+     *
+     * @param string $ext
+     * @return bool
+     */
+    public function isExtensionSupported($ext)
+    {
+        return isset($this->alternatives[$ext]);
+    }
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/FileNameResolver.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/FileNameResolver.php
index 2afb97b918ea1..bae2ff53a54e6 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/FileNameResolver.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/FileNameResolver.php
@@ -5,6 +5,11 @@
  */
 namespace Magento\Framework\View\Asset\PreProcessor;
 
+/**
+ * Class FileNameResolver
+ *
+ * @package Magento\Framework\View\Asset\PreProcessor
+ */
 class FileNameResolver
 {
     /**
@@ -38,7 +43,7 @@ public function resolve($fileName)
         $compiledFile = $fileName;
         $extension = pathinfo($fileName, PATHINFO_EXTENSION);
         foreach ($this->alternativeSources as $name => $alternative) {
-            if (in_array($extension, $alternative->getAlternativesExtensionsNames(), true)
+            if ($alternative->isExtensionSupported($extension)
                 && strpos(basename($fileName), '_') !== 0
             ) {
                 $compiledFile = substr($fileName, 0, strlen($fileName) - strlen($extension) - 1);
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/MinificationConfigProvider.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/MinificationConfigProvider.php
new file mode 100644
index 0000000000000..c779e84a5a51c
--- /dev/null
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/MinificationConfigProvider.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\View\Asset\PreProcessor;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\State;
+use Magento\Framework\View\Asset\Minification;
+
+/**
+ * Minification configuration provider
+ */
+class MinificationConfigProvider
+{
+    /**
+     * @var Minification
+     */
+    private $minification;
+
+    /**
+     * @var State
+     */
+    private $appState;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param Minification $minification
+     * @param ScopeConfigInterface $scopeConfig
+     * @param State $appState
+     */
+    public function __construct(
+        Minification $minification,
+        ScopeConfigInterface $scopeConfig,
+        State $appState
+    ) {
+        $this->minification = $minification;
+        $this->scopeConfig = $scopeConfig;
+        $this->appState = $appState;
+    }
+
+    /**
+     * Check whether asset minification is on
+     *
+     * @param string $filename
+     * @return bool
+     */
+    public function isMinificationEnabled(string $filename): bool
+    {
+        $extension = pathinfo($filename, PATHINFO_EXTENSION);
+        $result = $this->minification->isEnabled($extension);
+        $pathParts = explode('/', $filename);
+        if (!empty($pathParts) && isset($pathParts[0])) {
+            $area = $pathParts[0];
+            if ($area === 'adminhtml') {
+                $result = $this->appState->getMode() != State::MODE_DEVELOPER &&
+                    $this->scopeConfig->isSetFlag(
+                        sprintf(Minification::XML_PATH_MINIFICATION_ENABLED, $extension),
+                        'default'
+                    );
+            }
+        }
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/MinificationFilenameResolver.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/MinificationFilenameResolver.php
index 313f2daa80bcd..6a2e953a4c22d 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/MinificationFilenameResolver.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/MinificationFilenameResolver.php
@@ -22,14 +22,23 @@ class MinificationFilenameResolver implements FilenameResolverInterface
      */
     private $minification;
 
+    /**
+     * @var MinificationConfigProvider
+     */
+    private $minificationConfig;
+
     /**
      * Constructor
      *
      * @param Minification $minification
+     * @param MinificationConfigProvider $minificationConfig
      */
-    public function __construct(Minification $minification)
-    {
+    public function __construct(
+        Minification $minification,
+        MinificationConfigProvider $minificationConfig
+    ) {
         $this->minification = $minification;
+        $this->minificationConfig = $minificationConfig;
     }
 
     /**
@@ -40,10 +49,11 @@ public function __construct(Minification $minification)
      */
     public function resolve($path)
     {
-        if (!$this->minification->isEnabled(pathinfo($path, PATHINFO_EXTENSION))) {
-            return $path;
+        $result = $path;
+        if ($this->minificationConfig->isMinificationEnabled($path)) {
+            $result = str_replace(self::FILE_PART, '.', $path);
         }
 
-        return str_replace(self::FILE_PART, '.', $path);
+        return $result;
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Minify.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Minify.php
index c447285bc692b..3fa26b794c524 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Minify.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Minify.php
@@ -25,14 +25,24 @@ class Minify implements PreProcessorInterface
      */
     protected $minification;
 
+    /**
+     * @var MinificationConfigProvider
+     */
+    private $minificationConfig;
+
     /**
      * @param AdapterInterface $adapter
      * @param Minification $minification
+     * @param MinificationConfigProvider $minificationConfig
      */
-    public function __construct(AdapterInterface $adapter, Minification $minification)
-    {
+    public function __construct(
+        AdapterInterface $adapter,
+        Minification $minification,
+        MinificationConfigProvider $minificationConfig
+    ) {
         $this->adapter = $adapter;
         $this->minification = $minification;
+        $this->minificationConfig = $minificationConfig;
     }
 
     /**
@@ -43,7 +53,7 @@ public function __construct(AdapterInterface $adapter, Minification $minificatio
      */
     public function process(PreProcessor\Chain $chain)
     {
-        if ($this->minification->isEnabled(pathinfo($chain->getTargetAssetPath(), PATHINFO_EXTENSION)) &&
+        if ($this->minificationConfig->isMinificationEnabled($chain->getTargetAssetPath()) &&
             $this->minification->isMinifiedFilename($chain->getTargetAssetPath()) &&
             !$this->minification->isMinifiedFilename($chain->getOrigAssetPath())
         ) {
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index f8e8d2fee264a..a70b87b8099f6 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\View\Element;
 
@@ -16,6 +17,7 @@
  *
  * Marked as public API because it is actively used now.
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
@@ -244,6 +246,7 @@ public function getRequest()
      * Please override this one instead of overriding real __construct constructor
      *
      * @return void
+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
      */
     protected function _construct()
     {
@@ -439,9 +442,9 @@ public function unsetChild($alias)
      */
     public function unsetCallChild($alias, $callback, $result, $params)
     {
+        $args = func_get_args();
         $child = $this->getChildBlock($alias);
         if ($child) {
-            $args = func_get_args();
             $alias = array_shift($args);
             $callback = array_shift($args);
             $result = (string)array_shift($args);
@@ -819,7 +822,7 @@ public function formatDate(
         $showTime = false,
         $timezone = null
     ) {
-        $date = $date instanceof \DateTimeInterface ? $date : new \DateTime($date);
+        $date = $date instanceof \DateTimeInterface ? $date : new \DateTime($date ?? 'now');
         return $this->_localeDate->formatDateTime(
             $date,
             $format,
@@ -842,7 +845,7 @@ public function formatTime(
         $format = \IntlDateFormatter::SHORT,
         $showDate = false
     ) {
-        $time = $time instanceof \DateTimeInterface ? $time : new \DateTime($time);
+        $time = $time instanceof \DateTimeInterface ? $time : new \DateTime($time ?? 'now');
         return $this->_localeDate->formatDateTime(
             $time,
             $showDate ? $format : \IntlDateFormatter::NONE,
@@ -871,10 +874,14 @@ public function getModuleName()
      */
     public static function extractModuleName($className)
     {
+        if (!$className) {
+            return '';
+        }
+
         $namespace = substr(
             $className,
             0,
-            strpos($className, '\\' . 'Block')
+            (int)strpos($className, '\\' . 'Block' . '\\')
         );
         return str_replace('\\', '_', $namespace);
     }
@@ -885,6 +892,7 @@ public static function extractModuleName($className)
      * @param string|array $data
      * @param array|null $allowedTags
      * @return string
+     * @deprecated Use $escaper directly in templates and in blocks.
      */
     public function escapeHtml($data, $allowedTags = null)
     {
@@ -897,6 +905,7 @@ public function escapeHtml($data, $allowedTags = null)
      * @param string $string
      * @return string
      * @since 100.2.0
+     * @deprecated Use $escaper directly in templates and in blocks.
      */
     public function escapeJs($string)
     {
@@ -910,6 +919,7 @@ public function escapeJs($string)
      * @param boolean $escapeSingleQuote
      * @return string
      * @since 100.2.0
+     * @deprecated Use $escaper directly in templates and in blocks.
      */
     public function escapeHtmlAttr($string, $escapeSingleQuote = true)
     {
@@ -922,6 +932,7 @@ public function escapeHtmlAttr($string, $escapeSingleQuote = true)
      * @param string $string
      * @return string
      * @since 100.2.0
+     * @deprecated Use $escaper directly in templates and in blocks.
      */
     public function escapeCss($string)
     {
@@ -949,6 +960,7 @@ public function stripTags($data, $allowableTags = null, $allowHtmlEntities = fal
      *
      * @param string $string
      * @return string
+     * @deprecated Use $escaper directly in templates and in blocks.
      */
     public function escapeUrl($string)
     {
diff --git a/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlockFactory.php b/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlockFactory.php
index 83f7dda94328f..b13ac2531ebc8 100644
--- a/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlockFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/ExceptionHandlerBlockFactory.php
@@ -6,8 +6,7 @@
 namespace Magento\Framework\View\Element;
 
 /**
- * Class ExceptionHandlerBlockFactory
- * @package Magento\Framework\View\Element
+ * Factory for BlockInterface
  */
 class ExceptionHandlerBlockFactory
 {
diff --git a/lib/internal/Magento/Framework/View/Element/FormKey.php b/lib/internal/Magento/Framework/View/Element/FormKey.php
index 072ba42b34f1d..e6ecd20435ce8 100644
--- a/lib/internal/Magento/Framework/View/Element/FormKey.php
+++ b/lib/internal/Magento/Framework/View/Element/FormKey.php
@@ -10,6 +10,8 @@
 namespace Magento\Framework\View\Element;
 
 /**
+ * Element with FormKey
+ *
  * @api
  */
 class FormKey extends \Magento\Framework\View\Element\AbstractBlock
diff --git a/lib/internal/Magento/Framework/View/Element/Js/Components.php b/lib/internal/Magento/Framework/View/Element/Js/Components.php
index 3f9be417d62be..8e33ca5581960 100644
--- a/lib/internal/Magento/Framework/View/Element/Js/Components.php
+++ b/lib/internal/Magento/Framework/View/Element/Js/Components.php
@@ -9,6 +9,8 @@
 use Magento\Framework\View\Element\Template;
 
 /**
+ * Block for Components
+ *
  * @api
  */
 class Components extends Template
diff --git a/lib/internal/Magento/Framework/View/Element/Js/Cookie.php b/lib/internal/Magento/Framework/View/Element/Js/Cookie.php
index c44bad026ecac..b37a9387c07f6 100644
--- a/lib/internal/Magento/Framework/View/Element/Js/Cookie.php
+++ b/lib/internal/Magento/Framework/View/Element/Js/Cookie.php
@@ -10,6 +10,8 @@
 use Magento\Framework\View\Element\Template\Context;
 
 /**
+ * Block passes configuration for cookies set by JS
+ *
  * @api
  */
 class Cookie extends Template
@@ -75,6 +77,8 @@ public function getPath()
     }
 
     /**
+     * Get configured cookie lifetime
+     *
      * @return int
      */
     public function getLifetime()
diff --git a/lib/internal/Magento/Framework/View/Element/RendererList.php b/lib/internal/Magento/Framework/View/Element/RendererList.php
index 30bc38aed28f3..eba78867d7725 100644
--- a/lib/internal/Magento/Framework/View/Element/RendererList.php
+++ b/lib/internal/Magento/Framework/View/Element/RendererList.php
@@ -6,6 +6,8 @@
 namespace Magento\Framework\View\Element;
 
 /**
+ * Get renderer by code
+ *
  * @api
  */
 class RendererList extends AbstractBlock
diff --git a/lib/internal/Magento/Framework/View/Element/Template.php b/lib/internal/Magento/Framework/View/Element/Template.php
index a1aa599156d2a..99c876b440665 100644
--- a/lib/internal/Magento/Framework/View/Element/Template.php
+++ b/lib/internal/Magento/Framework/View/Element/Template.php
@@ -10,6 +10,7 @@
 
 /**
  * Standard Magento block.
+ *
  * Should be used when you declare a block in frontend area layout handle.
  *
  * Avoid extending this class.
@@ -166,6 +167,7 @@ public function setTemplateContext($templateContext)
 
     /**
      * Internal constructor, that is called from real constructor
+     *
      * @return void
      */
     protected function _construct()
diff --git a/lib/internal/Magento/Framework/View/Element/Template/File/Resolver.php b/lib/internal/Magento/Framework/View/Element/Template/File/Resolver.php
index abad0eee856c3..cd7ba1dfaecda 100644
--- a/lib/internal/Magento/Framework/View/Element/Template/File/Resolver.php
+++ b/lib/internal/Magento/Framework/View/Element/Template/File/Resolver.php
@@ -9,8 +9,7 @@
 use Magento\Framework\Serialize\Serializer\Json;
 
 /**
- * Class Resolver
- * @package Magento\Framework\View\Element\Template\File
+ * Resolver, returns template file name by template.
  */
 class Resolver
 {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Argument/Interpreter/ConfigurableObject.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Argument/Interpreter/ConfigurableObject.php
index c40d26ab2f500..2691bc21357b0 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Argument/Interpreter/ConfigurableObject.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Argument/Interpreter/ConfigurableObject.php
@@ -3,16 +3,27 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\View\Element\UiComponent\Argument\Interpreter;
 
+use Magento\Framework\Code\Reader\ClassReader;
+use Magento\Framework\Data\OptionSourceInterface;
+use Magento\Framework\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Data\Argument\InterpreterInterface;
+use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
 
 /**
  * Class ConfigurableObject
  */
 class ConfigurableObject implements InterpreterInterface
 {
+    /**
+     * @var array
+     */
+    private $classWhitelist = [];
+
     /**
      * @var ObjectManagerInterface
      */
@@ -23,20 +34,41 @@ class ConfigurableObject implements InterpreterInterface
      */
     protected $argumentInterpreter;
 
+    /**
+     * @var ClassReader|null
+     */
+    private $classReader;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $objectManagerConfig;
+
     /**
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
      * @param InterpreterInterface $argumentInterpreter
+     * @param array $classWhitelist
+     * @param ClassReader|null $classReader
+     * @param ConfigInterface|null $objectManagerConfig
      */
-    public function __construct(ObjectManagerInterface $objectManager, InterpreterInterface $argumentInterpreter)
-    {
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        InterpreterInterface $argumentInterpreter,
+        array $classWhitelist = [],
+        ClassReader $classReader = null,
+        ConfigInterface $objectManagerConfig = null
+    ) {
         $this->objectManager = $objectManager;
         $this->argumentInterpreter = $argumentInterpreter;
+        $this->classWhitelist = $classWhitelist;
+        $this->classReader = $classReader ?? $objectManager->get(ClassReader::class);
+        $this->objectManagerConfig = $objectManagerConfig ?? $objectManager->get(ConfigInterface::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function evaluate(array $data)
     {
@@ -53,10 +85,44 @@ public function evaluate(array $data)
             if (!isset($arguments['class'])) {
                 throw new \InvalidArgumentException('Node "argument" with name "class" is required for this type.');
             }
+
             $className = $arguments['class'];
             unset($arguments['class']);
+
+            $type = $this->objectManagerConfig->getInstanceType(
+                $this->objectManagerConfig->getPreference($className)
+            );
+
+            $classParents = $this->getParents($type);
+
+            $whitelistIntersection = array_intersect($classParents, $this->classWhitelist);
+
+            if (empty($whitelistIntersection)) {
+                throw new \InvalidArgumentException(
+                    sprintf('Class argument is invalid: %s', $className)
+                );
+            }
         }
 
         return $this->objectManager->create($className, $arguments);
     }
+
+    /**
+     * Retrieves all the parent classes and interfaces for a class including the ones implemented by the class itself
+     *
+     * @param string $type
+     * @return string[]
+     */
+    private function getParents(string $type)
+    {
+        $classParents = $this->classReader->getParents($type);
+        foreach ($classParents as $parent) {
+            if (empty($parent)) {
+                continue;
+            }
+            $classParents = array_merge($classParents, $this->getParents($parent));
+        }
+
+        return $classParents;
+    }
 }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponentInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponentInterface.php
index b5c3546084fcb..3ae2627881101 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponentInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponentInterface.php
@@ -52,6 +52,8 @@ public function render();
     public function addComponent($name, UiComponentInterface $component);
 
     /**
+     * Get component
+     *
      * @param string $name
      * @return UiComponentInterface
      */
diff --git a/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php b/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php
index 71fa8d2c0ae6b..34f32b2f6b7b2 100644
--- a/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php
+++ b/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\View\File\Collector\Decorator;
 
-use Magento\Framework\Module\ModuleManagerInterface;
+use Magento\Framework\Module\Manager;
 use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\File;
 use Magento\Framework\View\File\CollectorInterface;
@@ -26,7 +26,7 @@ class ModuleOutput implements CollectorInterface
     /**
      * Module manager
      *
-     * @var \Magento\Framework\Module\ModuleManagerInterface
+     * @var \Magento\Framework\Module\Manager
      */
     private $moduleManager;
 
@@ -38,7 +38,7 @@ class ModuleOutput implements CollectorInterface
      */
     public function __construct(
         CollectorInterface $subject,
-        ModuleManagerInterface $moduleManager
+        Manager $moduleManager
     ) {
         $this->subject = $subject;
         $this->moduleManager = $moduleManager;
diff --git a/lib/internal/Magento/Framework/View/Layout/Proxy.php b/lib/internal/Magento/Framework/View/Layout/Proxy.php
index 2ee50f8d14bc3..0e376fce034cd 100644
--- a/lib/internal/Magento/Framework/View/Layout/Proxy.php
+++ b/lib/internal/Magento/Framework/View/Layout/Proxy.php
@@ -60,9 +60,6 @@ public function __construct(
      * Remove links to objects.
      *
      * @return array
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __sleep()
     {
@@ -73,9 +70,6 @@ public function __sleep()
      * Retrieve ObjectManager from global scope
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.SerializationAware)
-     * @deprecated Do not use PHP serialization.
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
index d307935375f41..fe79976039a9c 100644
--- a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
+++ b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
@@ -382,6 +382,21 @@ public function getPageHandles()
         return $this->pageHandles;
     }
 
+    /**
+     * List of all available layout handles.
+     *
+     * @return string[]
+     */
+    public function getAvailableHandles(): array
+    {
+        $handles = [];
+        $nodes = $this->getFileLayoutUpdatesXml()->xpath('/layouts/handle[@id]');
+        foreach ($nodes as $node) {
+            $handles[] = (string)$node->attributes()->id;
+        }
+        return $handles;
+    }
+
     /**
      * Retrieve all design abstractions that exist in the system.
      *
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
index eae6126fa39c0..6e64ed2150d4d 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
@@ -349,19 +349,18 @@ protected function getGroupAttributes($group)
      */
     protected function addDefaultAttributes($contentType, $attributes)
     {
-        switch ($contentType) {
-            case 'js':
-                $attributes = ' type="text/javascript" ' . $attributes;
-                break;
+        if ($contentType === 'js') {
+            return ' type="text/javascript" ' . $attributes;
+        }
 
-            case 'css':
-                $attributes = ' rel="stylesheet" type="text/css" ' . ($attributes ?: ' media="all"');
-                break;
+        if ($contentType === 'css') {
+            return ' rel="stylesheet" type="text/css" ' . ($attributes ?: ' media="all"');
+        }
 
-            case $this->canTypeBeFont($contentType):
-                $attributes = 'rel="preload" as="font" crossorigin="anonymous"';
-                break;
+        if ($this->canTypeBeFont($contentType)) {
+            return 'rel="preload" as="font" crossorigin="anonymous"';
         }
+
         return $attributes;
     }
 
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Php.php b/lib/internal/Magento/Framework/View/TemplateEngine/Php.php
index 8c51433779424..0437386e4fc2b 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Php.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Php.php
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\View\TemplateEngine;
 
+use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\BlockInterface;
 use Magento\Framework\View\TemplateEngineInterface;
 
@@ -27,14 +30,23 @@ class Php implements TemplateEngineInterface
      */
     protected $_helperFactory;
 
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
     /**
      * Constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $helperFactory
+     * @param Escaper|null $escaper
      */
-    public function __construct(\Magento\Framework\ObjectManagerInterface $helperFactory)
-    {
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $helperFactory,
+        ?Escaper $escaper = null
+    ) {
         $this->_helperFactory = $helperFactory;
+        $this->escaper = $escaper ?? $helperFactory->get(Escaper::class);
     }
 
     /**
@@ -48,6 +60,7 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $helperFac
      * @param array                    $dictionary
      * @return string
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function render(BlockInterface $block, $fileName, array $dictionary = [])
     {
@@ -56,6 +69,9 @@ public function render(BlockInterface $block, $fileName, array $dictionary = [])
             $tmpBlock = $this->_currentBlock;
             $this->_currentBlock = $block;
             extract($dictionary, EXTR_SKIP);
+            //So it can be used in the template.
+            $escaper = $this->escaper;
+            // phpcs:ignore
             include $fileName;
             $this->_currentBlock = $tmpBlock;
         } catch (\Exception $exception) {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/MinificationFilenameResolverTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/MinificationFilenameResolverTest.php
index bcd1d03a629ce..c398aa502bb5b 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/MinificationFilenameResolverTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/MinificationFilenameResolverTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\View\Asset\Minification;
 use Magento\Framework\View\Asset\PreProcessor\MinificationFilenameResolver;
+use Magento\Framework\View\Asset\PreProcessor\MinificationConfigProvider;
 
 /**
  * Class MinificationFilenameResolverTest
@@ -29,13 +30,15 @@ public function testResolve($isMin, $input, $expected)
         $minificationMock = $this->getMockBuilder(Minification::class)
             ->disableOriginalConstructor()
             ->getMock();
-
-        $minificationMock->expects(self::once())
-            ->method('isEnabled')
-            ->with('ext')
+        $minificationConfigMock = $this->getMockBuilder(MinificationConfigProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $minificationConfigMock->expects(self::once())
+            ->method('isMinificationEnabled')
+            ->with($input)
             ->willReturn($isMin);
 
-        $resolver = new MinificationFilenameResolver($minificationMock);
+        $resolver = new MinificationFilenameResolver($minificationMock, $minificationConfigMock);
 
         self::assertEquals($expected, $resolver->resolve($input));
     }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/MinifyTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/MinifyTest.php
index 51ad9886d87a8..a46df9f27e19b 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/MinifyTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/MinifyTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Framework\View\Test\Unit\Asset\PreProcessor;
 
 use Magento\Framework\View\Asset\PreProcessor\Minify;
+use Magento\Framework\View\Asset\PreProcessor\MinificationConfigProvider;
 
 /**
  * Unit test for Magento\Framework\View\Asset\PreProcessor\Minify
@@ -28,6 +29,11 @@ class MinifyTest extends \PHPUnit\Framework\TestCase
      */
     protected $minificationMock;
 
+    /**
+     * @var MinificationConfigProvider|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $minificationConfigMock;
+
     /**
      * {@inheritDoc}
      */
@@ -40,10 +46,14 @@ protected function setUp()
         $this->minificationMock = $this->getMockBuilder(\Magento\Framework\View\Asset\Minification::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->minificationConfigMock = $this->getMockBuilder(MinificationConfigProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->minify = new Minify(
             $this->adapterMock,
-            $this->minificationMock
+            $this->minificationMock,
+            $this->minificationConfigMock
         );
     }
 
@@ -84,10 +94,10 @@ public function testProcess($targetPath, $originalPath, $minifyCalls, $setConten
             ->with('original content')
             ->willReturn('minified content');
 
-        $this->minificationMock
+        $this->minificationConfigMock
             ->expects($this->any())
-            ->method('isEnabled')
-            ->willReturnMap([['css', $isEnabled]]);
+            ->method('isMinificationEnabled')
+            ->willReturnMap([[$targetPath, $isEnabled]]);
 
         $this->minificationMock
             ->expects($this->any())
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 93192201c7831..a3f0f738335a0 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
@@ -325,4 +325,30 @@ public function getCacheLifetimeDataProvider()
             ],
         ];
     }
+
+    /**
+     * @return void
+     */
+    public function testExtractModuleName()
+    {
+        $blockClassNames = $this->getPossibleBlockClassNames();
+
+        foreach ($blockClassNames as $expectedModuleName => $className) {
+            $extractedModuleName = $this->block->extractModuleName($className);
+            $this->assertSame($expectedModuleName, $extractedModuleName);
+        }
+    }
+
+    /**
+     * @return array
+     */
+    private function getPossibleBlockClassNames()
+    {
+        return [
+            'Vendor_Module' => 'Vendor\Module\Block\Class',
+            'Vendor_ModuleBlock' => 'Vendor\ModuleBlock\Block\Class',
+            'Vendor_BlockModule' => 'Vendor\BlockModule\Block\Class',
+            'Vendor_CustomBlockModule' => 'Vendor\CustomBlockModule\Block\Class',
+        ];
+    }
 }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
index a702ea5458a87..d75c862a2da97 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
@@ -427,4 +427,48 @@ public function dataProviderRenderAssets()
             ],
         ];
     }
+
+    public function testRenderAssetWithNoContentType() : void
+    {
+        $type = '';
+
+        $assetMockOne = $this->createMock(\Magento\Framework\View\Asset\AssetInterface::class);
+        $assetMockOne->expects($this->exactly(1))
+            ->method('getUrl')
+            ->willReturn('url');
+
+        $assetMockOne->expects($this->atLeastOnce())->method('getContentType')->willReturn($type);
+
+        $groupAssetsOne = [$assetMockOne];
+
+        $groupMockOne = $this->getMockBuilder(\Magento\Framework\View\Asset\PropertyGroup::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $groupMockOne->expects($this->once())
+            ->method('getAll')
+            ->willReturn($groupAssetsOne);
+        $groupMockOne->expects($this->any())
+            ->method('getProperty')
+            ->willReturnMap(
+                [
+                    [GroupedCollection::PROPERTY_CAN_MERGE, true],
+                    [GroupedCollection::PROPERTY_CONTENT_TYPE, $type],
+                    ['attributes', 'rel="some-rel"'],
+                    ['ie_condition', null],
+                ]
+            );
+
+        $this->pageConfigMock->expects($this->once())
+            ->method('getAssetCollection')
+            ->willReturn($this->assetsCollection);
+
+        $this->assetsCollection->expects($this->once())
+            ->method('getGroups')
+            ->willReturn([$groupMockOne]);
+
+        $this->assertEquals(
+            '<link  rel="some-rel" href="url" />' . "\n",
+            $this->renderer->renderAssets($this->renderer->getAvailableResultGroups())
+        );
+    }
 }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/UiComponent/Argument/Interpreter/ConfigurableObjectTest.php b/lib/internal/Magento/Framework/View/Test/Unit/UiComponent/Argument/Interpreter/ConfigurableObjectTest.php
new file mode 100644
index 0000000000000..0d4be68a4c1bb
--- /dev/null
+++ b/lib/internal/Magento/Framework/View/Test/Unit/UiComponent/Argument/Interpreter/ConfigurableObjectTest.php
@@ -0,0 +1,278 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\View\Test\Unit\UiComponent\Argument\Interpreter;
+
+use Magento\Framework\Code\Reader\ClassReader;
+use Magento\Framework\Data\Argument\InterpreterInterface;
+use Magento\Framework\ObjectManager\ConfigInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Element\UiComponent\Argument\Interpreter\ConfigurableObject;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+
+/**
+ * Unit tests for ConfigurableObject
+ */
+class ConfigurableObjectTest extends TestCase
+{
+    /**
+     * @var ConfigurableObject
+     */
+    private $configurableObject;
+
+    /**
+     * @var ObjectManagerInterface|MockObject
+     */
+    private $objectManager;
+
+    /**
+     * @var InterpreterInterface|MockObject
+     */
+    private $interpreter;
+
+    /**
+     * @var ClassReader|MockObject
+     */
+    private $classReader;
+
+    /**
+     * @var ConfigInterface|MockObject
+     */
+    private $objectManagerConfig;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->objectManager = $this->createMock(ObjectManagerInterface::class);
+        $this->interpreter = $this->createMock(InterpreterInterface::class);
+        $this->classReader = $this->createMock(ClassReader::class);
+        $this->objectManagerConfig = $this->createMock(ConfigInterface::class);
+        $this->configurableObject = $objectManager->getObject(
+            ConfigurableObject::class,
+            [
+                'objectManager' => $this->objectManager,
+                'argumentInterpreter' => $this->interpreter,
+                'classWhitelist' => [
+                    \Foo\Bar\ClassA::class,
+                    \Foo\Bar\InterfaceA::class,
+                ],
+                'classReader' => $this->classReader,
+                'objectManagerConfig' => $this->objectManagerConfig,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider validDataProvider
+     */
+    public function testValidCombinations(
+        $data,
+        $expectedClass,
+        $classParentsValueMap,
+        $expectedArguments
+    ) {
+        $this->objectManagerConfig
+            ->method('getPreference')
+            ->with($expectedClass)
+            ->WillReturn('bar');
+        $this->objectManagerConfig
+            ->method('getInstanceType')
+            ->with('bar')
+            ->willReturn($expectedClass);
+
+        $this->classReader
+            ->method('getParents')
+            ->willReturnMap($classParentsValueMap);
+
+        $this->objectManager
+            ->expects($this->once())
+            ->method('create')
+            ->with($expectedClass, $expectedArguments)
+            ->willReturn('an object yay!');
+
+        $this->interpreter
+            ->method('evaluate')
+            ->will(
+                $this->returnCallback(
+                    function (array $arg) {
+                        return $arg['value'];
+                    }
+                )
+            );
+
+        $actualResult = $this->configurableObject->evaluate($data);
+        self::assertSame('an object yay!', $actualResult);
+    }
+
+    /**
+     * @dataProvider invalidDataProvider
+     */
+    public function testInvalidCombinations(
+        $data,
+        $expectedClass,
+        $classParentsValueMap,
+        $expectedException,
+        $expectedExceptionMessage
+    ) {
+
+        $this->expectException($expectedException);
+        $this->expectExceptionMessage($expectedExceptionMessage);
+
+        $this->objectManagerConfig
+            ->method('getPreference')
+            ->with($expectedClass)
+            ->WillReturn('bar');
+        $this->objectManagerConfig
+            ->method('getInstanceType')
+            ->with('bar')
+            ->willReturn($expectedClass);
+
+        $this->classReader
+            ->method('getParents')
+            ->willReturnMap($classParentsValueMap);
+
+        $this->objectManager
+            ->expects($this->never())
+            ->method('create');
+
+        $this->interpreter
+            ->method('evaluate')
+            ->will(
+                $this->returnCallback(
+                    function (array $arg) {
+                        return $arg['value'];
+                    }
+                )
+            );
+
+        $actualResult = $this->configurableObject->evaluate($data);
+        self::assertSame('an object yay!', $actualResult);
+    }
+
+    public function validDataProvider()
+    {
+        return [
+            // Test most basic syntax with no arguments
+            [
+                [
+                    'value' => 'MyObject',
+                ],
+                'MyObject',
+                [],
+                []
+            ],
+            // Test alternative data syntax
+            [
+                [
+                    'argument' => [
+                        'class' => ['value' => 'MyFooClass']
+                    ]
+                ],
+                'MyFooClass',
+                [
+                    ['MyFooClass', ['Something', 'skipme']],
+                    ['Something', ['dontcare', 'SomethingElse']],
+                    ['SomethingElse', [\Foo\Bar\ClassA::class, 'unrelated']],
+                    ['skipme', []],
+                    ['dontcare', []],
+                    ['unrelated', []],
+                    [\Foo\Bar\ClassA::class, []]
+                ],
+                []
+            ],
+            // Test arguments
+            [
+                [
+                    'argument' => [
+                        'class' => ['value' => 'MyFooClass'],
+                        'myarg' => ['value' => 'bar'],
+                    ]
+                ],
+                'MyFooClass',
+                [
+                    ['MyFooClass', ['Something', 'skipme']],
+                    ['Something', ['dontcare', 'SomethingElse']],
+                    ['SomethingElse', [\Foo\Bar\ClassA::class, 'unrelated']],
+                    ['skipme', []],
+                    ['dontcare', []],
+                    ['unrelated', []],
+                    [\Foo\Bar\ClassA::class, []]
+                ],
+                ['myarg' => 'bar']
+            ],
+            // Test multiple matching whitelisted classes
+            [
+                [
+                    'argument' => [
+                        'class' => ['value' => 'MyFooClass'],
+                        'myarg' => ['value' => 'bar'],
+                    ]
+                ],
+                'MyFooClass',
+                [
+                    ['MyFooClass', ['Something', 'skipme']],
+                    ['Something', ['dontcare', 'SomethingElse']],
+                    ['SomethingElse', [\Foo\Bar\ClassA::class, 'unrelated']],
+                    ['skipme', []],
+                    ['dontcare', []],
+                    ['unrelated', [\Foo\Bar\InterfaceA::class]],
+                    [\Foo\Bar\ClassA::class, []],
+                    [\Foo\Bar\InterfaceA::class, []]
+                ],
+                ['myarg' => 'bar']
+            ],
+        ];
+    }
+
+    public function invalidDataProvider()
+    {
+        return [
+            [
+                [
+                    'notvalid' => 'sup'
+                ],
+                '',
+                [],
+                \InvalidArgumentException::class,
+                'Node "argument" required for this type.'
+            ],
+            [
+                [
+                    'argument' => [
+                        'notclass' => ['value' => 'doesntmatter']
+                    ]
+                ],
+                '',
+                [],
+                \InvalidArgumentException::class,
+                'Node "argument" with name "class" is required for this type.'
+            ],
+            [
+                [
+                    'argument' => [
+                        'class' => ['value' => 'MyFooClass'],
+                        'myarg' => ['value' => 'bar'],
+                    ]
+                ],
+                'MyFooClass',
+                [
+                    ['MyFooClass', ['Something', 'skipme']],
+                    ['Something', ['dontcare', 'SomethingElse']],
+                    ['SomethingElse', ['unrelated']],
+                    ['skipme', []],
+                    ['dontcare', []],
+                    ['unrelated', []],
+                ],
+                \InvalidArgumentException::class,
+                'Class argument is invalid: MyFooClass'
+            ],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
index af2eb913fe3fe..dfbfb5a25debe 100644
--- a/lib/internal/Magento/Framework/composer.json
+++ b/lib/internal/Magento/Framework/composer.json
@@ -19,7 +19,6 @@
         "ext-intl": "*",
         "ext-openssl": "*",
         "ext-simplexml": "*",
-        "ext-spl": "*",
         "ext-xsl": "*",
         "ext-bcmath": "*",
         "lib-libxml": "*",
diff --git a/lib/web/css/docs/layout.html b/lib/web/css/docs/layout.html
index 77ed0597f0748..b338c66ffae71 100644
--- a/lib/web/css/docs/layout.html
+++ b/lib/web/css/docs/layout.html
@@ -55,25 +55,25 @@
         <tr>
             <th>@layout-class-1column</th>
             <td class="vars_value">page-layout-1column</td>
-            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
             <td>Class name for one column layout</td>
         </tr>
         <tr>
             <th>@layout-class-2columns__left</th>
             <td class="vars_value">page-layout-2columns-left</td>
-            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
             <td>Class name for two columns layout with left sidebar</td>
         </tr>
         <tr>
             <th nowrap="nowrap">@layout-class-2columns__right</th>
             <td class="vars_value">page-layout-2columns-right</td>
-            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
             <td>Class name for two columns layout with right sidebar</td>
         </tr>
         <tr>
             <th>@layout-class-3columns</th>
             <td class="vars_value">page-layout-3columns</td>
-            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
             <td>Class name for three columns layout with left sidebar</td>
         </tr>
         <tr>
diff --git a/lib/web/css/docs/responsive.html b/lib/web/css/docs/responsive.html
index 48d0bd551bd92..ebc42e698f60b 100644
--- a/lib/web/css/docs/responsive.html
+++ b/lib/web/css/docs/responsive.html
@@ -7,7 +7,7 @@
 
 <!DOCTYPE html><html><head><title>responsive | Magento UI Library
 </title><meta charset="utf-8"><style>*{-moz-box-sizing:border-box;box-sizing:border-box;margin:0;padding:0;border:0}body{padding:60px 0 40px;background-color:hsl(207,10%,90%);color:hsl(207,5%,30%)}.container{max-width:1300px;margin:0 auto;padding:0 20px}.section{position:relative;margin-bottom:20px}.docs{position:relative;z-index:2;width:68%;min-height:200px;background-color:hsl(207,0%,100%);background-clip:padding-box;border:1px solid hsla(207,5%,5%,.1);border-radius:5px;box-shadow:0 0 3px hsla(207,5%,5%,.1)}.code{position:absolute;top:5px;bottom:5px;right:0;z-index:1;width:33%;padding:10px 10px 10px 20px;border-radius:0 5px 5px 0;border:1px solid hsla(207,20%,10%,.1);background-color:hsla(207,20%,95%,.9);background-clip:padding-box;opacity:.5;-webkit-transition:opacity .4s;-moz-transition:opacity .4s;-o-transition:opacity .4s;transition:opacity .4s}.code:hover{opacity:1}.preview{background:hsl(207,0%,100%);border-top:1px solid hsl(207,30%,95%);position:relative;z-index:1}.preview-code+.preview{margin-top:0;border-top:0}.preview iframe{display:block;width:100%;height:100%;overflow:hidden}.preview-code{position:relative;z-index:2;display:block;width:100%;color:hsl(207,9%,37%);max-height:200px;padding:10px 20px;overflow-y:auto;background:hsl(207,30%,95%);border:1px solid hsl(207,30%,85%);border-left:0;border-right;box-shadow:inset 0 1px 2px hsla(207,30%,10%,.1);line-height:1.1!important;resize:none}.preview-code:focus{outline:0;background:hsl(207,30%,97%);box-shadow:inset 0 1px 2px hsla(207,30%,10%,.1),0 0 5px hsla(207,75%,75%,.9)}.preview-code:last-child{border-bottom:0;border-radius:0 0 5px 5px}.resizeable{padding:15px;overflow:auto;background:hsl(207,0%,100%);box-shadow:0 0 2px hsla(207,10%,20%,.2);resize:both}.preview-code,pre{white-space:pre-wrap;word-wrap:break-word;overflow-y:auto}.code pre{height:100%;margin-top:0}.bar{position:fixed;left:0;right:0;z-index:1010;min-height:40px;line-height:40px;background-image:-webkit-linear-gradient(hsla(207,10%,35%,.97),hsla(207,5%,25%,.92));background-image:-moz-linear-gradient(hsla(207,10%,35%,.97),hsla(207,5%,25%,.92));background-image:-o-linear-gradient(hsla(207,10%,35%,.97),hsla(207,5%,25%,.92));background-image:linear-gradient(hsla(207,10%,35%,.97),hsla(207,5%,25%,.92))}.bar.top{top:0;box-shadow:0 1px 2px hsla(207,5%,0%,.2)}.bar.bottom{bottom:0;box-shadow:0 -1px 2px hsla(207,5%,0%,.2)}.bar ul{margin:0!important}.bar li{display:block;list-style:none}.bar .icon path{fill:hsla(27,10%,75%,.75)}.docs .icon path{fill:hsla(207,10%,75%,.5)}.docs .permalink:hover .icon path{fill:hsl(207,10%,75%)}.bar button{color:hsla(27,10%,75%,.75)}.bar button:hover .icon path,.bar button.is-active .icon path{fill:hsl(27,10%,85%)}.bar button:hover,.bar button.is-active{color:hsl(27,10%,85%)}.bar .icon{vertical-align:middle;display:inline-block}.bar,.bar a,.bar a:visited{color:hsl(27,10%,85%);text-shadow:1px 1px 0 hsla(27,5%,0%,.5)}.bar a:hover,.bar a.is-active{color:hsl(27,10%,95%);text-shadow:1px 1px 0 hsla(27,5%,0%,1);text-decoration:none}.brand{float:left;margin-right:20px;font-weight:700;font-size:16px;text-decoration:none}.brand,a.brand,a.brand:visited{color:hsl(27,5%,5%);text-shadow:1px 1px 0 hsla(27,5%,100%,.2)}.brand:hover,a.brand:hover{color:hsl(27,5%,0%);text-shadow:1px 1px 0 hsla(27,5%,100%,.3);text-decoration:none}.menu{font-size:12px}.menu>li{float:left;position:relative}.menu a{display:block;margin-right:15px}.dropdown-toggle{position:relative;padding-right:15px}.dropdown-toggle:after{display:block;position:absolute;right:0;top:18px;content:'';border:4px solid;border-left-color:transparent;border-right-color:transparent;border-bottom-color:transparent}.nav-results,.dropdown{position:absolute;z-index:1020;top:32px;left:-16px;width:175px;max-height:500px;padding:10px 0;overflow-y:auto;word-wrap:break-word;font-size:11px;line-height:20px;background-color:hsla(207,10%,25%,.97);border:1px solid hsla(207,5%,70%,.3);border-radius:3px;box-shadow:0 0 3px hsla(207,5%,0%,.2)}.toc-list{width:200px}.nav-results{right:0;width:200px;left:auto;padding:5px 0}.nav-results-filename{display:block;font-size:10px;opacity:.75}.nav-results a{display:block;line-height:15px;padding:5px 10px}.nav-results li:not([hidden])~li a{border-top:1px solid hsla(27,10%,90%,.1)}.dropdown a{padding:0 15px}.dropdown li:hover{background-color:hsl(207,10%,22%)}.nav{float:right;position:relative}.nav input[type="search"]{padding:2px 4px;color:#fff;width:150px;border:1px solid hsla(207,5%,0%,.3);background:hsla(207,12%,40%,.9);box-shadow:inset 1px 1px 3px hsla(207,5%,0%,.05),1px 1px 0 hsla(207,5%,100%,.05);border-radius:10px;-webkit-appearance:textfield}.nav input[type="search"]:focus{outline:0;background:hsla(207,7%,45%,.9)}.settings{text-align:center}.bar button{display:inline-block;vertical-align:middle;padding:0 5px;margin:0 3px;background:transparent}.bar button:first-child{margin-left:0}.settings .auto{line-height:32px;font-size:11px;font-weight:700;letter-spacing:-1px;text-shadow:none;text-transform:uppercase}body{font-family:sans-serif;font-size:14px;line-height:1.618}.docs pre,p,ol,ul,dl,figure,blockquote,table{margin-left:20px;margin-right:20px}.preview,.docs pre,p,ol,ul,dl,figure,blockquote,table{margin-top:10px}ul ul,ol ol,ul ol,ol ul,blockquote p:last-child{margin-top:0}ul,ol{padding-left:1.5em}p:last-child,ol:last-child,ul:last-child,dl:last-child{margin-bottom:20px}hr,h1,h2,h3,h4,h5,h6{margin:1em 20px .5em}h1:first-of-type{margin-top:20px}h1,h2,h3,h4,h5,h6{line-height:1.2;color:hsl(207,10%,50%)}h1 a,h1 a:hover,h1 a:visited{color:inherit;text-decoration:inherit}h1{font-size:3.052em;font-weight:400;color:hsl(207,10%,45%)}h2{font-size:1.953em}h3{font-size:1.536em}h1,h2,h3{letter-spacing:-.025em}h4{font-size:1.25em}h5{font-size:1em;text-transform:uppercase}h6{font-size:1em}.permalink{position:absolute;top:15px;right:15px}a{color:hsl(207,90%,50%);text-decoration:none}a:hover{color:hsl(207,95%,40%);text-decoration:underline}a:visited{color:hsl(207,100%,35%)}.preview-code,pre,code,var{font-style:normal;font-family:"Ubuntu Mono","Andale Mono","DejaVu Sans Mono","Monaco","Bitstream Vera Sans Mono","Consolas","Lucida Console",monospace;font-size:12px}.docs pre,code,var{padding:.1em 3px;background:hsla(207,5%,0%,.025);border:1px solid hsla(207,5%,0%,.05);border-radius:3px}.code pre{line-height:1.1!important}pre code{padding:0;background:transparent;border:0}.cf:before,.cf:after{content:'';display:table}.cf:after{clear:both}[unselectable="on"]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}[hidden]{display:none!important}small{font-size:85%;opacity:.9}.docs .vars_list{width:100%}.docs .vars_list th,.docs .vars_list td{width:33%}.docs pre th{text-align:left}.docs pre table{border-collapse:collapse;margin:0}.docs th,.docs td{border:0;padding:9px 10px 9px 0;vertical-align:top}.docs tr th:last-child,.docs tr td:last-child{padding-right:0}.docs pre th{font-weight:400}.docs pre th.vars_head{border-bottom:1px solid #e5e5e5;color:#707070;white-space:nowrap}.docs pre th.vars_section{border-bottom:1px solid #e5e5e5;color:#333;font-size:18px;padding-top:30px}.vars_value{color:#338bb8}.docs li p{margin:0 0 20px}.dropdown a{text-transform:capitalize}#default-button #default-button-big+.preview+.preview-code{display:block}#actions-toolbar-alignment .preview-code,#reverse-primary-and-secondary-blocks .preview-code,#actions-toolbar-indents-customizations .preview-code,#actionstoolbarclearfloats-mixin .preview-code,#responsive-actions-toolbar .preview-code,#button-with-gradient-background .preview-code,#primary-button .preview-code,#button-as-an-icon .preview-code,#button-with-an-icon-on-the-left-or-right-side-of-the-text .preview-code,#button-with-fixed-width .preview-code,#button-as-a-link .preview-code,#link-as-a-button .preview-code,#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol .preview-code,#breadcrumbs-with-solid-background .preview-code,#pagination-without-label-with-solid-background .preview-code,#pagination-with-label-and-text-previousnext-links .preview-code,#pagination-with-label-and-gradient-background-on-links .preview-code,#fixed-height-popup .preview-code,#fixed-content-height-popup .preview-code,#margins-for-header-content-and-footer-block-in-popup .preview-code,#popup-titles-with-styled-as-theme-headings .preview-code,#popup-action-toolbar .preview-code,#popup-close-button-without-an-icon .preview-code,#modify-icon-of-popup-close-button .preview-code,#modify-overlay-styles .preview-code,#rating-summary-multiple-ratings .preview-code,#rating-summary-hide-label .preview-code,#rating-summary-icons-symbol .preview-code,#rating-summary-icons-color .preview-code,#rating-summary-set-number-of-icons .preview-code,#rating-summary .preview-code,#rating-with-vote-icon-symbol .preview-code,#rating-with-vote-setup-icons-colors .preview-code,#rating-with-vote-setup-number-of-icons .preview-code,#tabs-with-content-top-border .preview-code,#accordion-mixin-variables .preview-code,#tabs-base .preview-code,#accordion-base .preview-code,#warning-message .preview-code,#error-message .preview-code,#success-message .preview-code,#notice-message .preview-code,#message-with-inner-icon .preview-code,#message-with-lateral-icon .preview-code,#custom-message-style .preview-code,#modify-dropdown-list-styles .preview-code,#dropdown-with-icon-customization .preview-code,#split-button-button-styling .preview-code,#split-button-icon-customization .preview-code,#split-button-dropdown-list-customization .preview-code,#table-cells-resize .preview-code,#table-caption .preview-code,#table-typography .preview-code,#table-background-customization .preview-code,#table-borders-customization .preview-code,#table-without-borders .preview-code,#table-with-horizontal-borders .preview-code,#table-with-vertical-borders .preview-code,#striped-table .preview-code,#responsive-table-technics-1 .preview-code,#responsive-table-technics-2 .preview-code,#fontsize-mixin .preview-code,#word-breaking-mixin .preview-code,#word-breaking-mixin .preview-code,#text-overflow-mixin .preview-code,#text-hide .preview-code,#hyphens .preview-code,#font-style-and-color .preview-code,#reset-list-styles .preview-code,#inlineblock-list-item-styling .preview-code,#link-styling-mixin .preview-code,#heading-styling-mixin .preview-code,#icon-with-image-or-sprite .preview-code,#change-the-size-of-font-icon .preview-code,#sprite-and-font-icons-for-blank-theme .preview-code,#icon-position-for-an-icon-with-image-or-sprite .preview-code{display:none}article[id$="-variables"] .docs,#resets .docs,#ratings .docs,#tabs-and-accordions .docs,#messages .docs,#dropdown-and-split-buttons-mixins .docs,#font-face-mixin .docs,#layout .docs,#forms-mixins .docs,#including-magento-ui-library-to-your-theme .docs,#global-forms-elements-customization .docs,#mobile-off-canvas-navigation .docs,#desktop-navigation .docs,#utilities .docs,#layout-width .docs,#responsive-breakpoints .docs,#responsive-mixins-usage .docs{width:100%}article[id$="-variables"] .code{display:none}article[id$="-variables"] .docs pre{background:#fff;border:0;margin-top:0}</style><script type="text/preview">(function(){"use strict";var a=function(a){return Array.prototype.slice.call(a)},b=document.getElementsByTagName("body")[0],c=["link","visited","hover","active","focus","target","enabled","disabled","checked"],d=new RegExp(":(("+c.join(")|(")+"))","gi"),e=a(document.styleSheets).map(function(b){return a(b.cssRules).filter(function(a){return a.selectorText&&a.selectorText.match(d)}).map(function(a){return a.cssText.replace(d,".\\3A $1")}).join("")}).join("");if(e.length){var f=document.createElement("style");f.innerText=e;var g=document.getElementsByTagName("style")[0];g.parentNode.insertBefore(f,g)}var h=function(){var a=window.getComputedStyle(b,null);return function(){if(b.childElementCount===0)return b.offsetHeight;var c=b.getElementsByTagName("*"),d=[];for(var e=0,f=c.length;e<f;e++)d.push(c[e].offsetTop+c[e].offsetHeight+parseInt(window.getComputedStyle(c[e],null).getPropertyValue("margin-bottom")));var g=Math.max.apply(Math,d);return g+=parseInt(a.getPropertyValue("padding-bottom"),10),Math.max(g,b.offsetHeight)}}(),i={getHeight:function(){window.parent.postMessage({height:h()},"*")}};window.addEventListener("message",function(a){if(a.data==null)return;typeof a.data=="string"&&i[a.data]()},!1)})()</script><style type="text/preview">@media only screen and (max-width: 767px){.example-responsive-block{ background:#ffc}.example-responsive-block:before{content:'Mobile styles ';font-weight:700}}@media only screen and (max-width: 768px){.modal-popup.modal-slide{ left:14.8rem;z-index:900}.modal-popup.modal-slide._show .modal-inner-wrap{-webkit-transform:translateX(0);transform:translateX(0)}.modal-popup.modal-slide .modal-inner-wrap{height:100%;overflow-y:auto;position:static;-webkit-transform:translateX(100%);transform:translateX(100%);transition-duration:.3s;-webkit-transition-property:-webkit-transform,visibility;transition-property:transform,visibility;transition-timing-function:ease-in-out;width:auto}.modal-popup.modal-slide .modal-inner-wrap{margin:0;max-height:none}}@media all and (min-width: 768px),print{.example-responsive-block{ background:#ccf}.example-responsive-block:before{content:'Desktop styles ';font-weight:700}}.actions-toolbar:before,.actions-toolbar:after{content:'';display:table}.actions-toolbar:after{clear:both}.actions-toolbar .primary{float:left}.actions-toolbar .secondary{float:right}.actions-toolbar .primary,.actions-toolbar .secondary{display:inline-block}.actions-toolbar .primary a.action,.actions-toolbar .secondary a.action{display:inline-block}.actions-toolbar .primary .action{margin:0 5px 0 0}.actions-toolbar .secondary a.action{margin-top:6px}.example-actions-toolbar-1:before,.example-actions-toolbar-1:after{content:'';display:table}.example-actions-toolbar-1:after{clear:both}.example-actions-toolbar-1 .primary{float:left}.example-actions-toolbar-1 .secondary{float:right}.example-actions-toolbar-1 .primary,.example-actions-toolbar-1 .secondary{display:inline-block}.example-actions-toolbar-1 .primary a.action,.example-actions-toolbar-1 .secondary a.action{display:inline-block}.example-actions-toolbar-1 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-1 .secondary a.action{margin-top:6px}.example-actions-toolbar-2:before,.example-actions-toolbar-2:after{content:'';display:table}.example-actions-toolbar-2:after{clear:both}.example-actions-toolbar-2 .primary{float:left}.example-actions-toolbar-2 .secondary{float:right}.example-actions-toolbar-2 .primary,.example-actions-toolbar-2 .secondary{display:inline-block}.example-actions-toolbar-2 .primary a.action,.example-actions-toolbar-2 .secondary a.action{display:inline-block}.example-actions-toolbar-2 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-2 .secondary a.action{margin-top:6px}.example-actions-toolbar-3{text-align:left}.example-actions-toolbar-3:before,.example-actions-toolbar-3:after{content:'';display:table}.example-actions-toolbar-3:after{clear:both}.example-actions-toolbar-3 .primary{float:left}.example-actions-toolbar-3 .primary,.example-actions-toolbar-3 .secondary{display:inline-block}.example-actions-toolbar-3 .primary a.action,.example-actions-toolbar-3 .secondary a.action{display:inline-block}.example-actions-toolbar-3 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-3 .secondary a.action{margin-top:6px}.example-actions-toolbar-4{text-align:right}.example-actions-toolbar-4:before,.example-actions-toolbar-4:after{content:'';display:table}.example-actions-toolbar-4:after{clear:both}.example-actions-toolbar-4 .secondary{float:right}.example-actions-toolbar-4 .primary,.example-actions-toolbar-4 .secondary{display:inline-block}.example-actions-toolbar-4 .primary a.action,.example-actions-toolbar-4 .secondary a.action{display:inline-block}.example-actions-toolbar-4 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-4 .secondary a.action{margin-top:6px}.example-actions-toolbar-5{text-align:center}.example-actions-toolbar-5:before,.example-actions-toolbar-5:after{content:'';display:table}.example-actions-toolbar-5:after{clear:both}.example-actions-toolbar-5 .primary,.example-actions-toolbar-5 .secondary{vertical-align:top}.example-actions-toolbar-5 .primary,.example-actions-toolbar-5 .secondary{display:inline-block}.example-actions-toolbar-5 .primary a.action,.example-actions-toolbar-5 .secondary a.action{display:inline-block}.example-actions-toolbar-5 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-5 .secondary a.action{margin-top:6px}.example-actions-toolbar-6:before,.example-actions-toolbar-6:after{content:'';display:table}.example-actions-toolbar-6:after{clear:both}.example-actions-toolbar-6 .primary{float:right}.example-actions-toolbar-6 .secondary{float:left}.example-actions-toolbar-6 .primary,.example-actions-toolbar-6 .secondary{display:inline-block}.example-actions-toolbar-6 .primary a.action,.example-actions-toolbar-6 .secondary a.action{display:inline-block}.example-actions-toolbar-6 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-6 .secondary a.action{margin-top:6px}.example-actions-toolbar-7{text-align:left}.example-actions-toolbar-7:before,.example-actions-toolbar-7:after{content:'';display:table}.example-actions-toolbar-7:after{clear:both}.example-actions-toolbar-7 .secondary{float:left}.example-actions-toolbar-7 .primary,.example-actions-toolbar-7 .secondary{display:inline-block}.example-actions-toolbar-7 .primary a.action,.example-actions-toolbar-7 .secondary a.action{display:inline-block}.example-actions-toolbar-7 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-7 .secondary a.action{margin-top:6px}.example-actions-toolbar-8{text-align:right}.example-actions-toolbar-8:before,.example-actions-toolbar-8:after{content:'';display:table}.example-actions-toolbar-8:after{clear:both}.example-actions-toolbar-8 .primary{float:right}.example-actions-toolbar-8 .primary,.example-actions-toolbar-8 .secondary{display:inline-block}.example-actions-toolbar-8 .primary a.action,.example-actions-toolbar-8 .secondary a.action{display:inline-block}.example-actions-toolbar-8 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-8 .secondary a.action{margin-top:6px}.example-actions-toolbar-9{margin:10px;padding:10px}.example-actions-toolbar-9:before,.example-actions-toolbar-9:after{content:'';display:table}.example-actions-toolbar-9:after{clear:both}.example-actions-toolbar-9 .primary{float:left}.example-actions-toolbar-9 .secondary{float:right}.example-actions-toolbar-9 .primary,.example-actions-toolbar-9 .secondary{display:inline-block}.example-actions-toolbar-9 .primary a.action,.example-actions-toolbar-9 .secondary a.action{display:inline-block}.example-actions-toolbar-9 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-9 .secondary a.action{margin-top:6px}.example-actions-toolbar-10{text-align:left}.example-actions-toolbar-10:before,.example-actions-toolbar-10:after{content:'';display:table}.example-actions-toolbar-10:after{clear:both}.example-actions-toolbar-10 .primary{float:left}.example-actions-toolbar-10 .primary,.example-actions-toolbar-10 .secondary{display:inline-block}.example-actions-toolbar-10 .primary a.action,.example-actions-toolbar-10 .secondary a.action{display:inline-block}.example-actions-toolbar-10 .primary .action{margin:0 50px 0 0}.example-actions-toolbar-10 .secondary a.action{margin-top:6px}.example-actions-toolbar-11{text-align:left}.example-actions-toolbar-11:before,.example-actions-toolbar-11:after{content:'';display:table}.example-actions-toolbar-11:after{clear:both}.example-actions-toolbar-11 .primary{float:left}.example-actions-toolbar-11 .primary,.example-actions-toolbar-11 .secondary{display:inline-block}.example-actions-toolbar-11 .primary a.action,.example-actions-toolbar-11 .secondary a.action{display:inline-block}.example-actions-toolbar-11 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-11 .secondary .action{margin:0 50px 0 0}.example-actions-toolbar-11 .secondary a.action{margin-top:6px}.example-actions-toolbar-12:before,.example-actions-toolbar-12:after{content:'';display:table}.example-actions-toolbar-12:after{clear:both}.example-actions-toolbar-12 .primary{float:left}.example-actions-toolbar-12 .secondary{float:right}.example-actions-toolbar-12 .primary,.example-actions-toolbar-12 .secondary{display:inline-block}.example-actions-toolbar-12 .primary a.action,.example-actions-toolbar-12 .secondary a.action{display:inline-block}.example-actions-toolbar-12 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-12 .secondary a.action{margin-top:6px}@media only screen and (max-width: 768px){.example-actions-toolbar-12 .primary,.example-actions-toolbar-12 .secondary{ display:block;float:none}}.example-breadcrumbs-1{margin:0 0 20px}.example-breadcrumbs-1 .items{font-size:1.2rem;color:#a3a3a3;margin:0;padding:0;list-style:none none}.example-breadcrumbs-1 .items>li{display:inline-block;vertical-align:top}.example-breadcrumbs-1 .item{margin:0}.example-breadcrumbs-1 a{color:#333;text-decoration:none}.example-breadcrumbs-1 a:visited{color:#333;text-decoration:none}.example-breadcrumbs-1 a:hover{color:#333;text-decoration:underline}.example-breadcrumbs-1 a:active{color:#333;text-decoration:none}.example-breadcrumbs-1 strong{font-weight:400}.example-breadcrumbs-1 .item:not(:last-child){display:inline-block;text-decoration:none}.example-breadcrumbs-1 .item:not(:last-child):after{-webkit-font-smoothing:antialiased;font-size:24px;line-height:18px;content:'\e608';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-breadcrumbs-2{margin:0 0 20px}.example-breadcrumbs-2 .items{font-size:1.2rem;color:#1979c3;margin:0;padding:0;list-style:none none}.example-breadcrumbs-2 .items>li{display:inline-block;vertical-align:top}.example-breadcrumbs-2 .item{margin:0}.example-breadcrumbs-2 a{background-color:#ccc;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #f4f4f4 0, #ccc 100%);background-image:linear-gradient(to bottom, #f4f4f4 0, #ccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f4f4', endColorstr='#cccccc', GradientType=0);border:1px solid #ccc;color:#333;display:inline-block;padding:3px 5px;text-decoration:none}.example-breadcrumbs-2 a:visited{background-color:false;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top,false 0,false 100%);background-image:linear-gradient(to bottom,false 0,false 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='false', endColorstr='false', GradientType=0);color:#333;text-decoration:none}.example-breadcrumbs-2 a:hover{background-color:#f4f4f4;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #ccc 0, #f4f4f4 100%);background-image:linear-gradient(to bottom, #ccc 0, #f4f4f4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#f4f4f4', GradientType=0);color:#333;text-decoration:none}.example-breadcrumbs-2 a:active{background-color:false;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top,false 0,false 100%);background-image:linear-gradient(to bottom,false 0,false 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='false', endColorstr='false', GradientType=0);color:#333;text-decoration:none}.example-breadcrumbs-2 strong{background-color:#ff5501;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #f7b32e 0, #ff5501 100%);background-image:linear-gradient(to bottom, #f7b32e 0, #ff5501 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f7b32e', endColorstr='#ff5501', GradientType=0);border:1px solid #d04b0a;display:inline-block;font-weight:400;padding:3px 5px}.example-breadcrumbs-2 .item:not(:last-child){display:inline-block;text-decoration:none}.example-breadcrumbs-2 .item:not(:last-child):after{-webkit-font-smoothing:antialiased;font-size:24px;line-height:18px;content:'\e608';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-breadcrumbs-3{margin:0 0 20px}.example-breadcrumbs-3 .items{font-size:1.2rem;color:#333;margin:0;padding:0;list-style:none none}.example-breadcrumbs-3 .items>li{display:inline-block;vertical-align:top}.example-breadcrumbs-3 .item{margin:0}.example-breadcrumbs-3 a{background:#f4f4f4;color:#333;display:inline-block;padding:3px 5px;text-decoration:none}.example-breadcrumbs-3 a:visited{color:#333;text-decoration:none}.example-breadcrumbs-3 a:hover{background:#ccc;color:#333;text-decoration:none}.example-breadcrumbs-3 a:active{color:#333;text-decoration:none}.example-breadcrumbs-3 strong{background:#e7e7e7;display:inline-block;font-weight:400;padding:3px 5px}.example-breadcrumbs-3 .item:not(:last-child){display:inline-block;text-decoration:none}.example-breadcrumbs-3 .item:not(:last-child):after{-webkit-font-smoothing:antialiased;font-size:24px;line-height:18px;content:'\e608';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-breadcrumbs-3 .item a{position:relative;margin:0 11px 0 0}.example-breadcrumbs-3 .item a:after{border:12px solid transparent;height:0;width:0;border-left-color:#f4f4f4;content:"";position:absolute;display:block;top:0;right:-23px}.example-breadcrumbs-3 .item a:hover:after{border-color:transparent transparent transparent #ccc}button{background-image:none;background:#f2f2f2;border:1px solid #cdcdcd;color:#333;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:700;margin:3px;padding:7px 15px;font-size:1.4rem;line-height:1.6rem;box-sizing:border-box;vertical-align:middle;border-radius:3px}button:focus,button:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}button:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}button.disabled,button[disabled],fieldset[disabled] button{opacity:.5;cursor:default;pointer-events:none}button:active,button:focus{box-shadow:inset 0 2px 1px rgba(0,0,0,.12)}.example-button-1.example-button-2{line-height:2.2rem;padding:14px 17px;font-size:1.8rem}.example-button-1.example-button-3{line-height:1.2rem;padding:5px 8px;font-size:1.1rem;border-radius:0;color:#000}.example-button-1.example-button-3:hover,.example-button-1.example-button-3.active{color:#000}.example-button-10{background:#f2f2f2;border:1px solid #cdcdcd;color:#333;cursor:pointer;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:700;margin:3px;padding:7px 15px;font-size:1.4rem;line-height:1.6rem;box-sizing:border-box;vertical-align:middle;display:inline-block;background-image:none;background:0;-moz-box-sizing:content-box;border:0;box-shadow:none;line-height:inherit;margin:0;padding:0;text-decoration:none;text-shadow:none;font-weight:400}.example-button-10>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-button-10:before{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e611';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-button-10:hover:before{color:inherit}.example-button-10:active:before{color:inherit}.example-button-10:focus,.example-button-10:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-10:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-10.disabled,.example-button-10[disabled],fieldset[disabled] .example-button-10{opacity:.5;cursor:default;pointer-events:none}.example-button-10:focus,.example-button-10:active{background:0;border:0}.example-button-10:hover{background:0;border:0}.example-button-10.disabled,.example-button-10[disabled],fieldset[disabled] .example-button-10{cursor:not-allowed;pointer-events:none;opacity:.5}.example-button-11{background-image:none;background:#f2f2f2;border:1px solid #cdcdcd;color:#333;cursor:pointer;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:700;margin:3px;padding:7px 15px;font-size:1.4rem;line-height:1.6rem;box-sizing:border-box;vertical-align:middle;display:inline-block;text-decoration:none}.example-button-11:before{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e611';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-button-11:hover:before{color:inherit}.example-button-11:active:before{color:inherit}.example-button-11:focus,.example-button-11:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-11:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-11.disabled,.example-button-11[disabled],fieldset[disabled] .example-button-11{opacity:.5;cursor:default;pointer-events:none}.example-button-12{background-image:none;background:#f2f2f2;border:1px solid #cdcdcd;color:#333;cursor:pointer;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:700;margin:3px;padding:7px 15px;font-size:1.4rem;line-height:1.6rem;box-sizing:border-box;vertical-align:middle;display:inline-block;text-decoration:none}.example-button-12:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e611';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-button-12:hover:after{color:inherit}.example-button-12:active:after{color:inherit}.example-button-12:focus,.example-button-12:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-12:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-12.disabled,.example-button-12[disabled],fieldset[disabled] .example-button-12{opacity:.5;cursor:default;pointer-events:none}.example-button-13{background-image:none;background:#f2f2f2;border:1px solid #cdcdcd;color:#333;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:700;margin:3px;padding:7px 15px;width:100px;font-size:1.4rem;line-height:1.6rem;box-sizing:border-box;vertical-align:middle}.example-button-13:focus,.example-button-13:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-13:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-13.disabled,.example-button-13[disabled],fieldset[disabled] .example-button-13{opacity:.5;cursor:default;pointer-events:none}.example-button-4{background-image:none;background:#1979c3;border:1px solid #1979c3;color:#fff;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:700;margin:3px;padding:7px 15px;font-size:1.4rem;box-sizing:border-box;vertical-align:middle}.example-button-4:focus,.example-button-4:active{background:#006bb4;border:1px solid #006bb4;color:#fff}.example-button-4:hover{background:#006bb4;border:1px solid #006bb4;color:#fff}.example-button-4.disabled,.example-button-4[disabled],fieldset[disabled] .example-button-4{opacity:.5;cursor:default;pointer-events:none}.example-button-4:active{box-shadow:inset 0 3px 1px rgba(0,0,0,.29)}.example-button-4.example-button-5{line-height:2.2rem;padding:7px 35px;font-size:1.8rem}.example-button-4.example-button-6{line-height:1.2rem;padding:5px 8px;font-size:1.1rem;color:#fff}.example-button-4.example-button-6:hover,.example-button-4.example-button-6.active{color:#fff}.example-button-7{background-image:none;background:#f2f2f2;background-color:#006bb4;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #1979c3 0, #006bb4 100%);background-image:linear-gradient(to bottom, #1979c3 0, #006bb4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1979c3', endColorstr='#006bb4', GradientType=0);border:1px solid #1979c3;color:#fff;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:700;margin:3px;padding:7px 15px;font-size:1.4rem;line-height:1.6rem;box-sizing:border-box;vertical-align:middle;border-radius:3px}.example-button-7:focus,.example-button-7:active{background:#e2e2e2;background-color:#006bb4;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #006bb4 0, #006bb4 100%);background-image:linear-gradient(to bottom, #006bb4 0, #006bb4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#006bb4', endColorstr='#006bb4', GradientType=0);border:1px solid #006bb4;color:#fff}.example-button-7:hover{background:#e2e2e2;background-color:#1979c3;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #006bb4 0, #1979c3 100%);background-image:linear-gradient(to bottom, #006bb4 0, #1979c3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#006bb4', endColorstr='#1979c3', GradientType=0);border:1px solid #006bb4;color:#fff}.example-button-7.disabled,.example-button-7[disabled],fieldset[disabled] .example-button-7{opacity:.5;cursor:default;pointer-events:none}.example-button-7:active{box-shadow:inset 0 3px 1px rgba(0,0,0,.29)}.example-button-8{line-height:1.42857143;margin:0;padding:0;color:#1979c3;text-decoration:none;background:0;border:0;display:inline;font-weight:400}.example-button-8:visited{color:#1979c3;text-decoration:none}.example-button-8:hover{color:#006bb4;text-decoration:underline}.example-button-8:active{color:#ff5501;text-decoration:underline}.example-button-8:hover{color:#006bb4}.example-button-8:hover,.example-button-8:active,.example-button-8:focus{background:0;border:0}.example-button-8.disabled,.example-button-8[disabled],fieldset[disabled] .example-button-8{color:#1979c3;opacity:.5;cursor:default;pointer-events:none;text-decoration:underline}.example-button-8:active{box-shadow:none}.example-button-9{text-decoration:none;background-image:none;background:#f2f2f2;border:1px solid #cdcdcd;color:#333;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:700;margin:0;padding:7px 15px;font-size:1.4rem;line-height:1.6rem;box-sizing:border-box;vertical-align:middle;margin:3px;border-radius:3px;font-weight:700}.example-button-9:hover,.example-button-9:active,.example-button-9:focus{text-decoration:none}.example-button-9:focus,.example-button-9:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-9:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-9.disabled,.example-button-9[disabled],fieldset[disabled] .example-button-9{opacity:.5;cursor:default;pointer-events:none}.example-button-9:active{box-shadow:inset 0 3px 1px rgba(0,0,0,.29)}.example-button-14{background-image:none;background:0;-moz-box-sizing:content-box;border:0;box-shadow:none;line-height:inherit;margin:0;padding:0;text-decoration:none;text-shadow:none;font-weight:400}.example-button-14:focus,.example-button-14:active{background:0;border:0}.example-button-14:hover{background:0;border:0}.example-button-14.disabled,.example-button-14[disabled],fieldset[disabled] .example-button-14{cursor:not-allowed;pointer-events:none;opacity:.5}.example-button-15{background-image:none;background:#1979c3;border:1px solid #1979c3;color:#fff;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:700;padding:7px 15px;font-size:1.4rem;box-sizing:border-box;vertical-align:middle;background:#f2f2f2;border:1px solid #cdcdcd;color:#333}.example-button-15:focus,.example-button-15:active{background:#006bb4;border:1px solid #006bb4;color:#fff}.example-button-15:hover{background:#006bb4;border:1px solid #006bb4;color:#fff}.example-button-15.disabled,.example-button-15[disabled],fieldset[disabled] .example-button-15{opacity:.5;cursor:default;pointer-events:none}.example-button-15:focus,.example-button-15:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-15:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-17{line-height:2.2rem;padding:14px 17px;font-size:1.8rem;font-size:1.4rem;line-height:1.6rem;padding:7px 15px}.example-button-18{font-size:1rem;line-height:1.2rem;padding:4px 10px}body._has-modal{height:100%;overflow:hidden;width:100%}.modals-overlay{z-index:899}.modal-slide,.modal-popup{bottom:0;left:0;min-width:0;position:fixed;right:0;top:0;visibility:hidden}.modal-slide._show,.modal-popup._show{visibility:visible}.modal-slide._show .modal-inner-wrap,.modal-popup._show .modal-inner-wrap{-webkit-transform:translate(0,0);transform:translate(0,0)}.modal-slide .modal-inner-wrap,.modal-popup .modal-inner-wrap{background-color:#fff;box-shadow:0 0 12px 2px rgba(0,0,0,.35);opacity:1;pointer-events:auto}.modal-slide{left:14.8rem;z-index:900}.modal-slide._show .modal-inner-wrap{-webkit-transform:translateX(0);transform:translateX(0)}.modal-slide .modal-inner-wrap{height:100%;overflow-y:auto;position:static;-webkit-transform:translateX(100%);transform:translateX(100%);transition-duration:.3s;-webkit-transition-property:-webkit-transform,visibility;transition-property:transform,visibility;transition-timing-function:ease-in-out;width:auto}.modal-slide._inner-scroll .modal-inner-wrap{overflow-y:visible;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}.modal-slide._inner-scroll .modal-header,.modal-slide._inner-scroll .modal-footer{-webkit-flex-grow:0;flex-grow:0;-webkit-flex-shrink:0;flex-shrink:0}.modal-slide._inner-scroll .modal-content{overflow-y:auto}.modal-slide._inner-scroll .modal-footer{margin-top:auto}.modal-slide .modal-header,.modal-slide .modal-content,.modal-slide .modal-footer{padding:0 2.6rem 2.6rem}.modal-slide .modal-header{padding-bottom:2.1rem;padding-top:2.1rem}.modal-popup{z-index:900;left:0;overflow-y:auto}.modal-popup._show .modal-inner-wrap{-webkit-transform:translateY(0);transform:translateY(0)}.modal-popup .modal-inner-wrap{margin:5rem auto;width:75%;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;box-sizing:border-box;height:auto;left:0;position:absolute;right:0;-webkit-transform:translateY(-200%);transform:translateY(-200%);transition-duration:.2s;-webkit-transition-property:-webkit-transform,visibility;transition-property:transform,visibility;transition-timing-function:ease}.modal-popup._inner-scroll{overflow-y:visible}.ie10 .modal-popup._inner-scroll,.ie9 .modal-popup._inner-scroll{overflow-y:auto}.modal-popup._inner-scroll .modal-inner-wrap{max-height:90%}.ie10 .modal-popup._inner-scroll .modal-inner-wrap,.ie9 .modal-popup._inner-scroll .modal-inner-wrap{max-height:none}.modal-popup._inner-scroll .modal-content{overflow-y:auto}.modal-popup .modal-header,.modal-popup .modal-content,.modal-popup .modal-footer{padding-left:3rem;padding-right:3rem}.modal-popup .modal-header,.modal-popup .modal-footer{-webkit-flex-grow:0;flex-grow:0;-webkit-flex-shrink:0;flex-shrink:0}.modal-popup .modal-header{padding-bottom:1.2rem;padding-top:3rem}.modal-popup .modal-footer{margin-top:auto;padding-bottom:3rem;padding-top:3rem}.modal-popup .modal-footer-actions{text-align:right}.example-dropdown-1{display:inline-block;position:relative}.example-dropdown-1:before,.example-dropdown-1:after{content:'';display:table}.example-dropdown-1:after{clear:both}.example-dropdown-1 .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.example-dropdown-1 .action.toggle:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e607';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-1 .action.toggle:hover:after{color:inherit}.example-dropdown-1 .action.toggle:active:after{color:inherit}.example-dropdown-1 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-1 .action.toggle.active:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e618';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-1 .action.toggle.active:hover:after{color:inherit}.example-dropdown-1 .action.toggle.active:active:after{color:inherit}.example-dropdown-1 ul.dropdown{margin:0;padding:0;list-style:none none;background:#fff;border:1px solid #bbb;margin-top:4px;min-width:100%;z-index:100;box-sizing:border-box;display:none;position:absolute;top:100%;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-1 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-1 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-1 ul.dropdown:before,.example-dropdown-1 ul.dropdown:after{border-bottom-style:solid;content:'';display:block;height:0;position:absolute;width:0}.example-dropdown-1 ul.dropdown:before{border:6px solid;border-color:transparent transparent #fff transparent;z-index:99}.example-dropdown-1 ul.dropdown:after{border:7px solid;border-color:transparent transparent #bbb transparent;z-index:98}.example-dropdown-1 ul.dropdown:before{left:10px;top:-12px}.example-dropdown-1 ul.dropdown:after{left:9px;top:-14px}.example-dropdown-1.active{overflow:visible}.example-dropdown-1.active ul.dropdown{display:block}.example-dropdown-2{display:inline-block;position:relative}.example-dropdown-2:before,.example-dropdown-2:after{content:'';display:table}.example-dropdown-2:after{clear:both}.example-dropdown-2 .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.example-dropdown-2 .action.toggle:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e607';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-2 .action.toggle:hover:after{color:inherit}.example-dropdown-2 .action.toggle:active:after{color:inherit}.example-dropdown-2 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-2 .action.toggle.active:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e618';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-2 .action.toggle.active:hover:after{color:inherit}.example-dropdown-2 .action.toggle.active:active:after{color:inherit}.example-dropdown-2 ul.dropdown{margin:0;padding:0;list-style:none none;background:#fff;border:1px solid #bbb;margin-top:4px;min-width:100%;z-index:100;box-sizing:border-box;display:none;position:absolute;top:100%;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-2 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-2 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-2 ul.dropdown:before,.example-dropdown-2 ul.dropdown:after{border-bottom-style:solid;content:'';display:block;height:0;position:absolute;width:0}.example-dropdown-2 ul.dropdown:before{border:6px solid;border-color:transparent transparent #fff transparent;z-index:99}.example-dropdown-2 ul.dropdown:after{border:7px solid;border-color:transparent transparent #bbb transparent;z-index:98}.example-dropdown-2 ul.dropdown:before{left:10px;top:-12px}.example-dropdown-2 ul.dropdown:after{left:9px;top:-14px}.example-dropdown-2.active{overflow:visible}.example-dropdown-2.active ul.dropdown{display:block}.example-dropdown-3{display:inline-block;position:relative}.example-dropdown-3:before,.example-dropdown-3:after{content:'';display:table}.example-dropdown-3:after{clear:both}.example-dropdown-3 .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.example-dropdown-3 .action.toggle:before{-webkit-font-smoothing:antialiased;font-size:22px;line-height:1;color:red;content:'\e61c';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-3 .action.toggle:hover:before{color:red}.example-dropdown-3 .action.toggle:active:before{color:inherit}.example-dropdown-3 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-3 .action.toggle.active:before{-webkit-font-smoothing:antialiased;font-size:22px;line-height:1;color:red;content:'\e60f';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-3 .action.toggle.active:hover:before{color:red}.example-dropdown-3 .action.toggle.active:active:before{color:inherit}.example-dropdown-3 ul.dropdown{margin:0;padding:0;list-style:none none;background:#fff;border:1px solid #bbb;margin-top:4px;min-width:100%;z-index:100;box-sizing:border-box;display:none;position:absolute;top:100%;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-3 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-3 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-3 ul.dropdown:before,.example-dropdown-3 ul.dropdown:after{border-bottom-style:solid;content:'';display:block;height:0;position:absolute;width:0}.example-dropdown-3 ul.dropdown:before{border:6px solid;border-color:transparent transparent #fff transparent;z-index:99}.example-dropdown-3 ul.dropdown:after{border:7px solid;border-color:transparent transparent #bbb transparent;z-index:98}.example-dropdown-3 ul.dropdown:before{left:10px;top:-12px}.example-dropdown-3 ul.dropdown:after{left:9px;top:-14px}.example-dropdown-3.active{overflow:visible}.example-dropdown-3.active ul.dropdown{display:block}.example-dropdown-5{display:inline-block;position:relative}.example-dropdown-5:before,.example-dropdown-5:after{content:'';display:table}.example-dropdown-5:after{clear:both}.example-dropdown-5 .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.example-dropdown-5 .action.toggle:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:1;color:inherit;content:'\e607';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-5 .action.toggle:hover:after{color:inherit}.example-dropdown-5 .action.toggle:active:after{color:inherit}.example-dropdown-5 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-5 .action.toggle.active:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:1;color:inherit;content:'\e618';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-5 .action.toggle.active:hover:after{color:inherit}.example-dropdown-5 .action.toggle.active:active:after{color:inherit}.example-dropdown-5 ul.dropdown{margin:0;padding:0;list-style:none none;background:#eef1f3;border:2px solid #ced1d4;margin-top:4px;min-width:100%;z-index:100;box-sizing:border-box;display:none;position:absolute;top:100%}.example-dropdown-5 ul.dropdown li{margin:0;padding:10px;border-top:2px solid #e8eaed}.example-dropdown-5 ul.dropdown li:first-child{border:0}.example-dropdown-5 ul.dropdown li:hover{background:#d8e3e3;cursor:pointer}.example-dropdown-5.active{overflow:visible}.example-dropdown-5.active ul.dropdown{display:block}.example-dropdown-6{display:inline-block;position:relative}.example-dropdown-6:before,.example-dropdown-6:after{content:'';display:table}.example-dropdown-6:after{clear:both}.example-dropdown-6 .action.split{float:left;margin:0}.example-dropdown-6 .action.toggle{float:right;margin:0}.example-dropdown-6 button.action.split{border-bottom-right-radius:0;border-top-right-radius:0}.example-dropdown-6 button+.action.toggle{border-bottom-left-radius:0;border-left:0;border-top-left-radius:0}.example-dropdown-6 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-6 .action.toggle>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-6 .action.toggle:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e607';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-6 .action.toggle:hover:after{color:inherit}.example-dropdown-6 .action.toggle:active:after{color:inherit}.example-dropdown-6 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-6 .action.toggle.active>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-6 .action.toggle.active:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e618';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-6 .action.toggle.active:hover:after{color:inherit}.example-dropdown-6 .action.toggle.active:active:after{color:inherit}.example-dropdown-6 ul.dropdown{margin:0;padding:0;list-style:none none;background:#fff;border:1px solid #bbb;margin-top:4px;min-width:100%;z-index:100;box-sizing:border-box;display:none;position:absolute;top:100%;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-6 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-6 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-6 ul.dropdown:before,.example-dropdown-6 ul.dropdown:after{border-bottom-style:solid;content:'';display:block;height:0;position:absolute;width:0}.example-dropdown-6 ul.dropdown:before{border:6px solid;border-color:transparent transparent #fff transparent;z-index:99}.example-dropdown-6 ul.dropdown:after{border:7px solid;border-color:transparent transparent #bbb transparent;z-index:98}.example-dropdown-6 ul.dropdown:before{right:10px;top:-12px}.example-dropdown-6 ul.dropdown:after{right:9px;top:-14px}.example-dropdown-6.active{overflow:visible}.example-dropdown-6.active ul.dropdown{display:block}.split.example-dropdown-7{display:inline-block;position:relative}.split.example-dropdown-7:before,.split.example-dropdown-7:after{content:'';display:table}.split.example-dropdown-7:after{clear:both}.split.example-dropdown-7 .action.split{float:left;margin:0}.split.example-dropdown-7 .action.toggle{float:right;margin:0}.split.example-dropdown-7 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.split.example-dropdown-7 .action.toggle>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.split.example-dropdown-7 .action.toggle:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e607';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.split.example-dropdown-7 .action.toggle:hover:after{color:inherit}.split.example-dropdown-7 .action.toggle:active:after{color:inherit}.split.example-dropdown-7 .action.toggle.active{display:inline-block;text-decoration:none}.split.example-dropdown-7 .action.toggle.active>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.split.example-dropdown-7 .action.toggle.active:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e618';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.split.example-dropdown-7 .action.toggle.active:hover:after{color:inherit}.split.example-dropdown-7 .action.toggle.active:active:after{color:inherit}.split.example-dropdown-7 ul.dropdown{margin:0;padding:0;list-style:none none;background:#fff;border:1px solid #bbb;margin-top:4px;min-width:100%;z-index:100;box-sizing:border-box;display:none;position:absolute;top:100%;box-shadow:0 3px 3px rgba(0,0,0,.15)}.split.example-dropdown-7 ul.dropdown li{margin:0;padding:3px 5px}.split.example-dropdown-7 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.split.example-dropdown-7 ul.dropdown:before,.split.example-dropdown-7 ul.dropdown:after{border-bottom-style:solid;content:'';display:block;height:0;position:absolute;width:0}.split.example-dropdown-7 ul.dropdown:before{border:6px solid;border-color:transparent transparent #fff transparent;z-index:99}.split.example-dropdown-7 ul.dropdown:after{border:7px solid;border-color:transparent transparent #bbb transparent;z-index:98}.split.example-dropdown-7 ul.dropdown:before{right:10px;top:-12px}.split.example-dropdown-7 ul.dropdown:after{right:9px;top:-14px}.split.example-dropdown-7.active{overflow:visible}.split.example-dropdown-7.active ul.dropdown{display:block}.example-dropdown-8{display:inline-block;position:relative}.example-dropdown-8:before,.example-dropdown-8:after{content:'';display:table}.example-dropdown-8:after{clear:both}.example-dropdown-8 .action.split{float:left;margin:0}.example-dropdown-8 .action.toggle{float:right;margin:0}.example-dropdown-8 button.action.split{border-bottom-right-radius:0;border-top-right-radius:0}.example-dropdown-8 button+.action.toggle{border-bottom-left-radius:0;border-left:0;border-top-left-radius:0}.example-dropdown-8 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-8 .action.toggle>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-8 .action.toggle:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e607';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-8 .action.toggle:hover:after{color:inherit}.example-dropdown-8 .action.toggle:active:after{color:inherit}.example-dropdown-8 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-8 .action.toggle.active>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-8 .action.toggle.active:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e618';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-8 .action.toggle.active:hover:after{color:inherit}.example-dropdown-8 .action.toggle.active:active:after{color:inherit}.example-dropdown-8 ul.dropdown{margin:0;padding:0;list-style:none none;background:#fff;border:1px solid #bbb;margin-top:4px;min-width:100%;z-index:100;box-sizing:border-box;display:none;position:absolute;top:100%;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-8 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-8 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-8 ul.dropdown:before,.example-dropdown-8 ul.dropdown:after{border-bottom-style:solid;content:'';display:block;height:0;position:absolute;width:0}.example-dropdown-8 ul.dropdown:before{border:6px solid;border-color:transparent transparent #fff transparent;z-index:99}.example-dropdown-8 ul.dropdown:after{border:7px solid;border-color:transparent transparent #bbb transparent;z-index:98}.example-dropdown-8 ul.dropdown:before{right:10px;top:-12px}.example-dropdown-8 ul.dropdown:after{right:9px;top:-14px}.example-dropdown-8.active{overflow:visible}.example-dropdown-8.active ul.dropdown{display:block}.example-dropdown-9{display:inline-block;position:relative}.example-dropdown-9 .action.split,.example-dropdown-9 .action.toggle{line-height:2.2rem;padding:14px 17px;font-size:1.8rem}.example-dropdown-9:before,.example-dropdown-9:after{content:'';display:table}.example-dropdown-9:after{clear:both}.example-dropdown-9 .action.split{float:left;margin:0}.example-dropdown-9 .action.toggle{float:right;margin:0}.example-dropdown-9 button.action.split{border-bottom-right-radius:0;border-top-right-radius:0}.example-dropdown-9 button+.action.toggle{border-bottom-left-radius:0;border-left:0;border-top-left-radius:0}.example-dropdown-9 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-9 .action.toggle>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-9 .action.toggle:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e607';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-9 .action.toggle:hover:after{color:inherit}.example-dropdown-9 .action.toggle:active:after{color:inherit}.example-dropdown-9 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-9 .action.toggle.active>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-9 .action.toggle.active:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e618';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-9 .action.toggle.active:hover:after{color:inherit}.example-dropdown-9 .action.toggle.active:active:after{color:inherit}.example-dropdown-9 ul.dropdown{margin:0;padding:0;list-style:none none;background:#fff;border:1px solid #bbb;margin-top:4px;min-width:100%;z-index:100;box-sizing:border-box;display:none;position:absolute;top:100%;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-9 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-9 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-9 ul.dropdown:before,.example-dropdown-9 ul.dropdown:after{border-bottom-style:solid;content:'';display:block;height:0;position:absolute;width:0}.example-dropdown-9 ul.dropdown:before{border:6px solid;border-color:transparent transparent #fff transparent;z-index:99}.example-dropdown-9 ul.dropdown:after{border:7px solid;border-color:transparent transparent #bbb transparent;z-index:98}.example-dropdown-9 ul.dropdown:before{right:10px;top:-12px}.example-dropdown-9 ul.dropdown:after{right:9px;top:-14px}.example-dropdown-9.active{overflow:visible}.example-dropdown-9.active ul.dropdown{display:block}.example-dropdown-10{display:inline-block;position:relative}.example-dropdown-10 .action.split,.example-dropdown-10 .action.toggle{line-height:1.2rem;padding:5px 8px;font-size:1.1rem}.example-dropdown-10:before,.example-dropdown-10:after{content:'';display:table}.example-dropdown-10:after{clear:both}.example-dropdown-10 .action.split{float:left;margin:0}.example-dropdown-10 .action.toggle{float:right;margin:0}.example-dropdown-10 button.action.split{border-bottom-right-radius:0;border-top-right-radius:0}.example-dropdown-10 button+.action.toggle{border-bottom-left-radius:0;border-left:0;border-top-left-radius:0}.example-dropdown-10 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-10 .action.toggle>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-10 .action.toggle:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e607';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-10 .action.toggle:hover:after{color:inherit}.example-dropdown-10 .action.toggle:active:after{color:inherit}.example-dropdown-10 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-10 .action.toggle.active>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-10 .action.toggle.active:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e618';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-10 .action.toggle.active:hover:after{color:inherit}.example-dropdown-10 .action.toggle.active:active:after{color:inherit}.example-dropdown-10 ul.dropdown{margin:0;padding:0;list-style:none none;background:#fff;border:1px solid #bbb;margin-top:4px;min-width:100%;z-index:100;box-sizing:border-box;display:none;position:absolute;top:100%;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-10 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-10 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-10 ul.dropdown:before,.example-dropdown-10 ul.dropdown:after{border-bottom-style:solid;content:'';display:block;height:0;position:absolute;width:0}.example-dropdown-10 ul.dropdown:before{border:6px solid;border-color:transparent transparent #fff transparent;z-index:99}.example-dropdown-10 ul.dropdown:after{border:7px solid;border-color:transparent transparent #bbb transparent;z-index:98}.example-dropdown-10 ul.dropdown:before{right:10px;top:-12px}.example-dropdown-10 ul.dropdown:after{right:9px;top:-14px}.example-dropdown-10.active{overflow:visible}.example-dropdown-10.active ul.dropdown{display:block}.example-dropdown-11{display:inline-block;position:relative}.example-dropdown-11:before,.example-dropdown-11:after{content:'';display:table}.example-dropdown-11:after{clear:both}.example-dropdown-11 .action.split{float:right;margin:0}.example-dropdown-11 .action.toggle{float:left;margin:0}.example-dropdown-11 button.action.split{border-bottom-left-radius:0;border-top-left-radius:0}.example-dropdown-11 button+.action.toggle{border-bottom-right-radius:0;border-right:0;border-top-right-radius:0}.example-dropdown-11 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-11 .action.toggle>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-11 .action.toggle:before{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:red;content:'\e61c';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-11 .action.toggle:hover:before{color:red}.example-dropdown-11 .action.toggle:active:before{color:inherit}.example-dropdown-11 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-11 .action.toggle.active>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-11 .action.toggle.active:before{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:red;content:'\e60f';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-11 .action.toggle.active:hover:before{color:red}.example-dropdown-11 .action.toggle.active:active:before{color:inherit}.example-dropdown-11 ul.dropdown{margin:0;padding:0;list-style:none none;background:#fff;border:1px solid #bbb;margin-top:4px;min-width:100%;z-index:100;box-sizing:border-box;display:none;position:absolute;top:100%;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-11 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-11 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-11 ul.dropdown:before,.example-dropdown-11 ul.dropdown:after{border-bottom-style:solid;content:'';display:block;height:0;position:absolute;width:0}.example-dropdown-11 ul.dropdown:before{border:6px solid;border-color:transparent transparent #fff transparent;z-index:99}.example-dropdown-11 ul.dropdown:after{border:7px solid;border-color:transparent transparent #bbb transparent;z-index:98}.example-dropdown-11 ul.dropdown:before{right:10px;top:-12px}.example-dropdown-11 ul.dropdown:after{right:9px;top:-14px}.example-dropdown-11.active{overflow:visible}.example-dropdown-11.active ul.dropdown{display:block}.example-dropdown-12{display:inline-block;position:relative}.example-dropdown-12:before,.example-dropdown-12:after{content:'';display:table}.example-dropdown-12:after{clear:both}.example-dropdown-12 .action.split{float:left;margin:0}.example-dropdown-12 .action.toggle{float:right;margin:0}.example-dropdown-12 button.action.split{border-bottom-right-radius:0;border-top-right-radius:0}.example-dropdown-12 button+.action.toggle{border-bottom-left-radius:0;border-left:0;border-top-left-radius:0}.example-dropdown-12 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-12 .action.toggle>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-12 .action.toggle:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e607';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-12 .action.toggle:hover:after{color:inherit}.example-dropdown-12 .action.toggle:active:after{color:inherit}.example-dropdown-12 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-12 .action.toggle.active>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-12 .action.toggle.active:after{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e618';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-dropdown-12 .action.toggle.active:hover:after{color:inherit}.example-dropdown-12 .action.toggle.active:active:after{color:inherit}.example-dropdown-12 ul.dropdown{margin:0;padding:0;list-style:none none;background:#eef1f3;border:2px solid #ced1d4;margin-top:4px;min-width:100%;z-index:100;box-sizing:border-box;display:none;position:absolute;top:100%}.example-dropdown-12 ul.dropdown li{margin:0;padding:10px;border-top:2px solid #e8eaed}.example-dropdown-12 ul.dropdown li:first-child{border:0}.example-dropdown-12 ul.dropdown li:hover{background:#d8e3e3;cursor:pointer}.example-dropdown-12.active{overflow:visible}.example-dropdown-12.active ul.dropdown{display:block}.example-form-1 .example-form-1-fieldset{border:0;margin:0 0 40px;padding:0;letter-spacing:-.31em}.example-form-1 .example-form-1-fieldset>*{letter-spacing:normal}.example-form-1 .example-form-1-fieldset>.legend{margin:0 0 25px;padding:0;box-sizing:border-box;float:left;line-height:1.2;font-size:2rem}.example-form-1 .example-form-1-fieldset>.legend+br{clear:both;display:block;height:0;overflow:hidden;visibility:hidden}.example-form-1 .example-form-1-fieldset:after{margin:10px 0 0;content:attr(data-hasrequired);display:block;letter-spacing:normal;word-spacing:normal;color:#e02b27;font-size:1.2rem}.example-form-1 .example-form-1-fieldset>.field{margin:0 0 20px}.example-form-1 .example-form-1-fieldset>.field>.label{margin:0 0 5px;display:inline-block}.example-form-1 .example-form-1-fieldset>.field:last-child{margin-bottom:0}.example-form-1 .example-form-1-fieldset>.field>.label{font-weight:700}.example-form-1 .example-form-1-fieldset>.field>.label+br{display:none}.example-form-1 .example-form-1-fieldset>.field .choice input{vertical-align:top}.example-form-1 .example-form-1-fieldset>.field .fields.group:before,.example-form-1 .example-form-1-fieldset>.field .fields.group:after{content:'';display:table}.example-form-1 .example-form-1-fieldset>.field .fields.group:after{clear:both}.example-form-1 .example-form-1-fieldset>.field .fields.group .field{box-sizing:border-box;float:left}.example-form-1 .example-form-1-fieldset>.field .fields.group.group-2 .field{width:50%!important}.example-form-1 .example-form-1-fieldset>.field .fields.group.group-3 .field{width:33.3%!important}.example-form-1 .example-form-1-fieldset>.field .fields.group.group-4 .field{width:25%!important}.example-form-1 .example-form-1-fieldset>.field .fields.group.group-5 .field{width:20%!important}.example-form-1 .example-form-1-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%}.example-form-1 .example-form-1-fieldset>.field .addon textarea,.example-form-1 .example-form-1-fieldset>.field .addon select,.example-form-1 .example-form-1-fieldset>.field .addon input{-ms-flex-order:2;-webkit-order:2;order:2;-webkit-flex-basis:100%;flex-basis:100%;display:inline-block;margin:0;width:auto}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore,.example-form-1 .example-form-1-fieldset>.field .addon .addafter{background:#fff;background-clip:padding-box;border:1px solid #c2c2c2;border-radius:1px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:14px;height:32px;line-height:1.428571429;padding:0 9px;vertical-align:baseline;width:100%;box-sizing:border-box;-ms-flex-order:3;-webkit-order:3;order:3;display:inline-block;vertical-align:middle;white-space:nowrap;width:auto}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore:disabled,.example-form-1 .example-form-1-fieldset>.field .addon .addafter:disabled{opacity:.5}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore::-moz-placeholder,.example-form-1 .example-form-1-fieldset>.field .addon .addafter::-moz-placeholder{color:#c2c2c2}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore::-webkit-input-placeholder,.example-form-1 .example-form-1-fieldset>.field .addon .addafter::-webkit-input-placeholder{color:#c2c2c2}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore:-ms-input-placeholder,.example-form-1 .example-form-1-fieldset>.field .addon .addafter:-ms-input-placeholder{color:#c2c2c2}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore{float:left;-ms-flex-order:1;-webkit-order:1;order:1}.example-form-1 .example-form-1-fieldset>.field .additional{margin-top:10px}.example-form-1 .example-form-1-fieldset>.field.required>.label:after,.example-form-1 .example-form-1-fieldset>.field._required>.label:after{content:'*';color:#e02b27;font-size:1.2rem;margin:0 0 0 5px}.example-form-1 .example-form-1-fieldset>.field .note{font-size:1.2rem;margin:3px 0 0;padding:0;display:inline-block;text-decoration:none}.example-form-1 .example-form-1-fieldset>.field .note:before{-webkit-font-smoothing:antialiased;font-size:24px;line-height:12px;content:'\e618';font-family:'icons-blank-theme';vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-form-2 .example-form-2-fieldset{border:0;margin:0 0 40px;padding:0;letter-spacing:-.31em}.example-form-2 .example-form-2-fieldset>*{letter-spacing:normal}.example-form-2 .example-form-2-fieldset>.legend{margin:0 0 25px;padding:0;box-sizing:border-box;float:left;line-height:1.2;font-size:2rem}.example-form-2 .example-form-2-fieldset>.legend+br{clear:both;display:block;height:0;overflow:hidden;visibility:hidden}.example-form-2 .example-form-2-fieldset>.field{margin:0 0 20px;padding:0 12px 0 0;box-sizing:border-box;display:inline-block;width:50%;vertical-align:top}.example-form-2 .example-form-2-fieldset>.field>.label{margin:0 0 5px;display:inline-block}.example-form-2 .example-form-2-fieldset>.field:last-child{margin-bottom:0}.example-form-2 .example-form-2-fieldset>.field+.fieldset{clear:both}.example-form-2 .example-form-2-fieldset>.field>.label{font-weight:700}.example-form-2 .example-form-2-fieldset>.field>.label+br{display:none}.example-form-2 .example-form-2-fieldset>.field .choice input{vertical-align:top}.example-form-2 .example-form-2-fieldset>.field .fields.group:before,.example-form-2 .example-form-2-fieldset>.field .fields.group:after{content:'';display:table}.example-form-2 .example-form-2-fieldset>.field .fields.group:after{clear:both}.example-form-2 .example-form-2-fieldset>.field .fields.group .field{box-sizing:border-box;float:left}.example-form-2 .example-form-2-fieldset>.field .fields.group.group-2 .field{width:50%!important}.example-form-2 .example-form-2-fieldset>.field .fields.group.group-3 .field{width:33.3%!important}.example-form-2 .example-form-2-fieldset>.field .fields.group.group-4 .field{width:25%!important}.example-form-2 .example-form-2-fieldset>.field .fields.group.group-5 .field{width:20%!important}.example-form-2 .example-form-2-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%}.example-form-2 .example-form-2-fieldset>.field .addon textarea,.example-form-2 .example-form-2-fieldset>.field .addon select,.example-form-2 .example-form-2-fieldset>.field .addon input{-ms-flex-order:2;-webkit-order:2;order:2;-webkit-flex-basis:100%;flex-basis:100%;display:inline-block;margin:0;width:auto}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore,.example-form-2 .example-form-2-fieldset>.field .addon .addafter{background:#fff;background-clip:padding-box;border:1px solid #c2c2c2;border-radius:1px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:14px;height:32px;line-height:1.428571429;padding:0 9px;vertical-align:baseline;width:100%;box-sizing:border-box;-ms-flex-order:3;-webkit-order:3;order:3;display:inline-block;vertical-align:middle;white-space:nowrap;width:auto}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore:disabled,.example-form-2 .example-form-2-fieldset>.field .addon .addafter:disabled{opacity:.5}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore::-moz-placeholder,.example-form-2 .example-form-2-fieldset>.field .addon .addafter::-moz-placeholder{color:#c2c2c2}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore::-webkit-input-placeholder,.example-form-2 .example-form-2-fieldset>.field .addon .addafter::-webkit-input-placeholder{color:#c2c2c2}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore:-ms-input-placeholder,.example-form-2 .example-form-2-fieldset>.field .addon .addafter:-ms-input-placeholder{color:#c2c2c2}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore{float:left;-ms-flex-order:1;-webkit-order:1;order:1}.example-form-2 .example-form-2-fieldset>.field .additional{margin-top:10px}.example-form-2 .example-form-2-fieldset>.field.required>.label:after,.example-form-2 .example-form-2-fieldset>.field._required>.label:after{content:'*';color:#e02b27;font-size:1.2rem;margin:0 0 0 5px}.example-form-2 .example-form-2-fieldset>.field .note{font-size:1.2rem;margin:3px 0 0;padding:0;display:inline-block;text-decoration:none}.example-form-2 .example-form-2-fieldset>.field .note:before{-webkit-font-smoothing:antialiased;font-size:24px;line-height:12px;content:'\e618';font-family:'icons-blank-theme';vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}input[type="text"],input[type="password"],input[type="url"],input[type="tel"],input[type="search"],input[type="number"],input[type="datetime"],input[type="email"]{background:#fff;background-clip:padding-box;border:1px solid #c2c2c2;border-radius:1px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:14px;height:32px;line-height:1.428571429;padding:0 9px;vertical-align:baseline;width:100%;box-sizing:border-box;margin-bottom:20px}input[type="text"]:disabled,input[type="password"]:disabled,input[type="url"]:disabled,input[type="tel"]:disabled,input[type="search"]:disabled,input[type="number"]:disabled,input[type="datetime"]:disabled,input[type="email"]:disabled{opacity:.5}input[type="text"]::-moz-placeholder,input[type="password"]::-moz-placeholder,input[type="url"]::-moz-placeholder,input[type="tel"]::-moz-placeholder,input[type="search"]::-moz-placeholder,input[type="number"]::-moz-placeholder,input[type="datetime"]::-moz-placeholder,input[type="email"]::-moz-placeholder{color:#c2c2c2}input[type="text"]::-webkit-input-placeholder,input[type="password"]::-webkit-input-placeholder,input[type="url"]::-webkit-input-placeholder,input[type="tel"]::-webkit-input-placeholder,input[type="search"]::-webkit-input-placeholder,input[type="number"]::-webkit-input-placeholder,input[type="datetime"]::-webkit-input-placeholder,input[type="email"]::-webkit-input-placeholder{color:#c2c2c2}input[type="text"]:-ms-input-placeholder,input[type="password"]:-ms-input-placeholder,input[type="url"]:-ms-input-placeholder,input[type="tel"]:-ms-input-placeholder,input[type="search"]:-ms-input-placeholder,input[type="number"]:-ms-input-placeholder,input[type="datetime"]:-ms-input-placeholder,input[type="email"]:-ms-input-placeholder{color:#c2c2c2}select{background:#fff;background-clip:padding-box;border:1px solid #c2c2c2;border-radius:1px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:14px;height:32px;line-height:1.428571429;padding:5px 10px 4px;vertical-align:baseline;width:100%;box-sizing:border-box;margin-bottom:20px}select:disabled{opacity:.5}select[multiple="multiple"]{height:auto;margin-bottom:20px}textarea{background:#fff;background-clip:padding-box;border:1px solid #c2c2c2;border-radius:1px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:14px;height:auto;line-height:1.428571429;margin:0;padding:10px;vertical-align:baseline;width:100%;box-sizing:border-box;resize:vertical}textarea:disabled{opacity:.5}textarea::-moz-placeholder{color:#c2c2c2}textarea::-webkit-input-placeholder{color:#c2c2c2}textarea:-ms-input-placeholder{color:#c2c2c2}input[type="checkbox"]{margin:2px 5px 0 0}input[type="checkbox"]:disabled{opacity:.5}input[type="radio"]{margin:2px 5px 0 0}input[type="radio"]:disabled{opacity:.5}input.text-example-1,select.select-example-1,textarea.textarea-example-1{background:#fdf0d5;border-color:#fc0;color:#b30000}input.text-example-1:focus,select.select-example-1:focus,textarea.textarea-example-1:focus{border-color:#cff;color:#060}input.text-example-1:disabled,select.select-example-1:disabled,textarea.textarea-example-1:disabled{color:#fcc}input.text-example-1::-moz-placeholder,textarea.textarea-example-1::-moz-placeholder{color:#ccc}input.text-example-1::-webkit-input-placeholder,textarea.textarea-example-1::-webkit-input-placeholder{color:#ccc}input.text-example-1:-ms-input-placeholder,textarea.textarea-example-1:-ms-input-placeholder{color:#ccc}.number-example{-moz-appearance:textfield}.number-example::-webkit-inner-spin-button,.number-example::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.search-example{-webkit-appearance:none}.search-example::-webkit-search-cancel-button,.search-example::-webkit-search-decoration,.search-example::-webkit-search-results-button,.search-example::-webkit-search-results-decoration{-webkit-appearance:none}input,textarea,select{color:#e02b27;font-size:1.2rem}.example-icon-1{display:inline-block}.example-icon-1:before{background-image:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png');background-position-x:0;background-position-y:0;line-height:26px;vertical-align:middle;height:26px;width:26px;background-repeat:no-repeat;content:'';display:inline-block}.example-icon-2{display:inline-block}.example-icon-2:after{background-image:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png');background-position-x:-26px;background-position-y:0;line-height:26px;vertical-align:middle;height:26px;width:26px;background-repeat:no-repeat;content:'';display:inline-block}.example-icon-3{display:inline-block}.example-icon-3>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-icon-3:before{background-image:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png');background-position-x:-156px;background-position-y:-52px;line-height:26px;vertical-align:middle;height:26px;width:26px;background-repeat:no-repeat;content:'';display:inline-block}.example-icon-4{display:inline-block;text-decoration:none}.example-icon-4:before{-webkit-font-smoothing:antialiased;font-size:24px;line-height:inherit;color:inherit;content:'\e606';font-family:'icons-blank-theme';vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-icon-5{display:inline-block;text-decoration:none}.example-icon-5:after{-webkit-font-smoothing:antialiased;font-size:24px;line-height:inherit;color:inherit;content:'\e605';font-family:'icons-blank-theme';vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-icon-6{display:inline-block;text-decoration:none}.example-icon-6>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-icon-6:before{-webkit-font-smoothing:antialiased;font-size:24px;line-height:inherit;color:inherit;content:'\e61b';font-family:'icons-blank-theme';vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-icon-7{display:inline-block}.example-icon-7:before{background-image:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png');background-position-x:0;background-position-y:0;line-height:26px;vertical-align:middle;height:26px;width:26px;background-repeat:no-repeat;content:'';display:inline-block}.example-icon-8{display:inline-block}.example-icon-8:before{background-image:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png');background-position-x:0;background-position-y:0;line-height:26px;vertical-align:middle;height:26px;width:26px;background-repeat:no-repeat;content:'';display:inline-block}.example-icon-8:before{background-position:-182px 0}.example-icon-9{display:inline-block}.example-icon-9:after{background-image:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png');background-position-x:0;background-position-y:0;line-height:26px;vertical-align:middle;height:26px;width:26px;background-repeat:no-repeat;content:'';display:inline-block}.example-icon-9:after{background-position:-52px -26px}.example-icon-10{display:inline-block}.example-icon-10:before{background-image:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png');background-position-x:0;background-position-y:0;line-height:26px;vertical-align:middle;height:26px;width:26px;background-repeat:no-repeat;content:'';display:inline-block}.example-icon-10:before{background-position:-104px 0}.example-icon-11{display:inline-block}.example-icon-11:before{background-image:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png');background-position-x:0;background-position-y:0;line-height:26px;vertical-align:middle;height:26px;width:26px;background-repeat:no-repeat;content:'';display:inline-block}.example-icon-11:before{height:30px;width:30px}.example-icon-11:after{height:30px;width:30px}.example-icon-11:before{background-color:#f1f1f1}.example-icon-12{display:inline-block;text-decoration:none}.example-icon-12:before{-webkit-font-smoothing:antialiased;font-size:28px;line-height:inherit;color:inherit;content:'\e612';font-family:'icons-blank-theme';vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-icon-13{display:inline-block;text-decoration:none}.example-icon-13:before{-webkit-font-smoothing:antialiased;font-size:inherit;line-height:inherit;color:inherit;content:'\e612';font-family:'icons-blank-theme';vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-icon-13:before{font-size:26px;line-height:inherit}.example-icon-14{display:inline-block;text-decoration:none}.example-icon-14:before{-webkit-font-smoothing:antialiased;font-size:26px;line-height:inherit;color:inherit;content:'\e61d';font-family:'icons-blank-theme';vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-icon-14>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.icons-image-list{list-style:none;padding:0}.icons-image-list li{float:left;width:33%}.icons-image-list li>span{display:inline-block}.icons-image-list li>span:before{background-image:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png');background-position-x:0;background-position-y:0;line-height:26px;vertical-align:middle;height:26px;width:26px;background-repeat:no-repeat;content:'';display:inline-block}.icons-image-list li .icon-search:before{background-position:0 0}.icons-image-list li .icon-cart:before{background-position:-26px 0}.icons-image-list li .icon-arrow-down:before{background-position:-52px 0}.icons-image-list li .icon-arrow-up:before{background-position:-78px 0}.icons-image-list li .icon-grid:before{background-position:-104px 0}.icons-image-list li .icon-list:before{background-position:-130px 0}.icons-image-list li .icon-remove:before{background-position:-156px 0}.icons-image-list li .icon-star:before{background-position:-182px 0}.icons-image-list li .icon-pointer-down:before{background-position:-208px 0}.icons-image-list li .icon-pointer-up:before{background-position:-234px 0}.icons-image-list li .icon-pointer-left:before{background-position:-260px 0}.icons-image-list li .icon-pointer-right:before{background-position:-286px 0}.icons-image-list li .icon-compare-empty:before{background-position:0 -26px}.icons-image-list li .icon-compare-full:before{background-position:-26px -26px}.icons-image-list li .icon-wishlist-empty:before{background-position:-52px -26px}.icons-image-list li .icon-wishlist-full:before{background-position:-78px -26px}.icons-image-list li .icon-update:before{background-position:-104px -26px}.icons-image-list li .icon-collapse:before{background-position:-130px -26px}.icons-image-list li .icon-expand:before{background-position:-156px -26px}.icons-image-list li .icon-menu:before{background-position:-182px -26px}.icons-image-list li .icon-prev:before{background-position:-208px -26px}.icons-image-list li .icon-next:before{background-position:-234px -26px}.icons-image-list li .icon-settings:before{background-position:-260px -26px}.icons-image-list li .icon-info:before{background-position:-286px -26px}.icons-image-list li .icon-checkmark:before{background-position:0 -52px}.icons-image-list li .icon-calendar:before{background-position:-26px -52px}.icons-image-list li .icon-comment:before{background-position:-52px -52px}.icons-image-list li .icon-comment-reflected:before{background-position:-78px -52px}.icons-image-list li .icon-envelope:before{background-position:-104px -52px}.icons-image-list li .icon-warning:before{background-position:-130px -52px}.icons-image-list li .icon-trash:before{background-position:-156px -52px}.icons-image-list li .icon-flag:before{background-position:-182px -52px}.icons-image-list li .icon-location:before{background-position:-208px -52px}.icons-image-list li .icon-up:before{background-position:-234px -52px}.icons-image-list li .icon-down:before{background-position:-260px -52px}.icons-font-list{list-style:none;padding:0}.icons-font-list li{float:left;width:25%;margin-bottom:35px;text-align:center}.icons-font-list li>span{display:inline-block;text-decoration:none}.icons-font-list li>span:before{-webkit-font-smoothing:antialiased;font-size:34px;line-height:inherit;color:inherit;font-family:'icons-blank-theme';vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.icons-font-list li>span:before{content:attr(data-icon);margin:0 auto;display:block}.loader{background-color:rgba(255,255,255,.5);z-index:9999;bottom:0;left:0;position:fixed;right:0;top:0}.loader:before{background:transparent url('/pub/static/frontend/Magento/blank/en_US/images/loader-2.gif') no-repeat 50% 50%;border-radius:5px;height:160px;width:160px;bottom:0;box-sizing:border-box;content:'';left:0;margin:auto;position:absolute;right:0;top:0}.loading{position:relative}.loading:before{background:rgba(255,255,255,.5) url('/pub/static/frontend/Magento/blank/en_US/images/loader-2.gif') no-repeat 50% 50%;bottom:0;content:'';left:0;position:absolute;right:0;top:0}.example-message-info{margin:0 0 10px;padding:10px 20px;display:block;line-height:1.2em;font-size:1.3rem;background:#fdf0d5;color:#6f4400}.example-message-info a{color:#1979c3}.example-message-info a:hover{color:#006bb4}.example-message-info a:active{color:#006bb4}.example-message-warning{margin:0 0 10px;padding:10px 20px;display:block;line-height:1.2em;font-size:1.3rem;background:#fdf0d5;color:#6f4400}.example-message-warning a{color:#1979c3}.example-message-warning a:hover{color:#006bb4}.example-message-warning a:active{color:#006bb4}.example-message-error{margin:0 0 10px;padding:10px 20px;display:block;line-height:1.2em;font-size:1.3rem;background:#fae5e5;color:#e02b27}.example-message-error a{color:#1979c3}.example-message-error a:hover{color:#006bb4}.example-message-error a:active{color:#006bb4}.example-message-success{margin:0 0 10px;padding:10px 20px;display:block;line-height:1.2em;font-size:1.3rem;background:#e5efe5;color:#006400}.example-message-success a{color:#1979c3}.example-message-success a:hover{color:#006bb4}.example-message-success a:active{color:#006bb4}.example-message-notice{margin:0 0 10px;padding:10px 20px;display:block;line-height:1.2em;font-size:1.3rem;background:#fdf0d5;color:#6f4400}.example-message-notice a{color:#1979c3}.example-message-notice a:hover{color:#006bb4}.example-message-notice a:active{color:#006bb4}.example-message-1{margin:0 0 10px;padding:10px 20px;display:block;line-height:1.2em;font-size:1.3rem;background:#fdf0d5;color:#6f4400;padding-left:40px;position:relative}.example-message-1 a{color:#1979c3}.example-message-1 a:hover{color:#006bb4}.example-message-1 a:active{color:#006bb4}.example-message-1>:first-child:before{-webkit-font-smoothing:antialiased;font-size:28px;line-height:28px;color:#c07600;content:'\e602';font-family:'icons-blank-theme';margin:-14px 0 0;vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;left:0;top:18px;width:40px;position:absolute;text-align:center}.example-message-2{margin:0 0 10px;padding:10px 20px;display:block;line-height:1.2em;font-size:1.3rem;background:#fae5e5;color:#e02b27;position:relative;padding-right:40px}.example-message-2 a{color:#1979c3}.example-message-2 a:hover{color:#006bb4}.example-message-2 a:active{color:#006bb4}.example-message-2:before{background:#b30000;width:30px;content:'';display:block;height:100%;padding:0;position:absolute;text-align:center;top:0}.example-message-2>:first-child:before{margin-top:-5px;content:'';overflow:hidden;position:absolute;top:50%}.example-message-2>:first-child:after{-webkit-font-smoothing:antialiased;font-size:28px;line-height:28px;color:#fff;content:'\e602';font-family:'icons-blank-theme';margin:-14px 0 0;vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;left:0;top:18px;width:30px;position:absolute;text-align:center}.example-message-2:before{right:0}.example-message-2>:first-child:before{border:5px solid transparent;height:0;width:0;border-right-color:#b30000;right:30px}.example-message-2>:first-child:after{right:0}.example-message-3{margin:0 0 10px;padding:10px 20px;display:block;line-height:1.2em;font-size:1.3rem;background:#e5efe5;color:#006400;position:relative;padding-left:40px}.example-message-3 a{color:#1979c3}.example-message-3 a:hover{color:#006bb4}.example-message-3 a:active{color:#006bb4}.example-message-3:before{background:#006400;width:30px;content:'';display:block;height:100%;padding:0;position:absolute;text-align:center;top:0}.example-message-3>:first-child:before{margin-top:-5px;content:'';overflow:hidden;position:absolute;top:50%}.example-message-3>:first-child:after{-webkit-font-smoothing:antialiased;font-size:28px;line-height:28px;color:#fff;content:'\e610';font-family:'icons-blank-theme';margin:-14px 0 0;vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;left:0;top:18px;width:30px;position:absolute;text-align:center}.example-message-3:before{left:0}.example-message-3>:first-child:before{border:5px solid transparent;height:0;width:0;border-left-color:#006400;left:30px}.example-message-3>:first-child:after{left:0}.example-message-4{margin:0 0 10px;padding:10px 20px;display:block;line-height:1.2em;font-size:1.3rem;background:#fc0;border-color:#ffa500;color:#000;position:relative;padding-left:40px;border-width:4px;border-radius:10px}.example-message-4 a{color:#00f}.example-message-4 a:hover{color:#009}.example-message-4 a:active{color:#006}.example-message-4:before{background:#green;width:30px;content:'';display:block;height:100%;padding:0;position:absolute;text-align:center;top:0}.example-message-4>:first-child:before{margin-top:-5px;content:'';overflow:hidden;position:absolute;top:50%}.example-message-4>:first-child:after{-webkit-font-smoothing:antialiased;font-size:28px;line-height:28px;color:#000;content:'\e606';font-family:'icons-blank-theme';margin:-14px 0 0;vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;left:0;top:15px;width:30px;position:absolute;text-align:center}.example-message-4:before{left:0}.example-message-4>:first-child:before{border:5px solid transparent;height:0;width:0;border-left-color:#green;left:30px}.example-message-4>:first-child:after{left:0}header.header{background-color:rgba(255,0,0,.2)}.column.main{background-color:rgba(255,255,0,.2)}.column.left{background-color:rgba(0,255,255,.2)}.column.right{background-color:rgba(0,0,255,.2)}footer.footer{background-color:rgba(0,0,0,.2)}.columns{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;box-sizing:border-box}.columns:after{clear:both;content:' ';display:block;height:0;overflow:hidden;visibility:hidden}.columns>.column{padding-bottom:40px}@media (min-width: 600px){.page-layout-1column .column.main{ width:100%;-ms-flex-order:2;-webkit-order:2;order:2}.page-layout-3columns .column.main{width:66.66666667%;display:inline-block;-ms-flex-order:2;-webkit-order:2;order:2}.page-layout-2columns-left .column.main{width:83.33333333%;float:right;-ms-flex-order:2;-webkit-order:2;order:2}.page-layout-2columns-right .column.main{width:83.33333333%;float:left;-ms-flex-order:1;-webkit-order:1;order:1}.page-layout-3columns .column.left{width:16.66666667%;float:left;-ms-flex-order:1;-webkit-order:1;order:1}.page-layout-2columns-left .column.left{width:16.66666667%;float:left;-ms-flex-order:1;-webkit-order:1;order:1}.page-layout-2columns-right .column.left{width:16.66666667%;float:left;-ms-flex-order:1;-webkit-order:1;order:1}.page-layout-3columns .column.right{width:16.66666667%;float:right;-ms-flex-order:3;-webkit-order:3;order:3}.page-layout-2columns-left .column.right{width:16.66666667%;float:right;-ms-flex-order:2;-webkit-order:2;order:2}.page-layout-2columns-right .column.right{width:16.66666667%;float:right;-ms-flex-order:2;-webkit-order:2;order:2}}.layout-example-3 .column.main{width:60%;display:inline-block;-ms-flex-order:2;-webkit-order:2;order:2}.layout-example-3 .column.left{width:20%;float:left;-ms-flex-order:1;-webkit-order:1;order:1}.layout-example-3 .column.right{width:20%;float:right;-ms-flex-order:3;-webkit-order:3;order:3}.layout-example-3-1 .column.main{width:60%;float:left;-ms-flex-order:1;-webkit-order:1;order:1}.layout-example-3-1 .column.left{width:20%;display:inline-block;-ms-flex-order:2;-webkit-order:2;order:2}.layout-example-3-1 .column.right{width:20%;float:right;-ms-flex-order:3;-webkit-order:3;order:3}.pages>.label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.pages .items{font-size:0;letter-spacing:-1px;line-height:0;white-space:nowrap;margin:0;padding:0;list-style:none none;display:inline-block;font-weight:700}.pages .item{font-size:1.2rem;font-size:12px;letter-spacing:normal;line-height:32px;margin:0 2px 0 0;display:inline-block}.pages .item .label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.pages a.page{color:#1979c3;display:inline-block;padding:0 4px;text-decoration:none}.pages a.page:visited{color:#1979c3}.pages a.page:hover{color:#006bb4;text-decoration:none}.pages a.page:active{color:#ff5501}.pages strong.page{font-size:1.2rem;font-size:12px;letter-spacing:normal;line-height:32px;color:#333;display:inline-block;font-weight:700;padding:0 4px}.pages .action{border:1px solid #d1d1d1;color:#7d7d7d;display:inline-block;padding:0;text-decoration:none}.pages .action:visited{color:#7d7d7d}.pages .action:hover{color:#7d7d7d;text-decoration:none}.pages .action:active{color:#7d7d7d}.pages .action.next{display:inline-block;text-decoration:none}.pages .action.next:visited:before{color:#7d7d7d}.pages .action.next:active:before{color:#7d7d7d}.pages .action.next>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.pages .action.next:before{-webkit-font-smoothing:antialiased;font-size:46px;line-height:inherit;color:#7d7d7d;content:'\e608';font-family:'icons-blank-theme';margin:0 0 0 -6px;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.pages .action.next:hover:before{color:#7d7d7d}.pages .action.next:active:before{color:#7d7d7d}.pages .action.previous{display:inline-block;text-decoration:none}.pages .action.previous:visited:before{color:#7d7d7d}.pages .action.previous:active:before{color:#7d7d7d}.pages .action.previous>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.pages .action.previous:before{-webkit-font-smoothing:antialiased;font-size:46px;line-height:inherit;color:#7d7d7d;content:'\e617';font-family:'icons-blank-theme';margin:0 0 0 -6px;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.pages .action.previous:hover:before{color:#7d7d7d}.pages .action.previous:active:before{color:#7d7d7d}.example-pages-1>.label{display:inline-block;font-weight:700;font-size:1.2rem;font-size:12px;letter-spacing:normal;line-height:32px}.example-pages-1>.label:after{content:':'}.example-pages-1 .items{font-size:0;letter-spacing:-1px;line-height:0;white-space:nowrap;margin:0;padding:0;list-style:none none;display:inline-block;font-weight:700}.example-pages-1 .item{font-size:1.2rem;font-size:12px;letter-spacing:normal;line-height:32px;margin:0 3px;display:inline-block}.example-pages-1 .item .label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-1 a.page{background-color:#ccc;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #f4f4f4 0, #ccc 100%);background-image:linear-gradient(to bottom, #f4f4f4 0, #ccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f4f4', endColorstr='#cccccc', GradientType=0);border:1px solid #b3b3b3;color:#333;display:inline-block;padding:0 4px;text-decoration:none}.example-pages-1 a.page:visited{background-color:false;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top,false 0,false 100%);background-image:linear-gradient(to bottom,false 0,false 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='false', endColorstr='false', GradientType=0);color:#1979c3}.example-pages-1 a.page:hover{background-color:#f4f4f4;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #ccc 0, #f4f4f4 100%);background-image:linear-gradient(to bottom, #ccc 0, #f4f4f4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#f4f4f4', GradientType=0);border:1px solid #999;color:#333;text-decoration:none}.example-pages-1 a.page:active{background-color:false;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top,false 0,false 100%);background-image:linear-gradient(to bottom,false 0,false 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='false', endColorstr='false', GradientType=0);color:#ff5501}.example-pages-1 strong.page{background:#1979c3;border:1px solid #135d96;font-size:1.2rem;font-size:12px;letter-spacing:normal;line-height:32px;color:#f7b32e;display:inline-block;font-weight:700;padding:0 4px}.example-pages-1 .action{border:1px solid #d1d1d1;color:#7d7d7d;display:inline-block;padding:0;text-decoration:none}.example-pages-1 .action:visited{color:#7d7d7d}.example-pages-1 .action:hover{color:#ff5501;text-decoration:none}.example-pages-1 .action:active{color:#7d7d7d}.example-pages-1 .action.next{display:inline-block;text-decoration:none}.example-pages-1 .action.next:visited:before{color:#7d7d7d}.example-pages-1 .action.next:active:before{color:#7d7d7d}.example-pages-1 .action.next>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-1 .action.next:before{-webkit-font-smoothing:antialiased;font-size:30px;line-height:inherit;color:#7d7d7d;content:'\e608';font-family:'icons-blank-theme';margin:0 0 0 -6px;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-pages-1 .action.next:hover:before{color:#ff5501}.example-pages-1 .action.next:active:before{color:#7d7d7d}.example-pages-1 .action.previous{display:inline-block;text-decoration:none}.example-pages-1 .action.previous:visited:before{color:#7d7d7d}.example-pages-1 .action.previous:active:before{color:#7d7d7d}.example-pages-1 .action.previous>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-1 .action.previous:before{-webkit-font-smoothing:antialiased;font-size:30px;line-height:inherit;color:#7d7d7d;content:'\e617';font-family:'icons-blank-theme';margin:0 0 0 -6px;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-pages-1 .action.previous:hover:before{color:#ff5501}.example-pages-1 .action.previous:active:before{color:#7d7d7d}.example-pages-2>.label{display:inline-block;font-weight:700;font-size:1.2rem;font-size:12px;letter-spacing:normal;line-height:32px}.example-pages-2>.label:after{content:':'}.example-pages-2 .items{font-size:0;letter-spacing:-1px;line-height:0;white-space:nowrap;margin:0;padding:0;list-style:none none;display:inline-block;font-weight:700}.example-pages-2 .item{font-size:1.2rem;font-size:12px;letter-spacing:normal;line-height:32px;margin:0 2px 0 0;display:inline-block}.example-pages-2 .item .label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-2 a.page{color:#1979c3;display:inline-block;padding:0 4px;text-decoration:none}.example-pages-2 a.page:visited{color:#1979c3}.example-pages-2 a.page:hover{color:#006bb4;text-decoration:none}.example-pages-2 a.page:active{color:#ff5501}.example-pages-2 strong.page{font-size:1.2rem;font-size:12px;letter-spacing:normal;line-height:32px;color:#333;display:inline-block;font-weight:700;padding:0 4px}.example-pages-2 .action{border:1px solid #d1d1d1;color:#7d7d7d;display:inline-block;padding:0;text-decoration:none}.example-pages-2 .action:visited{color:#7d7d7d}.example-pages-2 .action:hover{color:#7d7d7d;text-decoration:none}.example-pages-2 .action:active{color:#7d7d7d}.example-pages-3>.label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-3 .items{font-size:0;letter-spacing:-1px;line-height:0;white-space:nowrap;margin:0;padding:0;list-style:none none;display:inline-block;font-weight:700}.example-pages-3 .item{font-size:1.2rem;font-size:12px;letter-spacing:normal;line-height:32px;margin:0 2px 0 0;display:inline-block}.example-pages-3 .item .label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-3 a.page{background:#1979c3;color:#fff;display:inline-block;padding:0 4px;text-decoration:none}.example-pages-3 a.page:visited{background:#1979c3;color:#fff}.example-pages-3 a.page:hover{background:#006bb4;color:#fff;text-decoration:none}.example-pages-3 a.page:active{background:#ff5501;color:#fff}.example-pages-3 strong.page{background:#1979c3;font-size:1.2rem;font-size:12px;letter-spacing:normal;line-height:32px;color:#fff;display:inline-block;font-weight:700;padding:0 4px}.example-pages-3 .action{background:#1979c3;border:1px solid #d1d1d1;color:#fff;display:inline-block;padding:0;text-decoration:none}.example-pages-3 .action:visited{background:#1979c3;color:#7d7d7d}.example-pages-3 .action:hover{background:#006bb4;color:#fff;text-decoration:none}.example-pages-3 .action:active{background:#ff5501;color:#fff}.example-pages-3 .action.next{display:inline-block;text-decoration:none}.example-pages-3 .action.next:visited:before{color:#7d7d7d}.example-pages-3 .action.next:active:before{color:#fff}.example-pages-3 .action.next>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-3 .action.next:before{-webkit-font-smoothing:antialiased;font-size:46px;line-height:inherit;color:#fff;content:'\e608';font-family:'icons-blank-theme';margin:0 0 0 -6px;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-pages-3 .action.next:hover:before{color:#fff}.example-pages-3 .action.next:active:before{color:#fff}.example-pages-3 .action.previous{display:inline-block;text-decoration:none}.example-pages-3 .action.previous:visited:before{color:#7d7d7d}.example-pages-3 .action.previous:active:before{color:#fff}.example-pages-3 .action.previous>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-3 .action.previous:before{-webkit-font-smoothing:antialiased;font-size:46px;line-height:inherit;color:#fff;content:'\e617';font-family:'icons-blank-theme';margin:0 0 0 -6px;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.example-pages-3 .action.previous:hover:before{color:#fff}.example-pages-3 .action.previous:active:before{color:#fff}.window.popup.popup-example{background:#fff;border:1px solid #aeaeae;padding:22px;width:100%;box-shadow:0 3px 3px rgba(0,0,0,.15);transition:opacity .3s linear;bottom:0;left:0;position:fixed;right:0;top:0;z-index:1001;display:none;opacity:0}.window.popup.popup-example .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example .popup-header .title{font-weight:300;line-height:1.1;font-size:1.8rem;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;-moz-box-sizing:content-box;border:0;box-shadow:none;line-height:inherit;margin:0;padding:0;text-decoration:none;text-shadow:none;font-weight:400;right:10px;top:10px}.window.popup.popup-example .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example .popup-actions .action.close:before{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e616';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.window.popup.popup-example .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example .popup-actions .action.close:focus,.window.popup.popup-example .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example .popup-actions .action.close.disabled,.window.popup.popup-example .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example.active{opacity:1}.window.popup.popup-example-1{background:#fff;border:1px solid #aeaeae;padding:22px;width:100%;box-shadow:0 3px 3px rgba(0,0,0,.15);transition:opacity .3s linear;bottom:0;left:0;position:fixed;right:0;top:0;z-index:1001;display:none;opacity:0}.window.popup.popup-example-1 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-1 .popup-header .title{font-weight:300;line-height:1.1;font-size:1.8rem;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-1 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;-moz-box-sizing:content-box;border:0;box-shadow:none;line-height:inherit;margin:0;padding:0;text-decoration:none;text-shadow:none;font-weight:400;right:10px;top:10px}.window.popup.popup-example-1 .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example-1 .popup-actions .action.close:before{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e616';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.window.popup.popup-example-1 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-1 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-1 .popup-actions .action.close:focus,.window.popup.popup-example-1 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-1 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-1 .popup-actions .action.close.disabled,.window.popup.popup-example-1 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-1 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-1.active{opacity:1}.window.overlay{transition:opacity .15s linear;background:#000;z-index:899;bottom:0;left:0;opacity:0;position:fixed;right:0;top:0}.window.overlay.active{opacity:.5;filter:alpha(opacity=50)}.window.popup.popup-example-2{background:#fff;border:1px solid #aeaeae;padding:22px;width:100%;overflow-y:auto;max-height:200px;box-shadow:0 3px 3px rgba(0,0,0,.15);transition:opacity .3s linear;bottom:0;left:0;position:fixed;right:0;top:0;z-index:1001;display:none;opacity:0}.window.popup.popup-example-2 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-2 .popup-header .title{font-weight:300;line-height:1.1;font-size:1.8rem;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-2 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;-moz-box-sizing:content-box;border:0;box-shadow:none;line-height:inherit;margin:0;padding:0;text-decoration:none;text-shadow:none;font-weight:400;right:10px;top:10px}.window.popup.popup-example-2 .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example-2 .popup-actions .action.close:before{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e616';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.window.popup.popup-example-2 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-2 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-2 .popup-actions .action.close:focus,.window.popup.popup-example-2 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-2 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-2 .popup-actions .action.close.disabled,.window.popup.popup-example-2 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-2 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-2.active{opacity:1}.window.popup.popup-example-3{background:#fff;border:1px solid #aeaeae;padding:22px;width:100%;box-shadow:0 3px 3px rgba(0,0,0,.15);transition:opacity .3s linear;bottom:0;left:0;position:fixed;right:0;top:0;z-index:1001;display:none;opacity:0}.window.popup.popup-example-3 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-3 .popup-header .title{font-weight:300;line-height:1.1;font-size:1.8rem;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-3 .popup-content{overflow-y:auto;max-height:200px}.window.popup.popup-example-3 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;-moz-box-sizing:content-box;border:0;box-shadow:none;line-height:inherit;margin:0;padding:0;text-decoration:none;text-shadow:none;font-weight:400;right:10px;top:10px}.window.popup.popup-example-3 .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example-3 .popup-actions .action.close:before{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e616';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.window.popup.popup-example-3 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-3 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-3 .popup-actions .action.close:focus,.window.popup.popup-example-3 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-3 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-3 .popup-actions .action.close.disabled,.window.popup.popup-example-3 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-3 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-3.active{opacity:1}.window.popup.popup-example-4{background:#fff;border:1px solid #aeaeae;padding:22px;width:100%;box-shadow:0 3px 3px rgba(0,0,0,.15);transition:opacity .3s linear;bottom:0;left:0;position:fixed;right:0;top:0;z-index:1001;display:none;opacity:0}.window.popup.popup-example-4 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-4 .popup-header .title{font-weight:300;line-height:1.1;font-size:1.8rem;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-4 .popup-content{margin:0 0 20px}.window.popup.popup-example-4 .popup-footer{margin:0 20px}.window.popup.popup-example-4 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;-moz-box-sizing:content-box;border:0;box-shadow:none;line-height:inherit;margin:0;padding:0;text-decoration:none;text-shadow:none;font-weight:400;right:10px;top:10px}.window.popup.popup-example-4 .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example-4 .popup-actions .action.close:before{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e616';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.window.popup.popup-example-4 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-4 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-4 .popup-actions .action.close:focus,.window.popup.popup-example-4 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-4 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-4 .popup-actions .action.close.disabled,.window.popup.popup-example-4 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-4 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-4.active{opacity:1}.window.popup.popup-example-5{background:#fff;border:1px solid #aeaeae;padding:22px;width:100%;box-shadow:0 3px 3px rgba(0,0,0,.15);transition:opacity .3s linear;bottom:0;left:0;position:fixed;right:0;top:0;z-index:1001;display:none;opacity:0}.window.popup.popup-example-5 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-5 .popup-header .title{font-weight:300;line-height:1.1;font-size:2.6rem;margin-top:0rem;margin-bottom:2rem}.window.popup.popup-example-5 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;-moz-box-sizing:content-box;border:0;box-shadow:none;line-height:inherit;margin:0;padding:0;text-decoration:none;text-shadow:none;font-weight:400;right:10px;top:10px}.window.popup.popup-example-5 .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example-5 .popup-actions .action.close:before{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e616';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.window.popup.popup-example-5 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-5 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-5 .popup-actions .action.close:focus,.window.popup.popup-example-5 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-5 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-5 .popup-actions .action.close.disabled,.window.popup.popup-example-5 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-5 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-5.active{opacity:1}.window.popup.popup-example-6{background:#fff;border:1px solid #aeaeae;padding:22px;width:100%;box-shadow:0 3px 3px rgba(0,0,0,.15);transition:opacity .3s linear;bottom:0;left:0;position:fixed;right:0;top:0;z-index:1001;display:none;opacity:0}.window.popup.popup-example-6 .popup-footer .actions.toolbar{text-align:left}.window.popup.popup-example-6 .popup-footer .actions.toolbar:before,.window.popup.popup-example-6 .popup-footer .actions.toolbar:after{content:'';display:table}.window.popup.popup-example-6 .popup-footer .actions.toolbar:after{clear:both}.window.popup.popup-example-6 .popup-footer .actions.toolbar .secondary{float:left}.window.popup.popup-example-6 .popup-footer .actions.toolbar .primary,.window.popup.popup-example-6 .popup-footer .actions.toolbar .secondary{display:inline-block}.window.popup.popup-example-6 .popup-footer .actions.toolbar .primary a.action,.window.popup.popup-example-6 .popup-footer .actions.toolbar .secondary a.action{display:inline-block}.window.popup.popup-example-6 .popup-footer .actions.toolbar .primary .action{margin:0 5px 0 0}.window.popup.popup-example-6 .popup-footer .actions.toolbar .secondary a.action{margin-top:6px}.window.popup.popup-example-6 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-6 .popup-header .title{font-weight:300;line-height:1.1;font-size:1.8rem;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-6 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;-moz-box-sizing:content-box;border:0;box-shadow:none;line-height:inherit;margin:0;padding:0;text-decoration:none;text-shadow:none;font-weight:400;right:10px;top:10px}.window.popup.popup-example-6 .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example-6 .popup-actions .action.close:before{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e616';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.window.popup.popup-example-6 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-6 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-6 .popup-actions .action.close:focus,.window.popup.popup-example-6 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-6 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-6 .popup-actions .action.close.disabled,.window.popup.popup-example-6 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-6 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-6.active{opacity:1}.window.popup.popup-example-7{background:#fff;border:1px solid #aeaeae;padding:22px;width:100%;box-shadow:0 3px 3px rgba(0,0,0,.15);transition:opacity .3s linear;bottom:0;left:0;position:fixed;right:0;top:0;z-index:1001;display:none;opacity:0}.window.popup.popup-example-7 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-7 .popup-header .title{font-weight:300;line-height:1.1;font-size:1.8rem;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-7 .popup-actions .action.close{position:absolute;right:10px;top:10px}.window.popup.popup-example-7.active{opacity:1}.window.popup.popup-example-8{background:#fff;border:1px solid #aeaeae;padding:22px;width:100%;box-shadow:0 3px 3px rgba(0,0,0,.15);transition:opacity .3s linear;bottom:0;left:0;position:fixed;right:0;top:0;z-index:1001;display:none;opacity:0}.window.popup.popup-example-8 .popup-header{margin:0 0 25px;padding-right:30px}.window.popup.popup-example-8 .popup-header .title{font-weight:300;line-height:1.1;font-size:1.8rem;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-8 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;-moz-box-sizing:content-box;border:0;box-shadow:none;line-height:inherit;margin:0;padding:0;text-decoration:none;text-shadow:none;font-weight:400;right:10px;top:10px}.window.popup.popup-example-8 .popup-actions .action.close:before{-webkit-font-smoothing:antialiased;font-size:30px;line-height:22px;color:red;content:'\e613';font-family:'icons-blank-theme';margin:0;vertical-align:middle;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.window.popup.popup-example-8 .popup-actions .action.close:hover:before{color:#090}.window.popup.popup-example-8 .popup-actions .action.close:active:before{color:#00f}.window.popup.popup-example-8 .popup-actions .action.close:focus,.window.popup.popup-example-8 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-8 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-8 .popup-actions .action.close.disabled,.window.popup.popup-example-8 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-8 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-8.active{opacity:1}.window.popup.popup-example-9{background:#fff;border:1px solid #aeaeae;padding:22px;width:100%;box-shadow:0 3px 3px rgba(0,0,0,.15);transition:opacity .3s linear;bottom:0;left:0;position:fixed;right:0;top:0;z-index:1001;display:none;opacity:0}.window.popup.popup-example-9 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-9 .popup-header .title{font-weight:300;line-height:1.1;font-size:1.8rem;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-9 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;-moz-box-sizing:content-box;border:0;box-shadow:none;line-height:inherit;margin:0;padding:0;text-decoration:none;text-shadow:none;font-weight:400;right:10px;top:10px}.window.popup.popup-example-9 .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example-9 .popup-actions .action.close:before{-webkit-font-smoothing:antialiased;font-size:22px;line-height:22px;color:inherit;content:'\e616';font-family:'icons-blank-theme';margin:0;vertical-align:top;display:inline-block;font-weight:400;overflow:hidden;speak:none;text-align:center}.window.popup.popup-example-9 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-9 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-9 .popup-actions .action.close:focus,.window.popup.popup-example-9 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-9 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-9 .popup-actions .action.close.disabled,.window.popup.popup-example-9 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-9.active{opacity:1}.window.overlay.example-overlay-1.active{transition:opacity .15s linear;background:#0f5293;z-index:899;bottom:0;left:0;opacity:0;position:fixed;right:0;top:0}.window.overlay.example-overlay-1.active.active{opacity:.8;filter:alpha(opacity=80)}.example-ratings-1{overflow:hidden}.example-ratings-1:before{color:#c7c7c7;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;font-style:normal;font-weight:400;speak:none;vertical-align:top;-webkit-font-smoothing:antialiased;content:'\e605' '\e605' '\e605' '\e605' '\e605';display:block;position:absolute;z-index:1}.example-ratings-1 input[type="radio"]{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-1 input[type="radio"]:focus+label:before,.example-ratings-1 input[type="radio"]:checked+label:before{opacity:1}.example-ratings-1 label{cursor:pointer;display:block;position:absolute}.example-ratings-1 label span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-1 label:before{color:#ff5501;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;font-style:normal;font-weight:400;speak:none;vertical-align:top;-webkit-font-smoothing:antialiased;opacity:0}.example-ratings-1 label:hover:before{opacity:1}.example-ratings-1 label:hover~label:before{opacity:0}.example-ratings-1 .rating-5{z-index:2}.example-ratings-1 .rating-5:before{content:'\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-1 .rating-4{z-index:3}.example-ratings-1 .rating-4:before{content:'\e605' '\e605' '\e605' '\e605'}.example-ratings-1 .rating-3{z-index:4}.example-ratings-1 .rating-3:before{content:'\e605' '\e605' '\e605'}.example-ratings-1 .rating-2{z-index:5}.example-ratings-1 .rating-2:before{content:'\e605' '\e605'}.example-ratings-1 .rating-1{z-index:6}.example-ratings-1 .rating-1:before{content:'\e605'}.example-ratings-2{overflow:hidden}.example-ratings-2:before{color:#c7c7c7;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;font-style:normal;font-weight:400;speak:none;vertical-align:top;-webkit-font-smoothing:antialiased;content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605';display:block;position:absolute;z-index:1}.example-ratings-2 input[type="radio"]{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-2 input[type="radio"]:focus+label:before,.example-ratings-2 input[type="radio"]:checked+label:before{opacity:1}.example-ratings-2 label{cursor:pointer;display:block;position:absolute}.example-ratings-2 label span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-2 label:before{color:#ff5501;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;font-style:normal;font-weight:400;speak:none;vertical-align:top;-webkit-font-smoothing:antialiased;opacity:0}.example-ratings-2 label:hover:before{opacity:1}.example-ratings-2 label:hover~label:before{opacity:0}.example-ratings-2 .rating-8{z-index:2}.example-ratings-2 .rating-8:before{content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-7{z-index:3}.example-ratings-2 .rating-7:before{content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-6{z-index:4}.example-ratings-2 .rating-6:before{content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-5{z-index:5}.example-ratings-2 .rating-5:before{content:'\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-4{z-index:6}.example-ratings-2 .rating-4:before{content:'\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-3{z-index:7}.example-ratings-2 .rating-3:before{content:'\e605' '\e605' '\e605'}.example-ratings-2 .rating-2{z-index:8}.example-ratings-2 .rating-2:before{content:'\e605' '\e605'}.example-ratings-2 .rating-1{z-index:9}.example-ratings-2 .rating-1:before{content:'\e605'}.example-ratings-3{overflow:hidden}.example-ratings-3:before{color:#aff5e3;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;font-style:normal;font-weight:400;speak:none;vertical-align:top;-webkit-font-smoothing:antialiased;content:'\e605' '\e605' '\e605' '\e605' '\e605';display:block;position:absolute;z-index:1}.example-ratings-3 input[type="radio"]{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-3 input[type="radio"]:focus+label:before,.example-ratings-3 input[type="radio"]:checked+label:before{opacity:1}.example-ratings-3 label{cursor:pointer;display:block;position:absolute}.example-ratings-3 label span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-3 label:before{color:#0a6767;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;font-style:normal;font-weight:400;speak:none;vertical-align:top;-webkit-font-smoothing:antialiased;opacity:0}.example-ratings-3 label:hover:before{opacity:1}.example-ratings-3 label:hover~label:before{opacity:0}.example-ratings-3 .rating-5{z-index:2}.example-ratings-3 .rating-5:before{content:'\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-3 .rating-4{z-index:3}.example-ratings-3 .rating-4:before{content:'\e605' '\e605' '\e605' '\e605'}.example-ratings-3 .rating-3{z-index:4}.example-ratings-3 .rating-3:before{content:'\e605' '\e605' '\e605'}.example-ratings-3 .rating-2{z-index:5}.example-ratings-3 .rating-2:before{content:'\e605' '\e605'}.example-ratings-3 .rating-1{z-index:6}.example-ratings-3 .rating-1:before{content:'\e605'}.example-ratings-4{overflow:hidden}.example-ratings-4:before{color:#c7c7c7;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;font-style:normal;font-weight:400;speak:none;vertical-align:top;-webkit-font-smoothing:antialiased;content:'\e600' '\e600' '\e600' '\e600' '\e600';display:block;position:absolute;z-index:1}.example-ratings-4 input[type="radio"]{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-4 input[type="radio"]:focus+label:before,.example-ratings-4 input[type="radio"]:checked+label:before{opacity:1}.example-ratings-4 label{cursor:pointer;display:block;position:absolute}.example-ratings-4 label span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-4 label:before{color:#ff5501;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;font-style:normal;font-weight:400;speak:none;vertical-align:top;-webkit-font-smoothing:antialiased;opacity:0}.example-ratings-4 label:hover:before{opacity:1}.example-ratings-4 label:hover~label:before{opacity:0}.example-ratings-4 .rating-5{z-index:2}.example-ratings-4 .rating-5:before{content:'\e600' '\e600' '\e600' '\e600' '\e600'}.example-ratings-4 .rating-4{z-index:3}.example-ratings-4 .rating-4:before{content:'\e600' '\e600' '\e600' '\e600'}.example-ratings-4 .rating-3{z-index:4}.example-ratings-4 .rating-3:before{content:'\e600' '\e600' '\e600'}.example-ratings-4 .rating-2{z-index:5}.example-ratings-4 .rating-2:before{content:'\e600' '\e600'}.example-ratings-4 .rating-1{z-index:6}.example-ratings-4 .rating-1:before{content:'\e600'}.exapmle-ratings-5 .control.rating.vote{overflow:hidden}.exapmle-ratings-5 .control.rating.vote:before{color:#c7c7c7;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;font-style:normal;font-weight:400;speak:none;vertical-align:top;-webkit-font-smoothing:antialiased;content:'\e605' '\e605' '\e605' '\e605' '\e605';display:block;position:absolute;z-index:1}.exapmle-ratings-5 .control.rating.vote input[type="radio"]{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.exapmle-ratings-5 .control.rating.vote input[type="radio"]:focus+label:before,.exapmle-ratings-5 .control.rating.vote input[type="radio"]:checked+label:before{opacity:1}.exapmle-ratings-5 .control.rating.vote label{cursor:pointer;display:block;position:absolute}.exapmle-ratings-5 .control.rating.vote label span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.exapmle-ratings-5 .control.rating.vote label:before{color:#ff5501;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;font-style:normal;font-weight:400;speak:none;vertical-align:top;-webkit-font-smoothing:antialiased;opacity:0}.exapmle-ratings-5 .control.rating.vote label:hover:before{opacity:1}.exapmle-ratings-5 .control.rating.vote label:hover~label:before{opacity:0}.exapmle-ratings-5 .control.rating.vote .rating-5{z-index:2}.exapmle-ratings-5 .control.rating.vote .rating-5:before{content:'\e605' '\e605' '\e605' '\e605' '\e605'}.exapmle-ratings-5 .control.rating.vote .rating-4{z-index:3}.exapmle-ratings-5 .control.rating.vote .rating-4:before{content:'\e605' '\e605' '\e605' '\e605'}.exapmle-ratings-5 .control.rating.vote .rating-3{z-index:4}.exapmle-ratings-5 .control.rating.vote .rating-3:before{content:'\e605' '\e605' '\e605'}.exapmle-ratings-5 .control.rating.vote .rating-2{z-index:5}.exapmle-ratings-5 .control.rating.vote .rating-2:before{content:'\e605' '\e605'}.exapmle-ratings-5 .control.rating.vote .rating-1{z-index:6}.exapmle-ratings-5 .control.rating.vote .rating-1:before{content:'\e605'}.example-rating-summary-1{overflow:hidden;white-space:nowrap}.example-rating-summary-1 .rating-result{width:100px;display:inline-block;position:relative;vertical-align:middle}.example-rating-summary-1 .rating-result:before{left:0;position:absolute;top:0;width:100%;z-index:1;-webkit-font-smoothing:antialiased;color:#c7c7c7;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;content:'\e605' '\e605' '\e605' '\e605' '\e605';display:block;font-style:normal;font-weight:400;speak:none}.example-rating-summary-1 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-1 .rating-result>span:before{position:relative;z-index:2;-webkit-font-smoothing:antialiased;color:#ff5501;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;content:'\e605' '\e605' '\e605' '\e605' '\e605';display:block;font-style:normal;font-weight:400;speak:none}.example-rating-summary-1 .rating-result>span span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-2{overflow:hidden;white-space:nowrap}.example-rating-summary-2 .rating-result{width:154px;display:inline-block;position:relative;vertical-align:middle}.example-rating-summary-2 .rating-result:before{left:0;position:absolute;top:0;width:100%;z-index:1;-webkit-font-smoothing:antialiased;color:#c7c7c7;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605';display:block;font-style:normal;font-weight:400;speak:none}.example-rating-summary-2 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-2 .rating-result>span:before{position:relative;z-index:2;-webkit-font-smoothing:antialiased;color:#ff5501;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605';display:block;font-style:normal;font-weight:400;speak:none}.example-rating-summary-2 .rating-result>span span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-3{overflow:hidden;white-space:nowrap}.example-rating-summary-3 .rating-result{width:100px;display:inline-block;position:relative;vertical-align:middle}.example-rating-summary-3 .rating-result:before{left:0;position:absolute;top:0;width:100%;z-index:1;-webkit-font-smoothing:antialiased;color:#aff5e3;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;content:'\e605' '\e605' '\e605' '\e605' '\e605';display:block;font-style:normal;font-weight:400;speak:none}.example-rating-summary-3 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-3 .rating-result>span:before{position:relative;z-index:2;-webkit-font-smoothing:antialiased;color:#0a6767;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;content:'\e605' '\e605' '\e605' '\e605' '\e605';display:block;font-style:normal;font-weight:400;speak:none}.example-rating-summary-3 .rating-result>span span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-4{overflow:hidden;white-space:nowrap}.example-rating-summary-4 .rating-result{width:100px;display:inline-block;position:relative;vertical-align:middle}.example-rating-summary-4 .rating-result:before{left:0;position:absolute;top:0;width:100%;z-index:1;-webkit-font-smoothing:antialiased;color:#c7c7c7;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;content:'\e600' '\e600' '\e600' '\e600' '\e600';display:block;font-style:normal;font-weight:400;speak:none}.example-rating-summary-4 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-4 .rating-result>span:before{position:relative;z-index:2;-webkit-font-smoothing:antialiased;color:#ff5501;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;content:'\e600' '\e600' '\e600' '\e600' '\e600';display:block;font-style:normal;font-weight:400;speak:none}.example-rating-summary-4 .rating-result>span span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-5{overflow:hidden;white-space:nowrap}.example-rating-summary-5 .label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-5 .rating-result{width:100px;display:inline-block;position:relative;vertical-align:middle}.example-rating-summary-5 .rating-result:before{left:0;position:absolute;top:0;width:100%;z-index:1;-webkit-font-smoothing:antialiased;color:#c7c7c7;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;content:'\e605' '\e605' '\e605' '\e605' '\e605';display:block;font-style:normal;font-weight:400;speak:none}.example-rating-summary-5 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-5 .rating-result>span:before{position:relative;z-index:2;-webkit-font-smoothing:antialiased;color:#ff5501;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;content:'\e605' '\e605' '\e605' '\e605' '\e605';display:block;font-style:normal;font-weight:400;speak:none}.example-rating-summary-5 .rating-result>span span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-6 .rating-summary{overflow:hidden;white-space:nowrap}.example-rating-summary-6 .rating-summary .rating-result{width:100px;display:inline-block;position:relative;vertical-align:middle}.example-rating-summary-6 .rating-summary .rating-result:before{left:0;position:absolute;top:0;width:100%;z-index:1;-webkit-font-smoothing:antialiased;color:#c7c7c7;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;content:'\e605' '\e605' '\e605' '\e605' '\e605';display:block;font-style:normal;font-weight:400;speak:none}.example-rating-summary-6 .rating-summary .rating-result>span{display:block;overflow:hidden}.example-rating-summary-6 .rating-summary .rating-result>span:before{position:relative;z-index:2;-webkit-font-smoothing:antialiased;color:#ff5501;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;content:'\e605' '\e605' '\e605' '\e605' '\e605';display:block;font-style:normal;font-weight:400;speak:none}.example-rating-summary-6 .rating-summary .rating-result>span span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-7{overflow:hidden;white-space:nowrap}.example-rating-summary-7 .rating-result{width:100px;display:inline-block;position:relative;vertical-align:middle}.example-rating-summary-7 .rating-result:before{left:0;position:absolute;top:0;width:100%;z-index:1;-webkit-font-smoothing:antialiased;color:#c7c7c7;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;content:'\e605' '\e605' '\e605' '\e605' '\e605';display:block;font-style:normal;font-weight:400;speak:none}.example-rating-summary-7 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-7 .rating-result>span:before{position:relative;z-index:2;-webkit-font-smoothing:antialiased;color:#ff5501;font-family:'icons-blank-theme';font-size:28px;height:28px;letter-spacing:-10px;line-height:28px;content:'\e605' '\e605' '\e605' '\e605' '\e605';display:block;font-style:normal;font-weight:400;speak:none}.example-rating-summary-7 .rating-result>span span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-7 .label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-responsive-block{padding:10px}.example-sections-1{position:relative;z-index:1}.example-sections-1:before,.example-sections-1:after{content:'';display:table}.example-sections-1:after{clear:both}.example-sections-1>.item.title{float:left;width:auto}.example-sections-1>.item.title>.switch{height:20px;display:block;position:relative;z-index:2}.example-sections-1>.item.content{margin-top:20px;box-sizing:border-box;float:right;margin-left:-100%;width:100%}.example-sections-1>.item.content:before,.example-sections-1>.item.content:after{content:'';display:table}.example-sections-1>.item.content:after{clear:both}.example-sections-1>.item.content.active{display:block}.example-sections-1>.item.title{margin:0 5px 0 0}.example-sections-1>.item.title>.switch{font-weight:600;line-height:20px;font-size:1.4rem;color:#7d7d7d;text-decoration:none;background:#f0f0f0;border:1px solid #d1d1d1;border-bottom:0;height:20px;padding:5px 20px 5px 20px}.example-sections-1>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-1>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-1>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-1>.item.title:not(.disabled)>.switch:focus,.example-sections-1>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-1>.item.title:not(.disabled)>.switch:active,.example-sections-1>.item.title.active>.switch,.example-sections-1>.item.title.active>.switch:focus,.example-sections-1>.item.title.active>.switch:hover{background:#fff;color:#333}.example-sections-1>.item.title.active>.switch,.example-sections-1>.item.title.active>.switch:focus,.example-sections-1>.item.title.active>.switch:hover{padding-bottom:6px}.example-sections-1>.item.content{background:#fff;margin-top:31px;padding:20px 20px 20px 20px;border:1px solid #d1d1d1}.example-sections-2{position:relative;z-index:1}.example-sections-2:before,.example-sections-2:after{content:'';display:table}.example-sections-2:after{clear:both}.example-sections-2>.item.title{float:left;width:auto}.example-sections-2>.item.title>.switch{height:20px;display:block;position:relative;z-index:2}.example-sections-2>.item.content{margin-top:20px;box-sizing:border-box;float:right;margin-left:-100%;width:100%}.example-sections-2>.item.content:before,.example-sections-2>.item.content:after{content:'';display:table}.example-sections-2>.item.content:after{clear:both}.example-sections-2>.item.content.active{display:block}.example-sections-2>.item.title{margin:0 5px 0 0}.example-sections-2>.item.title>.switch{font-weight:600;line-height:20px;font-size:1.4rem;color:#7d7d7d;text-decoration:none;background:#f0f0f0;border:1px solid #d1d1d1;border-bottom:0;height:20px;padding:5px 20px 5px 20px}.example-sections-2>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-2>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-2>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-2>.item.title:not(.disabled)>.switch:focus,.example-sections-2>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-2>.item.title:not(.disabled)>.switch:active,.example-sections-2>.item.title.active>.switch,.example-sections-2>.item.title.active>.switch:focus,.example-sections-2>.item.title.active>.switch:hover{background:#fff;color:#333}.example-sections-2>.item.title.active>.switch,.example-sections-2>.item.title.active>.switch:focus,.example-sections-2>.item.title.active>.switch:hover{padding-bottom:6px}.example-sections-2>.item.content{background:#fff;margin-top:31px;padding:20px 20px 20px 20px;border:0;border-top:1px solid #d1d1d1}.example-sections-3{margin:0;padding:0}.example-sections-3>.item.title{box-sizing:border-box;float:none;width:100%}.example-sections-3>.item.title>.switch{display:block}.example-sections-3>.item.content{box-sizing:border-box;display:block;float:none;margin:0}.example-sections-3>.item.content:before,.example-sections-3>.item.content:after{content:'';display:table}.example-sections-3>.item.content:after{clear:both}.example-sections-3>.item.content.active{display:block}.example-sections-3>.item.title{margin:0 0 5px}.example-sections-3>.item.title>.switch{background:#f0f0f0;border-bottom:1px solid #d1d1d1;border-left:1px solid #d1d1d1;border-right:1px solid #d1d1d1;border-top:1px solid #d1d1d1;height:40px;padding:5px 20px 5px 20px;font-weight:600;line-height:40px;font-size:1.8rem;color:#7d7d7d;text-decoration:none}.example-sections-3>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-3>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-3>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-3>.item.title:not(.disabled)>.switch:focus,.example-sections-3>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-3>.item.title:not(.disabled)>.switch:active,.example-sections-3>.item.title.active>.switch,.example-sections-3>.item.title.active>.switch:focus,.example-sections-3>.item.title.active>.switch:hover{background:#fff;padding-bottom:5px}.example-sections-3>.item.content{background:#fff;border:1px solid #d1d1d1;margin:0 0 5px;padding:20px 20px 20px 20px}@media only screen and (max-width: 99999px){.example-sections-4{ position:relative;z-index:1}.example-sections-4:before,.example-sections-4:after{content:'';display:table}.example-sections-4:after{clear:both}.example-sections-4>.item.title{float:left;width:auto}.example-sections-4>.item.title>.switch{height:20px;display:block;position:relative;z-index:2}.example-sections-4>.item.content{margin-top:20px;box-sizing:border-box;float:right;margin-left:-100%;width:100%}.example-sections-4>.item.content:before,.example-sections-4>.item.content:after{content:'';display:table}.example-sections-4>.item.content:after{clear:both}.example-sections-4>.item.content.active{display:block}.example-sections-4>.item.title{margin:0 5px 0 0}.example-sections-4>.item.title>.switch{font-weight:600;line-height:20px;font-size:1.4rem;color:#7d7d7d;text-decoration:none;background:#f0f0f0;border:1px solid #d1d1d1;border-bottom:0;height:20px;padding:5px 20px 5px 20px}.example-sections-4>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-4>.item.title:not(.disabled)>.switch:focus,.example-sections-4>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-4>.item.title:not(.disabled)>.switch:active,.example-sections-4>.item.title.active>.switch,.example-sections-4>.item.title.active>.switch:focus,.example-sections-4>.item.title.active>.switch:hover{background:#fff;color:#333}.example-sections-4>.item.title.active>.switch,.example-sections-4>.item.title.active>.switch:focus,.example-sections-4>.item.title.active>.switch:hover{padding-bottom:6px}.example-sections-4>.item.content{background:#fff;margin-top:31px;padding:20px 20px 20px 20px;border:1px solid #d1d1d1}}@media only screen and (max-width: 768px){.example-sections-4{ margin:0;padding:0}.example-sections-4>.item.title{box-sizing:border-box;float:none;width:100%}.example-sections-4>.item.title>.switch{display:block}.example-sections-4>.item.content{box-sizing:border-box;display:block;float:none;margin:0}.example-sections-4>.item.content:before,.example-sections-4>.item.content:after{content:'';display:table}.example-sections-4>.item.content:after{clear:both}.example-sections-4>.item.content.active{display:block}.example-sections-4>.item.title{margin:0 0 5px}.example-sections-4>.item.title>.switch{background:#f0f0f0;border-bottom:1px solid #d1d1d1;border-left:1px solid #d1d1d1;border-right:1px solid #d1d1d1;border-top:1px solid #d1d1d1;height:40px;padding:5px 20px 5px 20px;font-weight:600;line-height:40px;font-size:1.8rem;color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-4>.item.title:not(.disabled)>.switch:focus,.example-sections-4>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-4>.item.title:not(.disabled)>.switch:active,.example-sections-4>.item.title.active>.switch,.example-sections-4>.item.title.active>.switch:focus,.example-sections-4>.item.title.active>.switch:hover{background:#fff;padding-bottom:5px}.example-sections-4>.item.content{background:#fff;border:1px solid #d1d1d1;margin:0 0 5px;padding:20px 20px 20px 20px}}.example-sections-5{position:relative;z-index:1}.example-sections-5:before,.example-sections-5:after{content:'';display:table}.example-sections-5:after{clear:both}.example-sections-5>.item.title{float:left;width:auto}.example-sections-5>.item.title>.switch{height:20px;display:block;position:relative;z-index:2}.example-sections-5>.item.content{margin-top:20px;box-sizing:border-box;float:right;margin-left:-100%;width:100%}.example-sections-5>.item.content:before,.example-sections-5>.item.content:after{content:'';display:table}.example-sections-5>.item.content:after{clear:both}.example-sections-5>.item.content.active{display:block}.example-sections-6{margin:0;padding:0}.example-sections-6>.item.title{box-sizing:border-box;float:none;width:100%}.example-sections-6>.item.title>.switch{display:block}.example-sections-6>.item.content{box-sizing:border-box;display:block;float:none;margin:0}.example-sections-6>.item.content:before,.example-sections-6>.item.content:after{content:'';display:table}.example-sections-6>.item.content:after{clear:both}.example-sections-6>.item.content.active{display:block}.example-table-1{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%}.example-table-1 th{text-align:left}.example-table-1>tbody>tr>th,.example-table-1>tfoot>tr>th,.example-table-1>tbody>tr>td,.example-table-1>tfoot>tr>td{vertical-align:top}.example-table-1>thead>tr>th,.example-table-1>thead>tr>td{vertical-align:bottom}.example-table-1>thead>tr>th,.example-table-1>tbody>tr>th,.example-table-1>tfoot>tr>th,.example-table-1>thead>tr>td,.example-table-1>tbody>tr>td,.example-table-1>tfoot>tr>td{padding:8px 10px}.example-table-2>thead>tr>th,.example-table-2>tbody>tr>th,.example-table-2>tfoot>tr>th{color:#111;font-weight:700}.example-table-3{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%}.example-table-3 th{text-align:left}.example-table-3>tbody>tr>th,.example-table-3>tfoot>tr>th,.example-table-3>tbody>tr>td,.example-table-3>tfoot>tr>td{vertical-align:top}.example-table-3>thead>tr>th,.example-table-3>thead>tr>td{vertical-align:bottom}.example-table-3>thead>tr>th,.example-table-3>tbody>tr>th,.example-table-3>tfoot>tr>th,.example-table-3>thead>tr>td,.example-table-3>tbody>tr>td,.example-table-3>tfoot>tr>td{padding:8px 10px}.example-table-3>caption{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-table-4{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%}.example-table-4 th{text-align:left}.example-table-4>tbody>tr>th,.example-table-4>tfoot>tr>th,.example-table-4>tbody>tr>td,.example-table-4>tfoot>tr>td{vertical-align:top}.example-table-4>thead>tr>th,.example-table-4>thead>tr>td{vertical-align:bottom}.example-table-4>thead>tr>th,.example-table-4>tbody>tr>th,.example-table-4>tfoot>tr>th,.example-table-4>thead>tr>td,.example-table-4>tbody>tr>td,.example-table-4>tfoot>tr>td{padding:8px 10px}.example-table-4>thead>tr>td,.example-table-4>tbody>tr>td,.example-table-4>tfoot>tr>td{padding:15px 25px 5px 0}.example-table-4>thead>tr>th,.example-table-4>tbody>tr>th,.example-table-4>tfoot>tr>th{padding:15px 25px 10px 0}.example-table-5{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%;background:#fff}.example-table-5 th{text-align:left}.example-table-5>tbody>tr>th,.example-table-5>tfoot>tr>th,.example-table-5>tbody>tr>td,.example-table-5>tfoot>tr>td{vertical-align:top}.example-table-5>thead>tr>th,.example-table-5>thead>tr>td{vertical-align:bottom}.example-table-5>thead>tr>th,.example-table-5>tbody>tr>th,.example-table-5>tfoot>tr>th,.example-table-5>thead>tr>td,.example-table-5>tbody>tr>td,.example-table-5>tfoot>tr>td{padding:8px 10px}.example-table-5>thead{background:#ccf}.example-table-5>tfoot{background:#cff}.example-table-5>tbody>tr>td{background:#fcc}.example-table-5>tbody>tr>th{background:#ffc}.example-table-6{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%;border:1px solid #d1d1d1}.example-table-6 th{text-align:left}.example-table-6>tbody>tr>th,.example-table-6>tfoot>tr>th,.example-table-6>tbody>tr>td,.example-table-6>tfoot>tr>td{vertical-align:top}.example-table-6>thead>tr>th,.example-table-6>thead>tr>td{vertical-align:bottom}.example-table-6>thead>tr>th,.example-table-6>tbody>tr>th,.example-table-6>tfoot>tr>th,.example-table-6>thead>tr>td,.example-table-6>tbody>tr>td,.example-table-6>tfoot>tr>td{padding:8px 10px}.example-table-6>thead>tr>th,.example-table-6>tbody>tr>th,.example-table-6>tfoot>tr>th,.example-table-6>thead>tr>td,.example-table-6>tbody>tr>td,.example-table-6>tfoot>tr>td{border:1px solid #d1d1d1}.example-table-7{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%}.example-table-7 th{text-align:left}.example-table-7>tbody>tr>th,.example-table-7>tfoot>tr>th,.example-table-7>tbody>tr>td,.example-table-7>tfoot>tr>td{vertical-align:top}.example-table-7>thead>tr>th,.example-table-7>thead>tr>td{vertical-align:bottom}.example-table-7>thead>tr>th,.example-table-7>tbody>tr>th,.example-table-7>tfoot>tr>th,.example-table-7>thead>tr>td,.example-table-7>tbody>tr>td,.example-table-7>tfoot>tr>td{padding:8px 10px}.example-table-7>thead>tr>th,.example-table-7>tbody>tr>th,.example-table-7>tfoot>tr>th,.example-table-7>thead>tr>td,.example-table-7>tbody>tr>td,.example-table-7>tfoot>tr>td{border-top:1px solid #d1d1d1}.example-table-7>caption+thead>tr:first-child>th,.example-table-7>colgroup+thead>tr:first-child>th,.example-table-7>thead:first-child>tr:first-child>th,.example-table-7>caption+thead>tr:first-child>td,.example-table-7>colgroup+thead>tr:first-child>td,.example-table-7>thead:first-child>tr:first-child>td{border-top:0}.example-table-7>tbody+tbody{border-top:1px solid #d1d1d1}.example-table-8{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%}.example-table-8 th{text-align:left}.example-table-8>tbody>tr>th,.example-table-8>tfoot>tr>th,.example-table-8>tbody>tr>td,.example-table-8>tfoot>tr>td{vertical-align:top}.example-table-8>thead>tr>th,.example-table-8>thead>tr>td{vertical-align:bottom}.example-table-8>thead>tr>th,.example-table-8>tbody>tr>th,.example-table-8>tfoot>tr>th,.example-table-8>thead>tr>td,.example-table-8>tbody>tr>td,.example-table-8>tfoot>tr>td{padding:8px 10px}.example-table-8>thead>tr>th,.example-table-8>tbody>tr>th,.example-table-8>tfoot>tr>th,.example-table-8>thead>tr>td,.example-table-8>tbody>tr>td,.example-table-8>tfoot>tr>td{border-left:1px solid #d1d1d1}.example-table-8>thead>tr>th:first-child,.example-table-8>tbody>tr>th:first-child,.example-table-8>tfoot>tr>th:first-child,.example-table-8>thead>tr>td:first-child,.example-table-8>tbody>tr>td:first-child,.example-table-8>tfoot>tr>td:first-child{border-left:0}.example-table-9{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%;border:0}.example-table-9 th{text-align:left}.example-table-9>tbody>tr>th,.example-table-9>tfoot>tr>th,.example-table-9>tbody>tr>td,.example-table-9>tfoot>tr>td{vertical-align:top}.example-table-9>thead>tr>th,.example-table-9>thead>tr>td{vertical-align:bottom}.example-table-9>thead>tr>th,.example-table-9>tbody>tr>th,.example-table-9>tfoot>tr>th,.example-table-9>thead>tr>td,.example-table-9>tbody>tr>td,.example-table-9>tfoot>tr>td{padding:8px 10px}.example-table-9>thead>tr>th,.example-table-9>tbody>tr>th,.example-table-9>tfoot>tr>th,.example-table-9>thead>tr>td,.example-table-9>tbody>tr>td,.example-table-9>tfoot>tr>td{border:0}.example-table-9>thead>tr>th,.example-table-9>thead>tr>td{border-bottom:1px solid #d1d1d1}.example-table-10{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%;border:0}.example-table-10 th{text-align:left}.example-table-10>tbody>tr>th,.example-table-10>tfoot>tr>th,.example-table-10>tbody>tr>td,.example-table-10>tfoot>tr>td{vertical-align:top}.example-table-10>thead>tr>th,.example-table-10>thead>tr>td{vertical-align:bottom}.example-table-10>thead>tr>th,.example-table-10>tbody>tr>th,.example-table-10>tfoot>tr>th,.example-table-10>thead>tr>td,.example-table-10>tbody>tr>td,.example-table-10>tfoot>tr>td{padding:8px 10px}.example-table-10>thead>tr>th,.example-table-10>tbody>tr>th,.example-table-10>tfoot>tr>th,.example-table-10>thead>tr>td,.example-table-10>tbody>tr>td,.example-table-10>tfoot>tr>td{border:0}.example-table-11{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%}.example-table-11 th{text-align:left}.example-table-11>tbody>tr>th,.example-table-11>tfoot>tr>th,.example-table-11>tbody>tr>td,.example-table-11>tfoot>tr>td{vertical-align:top}.example-table-11>thead>tr>th,.example-table-11>thead>tr>td{vertical-align:bottom}.example-table-11>thead>tr>th,.example-table-11>tbody>tr>th,.example-table-11>tfoot>tr>th,.example-table-11>thead>tr>td,.example-table-11>tbody>tr>td,.example-table-11>tfoot>tr>td{padding:8px 10px}.example-table-11>tbody>tr:nth-child(even)>td,.example-table-11>tbody>tr:nth-child(even)>th{background:#ffc;color:#000}.example-table-12{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%}.example-table-12 th{text-align:left}.example-table-12>tbody>tr>th,.example-table-12>tfoot>tr>th,.example-table-12>tbody>tr>td,.example-table-12>tfoot>tr>td{vertical-align:top}.example-table-12>thead>tr>th,.example-table-12>thead>tr>td{vertical-align:bottom}.example-table-12>thead>tr>th,.example-table-12>tbody>tr>th,.example-table-12>tfoot>tr>th,.example-table-12>thead>tr>td,.example-table-12>tbody>tr>td,.example-table-12>tfoot>tr>td{padding:8px 10px}.example-table-12>tbody>tr:nth-child(even):hover>td,.example-table-12>tbody>tr:nth-child(even):hover>th{background:#f0f0f0}.example-table-12>tbody>tr:nth-child(odd):hover>td,.example-table-12>tbody>tr:nth-child(odd):hover>th{background:#f0f0f0}.example-table-13{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%;border:1px solid #d1d1d1}.example-table-13 th{text-align:left}.example-table-13>tbody>tr>th,.example-table-13>tfoot>tr>th,.example-table-13>tbody>tr>td,.example-table-13>tfoot>tr>td{vertical-align:top}.example-table-13>thead>tr>th,.example-table-13>thead>tr>td{vertical-align:bottom}.example-table-13>thead>tr>th,.example-table-13>tbody>tr>th,.example-table-13>tfoot>tr>th,.example-table-13>thead>tr>td,.example-table-13>tbody>tr>td,.example-table-13>tfoot>tr>td{padding:8px 10px}.example-table-13>thead>tr>th,.example-table-13>tbody>tr>th,.example-table-13>tfoot>tr>th,.example-table-13>thead>tr>td,.example-table-13>tbody>tr>td,.example-table-13>tfoot>tr>td{border:1px solid #d1d1d1}.example-table-13>tbody>tr:nth-child(odd)>td,.example-table-13>tbody>tr:nth-child(odd)>th{background:#fff}.example-table-13>tbody>tr:nth-child(even):hover>td,.example-table-13>tbody>tr:nth-child(even):hover>th{background:#f0f0f0}.example-table-13>tbody>tr:nth-child(odd):hover>td,.example-table-13>tbody>tr:nth-child(odd):hover>th{background:#f0f0f0}@media only screen and (max-width: 768px){.example-table-14{ overflow-x:auto;overflow-y:hidden;width:100%;-ms-overflow-style:-ms-autohiding-scrollbar;-webkit-overflow-scrolling:touch}}.example-table-15{width:100%;border-collapse:collapse;border-spacing:0;max-width:100%;border:1px solid #d1d1d1}.example-table-15 th{text-align:left}.example-table-15>tbody>tr>th,.example-table-15>tfoot>tr>th,.example-table-15>tbody>tr>td,.example-table-15>tfoot>tr>td{vertical-align:top}.example-table-15>thead>tr>th,.example-table-15>thead>tr>td{vertical-align:bottom}.example-table-15>thead>tr>th,.example-table-15>tbody>tr>th,.example-table-15>tfoot>tr>th,.example-table-15>thead>tr>td,.example-table-15>tbody>tr>td,.example-table-15>tfoot>tr>td{padding:8px 10px}.example-table-15>thead>tr>th,.example-table-15>tbody>tr>th,.example-table-15>tfoot>tr>th,.example-table-15>thead>tr>td,.example-table-15>tbody>tr>td,.example-table-15>tfoot>tr>td{border:1px solid #d1d1d1}.example-table-15>tbody>tr:nth-child(odd)>td,.example-table-15>tbody>tr:nth-child(odd)>th{background:#fff}.example-table-15>tbody>tr:nth-child(even):hover>td,.example-table-15>tbody>tr:nth-child(even):hover>th{background:#f0f0f0}.example-table-15>tbody>tr:nth-child(odd):hover>td,.example-table-15>tbody>tr:nth-child(odd):hover>th{background:#f0f0f0}@media only screen and (max-width: 768px){.example-table-15{ background:#cff;border:0;display:block}.example-table-15>tbody>tr:nth-child(odd)>td,.example-table-15>tbody>tr:nth-child(odd)>th{background:#cff}.example-table-15>tbody>tr:nth-child(even):hover>td,.example-table-15>tbody>tr:nth-child(even):hover>th{background:#cff}.example-table-15>tbody>tr:nth-child(odd):hover>td,.example-table-15>tbody>tr:nth-child(odd):hover>th{background:#cff}.example-table-15>thead>tr>th{display:none}.example-table-15>tbody{display:block}.example-table-15>tbody>tr{display:block}.example-table-15>tbody>tr td,.example-table-15>tbody>tr th{border-bottom:0;display:block;padding:5px 0}.example-table-15>tbody>tr td:before,.example-table-15>tbody>tr th:before{padding-right:10px;content:attr(data-th) ':';display:inline-block;color:#111;font-weight:700}.example-table-15>tbody>tr td{background:#cff}.example-table-15>tbody>tr>th{background-color:#ffc!important}}.example-tooltip-bottom{position:relative}.example-tooltip-bottom .tooltip-content{background:#fff;max-width:360px;min-width:210px;padding:12px 16px;z-index:100;display:none;position:absolute;text-align:left;color:#333;line-height:1.4;border:1px solid #bbb;margin-top:5px;left:0;top:100%}.example-tooltip-bottom .tooltip-content:after,.example-tooltip-bottom .tooltip-content:before{border:solid transparent;content:'';height:0;position:absolute;width:0}.example-tooltip-bottom .tooltip-content:after{border-width:5px;border-color:transparent}.example-tooltip-bottom .tooltip-content:before{border-width:6px;border-color:transparent}.example-tooltip-bottom .tooltip-content:after,.example-tooltip-bottom .tooltip-content:before{bottom:100%}.example-tooltip-bottom .tooltip-content:after{border-bottom-color:#fff;left:15px;margin-left:-5px}.example-tooltip-bottom .tooltip-content:before{border-bottom-color:#bbb;left:15px;margin-left:-6px}.example-tooltip-bottom .tooltip-toggle{cursor:help}.example-tooltip-bottom .tooltip-toggle:hover+.tooltip-content,.example-tooltip-bottom .tooltip-toggle:focus+.tooltip-content,.example-tooltip-bottom:hover .tooltip-content{display:block}.example-tooltip-left{position:relative}.example-tooltip-left .tooltip-content{background:#fff;max-width:360px;min-width:210px;padding:12px 16px;z-index:100;display:none;position:absolute;text-align:left;color:#333;line-height:1.4;border:1px solid #bbb;margin-right:5px;right:100%;top:0}.example-tooltip-left .tooltip-content:after,.example-tooltip-left .tooltip-content:before{border:solid transparent;content:'';height:0;position:absolute;width:0}.example-tooltip-left .tooltip-content:after{border-width:5px;border-color:transparent}.example-tooltip-left .tooltip-content:before{border-width:6px;border-color:transparent}.example-tooltip-left .tooltip-content:after,.example-tooltip-left .tooltip-content:before{left:100%}.example-tooltip-left .tooltip-content:after{border-left-color:#fff;margin-top:-5px;top:15px}.example-tooltip-left .tooltip-content:before{border-left-color:#bbb;margin-top:-6px;top:15px}.example-tooltip-left .tooltip-toggle{cursor:help}.example-tooltip-left .tooltip-toggle:hover+.tooltip-content,.example-tooltip-left .tooltip-toggle:focus+.tooltip-content,.example-tooltip-left:hover .tooltip-content{display:block}.example-tooltip-right{position:relative}.example-tooltip-right .tooltip-content{background:#fff;max-width:360px;min-width:210px;padding:12px 16px;z-index:100;display:none;position:absolute;text-align:left;color:#333;line-height:1.4;border:1px solid #bbb;margin-left:5px;left:100%;top:0}.example-tooltip-right .tooltip-content:after,.example-tooltip-right .tooltip-content:before{border:solid transparent;content:'';height:0;position:absolute;width:0}.example-tooltip-right .tooltip-content:after{border-width:5px;border-color:transparent}.example-tooltip-right .tooltip-content:before{border-width:6px;border-color:transparent}.example-tooltip-right .tooltip-content:after,.example-tooltip-right .tooltip-content:before{right:100%}.example-tooltip-right .tooltip-content:after{border-right-color:#fff;margin-top:-5px;top:15px}.example-tooltip-right .tooltip-content:before{border-right-color:#bbb;margin-top:-6px;top:15px}.example-tooltip-right .tooltip-toggle{cursor:help}.example-tooltip-right .tooltip-toggle:hover+.tooltip-content,.example-tooltip-right .tooltip-toggle:focus+.tooltip-content,.example-tooltip-right:hover .tooltip-content{display:block}.example-tooltip-top{position:relative}.example-tooltip-top .tooltip-content{background:#fff;max-width:360px;min-width:210px;padding:12px 16px;z-index:100;display:none;position:absolute;text-align:left;color:#333;line-height:1.4;border:1px solid #bbb;margin-bottom:5px;bottom:100%;left:0}.example-tooltip-top .tooltip-content:after,.example-tooltip-top .tooltip-content:before{border:solid transparent;content:'';height:0;position:absolute;width:0}.example-tooltip-top .tooltip-content:after{border-width:5px;border-color:transparent}.example-tooltip-top .tooltip-content:before{border-width:6px;border-color:transparent}.example-tooltip-top .tooltip-content:after,.example-tooltip-top .tooltip-content:before{top:100%}.example-tooltip-top .tooltip-content:after{border-top-color:#fff;left:15px;margin-left:-5px}.example-tooltip-top .tooltip-content:before{border-top-color:#bbb;left:15px;margin-left:-6px}.example-tooltip-top .tooltip-toggle{cursor:help}.example-tooltip-top .tooltip-toggle:hover+.tooltip-content,.example-tooltip-top .tooltip-toggle:focus+.tooltip-content,.example-tooltip-top:hover .tooltip-content{display:block}html{font-size:62.5%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size-adjust:100%}body{color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1.42857143;font-size:1.4rem}p{margin-top:0rem;margin-bottom:1rem}abbr[title]{border-bottom:1px dotted #d1d1d1;cursor:help}b,strong{font-weight:700}em,i{font-style:italic}mark{background:#f0f0f0;color:#000}small,.small{font-size:12px}hr{border:0;border-top:1px solid #d1d1d1;margin-bottom:20px;margin-top:20px}sub,sup{font-size:71.42857143%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dfn{font-style:italic}h1{font-weight:300;line-height:1.1;font-size:2.6rem;margin-top:0rem;margin-bottom:2rem}h2{font-weight:300;line-height:1.1;font-size:2.6rem;margin-top:2.5rem;margin-bottom:2rem}h3{font-weight:300;line-height:1.1;font-size:1.8rem;margin-top:1.5rem;margin-bottom:1rem}h4{font-weight:700;line-height:1.1;font-size:1.4rem;margin-top:2rem;margin-bottom:2rem}h5{font-weight:700;line-height:1.1;font-size:1.2rem;margin-top:2rem;margin-bottom:2rem}h6{font-weight:700;line-height:1.1;font-size:1rem;margin-top:2rem;margin-bottom:2rem}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small{color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1}a,.alink{color:#1979c3;text-decoration:none}a:visited,.alink:visited{color:#1979c3;text-decoration:none}a:hover,.alink:hover{color:#006bb4;text-decoration:underline}a:active,.alink:active{color:#ff5501;text-decoration:underline}ul,ol{margin-top:0rem;margin-bottom:2.5rem}ul>li,ol>li{margin-top:0rem;margin-bottom:1rem}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}dl{margin-bottom:20px;margin-top:0}dt{font-weight:700;margin-bottom:5px;margin-top:0}dd{margin-bottom:10px;margin-top:0;margin-left:0}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,'Courier New',monospace}code{background:#f0f0f0;color:#111;padding:2px 4px;font-size:1.2rem;white-space:nowrap}kbd{background:#f0f0f0;color:#111;padding:2px 4px;font-size:1.2rem}pre{background:#f0f0f0;border:1px solid #d1d1d1;color:#111;line-height:1.42857143;margin:0 0 10px;padding:10px;font-size:1.2rem;display:block;word-wrap:break-word}pre code{background-color:transparent;border-radius:0;color:inherit;font-size:inherit;padding:0;white-space:pre-wrap}blockquote{border-left:0 solid #d1d1d1;margin:0 0 20px 40px;padding:0;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-style:italic;font-weight:400;line-height:1.42857143;font-size:1.4rem}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{color:#333;line-height:1.42857143;font-size:1rem;display:block}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}blockquote cite{font-style:normal}blockquote:before,blockquote:after{content:''}q{quotes:none}q:before,q:after{content:'';content:none}cite{font-style:normal}.example{font-size:2.5rem}.example-line-height{line-height:3rem}.example-word-wrap{overflow-wrap:break-word;word-wrap:break-word;-ms-word-break:break-all;word-break:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;hyphens:auto;background:#ccc;width:120px}.example-text-overflow{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;background:#ccc;width:120px}.example-text-hide{background-color:transparent;border:0;color:transparent;font:0/0 a;text-shadow:none}.example-hyphens{-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;hyphens:auto}.example-hyphens-none{-webkit-hyphens:none;-moz-hyphens:none;-ms-hyphens:none;hyphens:none}.example-typography{color:#fc0;font-family:Menlo,Monaco,Consolas,'Courier New',monospace;font-style:italic;font-weight:500;line-height:1.2;font-size:3rem}.example-list-reset-styles{margin:0;padding:0;list-style:none none}.example-list-inline{margin:0;padding:0;list-style:none none}.example-list-inline>li{display:inline-block;vertical-align:top}.example-link-default{color:#1979c3;text-decoration:none}.example-link-default:visited{color:#1979c3;text-decoration:none}.example-link-default:hover{color:#006bb4;text-decoration:underline}.example-link-default:active{color:#ff5501;text-decoration:underline}.example-link{color:#008000;text-decoration:none}.example-link:visited{color:#1979c3;text-decoration:none}.example-link:hover{color:#ffa500;text-decoration:none}.example-link:active{color:#ff5501;text-decoration:underline}.example-heading{font-weight:300;line-height:1.1;font-size:2.6rem;margin-top:0rem;margin-bottom:2rem}.example-heading-2{font-weight:300;line-height:1.1;font-size:2.6rem;margin-top:2.5rem;margin-bottom:2rem}html{font-size:62.5%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size-adjust:100%}body{color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1.42857143;font-size:1.4rem}p{margin-top:0rem;margin-bottom:1rem}abbr[title]{border-bottom:1px dotted #d1d1d1;cursor:help}b,strong{font-weight:700}em,i{font-style:italic}mark{background:#f0f0f0;color:#000}small,.small{font-size:12px}hr{border:0;border-top:1px solid #d1d1d1;margin-bottom:20px;margin-top:20px}sub,sup{font-size:71.42857143%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dfn{font-style:italic}h1{font-weight:300;line-height:1.1;font-size:2.6rem;margin-top:0rem;margin-bottom:2rem}h2{font-weight:300;line-height:1.1;font-size:2.6rem;margin-top:2.5rem;margin-bottom:2rem}h3{font-weight:300;line-height:1.1;font-size:1.8rem;margin-top:1.5rem;margin-bottom:1rem}h4{font-weight:700;line-height:1.1;font-size:1.4rem;margin-top:2rem;margin-bottom:2rem}h5{font-weight:700;line-height:1.1;font-size:1.2rem;margin-top:2rem;margin-bottom:2rem}h6{font-weight:700;line-height:1.1;font-size:1rem;margin-top:2rem;margin-bottom:2rem}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small{color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;line-height:1}a,.alink{color:#1979c3;text-decoration:none}a:visited,.alink:visited{color:#1979c3;text-decoration:none}a:hover,.alink:hover{color:#006bb4;text-decoration:underline}a:active,.alink:active{color:#ff5501;text-decoration:underline}ul,ol{margin-top:0rem;margin-bottom:2.5rem}ul>li,ol>li{margin-top:0rem;margin-bottom:1rem}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}dl{margin-bottom:20px;margin-top:0}dt{font-weight:700;margin-bottom:5px;margin-top:0}dd{margin-bottom:10px;margin-top:0;margin-left:0}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,'Courier New',monospace}code{background:#f0f0f0;color:#111;padding:2px 4px;font-size:1.2rem;white-space:nowrap}kbd{background:#f0f0f0;color:#111;padding:2px 4px;font-size:1.2rem}pre{background:#f0f0f0;border:1px solid #d1d1d1;color:#111;line-height:1.42857143;margin:0 0 10px;padding:10px;font-size:1.2rem;display:block;word-wrap:break-word}pre code{background-color:transparent;border-radius:0;color:inherit;font-size:inherit;padding:0;white-space:pre-wrap}blockquote{border-left:0 solid #d1d1d1;margin:0 0 20px 40px;padding:0;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-style:italic;font-weight:400;line-height:1.42857143;font-size:1.4rem}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{color:#333;line-height:1.42857143;font-size:1rem;display:block}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}blockquote cite{font-style:normal}blockquote:before,blockquote:after{content:''}q{quotes:none}q:before,q:after{content:'';content:none}cite{font-style:normal}.example-clearfix-container-1{border:1px solid red}.example-clearfix-container-2{border:1px solid #0f0}.example-clearfix-container-2:before,.example-clearfix-container-2:after{content:'';display:table}.example-clearfix-container-2:after{clear:both}.example-clearfix-item.left{float:left}.example-clearfix-item.right{float:right}.example-visibility-hidden{height:0;visibility:hidden}.example-visually-hidden-1{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-visually-hidden-2{background:#fdf0d5;padding:5px;border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-visually-hidden-2{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.example-css-container{padding:20px;background:#e8e8e8}.example-rotate{background:red;position:absolute;height:20px;width:40px;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}.example-placeholder::-webkit-input-placeholder{color:#808080;font-weight:700}.example-placeholder:-moz-placeholder{color:#808080;font-weight:700}.example-placeholder::-moz-placeholder{color:#808080;font-weight:700}.example-placeholder:-ms-input-placeholder{color:#808080;font-weight:700}.example-background-gradient-1{background-color:#ccf;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #cff 0, #ccf 100%);background-image:linear-gradient(to bottom, #cff 0, #ccf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ccffff', endColorstr='#ccccff', GradientType=0)}.example-background-gradient-2{background-color:#ccf;background-repeat:repeat-x;background-image:-webkit-linear-gradient(left,color-stop( #cff 0),color-stop( #ccf 100%));background-image:linear-gradient(to right, #cff 0, #ccf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ccffff', endColorstr='#ccccff', GradientType=1)}.example-background-gradient-3-wrapper{background:#ffc;padding:10px}.example-background-gradient-3{background-color:rgba(255,255,255,0);background-repeat:repeat-x;background-image:-webkit-linear-gradient(left,color-stop(rgba(255,255,255,0) 0),color-stop( #ccf 100%));background-image:linear-gradient(to right,rgba(255,255,255,0) 0, #ccf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='rgba(255, 255, 255, 0)',endColorstr='#ccccff',GradientType=1)}.example-url-check{background:#eee url('/images/test.png') no-repeat 0 0}body{padding:15px;background-image:none}</style></head><body><nav class="bar top cf"><div class="container"><a href="index.html" class="brand">Magento UI Library</a><ul class="menu"><li><a href="#" data-toggle="dropdown-1" unselectable="on" class="dropdown-toggle">files</a><ul id="dropdown-1" hidden class="dropdown"><li><a href="actions-toolbar.html">actions-toolbar</a></li><li><a href="breadcrumbs.html">breadcrumbs</a></li><li><a href="buttons.html">buttons</a></li><li><a href="components.html">components</a></li><li><a href="dropdowns.html">dropdowns</a></li><li><a href="forms.html">forms</a></li><li><a href="icons.html">icons</a></li><li><a href="layout.html">layout</a></li><li><a href="lib.html">lib</a></li><li><a href="loaders.html">loaders</a></li><li><a href="messages.html">messages</a></li><li><a href="pages.html">pages</a></li><li><a href="popups.html">popups</a></li><li><a href="rating.html">rating</a></li><li><a href="resets.html">resets</a></li><li><a href="responsive.html">responsive</a></li><li><a href="sections.html">sections</a></li><li><a href="tables.html">tables</a></li><li><a href="tooltips.html">tooltips</a></li><li><a href="typography.html">typography</a></li><li><a href="utilities.html">utilities</a></li><li><a href="variables.html">variables</a></li><li><a href="docs.html">docs</a></li></ul></li></ul><div class="nav"><button title="Table of Contents" data-toggle="nav-toc"><svg viewBox="0 0 512 512" height="22" width="22" class="icon"><path d="M108.9,403.1V462H50v-58.9H108.9z M108.9,285.4H50v58.9h58.9V285.4zM108.9,50H50v58.9h58.9V50z M108.9,167.7H50v58.9h58.9V167.7z M167.7,344.3H462v-58.9H167.7V344.3zM167.7,50v58.9H462V50H167.7z M167.7,462H462v-58.9H167.7V462z M167.7,226.6H462v-58.9H167.7V226.6z"></path></svg></button><input type="search" placeholder="Search" class="search"></div></div></nav><section class="container"><article id="responsive" class="section"><div class="docs"><a href="#responsive" 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="responsive">Responsive</h1>
-<p>  Magento UI library provides a strong approach for working with media queries. It`s based on recursive call of <nobr><code>.media-width()</code></nobr> mixin defined anywhere in project but invoked in one place in <nobr><code>lib/web/css/source/lib/_responsive.less</code></nobr>. That&#39;s why in the resulting <code>styles.css</code> we have every media query only once with all the rules there, not a multiple calls for the same query.</p>
+<p>  Magento UI library provides a strong approach for working with media queries. It`s based on recursive call of <span style="white-space: nowrap"><code>.media-width()</code></span> mixin defined anywhere in project but invoked in one place in <span style="white-space: nowrap"><code>lib/web/css/source/lib/_responsive.less</code></span>. That&#39;s why in the resulting <code>styles.css</code> we have every media query only once with all the rules there, not a multiple calls for the same query.</p>
 <p>  To see the media queries work resize window to understand which breakpoint is applied.</p>
 <textarea class="preview-code" spellcheck="false">  &lt;div class="example-responsive-block"&gt;
       are applied.
@@ -37,8 +37,8 @@
 }</code></pre></div></article><article id="responsive-mixins-usage" class="section"><div class="docs"><a href="#responsive-mixins-usage" 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="responsive-mixins-usage">Responsive mixins usage</h1>
 <p>  For grouping style rules in certain media queries .media-width() mixin used.</p>
 <pre><code class="lang-css"> .media-width(&lt;@extremum&gt;, &lt;@break&gt;);</code></pre>
-<p>  <nobr><code>@extremum: max|min</code></nobr> - sets whether to use <strong>min-width</strong> or <strong>max-width</strong> in media query condition<br />
-  <nobr><code>@break: value</code></nobr> - sets the value of breakpoint to compare with in media query condition.<br />
+<p>  <span style="white-space: nowrap"><code>@extremum: max|min</code></span> - sets whether to use <strong>min-width</strong> or <strong>max-width</strong> in media query condition<br />
+  <span style="white-space: nowrap"><code>@break: value</code></span> - sets the value of breakpoint to compare with in media query condition.<br />
   For example</p>
 <pre><code class="lang-css">  .media-width(@extremum, @break) when (@extremum = &#39;max&#39;) and (@break = @screen__s) {
       your styles
diff --git a/lib/web/css/docs/source/_layout.less b/lib/web/css/docs/source/_layout.less
index 09fd183e30ba0..8c1c707ff358c 100644
--- a/lib/web/css/docs/source/_layout.less
+++ b/lib/web/css/docs/source/_layout.less
@@ -57,25 +57,25 @@ footer.footer {
 //        <tr>
 //            <th>@layout-class-1column</th>
 //            <td class="vars_value">page-layout-1column</td>
-//            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+//            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
 //            <td>Class name for one column layout</td>
 //        </tr>
 //        <tr>
 //            <th>@layout-class-2columns__left</th>
 //            <td class="vars_value">page-layout-2columns-left</td>
-//            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+//            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
 //            <td>Class name for two columns layout with left sidebar</td>
 //        </tr>
 //        <tr>
 //            <th nowrap="nowrap">@layout-class-2columns__right</th>
 //            <td class="vars_value">page-layout-2columns-right</td>
-//            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+//            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
 //            <td>Class name for two columns layout with right sidebar</td>
 //        </tr>
 //        <tr>
 //            <th>@layout-class-3columns</th>
 //            <td class="vars_value">page-layout-3columns</td>
-//            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+//            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
 //            <td>Class name for three columns layout with left sidebar</td>
 //        </tr>
 //        <tr>
diff --git a/lib/web/css/docs/source/_responsive.less b/lib/web/css/docs/source/_responsive.less
index 8e7397d6ad6f3..dca60791bfacf 100644
--- a/lib/web/css/docs/source/_responsive.less
+++ b/lib/web/css/docs/source/_responsive.less
@@ -4,7 +4,7 @@
 //  */
 
 //  # Responsive
-//  Magento UI library provides a strong approach for working with media queries. It`s based on recursive call of <nobr><code>.media-width()</code></nobr> mixin defined anywhere in project but invoked in one place in <nobr><code>lib/web/css/source/lib/_responsive.less</code></nobr>. That's why in the resulting <code>styles.css</code> we have every media query only once with all the rules there, not a multiple calls for the same query.
+//  Magento UI library provides a strong approach for working with media queries. It`s based on recursive call of <span style="white-space: nowrap"><code>.media-width()</code></span> mixin defined anywhere in project but invoked in one place in <span style="white-space: nowrap"><code>lib/web/css/source/lib/_responsive.less</code></span>. That's why in the resulting <code>styles.css</code> we have every media query only once with all the rules there, not a multiple calls for the same query.
 //
 //  To see the media queries work resize window to understand which breakpoint is applied.
 //  ```
@@ -43,8 +43,8 @@
 //  ```css
 // .media-width(<@extremum>, <@break>);
 //  ```
-//  <nobr><code>@extremum: max|min</code></nobr> - sets whether to use **min-width** or **max-width** in media query condition<br />
-//  <nobr><code>@break: value</code></nobr> - sets the value of breakpoint to compare with in media query condition.<br />
+//  <span style="white-space: nowrap"><code>@extremum: max|min</code></span> - sets whether to use **min-width** or **max-width** in media query condition<br />
+//  <span style="white-space: nowrap"><code>@break: value</code></span> - sets the value of breakpoint to compare with in media query condition.<br />
 //  For example
 //  ```css
 //  .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
diff --git a/lib/web/css/docs/source/_variables.less b/lib/web/css/docs/source/_variables.less
index e1845786067c8..74cbabdd07378 100644
--- a/lib/web/css/docs/source/_variables.less
+++ b/lib/web/css/docs/source/_variables.less
@@ -4169,25 +4169,25 @@
 //        <tr>
 //            <th>@layout-class-1column</th>
 //            <td class="vars_value">page-layout-1column</td>
-//            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+//            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
 //            <td>Class name for one column layout</td>
 //        </tr>
 //        <tr>
 //            <th>@layout-class-2columns__left</th>
 //            <td class="vars_value">page-layout-2columns-left</td>
-//            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+//            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
 //            <td>Class name for two columns layout with left sidebar</td>
 //        </tr>
 //        <tr>
 //            <th nowrap="nowrap">@layout-class-2columns__right</th>
 //            <td class="vars_value">page-layout-2columns-right</td>
-//            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+//            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
 //            <td>Class name for two columns layout with right sidebar</td>
 //        </tr>
 //        <tr>
 //            <th>@layout-class-3columns</th>
 //            <td class="vars_value">page-layout-3columns</td>
-//            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+//            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
 //            <td>Class name for three columns layout with left sidebar</td>
 //        </tr>
 //        <tr>
diff --git a/lib/web/css/docs/variables.html b/lib/web/css/docs/variables.html
index ebbf2122ab209..3c5a583e5101d 100644
--- a/lib/web/css/docs/variables.html
+++ b/lib/web/css/docs/variables.html
@@ -4168,25 +4168,25 @@ <h2 id="layout-variables">Layout variables</h2>
         <tr>
             <th>@layout-class-1column</th>
             <td class="vars_value">page-layout-1column</td>
-            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
             <td>Class name for one column layout</td>
         </tr>
         <tr>
             <th>@layout-class-2columns__left</th>
             <td class="vars_value">page-layout-2columns-left</td>
-            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
             <td>Class name for two columns layout with left sidebar</td>
         </tr>
         <tr>
             <th nowrap="nowrap">@layout-class-2columns__right</th>
             <td class="vars_value">page-layout-2columns-right</td>
-            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
             <td>Class name for two columns layout with right sidebar</td>
         </tr>
         <tr>
             <th>@layout-class-3columns</th>
             <td class="vars_value">page-layout-3columns</td>
-            <td class="vars_value">'' | false | <nobr>page-layout-1column</nobr> | <nobr>page-layout-2columns-left</nobr> | <nobr>page-layout-2columns-right</nobr> | <nobr>page-layout-3columns</nobr></td>
+            <td class="vars_value">'' | false | <span style="white-space: nowrap">page-layout-1column</span> | <span style="white-space: nowrap">page-layout-2columns-left</span> | <span style="white-space: nowrap">page-layout-2columns-right</span> | <span style="white-space: nowrap">page-layout-3columns</span></td>
             <td>Class name for three columns layout with left sidebar</td>
         </tr>
         <tr>
diff --git a/lib/web/css/source/lib/_navigation.less b/lib/web/css/source/lib/_navigation.less
index 6232333fca33f..38cd042591722 100644
--- a/lib/web/css/source/lib/_navigation.less
+++ b/lib/web/css/source/lib/_navigation.less
@@ -338,7 +338,7 @@
                     top: 0;
                     left: 100%;
                     width: 10px;
-                    height: calc(100% + 3px);
+                    height: calc(~'100% + 3px');
                     z-index: 1;
                 }
             }
@@ -409,7 +409,6 @@
                 display: none;
                 left: 0;
                 margin: 0 !important;
-                padding: 0;
                 position: absolute;
                 z-index: 1;
 
@@ -460,7 +459,7 @@
                 }
 
                 .submenu {
-                    top: 0 !important;
+                    top: -1px !important;
                     left: 100% !important;
                 }
 
diff --git a/lib/web/css/source/lib/variables/_navigation.less b/lib/web/css/source/lib/variables/_navigation.less
index 3ef1742547426..4801b8874abcc 100644
--- a/lib/web/css/source/lib/variables/_navigation.less
+++ b/lib/web/css/source/lib/variables/_navigation.less
@@ -91,7 +91,7 @@
 @submenu-desktop__font-size: '';
 @submenu-desktop__font-weight: @font-weight__bold;
 @submenu-desktop__min-width: 230px;
-@submenu-desktop__padding: 15px 0;
+@submenu-desktop__padding: 0;
 
 @submenu-desktop-arrow: true; // [true|false]
 @submenu-desktop-arrow__size: 10px;
diff --git a/lib/web/fotorama/fotorama.js b/lib/web/fotorama/fotorama.js
index b38e70d915c9d..ddf5a7f000d8e 100644
--- a/lib/web/fotorama/fotorama.js
+++ b/lib/web/fotorama/fotorama.js
@@ -434,6 +434,9 @@ fotoramaVersion = '4.6.4';
             return (this.prefix === '') ? el.requestFullScreen() : el[this.prefix + 'RequestFullScreen']();
         };
         fullScreenApi.cancel = function (el) {
+            if (!this.is()) {
+                return false;
+            }
             return (this.prefix === '') ? document.cancelFullScreen() : document[this.prefix + 'CancelFullScreen']();
         };
     }
diff --git a/lib/web/jquery/ui-modules/effect-fade.js b/lib/web/jquery/ui-modules/effect-fade.js
index ba289cbeb0180..46db40fc8a42e 100644
--- a/lib/web/jquery/ui-modules/effect-fade.js
+++ b/lib/web/jquery/ui-modules/effect-fade.js
@@ -7,9 +7,6 @@
  * http://jquery.org/license
  *
  * http://api.jqueryui.com/fade-effect/
- *
- * Depends:
- *	jquery.ui.effect.js
  */
 
 define([
diff --git a/lib/web/jquery/ui-modules/menu.js b/lib/web/jquery/ui-modules/menu.js
index 6d575b0462a9d..82a9b54f69e46 100644
--- a/lib/web/jquery/ui-modules/menu.js
+++ b/lib/web/jquery/ui-modules/menu.js
@@ -440,10 +440,7 @@ define([
                 return;
             }
 
-            this.timer = this._delay(function () {
-                this._close();
-                this._open(submenu);
-            }, this.delay);
+            this._open(submenu);
         },
 
         _open: function (submenu) {
diff --git a/lib/web/knockoutjs/knockout.js b/lib/web/knockoutjs/knockout.js
index cd11f4d0c0d14..93ccdc5415111 100644
--- a/lib/web/knockoutjs/knockout.js
+++ b/lib/web/knockoutjs/knockout.js
@@ -502,16 +502,6 @@ ko.utils = (function () {
 
         setElementName: function(element, name) {
             element.name = name;
-
-            // Workaround IE 6/7 issue
-            // - https://github.com/SteveSanderson/knockout/issues/197
-            // - http://www.matts411.com/post/setting_the_name_attribute_in_ie_dom/
-            if (ieVersion <= 7) {
-                try {
-                    element.mergeAttributes(document.createElement("<input name='" + element.name + "'/>"), false);
-                }
-                catch(e) {} // For IE9 with doc mode "IE9 Standards" and browser mode "IE9 Compatibility View"
-            }
         },
 
         forceRefresh: function(node) {
diff --git a/lib/web/mage/accordion.js b/lib/web/mage/accordion.js
index 93cdb30777c54..78d7dae019be2 100644
--- a/lib/web/mage/accordion.js
+++ b/lib/web/mage/accordion.js
@@ -82,8 +82,14 @@ define([
          * @private
          */
         _closeOthers: function () {
+            var self = this;
+
             if (!this.options.multipleCollapsible) {
-                this._super();
+                $.each(this.collapsibles, function () {
+                    $(this).on('beforeOpen', function () {
+                        self.collapsibles.not(this).collapsible('deactivate');
+                    });
+                });
             }
             $.each(this.collapsibles, function () {
                 $(this).on('beforeOpen', function () {
diff --git a/lib/web/mage/adminhtml/browser.js b/lib/web/mage/adminhtml/browser.js
index 137ad5541a87f..7780ac524fa49 100644
--- a/lib/web/mage/adminhtml/browser.js
+++ b/lib/web/mage/adminhtml/browser.js
@@ -11,11 +11,12 @@ define([
     'Magento_Ui/js/modal/prompt',
     'Magento_Ui/js/modal/confirm',
     'Magento_Ui/js/modal/alert',
+    'underscore',
     'Magento_Ui/js/modal/modal',
     'jquery/ui',
     'jquery/jstree/jquery.jstree',
     'mage/mage'
-], function ($, wysiwyg, prompt, confirm, alert) {
+], function ($, wysiwyg, prompt, confirm, alert, _) {
     window.MediabrowserUtility = {
         windowId: 'modal_dialog_message',
         modalLoaded: false,
@@ -52,16 +53,21 @@ define([
                 content = '<div class="popup-window" id="' + windowId + '"></div>',
                 self = this;
 
-            if (this.modalLoaded === true &&
-                options &&
+            if (options &&
                 self.targetElementId &&
-                self.targetElementId === options.targetElementId
-            ) {
+                self.targetElementId === options.targetElementId) {
                 if (typeof options.closed !== 'undefined') {
                     this.modal.modal('option', 'closed', options.closed);
                 }
                 this.modal.modal('openModal');
 
+                return;
+            } else if (_.isUndefined(options) &&
+                    self.modalLoaded === true &&
+                    self.targetElementId === url
+            ) {
+                this.modal.modal('openModal');
+
                 return;
             }
 
@@ -89,8 +95,11 @@ define([
             }).done(function (data) {
                 self.modal.html(data).trigger('contentUpdated');
                 self.modalLoaded = true;
-                self.targetElementId = options.targetElementId;
+                self.targetElementId = options ?
+                           options.targetElementId
+                           : url;
             });
+
         },
 
         /**
@@ -487,7 +496,7 @@ define([
                 var nodeData = $(element).data('node');
 
                 if (index > 0) {
-                    breadcrumbs.append($('<li>\/</li>'));
+                    breadcrumbs.append($('<li>\/</li>')); //eslint-disable-line
                 }
                 breadcrumbs.append($('<li />')
                     .data('node', nodeData).attr('data-row', 'breadcrumb').text(nodeData.text));
diff --git a/lib/web/mage/adminhtml/grid.js b/lib/web/mage/adminhtml/grid.js
index 1c9319f95a647..28bdb96e5cdb7 100644
--- a/lib/web/mage/adminhtml/grid.js
+++ b/lib/web/mage/adminhtml/grid.js
@@ -63,6 +63,7 @@ define([
             this.initRowCallback = false;
             this.doFilterCallback = false;
             this.sortableUpdateCallback = false;
+            this.filterKeyPressCallback = false;
 
             this.reloadParams = false;
 
@@ -511,6 +512,10 @@ define([
             if (event.keyCode == Event.KEY_RETURN) { //eslint-disable-line eqeqeq
                 this.doFilter();
             }
+
+            if (this.filterKeyPressCallback) {
+                this.filterKeyPressCallback(this, event);
+            }
         },
 
         /**
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 92c13fca63920..e54aaa1006d4b 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
@@ -196,10 +196,8 @@ define([
                     }
                 });
 
-                returnval += doc.head.innerHTML ?
-                    doc.head.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
-                returnval += doc.body.innerHTML ?
-                    doc.body.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
+                returnval += doc.head ? doc.head.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
+                returnval += doc.body ? doc.body.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
 
                 return returnval ? returnval : content;
             },
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 e6669d77a3889..f163206a13656 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
@@ -212,10 +212,8 @@ define([
                     widgetEl.parentNode.removeChild(widgetEl);
                 });
 
-                returnval += doc.head.innerHTML ?
-                    doc.head.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
-                returnval += doc.body.innerHTML ?
-                    doc.body.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
+                returnval += doc.head ? doc.head.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
+                returnval += doc.body ? doc.body.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
 
                 return returnval ? returnval : content;
             },
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
index 4dafc845309cb..aea636066be61 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
@@ -118,6 +118,7 @@ define([
                 tinyMCE4.init(settings);
                 this.getPluginButtons().hide();
                 varienGlobalEvents.clearEventHandlers('open_browser_callback');
+                this.eventBus.clearEventHandlers('open_browser_callback');
                 this.eventBus.attachEventHandler('open_browser_callback', tinyMceEditors.get(self.id).openFileBrowser);
             }.bind(this));
         },
@@ -375,7 +376,7 @@ define([
          */
         openFileBrowser: function (o) {
             var typeTitle = this.translate('Select Images'),
-                storeId = this.config['store_id'] !== null ? this.config['store_id'] : 0,
+                storeId = this.config['store_id'] ? this.config['store_id'] : 0,
                 frameDialog = jQuery('div.mce-container[role="dialog"]'),
                 self = this,
                 wUrl = this.config['files_browser_window_url'] +
diff --git a/lib/web/mage/backend/button.js b/lib/web/mage/backend/button.js
index c06d2dedab054..453fc7443a7c0 100644
--- a/lib/web/mage/backend/button.js
+++ b/lib/web/mage/backend/button.js
@@ -3,18 +3,10 @@
  * See COPYING.txt for license details.
  */
 
-(function (factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'jquery/ui'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+define([
+    'jquery',
+    'jquery/ui'
+], function ($) {
     'use strict';
 
     $.widget('ui.button', $.ui.button, {
@@ -58,4 +50,4 @@
     });
 
     return $.ui.button;
-}));
+});
diff --git a/lib/web/mage/backend/form.js b/lib/web/mage/backend/form.js
index 36b33d0a59d50..de270c8ccd202 100644
--- a/lib/web/mage/backend/form.js
+++ b/lib/web/mage/backend/form.js
@@ -2,18 +2,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-(function (factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'jquery/ui'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+define([
+    'jquery',
+    'jquery/ui'
+], function ($) {
     'use strict';
 
     $.widget('mage.form', {
@@ -209,4 +201,4 @@
     });
 
     return $.mage.form;
-}));
+});
diff --git a/lib/web/mage/backend/menu.js b/lib/web/mage/backend/menu.js
index b56d49086c4f0..35a851fa0de47 100644
--- a/lib/web/mage/backend/menu.js
+++ b/lib/web/mage/backend/menu.js
@@ -3,18 +3,10 @@
  * See COPYING.txt for license details.
  */
 
-(function (factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'jquery/ui'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+define([
+    'jquery',
+    'jquery/ui'
+], function ($) {
     'use strict';
 
     $.widget('mage.menu', {
@@ -784,4 +776,4 @@
     });
 
     return $.mage.menu;
-}));
+});
diff --git a/lib/web/mage/backend/suggest.js b/lib/web/mage/backend/suggest.js
index d34be10420912..ffd615a62a220 100644
--- a/lib/web/mage/backend/suggest.js
+++ b/lib/web/mage/backend/suggest.js
@@ -3,22 +3,14 @@
  * See COPYING.txt for license details.
  */
 
-(function (root, factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'mage/template',
-            'mage/mage',
-            'jquery/ui',
-            'mage/backend/menu',
-            'mage/translate'
-        ], factory);
-    } else {
-        factory(root.jQuery, root.mageTemplate);
-    }
-}(this, function ($, mageTemplate) {
+define([
+    'jquery',
+    'mage/template',
+    'mage/mage',
+    'jquery/ui',
+    'mage/backend/menu',
+    'mage/translate'
+], function ($, mageTemplate) {
     'use strict';
 
     /**
@@ -1196,4 +1188,4 @@
     });
 
     return $.mage.suggest;
-}));
+});
diff --git a/lib/web/mage/backend/tabs.js b/lib/web/mage/backend/tabs.js
index 849b73c20b5b2..5b602fda580ee 100644
--- a/lib/web/mage/backend/tabs.js
+++ b/lib/web/mage/backend/tabs.js
@@ -4,18 +4,10 @@
  */
 
 /* global FORM_KEY */
-(function (factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'jquery/ui'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+define([
+    'jquery',
+    'jquery/ui'
+], function ($) {
     'use strict';
 
     var rhash, isLocal;
@@ -423,4 +415,4 @@
     });
 
     return $.mage.tabs;
-}));
+});
diff --git a/lib/web/mage/backend/tree-suggest.js b/lib/web/mage/backend/tree-suggest.js
index 47f034b0b2431..8d09ce4dc1194 100644
--- a/lib/web/mage/backend/tree-suggest.js
+++ b/lib/web/mage/backend/tree-suggest.js
@@ -3,20 +3,12 @@
  * See COPYING.txt for license details.
  */
 
-(function (root, factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'jquery/ui',
-            'jquery/jstree/jquery.jstree',
-            'mage/backend/suggest'
-        ], factory);
-    } else {
-        factory(root.jQuery);
-    }
-}(this, function ($) {
+define([
+    'jquery',
+    'jquery/ui',
+    'jquery/jstree/jquery.jstree',
+    'mage/backend/suggest'
+], function ($) {
     'use strict';
 
     /* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
@@ -274,4 +266,4 @@
     });
 
     return $.mage.treeSuggest;
-}));
+});
diff --git a/lib/web/mage/backend/validation.js b/lib/web/mage/backend/validation.js
index 1043f45a7402e..c07fcd1542079 100644
--- a/lib/web/mage/backend/validation.js
+++ b/lib/web/mage/backend/validation.js
@@ -4,23 +4,15 @@
  */
 
 /* global BASE_URL, alertAlreadyDisplayed */
-(function (factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'underscore',
-            'Magento_Ui/js/modal/alert',
-            'jquery/ui',
-            'jquery/validate',
-            'mage/translate',
-            'mage/validation'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($, _, alert) {
+define([
+    'jquery',
+    'underscore',
+    'Magento_Ui/js/modal/alert',
+    'jquery/ui',
+    'jquery/validate',
+    'mage/translate',
+    'mage/validation'
+], function ($, _, alert) {
     'use strict';
 
     $.extend(true, $.validator.prototype, {
@@ -307,4 +299,4 @@
     });
 
     return $.mage.validation;
-}));
+});
diff --git a/lib/web/mage/calendar.css b/lib/web/mage/calendar.css
index 071270feeeb3e..da19f389d3085 100644
--- a/lib/web/mage/calendar.css
+++ b/lib/web/mage/calendar.css
@@ -141,7 +141,6 @@
     padding: 0;
 }
 .ui-datepicker {
-    background: #ffffff;
     padding: 15px;
     border: #ffffff 4px solid;
     -webkit-box-sizing: border-box;
diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js
index 85f1904c0e194..d3eb055d29d81 100644
--- a/lib/web/mage/calendar.js
+++ b/lib/web/mage/calendar.js
@@ -4,20 +4,12 @@
  */
 
 /*eslint max-depth: 0*/
-(function (factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'jquery-ui-modules/widget',
-            'jquery-ui-modules/datepicker',
-            'jquery-ui-modules/timepicker'
-        ], factory);
-    } else {
-        factory(window.jQuery);
-    }
-}(function ($) {
+define([
+    'jquery',
+    'jquery-ui-modules/widget',
+    'jquery-ui-modules/datepicker',
+    'jquery-ui-modules/timepicker'
+], function ($) {
     'use strict';
 
     var calendarBasePrototype,
@@ -566,4 +558,4 @@
         dateRange:  $.mage.dateRange,
         calendar:   $.mage.calendar
     };
-}));
+});
diff --git a/lib/web/mage/common.js b/lib/web/mage/common.js
index 53f5b74872192..3da2233218c62 100644
--- a/lib/web/mage/common.js
+++ b/lib/web/mage/common.js
@@ -20,8 +20,14 @@ define([
             var formKeyElement,
                 existingFormKeyElement,
                 isKeyPresentInForm,
+                isActionExternal,
+                baseUrl = window.BASE_URL,
                 form = $(e.target),
-                formKey = $('input[name="form_key"]').val();
+                formKey = $('input[name="form_key"]').val(),
+                formMethod = form.prop('method'),
+                formAction = form.prop('action');
+
+            isActionExternal = formAction.indexOf(baseUrl) !== 0;
 
             existingFormKeyElement = form.find('input[name="form_key"]');
             isKeyPresentInForm = existingFormKeyElement.length;
@@ -32,7 +38,7 @@ define([
                 isKeyPresentInForm = form.find('> input[name="form_key"]').length;
             }
 
-            if (formKey && !isKeyPresentInForm && form[0].method !== 'get') {
+            if (formKey && !isKeyPresentInForm && !isActionExternal && formMethod !== 'get') {
                 formKeyElement = document.createElement('input');
                 formKeyElement.setAttribute('type', 'hidden');
                 formKeyElement.setAttribute('name', 'form_key');
diff --git a/lib/web/mage/cookies.js b/lib/web/mage/cookies.js
index ee47d69949ead..627e22ade323b 100644
--- a/lib/web/mage/cookies.js
+++ b/lib/web/mage/cookies.js
@@ -3,19 +3,11 @@
  * See COPYING.txt for license details.
  */
 
-(function (factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'mage/mage',
-            'jquery/jquery.cookie'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+define([
+    'jquery',
+    'mage/mage',
+    'jquery/jquery.cookie'
+], function ($) {
     'use strict';
 
     /**
@@ -154,4 +146,4 @@
         $.extend($.mage.cookies.defaults, pageOptions);
         $.extend($.cookie.defaults, $.mage.cookies.defaults);
     };
-}));
+});
diff --git a/lib/web/mage/decorate.js b/lib/web/mage/decorate.js
index 238735ac455b9..437dee1be2888 100644
--- a/lib/web/mage/decorate.js
+++ b/lib/web/mage/decorate.js
@@ -4,16 +4,10 @@
  */
 
 /* eslint-disable strict */
-(function (factory) {
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'mage/translate'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+define([
+    'jquery',
+    'mage/translate'
+], function ($) {
     var methods = {
         /**
          * Decorate a list (e.g. a <ul> containing <li>) recursively if specified.
@@ -25,7 +19,7 @@
                     items;
 
                 if (list.length > 0) {
-                    items = typeof isRecursive === undefined || isRecursive ?
+                    items = typeof isRecursive === 'undefined' || isRecursive ?
                         list.find('li') :
                         list.children();
                     items.decorate('generic', ['odd', 'even', 'last']);
@@ -129,4 +123,4 @@
         message = $.mage.__('Method %s does not exist on jQuery.decorate');
         $.error(message.replace('%s', method));
     };
-}));
+});
diff --git a/lib/web/mage/edit-trigger.js b/lib/web/mage/edit-trigger.js
index e28a826ec87ee..30d26d8626df3 100644
--- a/lib/web/mage/edit-trigger.js
+++ b/lib/web/mage/edit-trigger.js
@@ -6,19 +6,11 @@
 /**
  * @deprecated since version 2.2.0
  */
-(function (root, factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'mage/template',
-            'jquery-ui-modules/widget'
-        ], factory);
-    } else {
-        factory(root.jQuery, root.mageTemplate);
-    }
-}(this, function ($, mageTemplate) {
+define([
+    'jquery',
+    'mage/template',
+    'jquery-ui-modules/widget'
+], function ($, mageTemplate) {
     'use strict';
 
     var editTriggerPrototype;
@@ -220,4 +212,4 @@
     }));
 
     return $.mage.editTrigger;
-}));
+});
diff --git a/lib/web/mage/gallery/gallery.less b/lib/web/mage/gallery/gallery.less
index 14056ea73b365..10fba50fe239b 100644
--- a/lib/web/mage/gallery/gallery.less
+++ b/lib/web/mage/gallery/gallery.less
@@ -418,9 +418,8 @@
 }
 
 .fotorama__arr--disabled {
-    *display: none;
     cursor: default;
-    opacity: 0.1;
+    opacity: 0;
     pointer-events: none;
 }
 
@@ -762,6 +761,7 @@
     img {
         left: 0;
         max-width: inherit;
+        max-height: inherit;
         position: absolute;
         top: 0;
         object-fit: scale-down;
diff --git a/lib/web/mage/loader_old.js b/lib/web/mage/loader_old.js
index f759758acd12a..f72191f5b634b 100644
--- a/lib/web/mage/loader_old.js
+++ b/lib/web/mage/loader_old.js
@@ -3,20 +3,12 @@
  * See COPYING.txt for license details.
  */
 
-(function (root, factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'mage/template',
-            'jquery-ui-modules/widget',
-            'mage/translate'
-        ], factory);
-    } else {
-        factory(root.jQuery, root.mageTemplate);
-    }
-}(this, function ($, mageTemplate) {
+define([
+    'jquery',
+    'mage/template',
+    'jquery-ui-modules/widget',
+    'mage/translate'
+], function ($, mageTemplate) {
     'use strict';
 
     $.widget('mage.loader', {
@@ -232,4 +224,4 @@
         loader: $.mage.loader,
         loaderAjax: $.mage.loaderAjax
     };
-}));
+});
diff --git a/lib/web/mage/mage.js b/lib/web/mage/mage.js
index ba9aa678aaef6..9e479016fecc5 100644
--- a/lib/web/mage/mage.js
+++ b/lib/web/mage/mage.js
@@ -3,18 +3,10 @@
  * See COPYING.txt for license details.
  */
 
-(function (root, factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'mage/apply/main'
-        ], factory);
-    } else {
-        factory(root.jQuery);
-    }
-}(this, function ($, mage) {
+define([
+    'jquery',
+    'mage/apply/main'
+], function ($, mage) {
     'use strict';
 
     /**
@@ -100,4 +92,4 @@
     });
 
     return $.mage;
-}));
+});
diff --git a/lib/web/mage/requirejs/mixins.js b/lib/web/mage/requirejs/mixins.js
index 77d98e0f81394..613605038f4b9 100644
--- a/lib/web/mage/requirejs/mixins.js
+++ b/lib/web/mage/requirejs/mixins.js
@@ -7,7 +7,25 @@ define('mixins', [
 ], function (module) {
     'use strict';
 
-    var rjsMixins;
+    var contexts = require.s.contexts,
+        defContextName = '_',
+        defContext = contexts[defContextName],
+        unbundledContext = require.s.newContext('$'),
+        defaultConfig = defContext.config,
+        unbundledConfig = {
+            baseUrl: defaultConfig.baseUrl,
+            paths: defaultConfig.paths,
+            shim: defaultConfig.shim,
+            config: defaultConfig.config,
+            map: defaultConfig.map
+        },
+        rjsMixins;
+
+    /**
+     * Prepare a separate context where modules are not assigned to bundles
+     * so we are able to get their true path and corresponding mixins.
+     */
+    unbundledContext.configure(unbundledConfig);
 
     /**
      * Checks if specified string contains
@@ -50,14 +68,14 @@ define('mixins', [
 
     /**
      * Extracts url (without baseUrl prefix)
-     * from a modules' name.
+     * from a module name ignoring the fact that it may be bundled.
      *
      * @param {String} name - Name, path or alias of a module.
-     * @param {Object} config - Contexts' configuartion.
+     * @param {Object} config - Context's configuration.
      * @returns {String}
      */
     function getPath(name, config) {
-        var url = require.toUrl(name);
+        var url = unbundledContext.require.toUrl(name);
 
         return removeBaseUrl(url, config);
     }
@@ -73,11 +91,11 @@ define('mixins', [
     }
 
     /**
-     * Iterativly calls mixins passing to them
+     * Iteratively calls mixins passing to them
      * current value of a 'target' parameter.
      *
      * @param {*} target - Value to be modified.
-     * @param {...Function} mixins
+     * @param {...Function} mixins - List of mixins to apply.
      * @returns {*} Modified 'target' value.
      */
     function applyMixins(target) {
@@ -94,8 +112,13 @@ define('mixins', [
 
         /**
          * Loads specified module along with its' mixins.
+         * This method is called for each module defined with "mixins!" prefix
+         * in its name that was added by processNames method.
          *
          * @param {String} name - Module to be loaded.
+         * @param {Function} req - Local "require" function to use to load other modules.
+         * @param {Function} onLoad - A function to call with the value for name.
+         * @param {Object} config - RequireJS configuration object.
          */
         load: function (name, req, onLoad, config) {
             var path     = getPath(name, config),
@@ -110,14 +133,14 @@ define('mixins', [
         /**
          * Retrieves list of mixins associated with a specified module.
          *
-         * @param {String} path - Path to the module (without base url).
+         * @param {String} path - Path to the module (without base URL).
          * @returns {Array} An array of paths to mixins.
          */
         getMixins: function (path) {
             var config = module.config() || {},
-            mixins;
+                mixins;
 
-            // fix for when urlArgs is set
+            // Fix for when urlArgs is set.
             if (path.indexOf('?') !== -1) {
                 path = path.substring(0, path.indexOf('?'));
             }
@@ -131,7 +154,7 @@ define('mixins', [
         /**
          * Checks if specified module has associated with it mixins.
          *
-         * @param {String} path - Path to the module (without base url).
+         * @param {String} path - Path to the module (without base URL).
          * @returns {Boolean}
          */
         hasMixins: function (path) {
@@ -139,11 +162,11 @@ define('mixins', [
         },
 
         /**
-         * Modifies provided names perpending to them
+         * Modifies provided names prepending to them
          * the 'mixins!' plugin prefix if it's necessary.
          *
          * @param {(Array|String)} names - Module names, paths or aliases.
-         * @param {Object} context - Current requirejs context.
+         * @param {Object} context - Current RequireJS context.
          * @returns {Array|String}
          */
         processNames: function (names, context) {
@@ -179,101 +202,40 @@ require([
 ], function (mixins) {
     'use strict';
 
-    var originalRequire  = window.require,
-        originalDefine   = window.define,
-        contexts         = originalRequire.s.contexts,
-        defContextName   = '_',
-        hasOwn           = Object.prototype.hasOwnProperty,
-        getLastInQueue;
-
-    getLastInQueue =
-        '(function () {' +
-            'var queue  = globalDefQueue,' +
-                'item   = queue[queue.length - 1];' +
-            '' +
-            'return item;' +
-        '})();';
-
-    /**
-     * Returns property of an object if
-     * it's not defined in it's prototype.
-     *
-     * @param {Object} obj - Object whose property should be retrieved.
-     * @param {String} prop - Name of the property.
-     * @returns {*} Value of the property or false.
-     */
-    function getOwn(obj, prop) {
-        return hasOwn.call(obj, prop) && obj[prop];
-    }
-
-    /**
-     * Overrides global 'require' method adding to it dependencies modfication.
-     */
-    window.require = function (deps, callback, errback, optional) {
-        var contextName = defContextName,
-            context,
-            config;
-
-        if (!Array.isArray(deps) && typeof deps !== 'string') {
-            config = deps;
-
-            if (Array.isArray(callback)) {
-                deps = callback;
-                callback = errback;
-                errback = optional;
-            } else {
-                deps = [];
-            }
-        }
-
-        if (config && config.context) {
-            contextName = config.context;
-        }
-
-        context = getOwn(contexts, contextName);
-
-        if (!context) {
-            context = contexts[contextName] = require.s.newContext(contextName);
-        }
-
-        if (config) {
-            context.configure(config);
-        }
-
-        deps = mixins.processNames(deps, context);
-
-        return context.require(deps, callback, errback);
-    };
+    var contexts = require.s.contexts,
+        defContextName = '_',
+        defContext = contexts[defContextName],
+        originalContextRequire = defContext.require,
+        processNames = mixins.processNames;
 
     /**
-     * Overrides global 'define' method adding to it dependencies modfication.
+     * Wrap default context's require function which gets called every time
+     * module is requested using require call. The upside of this approach
+     * is that deps parameter is already normalized and guaranteed to be an array.
      */
-    window.define = function (name, deps, callback) { // eslint-disable-line no-unused-vars
-        var context     = getOwn(contexts, defContextName),
-            result      = originalDefine.apply(this, arguments),
-            queueItem   = require.exec(getLastInQueue),
-            lastDeps    = queueItem && queueItem[1];
-
-        if (Array.isArray(lastDeps)) {
-            queueItem[1] = mixins.processNames(lastDeps, context);
-        }
+    defContext.require = function (deps, callback, errback) {
+        deps = processNames(deps, defContext);
 
-        return result;
+        return originalContextRequire(deps, callback, errback);
     };
 
     /**
      * Copy properties of original 'require' method.
      */
-    Object.keys(originalRequire).forEach(function (key) {
-        require[key] = originalRequire[key];
+    Object.keys(originalContextRequire).forEach(function (key) {
+        defContext.require[key] = originalContextRequire[key];
     });
 
     /**
-     * Copy properties of original 'define' method.
+     * Wrap shift method from context's definitions queue.
+     * Items are added to the queue when a new module is defined and taken
+     * from it every time require call happens.
      */
-    Object.keys(originalDefine).forEach(function (key) {
-        define[key] = originalDefine[key];
-    });
+    defContext.defQueue.shift = function () {
+        var queueItem = Array.prototype.shift.call(this);
+
+        queueItem[1] = processNames(queueItem[1], defContext);
 
-    window.requirejs = window.require;
+        return queueItem;
+    };
 });
diff --git a/lib/web/mage/requirejs/static.js b/lib/web/mage/requirejs/static.js
index 898850cb2948b..ec66b5f1063e0 100644
--- a/lib/web/mage/requirejs/static.js
+++ b/lib/web/mage/requirejs/static.js
@@ -2,13 +2,66 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+var storageShim = {
+    _data: {},
+
+    /**
+     * Sets value of the specified item.
+     *
+     * @param {String} key - Key of the property.
+     * @param {*} value - Properties' value.
+     */
+    setItem: function (key, value) {
+        'use strict';
+
+        this._data[key] = value + '';
+    },
+
+    /**
+     * Retrieves specified item.
+     *
+     * @param {String} key - Key of the property to be retrieved.
+     */
+    getItem: function (key) {
+        'use strict';
+
+        return this._data[key];
+    },
+
+    /**
+     * Removes specified item.
+     *
+     * @param {String} key - Key of the property to be removed.
+     */
+    removeItem: function (key) {
+        'use strict';
+
+        delete this._data[key];
+    },
+
+    /**
+     * Removes all items.
+     */
+    clear: function () {
+        'use strict';
+
+        this._data = {};
+    }
+};
+
 define('buildTools', [
 ], function () {
     'use strict';
 
-    var storage = window.localStorage,
+    var storage,
         storeName = 'buildDisabled';
 
+    try {
+        storage = window.localStorage;
+    } catch (e) {
+        storage = storageShim;
+    }
+
     return {
         isEnabled: storage.getItem(storeName) === null,
 
@@ -70,9 +123,15 @@ define('statistician', [
 ], function () {
     'use strict';
 
-    var storage     = window.localStorage,
+    var storage,
         stringify   = JSON.stringify.bind(JSON);
 
+    try {
+        storage = window.localStorage;
+    } catch (e) {
+        storage = storageShim;
+    }
+
     /**
      * Removes duplicated entries of array, returning new one.
      *
diff --git a/lib/web/mage/tabs.js b/lib/web/mage/tabs.js
index 496a271c631f2..b007d6113eca6 100644
--- a/lib/web/mage/tabs.js
+++ b/lib/web/mage/tabs.js
@@ -102,21 +102,31 @@ define([
          * @private
          */
         _processPanels: function () {
-            this.contents = this.element.find(this.options.content);
+            var isNotNested = this._isNotNested.bind(this);
 
-            this.collapsibles = this.element.find(this.options.collapsibleElement);
+            this.contents = this.element
+                .find(this.options.content)
+                .filter(isNotNested);
+
+            this.collapsibles =  this.element
+                .find(this.options.collapsibleElement)
+                .filter(isNotNested);
 
             this.collapsibles
                 .attr('role', 'presentation')
                 .parent()
                 .attr('role', 'tablist');
 
-            this.headers = this.element.find(this.options.header);
+            this.headers = this.element
+                .find(this.options.header)
+                .filter(isNotNested);
 
             if (this.headers.length === 0) {
                 this.headers = this.collapsibles;
             }
-            this.triggers = this.element.find(this.options.trigger);
+            this.triggers = this.element
+                .find(this.options.trigger)
+                .filter(isNotNested);
 
             if (this.triggers.length === 0) {
                 this.triggers = this.headers;
@@ -124,6 +134,19 @@ define([
             this._callCollapsible();
         },
 
+        /**
+         * Checks if element is not in nested container to keep the correct scope of collapsible
+         * @param {Number} index
+         * @param {HTMLElement} element
+         * @private
+         * @return {Boolean}
+         */
+        _isNotNested: function (index, element) {
+            var parentContent = $(element).parents(this.options.content);
+
+            return !parentContent.length || !this.element.find(parentContent).length;
+        },
+
         /**
          * Setting the disabled and active tabs and calling instantiation of collapsible
          * @private
diff --git a/lib/web/mage/template.js b/lib/web/mage/template.js
index 3da9693eb5340..db34bd4c4a1a4 100644
--- a/lib/web/mage/template.js
+++ b/lib/web/mage/template.js
@@ -3,17 +3,9 @@
  * See COPYING.txt for license details.
  */
 
-(function (root, factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'underscore'
-        ], factory);
-    } else {
-        root.mageTemplate = factory(root._);
-    }
-}(this, function (_) {
+define([
+    'underscore'
+], function (_) {
     'use strict';
 
     /**
@@ -84,4 +76,4 @@
             render(data) :
             render;
     };
-}));
+});
diff --git a/lib/web/mage/translate-inline-vde.css b/lib/web/mage/translate-inline-vde.css
index 369c1fb9a2f07..f898bb01c43d9 100644
--- a/lib/web/mage/translate-inline-vde.css
+++ b/lib/web/mage/translate-inline-vde.css
@@ -52,7 +52,6 @@
 }
 
 .translate-dialog .ui-dialog-buttonset {
-    padding-right: 0;
     margin-right: 0;
     float: right;
     background: rgba(223, 243, 250, 1.0);
diff --git a/lib/web/mage/translate-inline-vde.js b/lib/web/mage/translate-inline-vde.js
index 485413e3c9289..e39a86934b03b 100644
--- a/lib/web/mage/translate-inline-vde.js
+++ b/lib/web/mage/translate-inline-vde.js
@@ -6,22 +6,14 @@
 /**
  * @deprecated since version 2.2.0
  */
-(function (root, factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'mage/template',
-            'jquery-ui-modules/widget',
-            'jquery-ui-modules/core',
-            'mage/translate-inline',
-            'mage/translate'
-        ], factory);
-    } else {
-        factory(root.jQuery, root.mageTemplate);
-    }
-}(this, function ($, mageTemplate) {
+define([
+    'jquery',
+    'mage/template',
+    'jquery-ui-modules/widget',
+    'jquery-ui-modules/core',
+    'mage/translate-inline',
+    'mage/translate'
+], function ($, mageTemplate) {
     'use strict';
 
     /**
@@ -598,4 +590,4 @@
             }
         }
     });
-}));
+});
diff --git a/lib/web/mage/translate-inline.js b/lib/web/mage/translate-inline.js
index cdd2b8ad322f2..56acef5a49a42 100644
--- a/lib/web/mage/translate-inline.js
+++ b/lib/web/mage/translate-inline.js
@@ -3,20 +3,12 @@
  * See COPYING.txt for license details.
  */
 
-(function (root, factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'mage/template',
-            'jquery-ui-modules/dialog',
-            'mage/translate'
-        ], factory);
-    } else {
-        factory(root.jQuery, root.mageTemplate);
-    }
-}(this, function ($, mageTemplate) {
+define([
+    'jquery',
+    'mage/template',
+    'jquery-ui-modules/dialog',
+    'mage/translate'
+], function ($, mageTemplate) {
     'use strict';
 
     $.widget('mage.translateInline', $.ui.dialog, {
@@ -201,4 +193,4 @@
     });
 
     return $.mage.translateInline;
-}));
+});
diff --git a/lib/web/mage/utils/template.js b/lib/web/mage/utils/template.js
index 7aa695023cb56..e954ca50bac81 100644
--- a/lib/web/mage/utils/template.js
+++ b/lib/web/mage/utils/template.js
@@ -33,11 +33,15 @@ define([
     })();
 
     /**
-     * Validates template
+     * Objects can specify how to use templating for their properties - getting that configuration.
+     *
+     * To disable rendering for all properties of your object add __disableTmpl: true.
+     * To disable for specific property add __disableTmpl: {propertyName: true}.
+     * To limit recursion for a specific property add __disableTmpl: {propertyName: numberOfCycles}.
      *
      * @param {String} tmpl
-     * @param {Object} target
-     * @returns {Boolean}
+     * @param {Object | undefined} target
+     * @returns {Boolean|Object}
      */
     function isTmplIgnored(tmpl, target) {
         var parsedTmpl;
@@ -53,7 +57,7 @@ define([
 
         if (typeof target !== 'undefined') {
             if (typeof target === 'object' && target.hasOwnProperty('__disableTmpl')) {
-                return true;
+                return target.__disableTmpl;
             }
         }
 
@@ -69,16 +73,10 @@ define([
          *
          * @param {String} tmpl - Template string.
          * @param {Object} $ - Data object used in a template.
-         * @param {Object} target
          * @returns {String} Compiled template.
          */
-        template = function (tmpl, $, target) {
-
-            if (!isTmplIgnored(tmpl, target)) {
-                return eval('`' + tmpl + '`');
-            }
-
-            return tmpl;
+        template = function (tmpl, $) {
+            return eval('`' + tmpl + '`');
         };
 
         /*eslint-enable no-unused-vars, no-eval*/
@@ -130,19 +128,24 @@ define([
      * @param {Boolean} [castString=false] - Flag that indicates whether template
      *      should be casted after evaluation to a value of another type or
      *      that it should be leaved as a string.
+     * @param {Number|undefined} maxCycles - Maximum number of rendering cycles, can be 0.
      * @returns {*} Compiled template.
      */
-    function render(tmpl, data, castString, target) {
-        var last = tmpl;
+    function render(tmpl, data, castString, maxCycles) {
+        var last = tmpl,
+            cycles = 0;
 
-        while (~tmpl.indexOf(opener)) {
-            tmpl = template(tmpl, data, target);
+        while (~tmpl.indexOf(opener) && (typeof maxCycles === 'undefined' || cycles < maxCycles)) {
+            if (!isTmplIgnored(tmpl)) {
+                tmpl = template(tmpl, data);
+            }
 
             if (tmpl === last) {
                 break;
             }
 
             last = tmpl;
+            cycles++;
         }
 
         return castString ?
@@ -201,6 +204,9 @@ define([
              * Template iterator function.
              */
             _.each(tmpl, function iterate(value, key, list) {
+                var disabled,
+                    maxCycles;
+
                 if (key === '$data') {
                     return;
                 }
@@ -213,7 +219,21 @@ define([
                 }
 
                 if (isTemplate(value)) {
-                    list[key] = render(value, tmpl, castString, list);
+                    //Getting template disabling settings, can be true for all disabled and separate settings
+                    //for each property.
+                    disabled = isTmplIgnored(value, list);
+
+                    if (typeof disabled === 'object' && disabled.hasOwnProperty(key) && disabled[key] !== false) {
+                        //Checking if specific settings for a property provided.
+                        maxCycles = disabled[key];
+                    }
+
+                    if (disabled === true || maxCycles === true) {
+                        //Rendering for all properties is disabled.
+                        maxCycles = 0;
+                    }
+
+                    list[key] = render(value, tmpl, castString, maxCycles);
                 } else if ($.isPlainObject(value) || Array.isArray(value)) {
                     _.each(value, iterate);
                 }
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index 2ec39efcc283e..51c23a9b28c66 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -3,21 +3,13 @@
  * See COPYING.txt for license details.
  */
 
-(function (factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'moment',
-            'jquery-ui-modules/widget',
-            'jquery/validate',
-            'mage/translate'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($, moment) {
+define([
+    'jquery',
+    'moment',
+    'jquery-ui-modules/widget',
+    'jquery/validate',
+    'mage/translate'
+], function ($, moment) {
     'use strict';
 
     var creditCartTypes, rules, showLabel, originValidateDelegate;
@@ -1987,4 +1979,4 @@
     });
 
     return $.mage.validation;
-}));
+});
diff --git a/lib/web/mage/validation/validation.js b/lib/web/mage/validation/validation.js
index 0f2c4c06b119b..c8478ac84edd4 100644
--- a/lib/web/mage/validation/validation.js
+++ b/lib/web/mage/validation/validation.js
@@ -3,19 +3,11 @@
  * See COPYING.txt for license details.
  */
 
-(function (factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'mage/validation',
-            'mage/translate'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+define([
+    'jquery',
+    'mage/validation',
+    'mage/translate'
+], function ($) {
     'use strict';
 
     $.each({
@@ -175,4 +167,4 @@
         rule.unshift(i);
         $.validator.addMethod.apply($.validator, rule);
     });
-}));
+});
diff --git a/lib/web/mage/webapi.js b/lib/web/mage/webapi.js
index 3aa61b6f97752..ccb5efb85f64f 100644
--- a/lib/web/mage/webapi.js
+++ b/lib/web/mage/webapi.js
@@ -6,18 +6,10 @@
 /**
  * @deprecated since version 2.2.0
  */
-(function (factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'mage/mage'
-        ], factory);
-    } else {
-        factory(jQuery);
-    }
-}(function ($) {
+define([
+    'jquery',
+    'mage/mage'
+], function ($) {
     'use strict';
 
     /**
@@ -208,4 +200,4 @@
             }
         };
     };
-}));
+});
diff --git a/lib/web/mage/zoom.js b/lib/web/mage/zoom.js
index a7ad19fb560a0..cd7dd738158d0 100644
--- a/lib/web/mage/zoom.js
+++ b/lib/web/mage/zoom.js
@@ -6,19 +6,11 @@
 /**
  * @deprecated since version 2.2.0
  */
-(function (root, factory) {
-    'use strict';
-
-    if (typeof define === 'function' && define.amd) {
-        define([
-            'jquery',
-            'mage/template',
-            'jquery-ui-modules/widget'
-        ], factory);
-    } else {
-        factory(root.jQuery, root.mageTemplate);
-    }
-}(this, function ($, mageTemplate) {
+define([
+    'jquery',
+    'mage/template',
+    'jquery-ui-modules/widget'
+], function ($, mageTemplate) {
     'use strict';
 
     $.widget('mage.zoom', {
@@ -538,4 +530,4 @@
     });
 
     return $.mage.zoom;
-}));
+});
diff --git a/lib/web/magnifier/magnify.js b/lib/web/magnifier/magnify.js
index 9d673092b806c..559e7782f2476 100644
--- a/lib/web/magnifier/magnify.js
+++ b/lib/web/magnifier/magnify.js
@@ -680,8 +680,6 @@ define([
                         $image.removeClass(imageDraggableClass);
                     }
                 } else if (gallery.fullScreen && (!transitionEnabled || !transitionActive)) {
-                    e.preventDefault();
-
                     imagePosY = getTop($image);
                     imagePosX = $image.offset().left;
 
diff --git a/lib/web/moment.js b/lib/web/moment.js
index d34d1c6329e59..ee598a90a83f0 100644
--- a/lib/web/moment.js
+++ b/lib/web/moment.js
@@ -1,551 +1,6 @@
-//! moment.js
-//! version : 2.17.1
-//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
-//! license : MIT
-//! momentjs.com
-!function(a,b){"object"==typeof exports&&"undefined"!=typeof module?module.exports=b():"function"==typeof define&&define.amd?define(b):a.moment=b()}(this,function(){"use strict";function a(){return od.apply(null,arguments)}
-// This is done to register the method called with moment()
-// without creating circular dependencies.
-    function b(a){od=a}function c(a){return a instanceof Array||"[object Array]"===Object.prototype.toString.call(a)}function d(a){
-// IE8 will treat undefined and null as object if it wasn't for
-// input != null
-        return null!=a&&"[object Object]"===Object.prototype.toString.call(a)}function e(a){var b;for(b in a)
-// even if its not own property I'd still call it non-empty
-        return!1;return!0}function f(a){return"number"==typeof a||"[object Number]"===Object.prototype.toString.call(a)}function g(a){return a instanceof Date||"[object Date]"===Object.prototype.toString.call(a)}function h(a,b){var c,d=[];for(c=0;c<a.length;++c)d.push(b(a[c],c));return d}function i(a,b){return Object.prototype.hasOwnProperty.call(a,b)}function j(a,b){for(var c in b)i(b,c)&&(a[c]=b[c]);return i(b,"toString")&&(a.toString=b.toString),i(b,"valueOf")&&(a.valueOf=b.valueOf),a}function k(a,b,c,d){return rb(a,b,c,d,!0).utc()}function l(){
-// We need to deep clone this object.
-        return{empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1,parsedDateParts:[],meridiem:null}}function m(a){return null==a._pf&&(a._pf=l()),a._pf}function n(a){if(null==a._isValid){var b=m(a),c=qd.call(b.parsedDateParts,function(a){return null!=a}),d=!isNaN(a._d.getTime())&&b.overflow<0&&!b.empty&&!b.invalidMonth&&!b.invalidWeekday&&!b.nullInput&&!b.invalidFormat&&!b.userInvalidated&&(!b.meridiem||b.meridiem&&c);if(a._strict&&(d=d&&0===b.charsLeftOver&&0===b.unusedTokens.length&&void 0===b.bigHour),null!=Object.isFrozen&&Object.isFrozen(a))return d;a._isValid=d}return a._isValid}function o(a){var b=k(NaN);return null!=a?j(m(b),a):m(b).userInvalidated=!0,b}function p(a){return void 0===a}function q(a,b){var c,d,e;if(p(b._isAMomentObject)||(a._isAMomentObject=b._isAMomentObject),p(b._i)||(a._i=b._i),p(b._f)||(a._f=b._f),p(b._l)||(a._l=b._l),p(b._strict)||(a._strict=b._strict),p(b._tzm)||(a._tzm=b._tzm),p(b._isUTC)||(a._isUTC=b._isUTC),p(b._offset)||(a._offset=b._offset),p(b._pf)||(a._pf=m(b)),p(b._locale)||(a._locale=b._locale),rd.length>0)for(c in rd)d=rd[c],e=b[d],p(e)||(a[d]=e);return a}
-// Moment prototype object
-    function r(b){q(this,b),this._d=new Date(null!=b._d?b._d.getTime():NaN),this.isValid()||(this._d=new Date(NaN)),
-// Prevent infinite loop in case updateOffset creates new moment
-// objects.
-    sd===!1&&(sd=!0,a.updateOffset(this),sd=!1)}function s(a){return a instanceof r||null!=a&&null!=a._isAMomentObject}function t(a){return a<0?Math.ceil(a)||0:Math.floor(a)}function u(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=t(b)),c}
-// compare two arrays, return the number of differences
-    function v(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;d<e;d++)(c&&a[d]!==b[d]||!c&&u(a[d])!==u(b[d]))&&g++;return g+f}function w(b){a.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+b)}function x(b,c){var d=!0;return j(function(){if(null!=a.deprecationHandler&&a.deprecationHandler(null,b),d){for(var e,f=[],g=0;g<arguments.length;g++){if(e="","object"==typeof arguments[g]){e+="\n["+g+"] ";for(var h in arguments[0])e+=h+": "+arguments[0][h]+", ";e=e.slice(0,-2)}else e=arguments[g];f.push(e)}w(b+"\nArguments: "+Array.prototype.slice.call(f).join("")+"\n"+(new Error).stack),d=!1}return c.apply(this,arguments)},c)}function y(b,c){null!=a.deprecationHandler&&a.deprecationHandler(b,c),td[b]||(w(c),td[b]=!0)}function z(a){return a instanceof Function||"[object Function]"===Object.prototype.toString.call(a)}function A(a){var b,c;for(c in a)b=a[c],z(b)?this[c]=b:this["_"+c]=b;this._config=a,
-// Lenient ordinal parsing accepts just a number in addition to
-// number + (possibly) stuff coming from _ordinalParseLenient.
-        this._ordinalParseLenient=new RegExp(this._ordinalParse.source+"|"+/\d{1,2}/.source)}function B(a,b){var c,e=j({},a);for(c in b)i(b,c)&&(d(a[c])&&d(b[c])?(e[c]={},j(e[c],a[c]),j(e[c],b[c])):null!=b[c]?e[c]=b[c]:delete e[c]);for(c in a)i(a,c)&&!i(b,c)&&d(a[c])&&(
-// make sure changes to properties don't modify parent config
-        e[c]=j({},e[c]));return e}function C(a){null!=a&&this.set(a)}function D(a,b,c){var d=this._calendar[a]||this._calendar.sameElse;return z(d)?d.call(b,c):d}function E(a){var b=this._longDateFormat[a],c=this._longDateFormat[a.toUpperCase()];return b||!c?b:(this._longDateFormat[a]=c.replace(/MMMM|MM|DD|dddd/g,function(a){return a.slice(1)}),this._longDateFormat[a])}function F(){return this._invalidDate}function G(a){return this._ordinal.replace("%d",a)}function H(a,b,c,d){var e=this._relativeTime[c];return z(e)?e(a,b,c,d):e.replace(/%d/i,a)}function I(a,b){var c=this._relativeTime[a>0?"future":"past"];return z(c)?c(b):c.replace(/%s/i,b)}function J(a,b){var c=a.toLowerCase();Dd[c]=Dd[c+"s"]=Dd[b]=a}function K(a){return"string"==typeof a?Dd[a]||Dd[a.toLowerCase()]:void 0}function L(a){var b,c,d={};for(c in a)i(a,c)&&(b=K(c),b&&(d[b]=a[c]));return d}function M(a,b){Ed[a]=b}function N(a){var b=[];for(var c in a)b.push({unit:c,priority:Ed[c]});return b.sort(function(a,b){return a.priority-b.priority}),b}function O(b,c){return function(d){return null!=d?(Q(this,b,d),a.updateOffset(this,c),this):P(this,b)}}function P(a,b){return a.isValid()?a._d["get"+(a._isUTC?"UTC":"")+b]():NaN}function Q(a,b,c){a.isValid()&&a._d["set"+(a._isUTC?"UTC":"")+b](c)}
-// MOMENTS
-    function R(a){return a=K(a),z(this[a])?this[a]():this}function S(a,b){if("object"==typeof a){a=L(a);for(var c=N(a),d=0;d<c.length;d++)this[c[d].unit](a[c[d].unit])}else if(a=K(a),z(this[a]))return this[a](b);return this}function T(a,b,c){var d=""+Math.abs(a),e=b-d.length,f=a>=0;return(f?c?"+":"":"-")+Math.pow(10,Math.max(0,e)).toString().substr(1)+d}
-// token:    'M'
-// padded:   ['MM', 2]
-// ordinal:  'Mo'
-// callback: function () { this.month() + 1 }
-    function U(a,b,c,d){var e=d;"string"==typeof d&&(e=function(){return this[d]()}),a&&(Id[a]=e),b&&(Id[b[0]]=function(){return T(e.apply(this,arguments),b[1],b[2])}),c&&(Id[c]=function(){return this.localeData().ordinal(e.apply(this,arguments),a)})}function V(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function W(a){var b,c,d=a.match(Fd);for(b=0,c=d.length;b<c;b++)Id[d[b]]?d[b]=Id[d[b]]:d[b]=V(d[b]);return function(b){var e,f="";for(e=0;e<c;e++)f+=d[e]instanceof Function?d[e].call(b,a):d[e];return f}}
-// format date using native date object
-    function X(a,b){return a.isValid()?(b=Y(b,a.localeData()),Hd[b]=Hd[b]||W(b),Hd[b](a)):a.localeData().invalidDate()}function Y(a,b){function c(a){return b.longDateFormat(a)||a}var d=5;for(Gd.lastIndex=0;d>=0&&Gd.test(a);)a=a.replace(Gd,c),Gd.lastIndex=0,d-=1;return a}function Z(a,b,c){$d[a]=z(b)?b:function(a,d){return a&&c?c:b}}function $(a,b){return i($d,a)?$d[a](b._strict,b._locale):new RegExp(_(a))}
-// Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
-    function _(a){return aa(a.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e}))}function aa(a){return a.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function ba(a,b){var c,d=b;for("string"==typeof a&&(a=[a]),f(b)&&(d=function(a,c){c[b]=u(a)}),c=0;c<a.length;c++)_d[a[c]]=d}function ca(a,b){ba(a,function(a,c,d,e){d._w=d._w||{},b(a,d._w,d,e)})}function da(a,b,c){null!=b&&i(_d,a)&&_d[a](b,c._a,c,a)}function ea(a,b){return new Date(Date.UTC(a,b+1,0)).getUTCDate()}function fa(a,b){return a?c(this._months)?this._months[a.month()]:this._months[(this._months.isFormat||ke).test(b)?"format":"standalone"][a.month()]:this._months}function ga(a,b){return a?c(this._monthsShort)?this._monthsShort[a.month()]:this._monthsShort[ke.test(b)?"format":"standalone"][a.month()]:this._monthsShort}function ha(a,b,c){var d,e,f,g=a.toLocaleLowerCase();if(!this._monthsParse)for(
-// this is not used
-        this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[],d=0;d<12;++d)f=k([2e3,d]),this._shortMonthsParse[d]=this.monthsShort(f,"").toLocaleLowerCase(),this._longMonthsParse[d]=this.months(f,"").toLocaleLowerCase();return c?"MMM"===b?(e=je.call(this._shortMonthsParse,g),e!==-1?e:null):(e=je.call(this._longMonthsParse,g),e!==-1?e:null):"MMM"===b?(e=je.call(this._shortMonthsParse,g),e!==-1?e:(e=je.call(this._longMonthsParse,g),e!==-1?e:null)):(e=je.call(this._longMonthsParse,g),e!==-1?e:(e=je.call(this._shortMonthsParse,g),e!==-1?e:null))}function ia(a,b,c){var d,e,f;if(this._monthsParseExact)return ha.call(this,a,b,c);
-// TODO: add sorting
-// Sorting makes sure if one month (or abbr) is a prefix of another
-// see sorting in computeMonthsParse
-        for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),d=0;d<12;d++){
-// test the regex
-            if(
-// make the regex if we don't have it already
-                e=k([2e3,d]),c&&!this._longMonthsParse[d]&&(this._longMonthsParse[d]=new RegExp("^"+this.months(e,"").replace(".","")+"$","i"),this._shortMonthsParse[d]=new RegExp("^"+this.monthsShort(e,"").replace(".","")+"$","i")),c||this._monthsParse[d]||(f="^"+this.months(e,"")+"|^"+this.monthsShort(e,""),this._monthsParse[d]=new RegExp(f.replace(".",""),"i")),c&&"MMMM"===b&&this._longMonthsParse[d].test(a))return d;if(c&&"MMM"===b&&this._shortMonthsParse[d].test(a))return d;if(!c&&this._monthsParse[d].test(a))return d}}
-// MOMENTS
-    function ja(a,b){var c;if(!a.isValid())
-// No op
-        return a;if("string"==typeof b)if(/^\d+$/.test(b))b=u(b);else
-// TODO: Another silent failure?
-    if(b=a.localeData().monthsParse(b),!f(b))return a;return c=Math.min(a.date(),ea(a.year(),b)),a._d["set"+(a._isUTC?"UTC":"")+"Month"](b,c),a}function ka(b){return null!=b?(ja(this,b),a.updateOffset(this,!0),this):P(this,"Month")}function la(){return ea(this.year(),this.month())}function ma(a){return this._monthsParseExact?(i(this,"_monthsRegex")||oa.call(this),a?this._monthsShortStrictRegex:this._monthsShortRegex):(i(this,"_monthsShortRegex")||(this._monthsShortRegex=ne),this._monthsShortStrictRegex&&a?this._monthsShortStrictRegex:this._monthsShortRegex)}function na(a){return this._monthsParseExact?(i(this,"_monthsRegex")||oa.call(this),a?this._monthsStrictRegex:this._monthsRegex):(i(this,"_monthsRegex")||(this._monthsRegex=oe),this._monthsStrictRegex&&a?this._monthsStrictRegex:this._monthsRegex)}function oa(){function a(a,b){return b.length-a.length}var b,c,d=[],e=[],f=[];for(b=0;b<12;b++)
-// make the regex if we don't have it already
-        c=k([2e3,b]),d.push(this.monthsShort(c,"")),e.push(this.months(c,"")),f.push(this.months(c,"")),f.push(this.monthsShort(c,""));for(
-// Sorting makes sure if one month (or abbr) is a prefix of another it
-// will match the longer piece.
-        d.sort(a),e.sort(a),f.sort(a),b=0;b<12;b++)d[b]=aa(d[b]),e[b]=aa(e[b]);for(b=0;b<24;b++)f[b]=aa(f[b]);this._monthsRegex=new RegExp("^("+f.join("|")+")","i"),this._monthsShortRegex=this._monthsRegex,this._monthsStrictRegex=new RegExp("^("+e.join("|")+")","i"),this._monthsShortStrictRegex=new RegExp("^("+d.join("|")+")","i")}
-// HELPERS
-    function pa(a){return qa(a)?366:365}function qa(a){return a%4===0&&a%100!==0||a%400===0}function ra(){return qa(this.year())}function sa(a,b,c,d,e,f,g){
-//can't just apply() to create a date:
-//http://stackoverflow.com/questions/181348/instantiating-a-javascript-object-by-calling-prototype-constructor-apply
-        var h=new Date(a,b,c,d,e,f,g);
-//the date constructor remaps years 0-99 to 1900-1999
-        return a<100&&a>=0&&isFinite(h.getFullYear())&&h.setFullYear(a),h}function ta(a){var b=new Date(Date.UTC.apply(null,arguments));
-//the Date.UTC function remaps years 0-99 to 1900-1999
-        return a<100&&a>=0&&isFinite(b.getUTCFullYear())&&b.setUTCFullYear(a),b}
-// start-of-first-week - start-of-year
-    function ua(a,b,c){var// first-week day -- which january is always in the first week (4 for iso, 1 for other)
-        d=7+b-c,
-// first-week day local weekday -- which local weekday is fwd
-        e=(7+ta(a,0,d).getUTCDay()-b)%7;return-e+d-1}
-//http://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
-    function va(a,b,c,d,e){var f,g,h=(7+c-d)%7,i=ua(a,d,e),j=1+7*(b-1)+h+i;return j<=0?(f=a-1,g=pa(f)+j):j>pa(a)?(f=a+1,g=j-pa(a)):(f=a,g=j),{year:f,dayOfYear:g}}function wa(a,b,c){var d,e,f=ua(a.year(),b,c),g=Math.floor((a.dayOfYear()-f-1)/7)+1;return g<1?(e=a.year()-1,d=g+xa(e,b,c)):g>xa(a.year(),b,c)?(d=g-xa(a.year(),b,c),e=a.year()+1):(e=a.year(),d=g),{week:d,year:e}}function xa(a,b,c){var d=ua(a,b,c),e=ua(a+1,b,c);return(pa(a)-d+e)/7}
-// HELPERS
-// LOCALES
-    function ya(a){return wa(a,this._week.dow,this._week.doy).week}function za(){return this._week.dow}function Aa(){return this._week.doy}
-// MOMENTS
-    function Ba(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")}function Ca(a){var b=wa(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")}
-// HELPERS
-    function Da(a,b){return"string"!=typeof a?a:isNaN(a)?(a=b.weekdaysParse(a),"number"==typeof a?a:null):parseInt(a,10)}function Ea(a,b){return"string"==typeof a?b.weekdaysParse(a)%7||7:isNaN(a)?null:a}function Fa(a,b){return a?c(this._weekdays)?this._weekdays[a.day()]:this._weekdays[this._weekdays.isFormat.test(b)?"format":"standalone"][a.day()]:this._weekdays}function Ga(a){return a?this._weekdaysShort[a.day()]:this._weekdaysShort}function Ha(a){return a?this._weekdaysMin[a.day()]:this._weekdaysMin}function Ia(a,b,c){var d,e,f,g=a.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],d=0;d<7;++d)f=k([2e3,1]).day(d),this._minWeekdaysParse[d]=this.weekdaysMin(f,"").toLocaleLowerCase(),this._shortWeekdaysParse[d]=this.weekdaysShort(f,"").toLocaleLowerCase(),this._weekdaysParse[d]=this.weekdays(f,"").toLocaleLowerCase();return c?"dddd"===b?(e=je.call(this._weekdaysParse,g),e!==-1?e:null):"ddd"===b?(e=je.call(this._shortWeekdaysParse,g),e!==-1?e:null):(e=je.call(this._minWeekdaysParse,g),e!==-1?e:null):"dddd"===b?(e=je.call(this._weekdaysParse,g),e!==-1?e:(e=je.call(this._shortWeekdaysParse,g),e!==-1?e:(e=je.call(this._minWeekdaysParse,g),e!==-1?e:null))):"ddd"===b?(e=je.call(this._shortWeekdaysParse,g),e!==-1?e:(e=je.call(this._weekdaysParse,g),e!==-1?e:(e=je.call(this._minWeekdaysParse,g),e!==-1?e:null))):(e=je.call(this._minWeekdaysParse,g),e!==-1?e:(e=je.call(this._weekdaysParse,g),e!==-1?e:(e=je.call(this._shortWeekdaysParse,g),e!==-1?e:null)))}function Ja(a,b,c){var d,e,f;if(this._weekdaysParseExact)return Ia.call(this,a,b,c);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),d=0;d<7;d++){
-// test the regex
-        if(
-// make the regex if we don't have it already
-            e=k([2e3,1]).day(d),c&&!this._fullWeekdaysParse[d]&&(this._fullWeekdaysParse[d]=new RegExp("^"+this.weekdays(e,"").replace(".",".?")+"$","i"),this._shortWeekdaysParse[d]=new RegExp("^"+this.weekdaysShort(e,"").replace(".",".?")+"$","i"),this._minWeekdaysParse[d]=new RegExp("^"+this.weekdaysMin(e,"").replace(".",".?")+"$","i")),this._weekdaysParse[d]||(f="^"+this.weekdays(e,"")+"|^"+this.weekdaysShort(e,"")+"|^"+this.weekdaysMin(e,""),this._weekdaysParse[d]=new RegExp(f.replace(".",""),"i")),c&&"dddd"===b&&this._fullWeekdaysParse[d].test(a))return d;if(c&&"ddd"===b&&this._shortWeekdaysParse[d].test(a))return d;if(c&&"dd"===b&&this._minWeekdaysParse[d].test(a))return d;if(!c&&this._weekdaysParse[d].test(a))return d}}
-// MOMENTS
-    function Ka(a){if(!this.isValid())return null!=a?this:NaN;var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=Da(a,this.localeData()),this.add(a-b,"d")):b}function La(a){if(!this.isValid())return null!=a?this:NaN;var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")}function Ma(a){if(!this.isValid())return null!=a?this:NaN;
-// behaves the same as moment#day except
-// as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
-// as a setter, sunday should belong to the previous week.
-        if(null!=a){var b=Ea(a,this.localeData());return this.day(this.day()%7?b:b-7)}return this.day()||7}function Na(a){return this._weekdaysParseExact?(i(this,"_weekdaysRegex")||Qa.call(this),a?this._weekdaysStrictRegex:this._weekdaysRegex):(i(this,"_weekdaysRegex")||(this._weekdaysRegex=ue),this._weekdaysStrictRegex&&a?this._weekdaysStrictRegex:this._weekdaysRegex)}function Oa(a){return this._weekdaysParseExact?(i(this,"_weekdaysRegex")||Qa.call(this),a?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(i(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=ve),this._weekdaysShortStrictRegex&&a?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)}function Pa(a){return this._weekdaysParseExact?(i(this,"_weekdaysRegex")||Qa.call(this),a?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(i(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=we),this._weekdaysMinStrictRegex&&a?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)}function Qa(){function a(a,b){return b.length-a.length}var b,c,d,e,f,g=[],h=[],i=[],j=[];for(b=0;b<7;b++)
-// make the regex if we don't have it already
-        c=k([2e3,1]).day(b),d=this.weekdaysMin(c,""),e=this.weekdaysShort(c,""),f=this.weekdays(c,""),g.push(d),h.push(e),i.push(f),j.push(d),j.push(e),j.push(f);for(
-// Sorting makes sure if one weekday (or abbr) is a prefix of another it
-// will match the longer piece.
-        g.sort(a),h.sort(a),i.sort(a),j.sort(a),b=0;b<7;b++)h[b]=aa(h[b]),i[b]=aa(i[b]),j[b]=aa(j[b]);this._weekdaysRegex=new RegExp("^("+j.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+i.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+h.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+g.join("|")+")","i")}
-// FORMATTING
-    function Ra(){return this.hours()%12||12}function Sa(){return this.hours()||24}function Ta(a,b){U(a,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),b)})}
-// PARSING
-    function Ua(a,b){return b._meridiemParse}
-// LOCALES
-    function Va(a){
-// IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
-// Using charAt should be more compatible.
-        return"p"===(a+"").toLowerCase().charAt(0)}function Wa(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"}function Xa(a){return a?a.toLowerCase().replace("_","-"):a}
-// pick the locale from the array
-// try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
-// substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
-    function Ya(a){for(var b,c,d,e,f=0;f<a.length;){for(e=Xa(a[f]).split("-"),b=e.length,c=Xa(a[f+1]),c=c?c.split("-"):null;b>0;){if(d=Za(e.slice(0,b).join("-")))return d;if(c&&c.length>=b&&v(e,c,!0)>=b-1)
-//the next array item is better than a shallower substring of this one
-        break;b--}f++}return null}function Za(a){var b=null;
-// TODO: Find a better way to register and load all the locales in Node
-        if(!Be[a]&&"undefined"!=typeof module&&module&&module.exports)try{b=xe._abbr,require("./locale/"+a),
-// because defineLocale currently also sets the global locale, we
-// want to undo that for lazy loaded locales
-            $a(b)}catch(a){}return Be[a]}
-// This function will load locale and then set the global locale.  If
-// no arguments are passed in, it will simply return the current global
-// locale key.
-    function $a(a,b){var c;
-// moment.duration._locale = moment._locale = data;
-        return a&&(c=p(b)?bb(a):_a(a,b),c&&(xe=c)),xe._abbr}function _a(a,b){if(null!==b){var c=Ae;if(b.abbr=a,null!=Be[a])y("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),c=Be[a]._config;else if(null!=b.parentLocale){if(null==Be[b.parentLocale])return Ce[b.parentLocale]||(Ce[b.parentLocale]=[]),Ce[b.parentLocale].push({name:a,config:b}),null;c=Be[b.parentLocale]._config}
-// backwards compat for now: also set the locale
-// make sure we set the locale AFTER all child locales have been
-// created, so we won't end up with the child locale set.
-        return Be[a]=new C(B(c,b)),Ce[a]&&Ce[a].forEach(function(a){_a(a.name,a.config)}),$a(a),Be[a]}
-// useful for testing
-        return delete Be[a],null}function ab(a,b){if(null!=b){var c,d=Ae;
-// MERGE
-        null!=Be[a]&&(d=Be[a]._config),b=B(d,b),c=new C(b),c.parentLocale=Be[a],Be[a]=c,
-// backwards compat for now: also set the locale
-            $a(a)}else
-// pass null for config to unupdate, useful for tests
-        null!=Be[a]&&(null!=Be[a].parentLocale?Be[a]=Be[a].parentLocale:null!=Be[a]&&delete Be[a]);return Be[a]}
-// returns locale data
-    function bb(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return xe;if(!c(a)){if(
-//short-circuit everything else
-        b=Za(a))return b;a=[a]}return Ya(a)}function cb(){return wd(Be)}function db(a){var b,c=a._a;return c&&m(a).overflow===-2&&(b=c[be]<0||c[be]>11?be:c[ce]<1||c[ce]>ea(c[ae],c[be])?ce:c[de]<0||c[de]>24||24===c[de]&&(0!==c[ee]||0!==c[fe]||0!==c[ge])?de:c[ee]<0||c[ee]>59?ee:c[fe]<0||c[fe]>59?fe:c[ge]<0||c[ge]>999?ge:-1,m(a)._overflowDayOfYear&&(b<ae||b>ce)&&(b=ce),m(a)._overflowWeeks&&b===-1&&(b=he),m(a)._overflowWeekday&&b===-1&&(b=ie),m(a).overflow=b),a}
-// date from iso format
-    function eb(a){var b,c,d,e,f,g,h=a._i,i=De.exec(h)||Ee.exec(h);if(i){for(m(a).iso=!0,b=0,c=Ge.length;b<c;b++)if(Ge[b][1].exec(i[1])){e=Ge[b][0],d=Ge[b][2]!==!1;break}if(null==e)return void(a._isValid=!1);if(i[3]){for(b=0,c=He.length;b<c;b++)if(He[b][1].exec(i[3])){
-// match[2] should be 'T' or space
-        f=(i[2]||" ")+He[b][0];break}if(null==f)return void(a._isValid=!1)}if(!d&&null!=f)return void(a._isValid=!1);if(i[4]){if(!Fe.exec(i[4]))return void(a._isValid=!1);g="Z"}a._f=e+(f||"")+(g||""),kb(a)}else a._isValid=!1}
-// date from iso format or fallback
-    function fb(b){var c=Ie.exec(b._i);return null!==c?void(b._d=new Date(+c[1])):(eb(b),void(b._isValid===!1&&(delete b._isValid,a.createFromInputFallback(b))))}
-// Pick the first defined of two or three arguments.
-    function gb(a,b,c){return null!=a?a:null!=b?b:c}function hb(b){
-// hooks is actually the exported moment object
-        var c=new Date(a.now());return b._useUTC?[c.getUTCFullYear(),c.getUTCMonth(),c.getUTCDate()]:[c.getFullYear(),c.getMonth(),c.getDate()]}
-// convert an array to a date.
-// the array should mirror the parameters below
-// note: all values past the year are optional and will default to the lowest possible value.
-// [year, month, day , hour, minute, second, millisecond]
-    function ib(a){var b,c,d,e,f=[];if(!a._d){
-// Default to current date.
-// * if no year, month, day of month are given, default to today
-// * if day of month is given, default month and year
-// * if month is given, default only year
-// * if year is given, don't default anything
-        for(d=hb(a),
-//compute day of the year from weeks and weekdays
-            a._w&&null==a._a[ce]&&null==a._a[be]&&jb(a),
-//if the day of the year is set, figure out what it is
-            a._dayOfYear&&(e=gb(a._a[ae],d[ae]),a._dayOfYear>pa(e)&&(m(a)._overflowDayOfYear=!0),c=ta(e,0,a._dayOfYear),a._a[be]=c.getUTCMonth(),a._a[ce]=c.getUTCDate()),b=0;b<3&&null==a._a[b];++b)a._a[b]=f[b]=d[b];
-// Zero out whatever was not defaulted, including time
-        for(;b<7;b++)a._a[b]=f[b]=null==a._a[b]?2===b?1:0:a._a[b];
-// Check for 24:00:00.000
-        24===a._a[de]&&0===a._a[ee]&&0===a._a[fe]&&0===a._a[ge]&&(a._nextDay=!0,a._a[de]=0),a._d=(a._useUTC?ta:sa).apply(null,f),
-// Apply timezone offset from input. The actual utcOffset can be changed
-// with parseZone.
-        null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()-a._tzm),a._nextDay&&(a._a[de]=24)}}function jb(a){var b,c,d,e,f,g,h,i;if(b=a._w,null!=b.GG||null!=b.W||null!=b.E)f=1,g=4,
-// TODO: We need to take the current isoWeekYear, but that depends on
-// how we interpret now (local, utc, fixed offset). So create
-// a now version of current config (take local/utc/offset flags, and
-// create now).
-        c=gb(b.GG,a._a[ae],wa(sb(),1,4).year),d=gb(b.W,1),e=gb(b.E,1),(e<1||e>7)&&(i=!0);else{f=a._locale._week.dow,g=a._locale._week.doy;var j=wa(sb(),f,g);c=gb(b.gg,a._a[ae],j.year),
-// Default to current week.
-        d=gb(b.w,j.week),null!=b.d?(
-// weekday -- low day numbers are considered next week
-        e=b.d,(e<0||e>6)&&(i=!0)):null!=b.e?(
-// local weekday -- counting starts from begining of week
-        e=b.e+f,(b.e<0||b.e>6)&&(i=!0)):
-// default to begining of week
-        e=f}d<1||d>xa(c,f,g)?m(a)._overflowWeeks=!0:null!=i?m(a)._overflowWeekday=!0:(h=va(c,d,e,f,g),a._a[ae]=h.year,a._dayOfYear=h.dayOfYear)}
-// date from string and format string
-    function kb(b){
-// TODO: Move this to another part of the creation flow to prevent circular deps
-        if(b._f===a.ISO_8601)return void eb(b);b._a=[],m(b).empty=!0;
-// This array is used to make a Date, either with `new Date` or `Date.UTC`
-        var c,d,e,f,g,h=""+b._i,i=h.length,j=0;for(e=Y(b._f,b._locale).match(Fd)||[],c=0;c<e.length;c++)f=e[c],d=(h.match($(f,b))||[])[0],
-// console.log('token', token, 'parsedInput', parsedInput,
-//         'regex', getParseRegexForToken(token, config));
-        d&&(g=h.substr(0,h.indexOf(d)),g.length>0&&m(b).unusedInput.push(g),h=h.slice(h.indexOf(d)+d.length),j+=d.length),
-// don't parse if it's not a known token
-            Id[f]?(d?m(b).empty=!1:m(b).unusedTokens.push(f),da(f,d,b)):b._strict&&!d&&m(b).unusedTokens.push(f);
-// add remaining unparsed input length to the string
-        m(b).charsLeftOver=i-j,h.length>0&&m(b).unusedInput.push(h),
-// clear _12h flag if hour is <= 12
-        b._a[de]<=12&&m(b).bigHour===!0&&b._a[de]>0&&(m(b).bigHour=void 0),m(b).parsedDateParts=b._a.slice(0),m(b).meridiem=b._meridiem,
-// handle meridiem
-            b._a[de]=lb(b._locale,b._a[de],b._meridiem),ib(b),db(b)}function lb(a,b,c){var d;
-// Fallback
-        return null==c?b:null!=a.meridiemHour?a.meridiemHour(b,c):null!=a.isPM?(d=a.isPM(c),d&&b<12&&(b+=12),d||12!==b||(b=0),b):b}
-// date from string and array of format strings
-    function mb(a){var b,c,d,e,f;if(0===a._f.length)return m(a).invalidFormat=!0,void(a._d=new Date(NaN));for(e=0;e<a._f.length;e++)f=0,b=q({},a),null!=a._useUTC&&(b._useUTC=a._useUTC),b._f=a._f[e],kb(b),n(b)&&(
-// if there is any input that was not parsed add a penalty for that format
-        f+=m(b).charsLeftOver,
-//or tokens
-        f+=10*m(b).unusedTokens.length,m(b).score=f,(null==d||f<d)&&(d=f,c=b));j(a,c||b)}function nb(a){if(!a._d){var b=L(a._i);a._a=h([b.year,b.month,b.day||b.date,b.hour,b.minute,b.second,b.millisecond],function(a){return a&&parseInt(a,10)}),ib(a)}}function ob(a){var b=new r(db(pb(a)));
-// Adding is smart enough around DST
-        return b._nextDay&&(b.add(1,"d"),b._nextDay=void 0),b}function pb(a){var b=a._i,d=a._f;return a._locale=a._locale||bb(a._l),null===b||void 0===d&&""===b?o({nullInput:!0}):("string"==typeof b&&(a._i=b=a._locale.preparse(b)),s(b)?new r(db(b)):(g(b)?a._d=b:c(d)?mb(a):d?kb(a):qb(a),n(a)||(a._d=null),a))}function qb(b){var d=b._i;void 0===d?b._d=new Date(a.now()):g(d)?b._d=new Date(d.valueOf()):"string"==typeof d?fb(b):c(d)?(b._a=h(d.slice(0),function(a){return parseInt(a,10)}),ib(b)):"object"==typeof d?nb(b):f(d)?
-// from milliseconds
-        b._d=new Date(d):a.createFromInputFallback(b)}function rb(a,b,f,g,h){var i={};
-// object construction must be done this way.
-// https://github.com/moment/moment/issues/1423
-        return f!==!0&&f!==!1||(g=f,f=void 0),(d(a)&&e(a)||c(a)&&0===a.length)&&(a=void 0),i._isAMomentObject=!0,i._useUTC=i._isUTC=h,i._l=f,i._i=a,i._f=b,i._strict=g,ob(i)}function sb(a,b,c,d){return rb(a,b,c,d,!1)}
-// Pick a moment m from moments so that m[fn](other) is true for all
-// other. This relies on the function fn to be transitive.
-//
-// moments should either be an array of moment objects or an array, whose
-// first element is an array of moment objects.
-    function tb(a,b){var d,e;if(1===b.length&&c(b[0])&&(b=b[0]),!b.length)return sb();for(d=b[0],e=1;e<b.length;++e)b[e].isValid()&&!b[e][a](d)||(d=b[e]);return d}
-// TODO: Use [].sort instead?
-    function ub(){var a=[].slice.call(arguments,0);return tb("isBefore",a)}function vb(){var a=[].slice.call(arguments,0);return tb("isAfter",a)}function wb(a){var b=L(a),c=b.year||0,d=b.quarter||0,e=b.month||0,f=b.week||0,g=b.day||0,h=b.hour||0,i=b.minute||0,j=b.second||0,k=b.millisecond||0;
-// representation for dateAddRemove
-        this._milliseconds=+k+1e3*j+// 1000
-            6e4*i+// 1000 * 60
-            1e3*h*60*60,//using 1000 * 60 * 60 instead of 36e5 to avoid floating point rounding errors https://github.com/moment/moment/issues/2978
-// Because of dateAddRemove treats 24 hours as different from a
-// day when working around DST, we need to store them separately
-            this._days=+g+7*f,
-// It is impossible translate months into days without knowing
-// which months you are are talking about, so we have to store
-// it separately.
-            this._months=+e+3*d+12*c,this._data={},this._locale=bb(),this._bubble()}function xb(a){return a instanceof wb}function yb(a){return a<0?Math.round(-1*a)*-1:Math.round(a)}
-// FORMATTING
-    function zb(a,b){U(a,0,0,function(){var a=this.utcOffset(),c="+";return a<0&&(a=-a,c="-"),c+T(~~(a/60),2)+b+T(~~a%60,2)})}function Ab(a,b){var c=(b||"").match(a);if(null===c)return null;var d=c[c.length-1]||[],e=(d+"").match(Me)||["-",0,0],f=+(60*e[1])+u(e[2]);return 0===f?0:"+"===e[0]?f:-f}
-// Return a moment from input, that is local/utc/zone equivalent to model.
-    function Bb(b,c){var d,e;
-// Use low-level api, because this fn is low-level api.
-        return c._isUTC?(d=c.clone(),e=(s(b)||g(b)?b.valueOf():sb(b).valueOf())-d.valueOf(),d._d.setTime(d._d.valueOf()+e),a.updateOffset(d,!1),d):sb(b).local()}function Cb(a){
-// On Firefox.24 Date#getTimezoneOffset returns a floating point.
-// https://github.com/moment/moment/pull/1871
-        return 15*-Math.round(a._d.getTimezoneOffset()/15)}
-// MOMENTS
-// keepLocalTime = true means only change the timezone, without
-// affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
-// 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
-// +0200, so we adjust the time as needed, to be valid.
-//
-// Keeping the time actually adds/subtracts (one hour)
-// from the actual represented time. That is why we call updateOffset
-// a second time. In case it wants us to change the offset again
-// _changeInProgress == true case, then we have to adjust, because
-// there is no such time in the given timezone.
-    function Db(b,c){var d,e=this._offset||0;if(!this.isValid())return null!=b?this:NaN;if(null!=b){if("string"==typeof b){if(b=Ab(Xd,b),null===b)return this}else Math.abs(b)<16&&(b=60*b);return!this._isUTC&&c&&(d=Cb(this)),this._offset=b,this._isUTC=!0,null!=d&&this.add(d,"m"),e!==b&&(!c||this._changeInProgress?Tb(this,Ob(b-e,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,a.updateOffset(this,!0),this._changeInProgress=null)),this}return this._isUTC?e:Cb(this)}function Eb(a,b){return null!=a?("string"!=typeof a&&(a=-a),this.utcOffset(a,b),this):-this.utcOffset()}function Fb(a){return this.utcOffset(0,a)}function Gb(a){return this._isUTC&&(this.utcOffset(0,a),this._isUTC=!1,a&&this.subtract(Cb(this),"m")),this}function Hb(){if(null!=this._tzm)this.utcOffset(this._tzm);else if("string"==typeof this._i){var a=Ab(Wd,this._i);null!=a?this.utcOffset(a):this.utcOffset(0,!0)}return this}function Ib(a){return!!this.isValid()&&(a=a?sb(a).utcOffset():0,(this.utcOffset()-a)%60===0)}function Jb(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()}function Kb(){if(!p(this._isDSTShifted))return this._isDSTShifted;var a={};if(q(a,this),a=pb(a),a._a){var b=a._isUTC?k(a._a):sb(a._a);this._isDSTShifted=this.isValid()&&v(a._a,b.toArray())>0}else this._isDSTShifted=!1;return this._isDSTShifted}function Lb(){return!!this.isValid()&&!this._isUTC}function Mb(){return!!this.isValid()&&this._isUTC}function Nb(){return!!this.isValid()&&(this._isUTC&&0===this._offset)}function Ob(a,b){var c,d,e,g=a,
-// matching against regexp is expensive, do it on demand
-        h=null;// checks for null or undefined
-        return xb(a)?g={ms:a._milliseconds,d:a._days,M:a._months}:f(a)?(g={},b?g[b]=a:g.milliseconds=a):(h=Ne.exec(a))?(c="-"===h[1]?-1:1,g={y:0,d:u(h[ce])*c,h:u(h[de])*c,m:u(h[ee])*c,s:u(h[fe])*c,ms:u(yb(1e3*h[ge]))*c}):(h=Oe.exec(a))?(c="-"===h[1]?-1:1,g={y:Pb(h[2],c),M:Pb(h[3],c),w:Pb(h[4],c),d:Pb(h[5],c),h:Pb(h[6],c),m:Pb(h[7],c),s:Pb(h[8],c)}):null==g?g={}:"object"==typeof g&&("from"in g||"to"in g)&&(e=Rb(sb(g.from),sb(g.to)),g={},g.ms=e.milliseconds,g.M=e.months),d=new wb(g),xb(a)&&i(a,"_locale")&&(d._locale=a._locale),d}function Pb(a,b){
-// We'd normally use ~~inp for this, but unfortunately it also
-// converts floats to ints.
-// inp may be undefined, so careful calling replace on it.
-        var c=a&&parseFloat(a.replace(",","."));
-// apply sign while we're at it
-        return(isNaN(c)?0:c)*b}function Qb(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function Rb(a,b){var c;return a.isValid()&&b.isValid()?(b=Bb(b,a),a.isBefore(b)?c=Qb(a,b):(c=Qb(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c):{milliseconds:0,months:0}}
-// TODO: remove 'name' arg after deprecation is removed
-    function Sb(a,b){return function(c,d){var e,f;
-//invert the arguments, but complain about it
-        return null===d||isNaN(+d)||(y(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info."),f=c,c=d,d=f),c="string"==typeof c?+c:c,e=Ob(c,d),Tb(this,e,a),this}}function Tb(b,c,d,e){var f=c._milliseconds,g=yb(c._days),h=yb(c._months);b.isValid()&&(e=null==e||e,f&&b._d.setTime(b._d.valueOf()+f*d),g&&Q(b,"Date",P(b,"Date")+g*d),h&&ja(b,P(b,"Month")+h*d),e&&a.updateOffset(b,g||h))}function Ub(a,b){var c=a.diff(b,"days",!0);return c<-6?"sameElse":c<-1?"lastWeek":c<0?"lastDay":c<1?"sameDay":c<2?"nextDay":c<7?"nextWeek":"sameElse"}function Vb(b,c){
-// We want to compare the start of today, vs this.
-// Getting start-of-today depends on whether we're local/utc/offset or not.
-        var d=b||sb(),e=Bb(d,this).startOf("day"),f=a.calendarFormat(this,e)||"sameElse",g=c&&(z(c[f])?c[f].call(this,d):c[f]);return this.format(g||this.localeData().calendar(f,this,sb(d)))}function Wb(){return new r(this)}function Xb(a,b){var c=s(a)?a:sb(a);return!(!this.isValid()||!c.isValid())&&(b=K(p(b)?"millisecond":b),"millisecond"===b?this.valueOf()>c.valueOf():c.valueOf()<this.clone().startOf(b).valueOf())}function Yb(a,b){var c=s(a)?a:sb(a);return!(!this.isValid()||!c.isValid())&&(b=K(p(b)?"millisecond":b),"millisecond"===b?this.valueOf()<c.valueOf():this.clone().endOf(b).valueOf()<c.valueOf())}function Zb(a,b,c,d){return d=d||"()",("("===d[0]?this.isAfter(a,c):!this.isBefore(a,c))&&(")"===d[1]?this.isBefore(b,c):!this.isAfter(b,c))}function $b(a,b){var c,d=s(a)?a:sb(a);return!(!this.isValid()||!d.isValid())&&(b=K(b||"millisecond"),"millisecond"===b?this.valueOf()===d.valueOf():(c=d.valueOf(),this.clone().startOf(b).valueOf()<=c&&c<=this.clone().endOf(b).valueOf()))}function _b(a,b){return this.isSame(a,b)||this.isAfter(a,b)}function ac(a,b){return this.isSame(a,b)||this.isBefore(a,b)}function bc(a,b,c){var d,e,f,g;// 1000
-// 1000 * 60
-// 1000 * 60 * 60
-// 1000 * 60 * 60 * 24, negate dst
-// 1000 * 60 * 60 * 24 * 7, negate dst
-        return this.isValid()?(d=Bb(a,this),d.isValid()?(e=6e4*(d.utcOffset()-this.utcOffset()),b=K(b),"year"===b||"month"===b||"quarter"===b?(g=cc(this,d),"quarter"===b?g/=3:"year"===b&&(g/=12)):(f=this-d,g="second"===b?f/1e3:"minute"===b?f/6e4:"hour"===b?f/36e5:"day"===b?(f-e)/864e5:"week"===b?(f-e)/6048e5:f),c?g:t(g)):NaN):NaN}function cc(a,b){
-// difference in months
-        var c,d,e=12*(b.year()-a.year())+(b.month()-a.month()),
-// b is in (anchor - 1 month, anchor + 1 month)
-            f=a.clone().add(e,"months");
-//check for negative zero, return zero if negative zero
-// linear across the month
-// linear across the month
-        return b-f<0?(c=a.clone().add(e-1,"months"),d=(b-f)/(f-c)):(c=a.clone().add(e+1,"months"),d=(b-f)/(c-f)),-(e+d)||0}function dc(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")}function ec(){var a=this.clone().utc();return 0<a.year()&&a.year()<=9999?z(Date.prototype.toISOString)?this.toDate().toISOString():X(a,"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]"):X(a,"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]")}/**
-     * Return a human readable representation of a moment that can
-     * also be evaluated to get a new moment which is the same
-     *
-     * @link https://nodejs.org/dist/latest/docs/api/util.html#util_custom_inspect_function_on_objects
-     */
-    function fc(){if(!this.isValid())return"moment.invalid(/* "+this._i+" */)";var a="moment",b="";this.isLocal()||(a=0===this.utcOffset()?"moment.utc":"moment.parseZone",b="Z");var c="["+a+'("]',d=0<this.year()&&this.year()<=9999?"YYYY":"YYYYYY",e="-MM-DD[T]HH:mm:ss.SSS",f=b+'[")]';return this.format(c+d+e+f)}function gc(b){b||(b=this.isUtc()?a.defaultFormatUtc:a.defaultFormat);var c=X(this,b);return this.localeData().postformat(c)}function hc(a,b){return this.isValid()&&(s(a)&&a.isValid()||sb(a).isValid())?Ob({to:this,from:a}).locale(this.locale()).humanize(!b):this.localeData().invalidDate()}function ic(a){return this.from(sb(),a)}function jc(a,b){return this.isValid()&&(s(a)&&a.isValid()||sb(a).isValid())?Ob({from:this,to:a}).locale(this.locale()).humanize(!b):this.localeData().invalidDate()}function kc(a){return this.to(sb(),a)}
-// If passed a locale key, it will set the locale for this
-// instance.  Otherwise, it will return the locale configuration
-// variables for this instance.
-    function lc(a){var b;return void 0===a?this._locale._abbr:(b=bb(a),null!=b&&(this._locale=b),this)}function mc(){return this._locale}function nc(a){
-// the following switch intentionally omits break keywords
-// to utilize falling through the cases.
-        switch(a=K(a)){case"year":this.month(0);/* falls through */
-            case"quarter":case"month":this.date(1);/* falls through */
-            case"week":case"isoWeek":case"day":case"date":this.hours(0);/* falls through */
-            case"hour":this.minutes(0);/* falls through */
-            case"minute":this.seconds(0);/* falls through */
-            case"second":this.milliseconds(0)}
-// weeks are a special case
-// quarters are also special
-        return"week"===a&&this.weekday(0),"isoWeek"===a&&this.isoWeekday(1),"quarter"===a&&this.month(3*Math.floor(this.month()/3)),this}function oc(a){
-// 'date' is an alias for 'day', so it should be considered as such.
-        return a=K(a),void 0===a||"millisecond"===a?this:("date"===a&&(a="day"),this.startOf(a).add(1,"isoWeek"===a?"week":a).subtract(1,"ms"))}function pc(){return this._d.valueOf()-6e4*(this._offset||0)}function qc(){return Math.floor(this.valueOf()/1e3)}function rc(){return new Date(this.valueOf())}function sc(){var a=this;return[a.year(),a.month(),a.date(),a.hour(),a.minute(),a.second(),a.millisecond()]}function tc(){var a=this;return{years:a.year(),months:a.month(),date:a.date(),hours:a.hours(),minutes:a.minutes(),seconds:a.seconds(),milliseconds:a.milliseconds()}}function uc(){
-// new Date(NaN).toJSON() === null
-        return this.isValid()?this.toISOString():null}function vc(){return n(this)}function wc(){return j({},m(this))}function xc(){return m(this).overflow}function yc(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}}function zc(a,b){U(0,[a,a.length],0,b)}
-// MOMENTS
-    function Ac(a){return Ec.call(this,a,this.week(),this.weekday(),this.localeData()._week.dow,this.localeData()._week.doy)}function Bc(a){return Ec.call(this,a,this.isoWeek(),this.isoWeekday(),1,4)}function Cc(){return xa(this.year(),1,4)}function Dc(){var a=this.localeData()._week;return xa(this.year(),a.dow,a.doy)}function Ec(a,b,c,d,e){var f;return null==a?wa(this,d,e).year:(f=xa(a,d,e),b>f&&(b=f),Fc.call(this,a,b,c,d,e))}function Fc(a,b,c,d,e){var f=va(a,b,c,d,e),g=ta(f.year,0,f.dayOfYear);return this.year(g.getUTCFullYear()),this.month(g.getUTCMonth()),this.date(g.getUTCDate()),this}
-// MOMENTS
-    function Gc(a){return null==a?Math.ceil((this.month()+1)/3):this.month(3*(a-1)+this.month()%3)}
-// HELPERS
-// MOMENTS
-    function Hc(a){var b=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")}function Ic(a,b){b[ge]=u(1e3*("0."+a))}
-// MOMENTS
-    function Jc(){return this._isUTC?"UTC":""}function Kc(){return this._isUTC?"Coordinated Universal Time":""}function Lc(a){return sb(1e3*a)}function Mc(){return sb.apply(null,arguments).parseZone()}function Nc(a){return a}function Oc(a,b,c,d){var e=bb(),f=k().set(d,b);return e[c](f,a)}function Pc(a,b,c){if(f(a)&&(b=a,a=void 0),a=a||"",null!=b)return Oc(a,b,c,"month");var d,e=[];for(d=0;d<12;d++)e[d]=Oc(a,d,c,"month");return e}
-// ()
-// (5)
-// (fmt, 5)
-// (fmt)
-// (true)
-// (true, 5)
-// (true, fmt, 5)
-// (true, fmt)
-    function Qc(a,b,c,d){"boolean"==typeof a?(f(b)&&(c=b,b=void 0),b=b||""):(b=a,c=b,a=!1,f(b)&&(c=b,b=void 0),b=b||"");var e=bb(),g=a?e._week.dow:0;if(null!=c)return Oc(b,(c+g)%7,d,"day");var h,i=[];for(h=0;h<7;h++)i[h]=Oc(b,(h+g)%7,d,"day");return i}function Rc(a,b){return Pc(a,b,"months")}function Sc(a,b){return Pc(a,b,"monthsShort")}function Tc(a,b,c){return Qc(a,b,c,"weekdays")}function Uc(a,b,c){return Qc(a,b,c,"weekdaysShort")}function Vc(a,b,c){return Qc(a,b,c,"weekdaysMin")}function Wc(){var a=this._data;return this._milliseconds=Ze(this._milliseconds),this._days=Ze(this._days),this._months=Ze(this._months),a.milliseconds=Ze(a.milliseconds),a.seconds=Ze(a.seconds),a.minutes=Ze(a.minutes),a.hours=Ze(a.hours),a.months=Ze(a.months),a.years=Ze(a.years),this}function Xc(a,b,c,d){var e=Ob(b,c);return a._milliseconds+=d*e._milliseconds,a._days+=d*e._days,a._months+=d*e._months,a._bubble()}
-// supports only 2.0-style add(1, 's') or add(duration)
-    function Yc(a,b){return Xc(this,a,b,1)}
-// supports only 2.0-style subtract(1, 's') or subtract(duration)
-    function Zc(a,b){return Xc(this,a,b,-1)}function $c(a){return a<0?Math.floor(a):Math.ceil(a)}function _c(){var a,b,c,d,e,f=this._milliseconds,g=this._days,h=this._months,i=this._data;
-// if we have a mix of positive and negative values, bubble down first
-// check: https://github.com/moment/moment/issues/2166
-// The following code bubbles up values, see the tests for
-// examples of what that means.
-// convert days to months
-// 12 months -> 1 year
-        return f>=0&&g>=0&&h>=0||f<=0&&g<=0&&h<=0||(f+=864e5*$c(bd(h)+g),g=0,h=0),i.milliseconds=f%1e3,a=t(f/1e3),i.seconds=a%60,b=t(a/60),i.minutes=b%60,c=t(b/60),i.hours=c%24,g+=t(c/24),e=t(ad(g)),h+=e,g-=$c(bd(e)),d=t(h/12),h%=12,i.days=g,i.months=h,i.years=d,this}function ad(a){
-// 400 years have 146097 days (taking into account leap year rules)
-// 400 years have 12 months === 4800
-        return 4800*a/146097}function bd(a){
-// the reverse of daysToMonths
-        return 146097*a/4800}function cd(a){var b,c,d=this._milliseconds;if(a=K(a),"month"===a||"year"===a)return b=this._days+d/864e5,c=this._months+ad(b),"month"===a?c:c/12;switch(
-// handle milliseconds separately because of floating point math errors (issue #1867)
-        b=this._days+Math.round(bd(this._months)),a){case"week":return b/7+d/6048e5;case"day":return b+d/864e5;case"hour":return 24*b+d/36e5;case"minute":return 1440*b+d/6e4;case"second":return 86400*b+d/1e3;
-// Math.floor prevents floating point math errors here
-        case"millisecond":return Math.floor(864e5*b)+d;default:throw new Error("Unknown unit "+a)}}
-// TODO: Use this.as('ms')?
-    function dd(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*u(this._months/12)}function ed(a){return function(){return this.as(a)}}function fd(a){return a=K(a),this[a+"s"]()}function gd(a){return function(){return this._data[a]}}function hd(){return t(this.days()/7)}
-// helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
-    function id(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function jd(a,b,c){var d=Ob(a).abs(),e=of(d.as("s")),f=of(d.as("m")),g=of(d.as("h")),h=of(d.as("d")),i=of(d.as("M")),j=of(d.as("y")),k=e<pf.s&&["s",e]||f<=1&&["m"]||f<pf.m&&["mm",f]||g<=1&&["h"]||g<pf.h&&["hh",g]||h<=1&&["d"]||h<pf.d&&["dd",h]||i<=1&&["M"]||i<pf.M&&["MM",i]||j<=1&&["y"]||["yy",j];return k[2]=b,k[3]=+a>0,k[4]=c,id.apply(null,k)}
-// This function allows you to set the rounding function for relative time strings
-    function kd(a){return void 0===a?of:"function"==typeof a&&(of=a,!0)}
-// This function allows you to set a threshold for relative time strings
-    function ld(a,b){return void 0!==pf[a]&&(void 0===b?pf[a]:(pf[a]=b,!0))}function md(a){var b=this.localeData(),c=jd(this,!a,b);return a&&(c=b.pastFuture(+this,c)),b.postformat(c)}function nd(){
-// for ISO strings we do not use the normal bubbling rules:
-//  * milliseconds bubble up until they become hours
-//  * days do not bubble at all
-//  * months bubble up until they become years
-// This is because there is no context-free conversion between hours and days
-// (think of clock changes)
-// and also not between days and months (28-31 days per month)
-        var a,b,c,d=qf(this._milliseconds)/1e3,e=qf(this._days),f=qf(this._months);
-// 3600 seconds -> 60 minutes -> 1 hour
-        a=t(d/60),b=t(a/60),d%=60,a%=60,
-// 12 months -> 1 year
-            c=t(f/12),f%=12;
-// inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
-        var g=c,h=f,i=e,j=b,k=a,l=d,m=this.asSeconds();return m?(m<0?"-":"")+"P"+(g?g+"Y":"")+(h?h+"M":"")+(i?i+"D":"")+(j||k||l?"T":"")+(j?j+"H":"")+(k?k+"M":"")+(l?l+"S":""):"P0D"}var od,pd;pd=Array.prototype.some?Array.prototype.some:function(a){for(var b=Object(this),c=b.length>>>0,d=0;d<c;d++)if(d in b&&a.call(this,b[d],d,b))return!0;return!1};var qd=pd,rd=a.momentProperties=[],sd=!1,td={};a.suppressDeprecationWarnings=!1,a.deprecationHandler=null;var ud;ud=Object.keys?Object.keys:function(a){var b,c=[];for(b in a)i(a,b)&&c.push(b);return c};var vd,wd=ud,xd={sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},yd={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},zd="Invalid date",Ad="%d",Bd=/\d{1,2}/,Cd={future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},Dd={},Ed={},Fd=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,Gd=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,Hd={},Id={},Jd=/\d/,Kd=/\d\d/,Ld=/\d{3}/,Md=/\d{4}/,Nd=/[+-]?\d{6}/,Od=/\d\d?/,Pd=/\d\d\d\d?/,Qd=/\d\d\d\d\d\d?/,Rd=/\d{1,3}/,Sd=/\d{1,4}/,Td=/[+-]?\d{1,6}/,Ud=/\d+/,Vd=/[+-]?\d+/,Wd=/Z|[+-]\d\d:?\d\d/gi,Xd=/Z|[+-]\d\d(?::?\d\d)?/gi,Yd=/[+-]?\d+(\.\d{1,3})?/,Zd=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,$d={},_d={},ae=0,be=1,ce=2,de=3,ee=4,fe=5,ge=6,he=7,ie=8;vd=Array.prototype.indexOf?Array.prototype.indexOf:function(a){
-// I know
-        var b;for(b=0;b<this.length;++b)if(this[b]===a)return b;return-1};var je=vd;
-// FORMATTING
-    U("M",["MM",2],"Mo",function(){return this.month()+1}),U("MMM",0,0,function(a){return this.localeData().monthsShort(this,a)}),U("MMMM",0,0,function(a){return this.localeData().months(this,a)}),
-// ALIASES
-        J("month","M"),
-// PRIORITY
-        M("month",8),
-// PARSING
-        Z("M",Od),Z("MM",Od,Kd),Z("MMM",function(a,b){return b.monthsShortRegex(a)}),Z("MMMM",function(a,b){return b.monthsRegex(a)}),ba(["M","MM"],function(a,b){b[be]=u(a)-1}),ba(["MMM","MMMM"],function(a,b,c,d){var e=c._locale.monthsParse(a,d,c._strict);
-// if we didn't find a month name, mark the date as invalid.
-        null!=e?b[be]=e:m(c).invalidMonth=a});
-// LOCALES
-    var ke=/D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/,le="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),me="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),ne=Zd,oe=Zd;
-// FORMATTING
-    U("Y",0,0,function(){var a=this.year();return a<=9999?""+a:"+"+a}),U(0,["YY",2],0,function(){return this.year()%100}),U(0,["YYYY",4],0,"year"),U(0,["YYYYY",5],0,"year"),U(0,["YYYYYY",6,!0],0,"year"),
-// ALIASES
-        J("year","y"),
-// PRIORITIES
-        M("year",1),
-// PARSING
-        Z("Y",Vd),Z("YY",Od,Kd),Z("YYYY",Sd,Md),Z("YYYYY",Td,Nd),Z("YYYYYY",Td,Nd),ba(["YYYYY","YYYYYY"],ae),ba("YYYY",function(b,c){c[ae]=2===b.length?a.parseTwoDigitYear(b):u(b)}),ba("YY",function(b,c){c[ae]=a.parseTwoDigitYear(b)}),ba("Y",function(a,b){b[ae]=parseInt(a,10)}),
-// HOOKS
-        a.parseTwoDigitYear=function(a){return u(a)+(u(a)>68?1900:2e3)};
-// MOMENTS
-    var pe=O("FullYear",!0);
-// FORMATTING
-    U("w",["ww",2],"wo","week"),U("W",["WW",2],"Wo","isoWeek"),
-// ALIASES
-        J("week","w"),J("isoWeek","W"),
-// PRIORITIES
-        M("week",5),M("isoWeek",5),
-// PARSING
-        Z("w",Od),Z("ww",Od,Kd),Z("W",Od),Z("WW",Od,Kd),ca(["w","ww","W","WW"],function(a,b,c,d){b[d.substr(0,1)]=u(a)});var qe={dow:0,// Sunday is the first day of the week.
-        doy:6};
-// FORMATTING
-    U("d",0,"do","day"),U("dd",0,0,function(a){return this.localeData().weekdaysMin(this,a)}),U("ddd",0,0,function(a){return this.localeData().weekdaysShort(this,a)}),U("dddd",0,0,function(a){return this.localeData().weekdays(this,a)}),U("e",0,0,"weekday"),U("E",0,0,"isoWeekday"),
-// ALIASES
-        J("day","d"),J("weekday","e"),J("isoWeekday","E"),
-// PRIORITY
-        M("day",11),M("weekday",11),M("isoWeekday",11),
-// PARSING
-        Z("d",Od),Z("e",Od),Z("E",Od),Z("dd",function(a,b){return b.weekdaysMinRegex(a)}),Z("ddd",function(a,b){return b.weekdaysShortRegex(a)}),Z("dddd",function(a,b){return b.weekdaysRegex(a)}),ca(["dd","ddd","dddd"],function(a,b,c,d){var e=c._locale.weekdaysParse(a,d,c._strict);
-// if we didn't get a weekday name, mark the date as invalid
-        null!=e?b.d=e:m(c).invalidWeekday=a}),ca(["d","e","E"],function(a,b,c,d){b[d]=u(a)});
-// LOCALES
-    var re="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),se="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),te="Su_Mo_Tu_We_Th_Fr_Sa".split("_"),ue=Zd,ve=Zd,we=Zd;U("H",["HH",2],0,"hour"),U("h",["hh",2],0,Ra),U("k",["kk",2],0,Sa),U("hmm",0,0,function(){return""+Ra.apply(this)+T(this.minutes(),2)}),U("hmmss",0,0,function(){return""+Ra.apply(this)+T(this.minutes(),2)+T(this.seconds(),2)}),U("Hmm",0,0,function(){return""+this.hours()+T(this.minutes(),2)}),U("Hmmss",0,0,function(){return""+this.hours()+T(this.minutes(),2)+T(this.seconds(),2)}),Ta("a",!0),Ta("A",!1),
-// ALIASES
-        J("hour","h"),
-// PRIORITY
-        M("hour",13),Z("a",Ua),Z("A",Ua),Z("H",Od),Z("h",Od),Z("HH",Od,Kd),Z("hh",Od,Kd),Z("hmm",Pd),Z("hmmss",Qd),Z("Hmm",Pd),Z("Hmmss",Qd),ba(["H","HH"],de),ba(["a","A"],function(a,b,c){c._isPm=c._locale.isPM(a),c._meridiem=a}),ba(["h","hh"],function(a,b,c){b[de]=u(a),m(c).bigHour=!0}),ba("hmm",function(a,b,c){var d=a.length-2;b[de]=u(a.substr(0,d)),b[ee]=u(a.substr(d)),m(c).bigHour=!0}),ba("hmmss",function(a,b,c){var d=a.length-4,e=a.length-2;b[de]=u(a.substr(0,d)),b[ee]=u(a.substr(d,2)),b[fe]=u(a.substr(e)),m(c).bigHour=!0}),ba("Hmm",function(a,b,c){var d=a.length-2;b[de]=u(a.substr(0,d)),b[ee]=u(a.substr(d))}),ba("Hmmss",function(a,b,c){var d=a.length-4,e=a.length-2;b[de]=u(a.substr(0,d)),b[ee]=u(a.substr(d,2)),b[fe]=u(a.substr(e))});var xe,ye=/[ap]\.?m?\.?/i,ze=O("Hours",!0),Ae={calendar:xd,longDateFormat:yd,invalidDate:zd,ordinal:Ad,ordinalParse:Bd,relativeTime:Cd,months:le,monthsShort:me,week:qe,weekdays:re,weekdaysMin:te,weekdaysShort:se,meridiemParse:ye},Be={},Ce={},De=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,Ee=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,Fe=/Z|[+-]\d\d(?::?\d\d)?/,Ge=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],
-// YYYYMM is NOT allowed by the standard
-        ["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/]],He=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],Ie=/^\/?Date\((\-?\d+)/i;a.createFromInputFallback=x("value provided is not in a recognized ISO format. moment construction falls back to js Date(), which is not reliable across all browsers and versions. Non ISO date formats are discouraged and will be removed in an upcoming major release. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.",function(a){a._d=new Date(a._i+(a._useUTC?" UTC":""))}),
-// constant that refers to the ISO standard
-        a.ISO_8601=function(){};var Je=x("moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/",function(){var a=sb.apply(null,arguments);return this.isValid()&&a.isValid()?a<this?this:a:o()}),Ke=x("moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/",function(){var a=sb.apply(null,arguments);return this.isValid()&&a.isValid()?a>this?this:a:o()}),Le=function(){return Date.now?Date.now():+new Date};zb("Z",":"),zb("ZZ",""),
-// PARSING
-        Z("Z",Xd),Z("ZZ",Xd),ba(["Z","ZZ"],function(a,b,c){c._useUTC=!0,c._tzm=Ab(Xd,a)});
-// HELPERS
-// timezone chunker
-// '+10:00' > ['10',  '00']
-// '-1530'  > ['-15', '30']
-    var Me=/([\+\-]|\d\d)/gi;
-// HOOKS
-// This function will be called whenever a moment is mutated.
-// It is intended to keep the offset in sync with the timezone.
-    a.updateOffset=function(){};
-// ASP.NET json date format regex
-    var Ne=/^(\-)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/,Oe=/^(-)?P(?:(-?[0-9,.]*)Y)?(?:(-?[0-9,.]*)M)?(?:(-?[0-9,.]*)W)?(?:(-?[0-9,.]*)D)?(?:T(?:(-?[0-9,.]*)H)?(?:(-?[0-9,.]*)M)?(?:(-?[0-9,.]*)S)?)?$/;Ob.fn=wb.prototype;var Pe=Sb(1,"add"),Qe=Sb(-1,"subtract");a.defaultFormat="YYYY-MM-DDTHH:mm:ssZ",a.defaultFormatUtc="YYYY-MM-DDTHH:mm:ss[Z]";var Re=x("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(a){return void 0===a?this.localeData():this.locale(a)});
-// FORMATTING
-    U(0,["gg",2],0,function(){return this.weekYear()%100}),U(0,["GG",2],0,function(){return this.isoWeekYear()%100}),zc("gggg","weekYear"),zc("ggggg","weekYear"),zc("GGGG","isoWeekYear"),zc("GGGGG","isoWeekYear"),
-// ALIASES
-        J("weekYear","gg"),J("isoWeekYear","GG"),
-// PRIORITY
-        M("weekYear",1),M("isoWeekYear",1),
-// PARSING
-        Z("G",Vd),Z("g",Vd),Z("GG",Od,Kd),Z("gg",Od,Kd),Z("GGGG",Sd,Md),Z("gggg",Sd,Md),Z("GGGGG",Td,Nd),Z("ggggg",Td,Nd),ca(["gggg","ggggg","GGGG","GGGGG"],function(a,b,c,d){b[d.substr(0,2)]=u(a)}),ca(["gg","GG"],function(b,c,d,e){c[e]=a.parseTwoDigitYear(b)}),
-// FORMATTING
-        U("Q",0,"Qo","quarter"),
-// ALIASES
-        J("quarter","Q"),
-// PRIORITY
-        M("quarter",7),
-// PARSING
-        Z("Q",Jd),ba("Q",function(a,b){b[be]=3*(u(a)-1)}),
-// FORMATTING
-        U("D",["DD",2],"Do","date"),
-// ALIASES
-        J("date","D"),
-// PRIOROITY
-        M("date",9),
-// PARSING
-        Z("D",Od),Z("DD",Od,Kd),Z("Do",function(a,b){return a?b._ordinalParse:b._ordinalParseLenient}),ba(["D","DD"],ce),ba("Do",function(a,b){b[ce]=u(a.match(Od)[0],10)});
-// MOMENTS
-    var Se=O("Date",!0);
-// FORMATTING
-    U("DDD",["DDDD",3],"DDDo","dayOfYear"),
-// ALIASES
-        J("dayOfYear","DDD"),
-// PRIORITY
-        M("dayOfYear",4),
-// PARSING
-        Z("DDD",Rd),Z("DDDD",Ld),ba(["DDD","DDDD"],function(a,b,c){c._dayOfYear=u(a)}),
-// FORMATTING
-        U("m",["mm",2],0,"minute"),
-// ALIASES
-        J("minute","m"),
-// PRIORITY
-        M("minute",14),
-// PARSING
-        Z("m",Od),Z("mm",Od,Kd),ba(["m","mm"],ee);
-// MOMENTS
-    var Te=O("Minutes",!1);
-// FORMATTING
-    U("s",["ss",2],0,"second"),
-// ALIASES
-        J("second","s"),
-// PRIORITY
-        M("second",15),
-// PARSING
-        Z("s",Od),Z("ss",Od,Kd),ba(["s","ss"],fe);
-// MOMENTS
-    var Ue=O("Seconds",!1);
-// FORMATTING
-    U("S",0,0,function(){return~~(this.millisecond()/100)}),U(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),U(0,["SSS",3],0,"millisecond"),U(0,["SSSS",4],0,function(){return 10*this.millisecond()}),U(0,["SSSSS",5],0,function(){return 100*this.millisecond()}),U(0,["SSSSSS",6],0,function(){return 1e3*this.millisecond()}),U(0,["SSSSSSS",7],0,function(){return 1e4*this.millisecond()}),U(0,["SSSSSSSS",8],0,function(){return 1e5*this.millisecond()}),U(0,["SSSSSSSSS",9],0,function(){return 1e6*this.millisecond()}),
-// ALIASES
-        J("millisecond","ms"),
-// PRIORITY
-        M("millisecond",16),
-// PARSING
-        Z("S",Rd,Jd),Z("SS",Rd,Kd),Z("SSS",Rd,Ld);var Ve;for(Ve="SSSS";Ve.length<=9;Ve+="S")Z(Ve,Ud);for(Ve="S";Ve.length<=9;Ve+="S")ba(Ve,Ic);
-// MOMENTS
-    var We=O("Milliseconds",!1);
-// FORMATTING
-    U("z",0,0,"zoneAbbr"),U("zz",0,0,"zoneName");var Xe=r.prototype;Xe.add=Pe,Xe.calendar=Vb,Xe.clone=Wb,Xe.diff=bc,Xe.endOf=oc,Xe.format=gc,Xe.from=hc,Xe.fromNow=ic,Xe.to=jc,Xe.toNow=kc,Xe.get=R,Xe.invalidAt=xc,Xe.isAfter=Xb,Xe.isBefore=Yb,Xe.isBetween=Zb,Xe.isSame=$b,Xe.isSameOrAfter=_b,Xe.isSameOrBefore=ac,Xe.isValid=vc,Xe.lang=Re,Xe.locale=lc,Xe.localeData=mc,Xe.max=Ke,Xe.min=Je,Xe.parsingFlags=wc,Xe.set=S,Xe.startOf=nc,Xe.subtract=Qe,Xe.toArray=sc,Xe.toObject=tc,Xe.toDate=rc,Xe.toISOString=ec,Xe.inspect=fc,Xe.toJSON=uc,Xe.toString=dc,Xe.unix=qc,Xe.valueOf=pc,Xe.creationData=yc,
-// Year
-        Xe.year=pe,Xe.isLeapYear=ra,
-// Week Year
-        Xe.weekYear=Ac,Xe.isoWeekYear=Bc,
-// Quarter
-        Xe.quarter=Xe.quarters=Gc,
-// Month
-        Xe.month=ka,Xe.daysInMonth=la,
-// Week
-        Xe.week=Xe.weeks=Ba,Xe.isoWeek=Xe.isoWeeks=Ca,Xe.weeksInYear=Dc,Xe.isoWeeksInYear=Cc,
-// Day
-        Xe.date=Se,Xe.day=Xe.days=Ka,Xe.weekday=La,Xe.isoWeekday=Ma,Xe.dayOfYear=Hc,
-// Hour
-        Xe.hour=Xe.hours=ze,
-// Minute
-        Xe.minute=Xe.minutes=Te,
-// Second
-        Xe.second=Xe.seconds=Ue,
-// Millisecond
-        Xe.millisecond=Xe.milliseconds=We,
-// Offset
-        Xe.utcOffset=Db,Xe.utc=Fb,Xe.local=Gb,Xe.parseZone=Hb,Xe.hasAlignedHourOffset=Ib,Xe.isDST=Jb,Xe.isLocal=Lb,Xe.isUtcOffset=Mb,Xe.isUtc=Nb,Xe.isUTC=Nb,
-// Timezone
-        Xe.zoneAbbr=Jc,Xe.zoneName=Kc,
-// Deprecations
-        Xe.dates=x("dates accessor is deprecated. Use date instead.",Se),Xe.months=x("months accessor is deprecated. Use month instead",ka),Xe.years=x("years accessor is deprecated. Use year instead",pe),Xe.zone=x("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",Eb),Xe.isDSTShifted=x("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",Kb);var Ye=C.prototype;Ye.calendar=D,Ye.longDateFormat=E,Ye.invalidDate=F,Ye.ordinal=G,Ye.preparse=Nc,Ye.postformat=Nc,Ye.relativeTime=H,Ye.pastFuture=I,Ye.set=A,
-// Month
-        Ye.months=fa,Ye.monthsShort=ga,Ye.monthsParse=ia,Ye.monthsRegex=na,Ye.monthsShortRegex=ma,
-// Week
-        Ye.week=ya,Ye.firstDayOfYear=Aa,Ye.firstDayOfWeek=za,
-// Day of Week
-        Ye.weekdays=Fa,Ye.weekdaysMin=Ha,Ye.weekdaysShort=Ga,Ye.weekdaysParse=Ja,Ye.weekdaysRegex=Na,Ye.weekdaysShortRegex=Oa,Ye.weekdaysMinRegex=Pa,
-// Hours
-        Ye.isPM=Va,Ye.meridiem=Wa,$a("en",{ordinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(a){var b=a%10,c=1===u(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),
-// Side effect imports
-        a.lang=x("moment.lang is deprecated. Use moment.locale instead.",$a),a.langData=x("moment.langData is deprecated. Use moment.localeData instead.",bb);var Ze=Math.abs,$e=ed("ms"),_e=ed("s"),af=ed("m"),bf=ed("h"),cf=ed("d"),df=ed("w"),ef=ed("M"),ff=ed("y"),gf=gd("milliseconds"),hf=gd("seconds"),jf=gd("minutes"),kf=gd("hours"),lf=gd("days"),mf=gd("months"),nf=gd("years"),of=Math.round,pf={s:45,// seconds to minute
-        m:45,// minutes to hour
-        h:22,// hours to day
-        d:26,// days to month
-        M:11},qf=Math.abs,rf=wb.prototype;
-// Deprecations
-// Side effect imports
-// FORMATTING
-// PARSING
-// Side effect imports
-    return rf.abs=Wc,rf.add=Yc,rf.subtract=Zc,rf.as=cd,rf.asMilliseconds=$e,rf.asSeconds=_e,rf.asMinutes=af,rf.asHours=bf,rf.asDays=cf,rf.asWeeks=df,rf.asMonths=ef,rf.asYears=ff,rf.valueOf=dd,rf._bubble=_c,rf.get=fd,rf.milliseconds=gf,rf.seconds=hf,rf.minutes=jf,rf.hours=kf,rf.days=lf,rf.weeks=hd,rf.months=mf,rf.years=nf,rf.humanize=md,rf.toISOString=nd,rf.toString=nd,rf.toJSON=nd,rf.locale=lc,rf.localeData=mc,rf.toIsoString=x("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",nd),rf.lang=Re,U("X",0,0,"unix"),U("x",0,0,"valueOf"),Z("x",Vd),Z("X",Yd),ba("X",function(a,b,c){c._d=new Date(1e3*parseFloat(a,10))}),ba("x",function(a,b,c){c._d=new Date(u(a))}),a.version="2.17.1",b(sb),a.fn=Xe,a.min=ub,a.max=vb,a.now=Le,a.utc=k,a.unix=Lc,a.months=Rc,a.isDate=g,a.locale=$a,a.invalid=o,a.duration=Ob,a.isMoment=s,a.weekdays=Tc,a.parseZone=Mc,a.localeData=bb,a.isDuration=xb,a.monthsShort=Sc,a.weekdaysMin=Vc,a.defineLocale=_a,a.updateLocale=ab,a.locales=cb,a.weekdaysShort=Uc,a.normalizeUnits=K,a.relativeTimeRounding=kd,a.relativeTimeThreshold=ld,a.calendarFormat=Ub,a.prototype=Xe,a});
\ No newline at end of file
+/**
+ * Moment.js
+ *
+ * Version: 2.24.0
+ */
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.moment=t()}(this,function(){"use strict";var e,i;function c(){return e.apply(null,arguments)}function o(e){return e instanceof Array||"[object Array]"===Object.prototype.toString.call(e)}function u(e){return null!=e&&"[object Object]"===Object.prototype.toString.call(e)}function l(e){return void 0===e}function h(e){return"number"==typeof e||"[object Number]"===Object.prototype.toString.call(e)}function d(e){return e instanceof Date||"[object Date]"===Object.prototype.toString.call(e)}function f(e,t){var n,s=[];for(n=0;n<e.length;++n)s.push(t(e[n],n));return s}function m(e,t){return Object.prototype.hasOwnProperty.call(e,t)}function _(e,t){for(var n in t)m(t,n)&&(e[n]=t[n]);return m(t,"toString")&&(e.toString=t.toString),m(t,"valueOf")&&(e.valueOf=t.valueOf),e}function y(e,t,n,s){return Tt(e,t,n,s,!0).utc()}function g(e){return null==e._pf&&(e._pf={empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1,parsedDateParts:[],meridiem:null,rfc2822:!1,weekdayMismatch:!1}),e._pf}function v(e){if(null==e._isValid){var t=g(e),n=i.call(t.parsedDateParts,function(e){return null!=e}),s=!isNaN(e._d.getTime())&&t.overflow<0&&!t.empty&&!t.invalidMonth&&!t.invalidWeekday&&!t.weekdayMismatch&&!t.nullInput&&!t.invalidFormat&&!t.userInvalidated&&(!t.meridiem||t.meridiem&&n);if(e._strict&&(s=s&&0===t.charsLeftOver&&0===t.unusedTokens.length&&void 0===t.bigHour),null!=Object.isFrozen&&Object.isFrozen(e))return s;e._isValid=s}return e._isValid}function p(e){var t=y(NaN);return null!=e?_(g(t),e):g(t).userInvalidated=!0,t}i=Array.prototype.some?Array.prototype.some:function(e){for(var t=Object(this),n=t.length>>>0,s=0;s<n;s++)if(s in t&&e.call(this,t[s],s,t))return!0;return!1};var r=c.momentProperties=[];function w(e,t){var n,s,i;if(l(t._isAMomentObject)||(e._isAMomentObject=t._isAMomentObject),l(t._i)||(e._i=t._i),l(t._f)||(e._f=t._f),l(t._l)||(e._l=t._l),l(t._strict)||(e._strict=t._strict),l(t._tzm)||(e._tzm=t._tzm),l(t._isUTC)||(e._isUTC=t._isUTC),l(t._offset)||(e._offset=t._offset),l(t._pf)||(e._pf=g(t)),l(t._locale)||(e._locale=t._locale),0<r.length)for(n=0;n<r.length;n++)l(i=t[s=r[n]])||(e[s]=i);return e}var t=!1;function M(e){w(this,e),this._d=new Date(null!=e._d?e._d.getTime():NaN),this.isValid()||(this._d=new Date(NaN)),!1===t&&(t=!0,c.updateOffset(this),t=!1)}function k(e){return e instanceof M||null!=e&&null!=e._isAMomentObject}function S(e){return e<0?Math.ceil(e)||0:Math.floor(e)}function D(e){var t=+e,n=0;return 0!==t&&isFinite(t)&&(n=S(t)),n}function a(e,t,n){var s,i=Math.min(e.length,t.length),r=Math.abs(e.length-t.length),a=0;for(s=0;s<i;s++)(n&&e[s]!==t[s]||!n&&D(e[s])!==D(t[s]))&&a++;return a+r}function Y(e){!1===c.suppressDeprecationWarnings&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+e)}function n(i,r){var a=!0;return _(function(){if(null!=c.deprecationHandler&&c.deprecationHandler(null,i),a){for(var e,t=[],n=0;n<arguments.length;n++){if(e="","object"==typeof arguments[n]){for(var s in e+="\n["+n+"] ",arguments[0])e+=s+": "+arguments[0][s]+", ";e=e.slice(0,-2)}else e=arguments[n];t.push(e)}Y(i+"\nArguments: "+Array.prototype.slice.call(t).join("")+"\n"+(new Error).stack),a=!1}return r.apply(this,arguments)},r)}var s,O={};function T(e,t){null!=c.deprecationHandler&&c.deprecationHandler(e,t),O[e]||(Y(t),O[e]=!0)}function b(e){return e instanceof Function||"[object Function]"===Object.prototype.toString.call(e)}function x(e,t){var n,s=_({},e);for(n in t)m(t,n)&&(u(e[n])&&u(t[n])?(s[n]={},_(s[n],e[n]),_(s[n],t[n])):null!=t[n]?s[n]=t[n]:delete s[n]);for(n in e)m(e,n)&&!m(t,n)&&u(e[n])&&(s[n]=_({},s[n]));return s}function P(e){null!=e&&this.set(e)}c.suppressDeprecationWarnings=!1,c.deprecationHandler=null,s=Object.keys?Object.keys:function(e){var t,n=[];for(t in e)m(e,t)&&n.push(t);return n};var W={};function C(e,t){var n=e.toLowerCase();W[n]=W[n+"s"]=W[t]=e}function H(e){return"string"==typeof e?W[e]||W[e.toLowerCase()]:void 0}function R(e){var t,n,s={};for(n in e)m(e,n)&&(t=H(n))&&(s[t]=e[n]);return s}var U={};function F(e,t){U[e]=t}function L(e,t,n){var s=""+Math.abs(e),i=t-s.length;return(0<=e?n?"+":"":"-")+Math.pow(10,Math.max(0,i)).toString().substr(1)+s}var N=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,G=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,V={},E={};function I(e,t,n,s){var i=s;"string"==typeof s&&(i=function(){return this[s]()}),e&&(E[e]=i),t&&(E[t[0]]=function(){return L(i.apply(this,arguments),t[1],t[2])}),n&&(E[n]=function(){return this.localeData().ordinal(i.apply(this,arguments),e)})}function A(e,t){return e.isValid()?(t=j(t,e.localeData()),V[t]=V[t]||function(s){var e,i,t,r=s.match(N);for(e=0,i=r.length;e<i;e++)E[r[e]]?r[e]=E[r[e]]:r[e]=(t=r[e]).match(/\[[\s\S]/)?t.replace(/^\[|\]$/g,""):t.replace(/\\/g,"");return function(e){var t,n="";for(t=0;t<i;t++)n+=b(r[t])?r[t].call(e,s):r[t];return n}}(t),V[t](e)):e.localeData().invalidDate()}function j(e,t){var n=5;function s(e){return t.longDateFormat(e)||e}for(G.lastIndex=0;0<=n&&G.test(e);)e=e.replace(G,s),G.lastIndex=0,n-=1;return e}var Z=/\d/,z=/\d\d/,$=/\d{3}/,q=/\d{4}/,J=/[+-]?\d{6}/,B=/\d\d?/,Q=/\d\d\d\d?/,X=/\d\d\d\d\d\d?/,K=/\d{1,3}/,ee=/\d{1,4}/,te=/[+-]?\d{1,6}/,ne=/\d+/,se=/[+-]?\d+/,ie=/Z|[+-]\d\d:?\d\d/gi,re=/Z|[+-]\d\d(?::?\d\d)?/gi,ae=/[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i,oe={};function ue(e,n,s){oe[e]=b(n)?n:function(e,t){return e&&s?s:n}}function le(e,t){return m(oe,e)?oe[e](t._strict,t._locale):new RegExp(he(e.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(e,t,n,s,i){return t||n||s||i})))}function he(e){return e.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}var de={};function ce(e,n){var t,s=n;for("string"==typeof e&&(e=[e]),h(n)&&(s=function(e,t){t[n]=D(e)}),t=0;t<e.length;t++)de[e[t]]=s}function fe(e,i){ce(e,function(e,t,n,s){n._w=n._w||{},i(e,n._w,n,s)})}var me=0,_e=1,ye=2,ge=3,ve=4,pe=5,we=6,Me=7,ke=8;function Se(e){return De(e)?366:365}function De(e){return e%4==0&&e%100!=0||e%400==0}I("Y",0,0,function(){var e=this.year();return e<=9999?""+e:"+"+e}),I(0,["YY",2],0,function(){return this.year()%100}),I(0,["YYYY",4],0,"year"),I(0,["YYYYY",5],0,"year"),I(0,["YYYYYY",6,!0],0,"year"),C("year","y"),F("year",1),ue("Y",se),ue("YY",B,z),ue("YYYY",ee,q),ue("YYYYY",te,J),ue("YYYYYY",te,J),ce(["YYYYY","YYYYYY"],me),ce("YYYY",function(e,t){t[me]=2===e.length?c.parseTwoDigitYear(e):D(e)}),ce("YY",function(e,t){t[me]=c.parseTwoDigitYear(e)}),ce("Y",function(e,t){t[me]=parseInt(e,10)}),c.parseTwoDigitYear=function(e){return D(e)+(68<D(e)?1900:2e3)};var Ye,Oe=Te("FullYear",!0);function Te(t,n){return function(e){return null!=e?(xe(this,t,e),c.updateOffset(this,n),this):be(this,t)}}function be(e,t){return e.isValid()?e._d["get"+(e._isUTC?"UTC":"")+t]():NaN}function xe(e,t,n){e.isValid()&&!isNaN(n)&&("FullYear"===t&&De(e.year())&&1===e.month()&&29===e.date()?e._d["set"+(e._isUTC?"UTC":"")+t](n,e.month(),Pe(n,e.month())):e._d["set"+(e._isUTC?"UTC":"")+t](n))}function Pe(e,t){if(isNaN(e)||isNaN(t))return NaN;var n,s=(t%(n=12)+n)%n;return e+=(t-s)/12,1===s?De(e)?29:28:31-s%7%2}Ye=Array.prototype.indexOf?Array.prototype.indexOf:function(e){var t;for(t=0;t<this.length;++t)if(this[t]===e)return t;return-1},I("M",["MM",2],"Mo",function(){return this.month()+1}),I("MMM",0,0,function(e){return this.localeData().monthsShort(this,e)}),I("MMMM",0,0,function(e){return this.localeData().months(this,e)}),C("month","M"),F("month",8),ue("M",B),ue("MM",B,z),ue("MMM",function(e,t){return t.monthsShortRegex(e)}),ue("MMMM",function(e,t){return t.monthsRegex(e)}),ce(["M","MM"],function(e,t){t[_e]=D(e)-1}),ce(["MMM","MMMM"],function(e,t,n,s){var i=n._locale.monthsParse(e,s,n._strict);null!=i?t[_e]=i:g(n).invalidMonth=e});var We=/D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/,Ce="January_February_March_April_May_June_July_August_September_October_November_December".split("_");var He="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_");function Re(e,t){var n;if(!e.isValid())return e;if("string"==typeof t)if(/^\d+$/.test(t))t=D(t);else if(!h(t=e.localeData().monthsParse(t)))return e;return n=Math.min(e.date(),Pe(e.year(),t)),e._d["set"+(e._isUTC?"UTC":"")+"Month"](t,n),e}function Ue(e){return null!=e?(Re(this,e),c.updateOffset(this,!0),this):be(this,"Month")}var Fe=ae;var Le=ae;function Ne(){function e(e,t){return t.length-e.length}var t,n,s=[],i=[],r=[];for(t=0;t<12;t++)n=y([2e3,t]),s.push(this.monthsShort(n,"")),i.push(this.months(n,"")),r.push(this.months(n,"")),r.push(this.monthsShort(n,""));for(s.sort(e),i.sort(e),r.sort(e),t=0;t<12;t++)s[t]=he(s[t]),i[t]=he(i[t]);for(t=0;t<24;t++)r[t]=he(r[t]);this._monthsRegex=new RegExp("^("+r.join("|")+")","i"),this._monthsShortRegex=this._monthsRegex,this._monthsStrictRegex=new RegExp("^("+i.join("|")+")","i"),this._monthsShortStrictRegex=new RegExp("^("+s.join("|")+")","i")}function Ge(e){var t;if(e<100&&0<=e){var n=Array.prototype.slice.call(arguments);n[0]=e+400,t=new Date(Date.UTC.apply(null,n)),isFinite(t.getUTCFullYear())&&t.setUTCFullYear(e)}else t=new Date(Date.UTC.apply(null,arguments));return t}function Ve(e,t,n){var s=7+t-n;return-((7+Ge(e,0,s).getUTCDay()-t)%7)+s-1}function Ee(e,t,n,s,i){var r,a,o=1+7*(t-1)+(7+n-s)%7+Ve(e,s,i);return a=o<=0?Se(r=e-1)+o:o>Se(e)?(r=e+1,o-Se(e)):(r=e,o),{year:r,dayOfYear:a}}function Ie(e,t,n){var s,i,r=Ve(e.year(),t,n),a=Math.floor((e.dayOfYear()-r-1)/7)+1;return a<1?s=a+Ae(i=e.year()-1,t,n):a>Ae(e.year(),t,n)?(s=a-Ae(e.year(),t,n),i=e.year()+1):(i=e.year(),s=a),{week:s,year:i}}function Ae(e,t,n){var s=Ve(e,t,n),i=Ve(e+1,t,n);return(Se(e)-s+i)/7}I("w",["ww",2],"wo","week"),I("W",["WW",2],"Wo","isoWeek"),C("week","w"),C("isoWeek","W"),F("week",5),F("isoWeek",5),ue("w",B),ue("ww",B,z),ue("W",B),ue("WW",B,z),fe(["w","ww","W","WW"],function(e,t,n,s){t[s.substr(0,1)]=D(e)});function je(e,t){return e.slice(t,7).concat(e.slice(0,t))}I("d",0,"do","day"),I("dd",0,0,function(e){return this.localeData().weekdaysMin(this,e)}),I("ddd",0,0,function(e){return this.localeData().weekdaysShort(this,e)}),I("dddd",0,0,function(e){return this.localeData().weekdays(this,e)}),I("e",0,0,"weekday"),I("E",0,0,"isoWeekday"),C("day","d"),C("weekday","e"),C("isoWeekday","E"),F("day",11),F("weekday",11),F("isoWeekday",11),ue("d",B),ue("e",B),ue("E",B),ue("dd",function(e,t){return t.weekdaysMinRegex(e)}),ue("ddd",function(e,t){return t.weekdaysShortRegex(e)}),ue("dddd",function(e,t){return t.weekdaysRegex(e)}),fe(["dd","ddd","dddd"],function(e,t,n,s){var i=n._locale.weekdaysParse(e,s,n._strict);null!=i?t.d=i:g(n).invalidWeekday=e}),fe(["d","e","E"],function(e,t,n,s){t[s]=D(e)});var Ze="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_");var ze="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_");var $e="Su_Mo_Tu_We_Th_Fr_Sa".split("_");var qe=ae;var Je=ae;var Be=ae;function Qe(){function e(e,t){return t.length-e.length}var t,n,s,i,r,a=[],o=[],u=[],l=[];for(t=0;t<7;t++)n=y([2e3,1]).day(t),s=this.weekdaysMin(n,""),i=this.weekdaysShort(n,""),r=this.weekdays(n,""),a.push(s),o.push(i),u.push(r),l.push(s),l.push(i),l.push(r);for(a.sort(e),o.sort(e),u.sort(e),l.sort(e),t=0;t<7;t++)o[t]=he(o[t]),u[t]=he(u[t]),l[t]=he(l[t]);this._weekdaysRegex=new RegExp("^("+l.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+u.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+o.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+a.join("|")+")","i")}function Xe(){return this.hours()%12||12}function Ke(e,t){I(e,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),t)})}function et(e,t){return t._meridiemParse}I("H",["HH",2],0,"hour"),I("h",["hh",2],0,Xe),I("k",["kk",2],0,function(){return this.hours()||24}),I("hmm",0,0,function(){return""+Xe.apply(this)+L(this.minutes(),2)}),I("hmmss",0,0,function(){return""+Xe.apply(this)+L(this.minutes(),2)+L(this.seconds(),2)}),I("Hmm",0,0,function(){return""+this.hours()+L(this.minutes(),2)}),I("Hmmss",0,0,function(){return""+this.hours()+L(this.minutes(),2)+L(this.seconds(),2)}),Ke("a",!0),Ke("A",!1),C("hour","h"),F("hour",13),ue("a",et),ue("A",et),ue("H",B),ue("h",B),ue("k",B),ue("HH",B,z),ue("hh",B,z),ue("kk",B,z),ue("hmm",Q),ue("hmmss",X),ue("Hmm",Q),ue("Hmmss",X),ce(["H","HH"],ge),ce(["k","kk"],function(e,t,n){var s=D(e);t[ge]=24===s?0:s}),ce(["a","A"],function(e,t,n){n._isPm=n._locale.isPM(e),n._meridiem=e}),ce(["h","hh"],function(e,t,n){t[ge]=D(e),g(n).bigHour=!0}),ce("hmm",function(e,t,n){var s=e.length-2;t[ge]=D(e.substr(0,s)),t[ve]=D(e.substr(s)),g(n).bigHour=!0}),ce("hmmss",function(e,t,n){var s=e.length-4,i=e.length-2;t[ge]=D(e.substr(0,s)),t[ve]=D(e.substr(s,2)),t[pe]=D(e.substr(i)),g(n).bigHour=!0}),ce("Hmm",function(e,t,n){var s=e.length-2;t[ge]=D(e.substr(0,s)),t[ve]=D(e.substr(s))}),ce("Hmmss",function(e,t,n){var s=e.length-4,i=e.length-2;t[ge]=D(e.substr(0,s)),t[ve]=D(e.substr(s,2)),t[pe]=D(e.substr(i))});var tt,nt=Te("Hours",!0),st={calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},invalidDate:"Invalid date",ordinal:"%d",dayOfMonthOrdinalParse:/\d{1,2}/,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},months:Ce,monthsShort:He,week:{dow:0,doy:6},weekdays:Ze,weekdaysMin:$e,weekdaysShort:ze,meridiemParse:/[ap]\.?m?\.?/i},it={},rt={};function at(e){return e?e.toLowerCase().replace("_","-"):e}function ot(e){var t=null;if(!it[e]&&"undefined"!=typeof module&&module&&module.exports)try{t=tt._abbr,require("./locale/"+e),ut(t)}catch(e){}return it[e]}function ut(e,t){var n;return e&&((n=l(t)?ht(e):lt(e,t))?tt=n:"undefined"!=typeof console&&console.warn&&console.warn("Locale "+e+" not found. Did you forget to load it?")),tt._abbr}function lt(e,t){if(null===t)return delete it[e],null;var n,s=st;if(t.abbr=e,null!=it[e])T("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),s=it[e]._config;else if(null!=t.parentLocale)if(null!=it[t.parentLocale])s=it[t.parentLocale]._config;else{if(null==(n=ot(t.parentLocale)))return rt[t.parentLocale]||(rt[t.parentLocale]=[]),rt[t.parentLocale].push({name:e,config:t}),null;s=n._config}return it[e]=new P(x(s,t)),rt[e]&&rt[e].forEach(function(e){lt(e.name,e.config)}),ut(e),it[e]}function ht(e){var t;if(e&&e._locale&&e._locale._abbr&&(e=e._locale._abbr),!e)return tt;if(!o(e)){if(t=ot(e))return t;e=[e]}return function(e){for(var t,n,s,i,r=0;r<e.length;){for(t=(i=at(e[r]).split("-")).length,n=(n=at(e[r+1]))?n.split("-"):null;0<t;){if(s=ot(i.slice(0,t).join("-")))return s;if(n&&n.length>=t&&a(i,n,!0)>=t-1)break;t--}r++}return tt}(e)}function dt(e){var t,n=e._a;return n&&-2===g(e).overflow&&(t=n[_e]<0||11<n[_e]?_e:n[ye]<1||n[ye]>Pe(n[me],n[_e])?ye:n[ge]<0||24<n[ge]||24===n[ge]&&(0!==n[ve]||0!==n[pe]||0!==n[we])?ge:n[ve]<0||59<n[ve]?ve:n[pe]<0||59<n[pe]?pe:n[we]<0||999<n[we]?we:-1,g(e)._overflowDayOfYear&&(t<me||ye<t)&&(t=ye),g(e)._overflowWeeks&&-1===t&&(t=Me),g(e)._overflowWeekday&&-1===t&&(t=ke),g(e).overflow=t),e}function ct(e,t,n){return null!=e?e:null!=t?t:n}function ft(e){var t,n,s,i,r,a=[];if(!e._d){var o,u;for(o=e,u=new Date(c.now()),s=o._useUTC?[u.getUTCFullYear(),u.getUTCMonth(),u.getUTCDate()]:[u.getFullYear(),u.getMonth(),u.getDate()],e._w&&null==e._a[ye]&&null==e._a[_e]&&function(e){var t,n,s,i,r,a,o,u;if(null!=(t=e._w).GG||null!=t.W||null!=t.E)r=1,a=4,n=ct(t.GG,e._a[me],Ie(bt(),1,4).year),s=ct(t.W,1),((i=ct(t.E,1))<1||7<i)&&(u=!0);else{r=e._locale._week.dow,a=e._locale._week.doy;var l=Ie(bt(),r,a);n=ct(t.gg,e._a[me],l.year),s=ct(t.w,l.week),null!=t.d?((i=t.d)<0||6<i)&&(u=!0):null!=t.e?(i=t.e+r,(t.e<0||6<t.e)&&(u=!0)):i=r}s<1||s>Ae(n,r,a)?g(e)._overflowWeeks=!0:null!=u?g(e)._overflowWeekday=!0:(o=Ee(n,s,i,r,a),e._a[me]=o.year,e._dayOfYear=o.dayOfYear)}(e),null!=e._dayOfYear&&(r=ct(e._a[me],s[me]),(e._dayOfYear>Se(r)||0===e._dayOfYear)&&(g(e)._overflowDayOfYear=!0),n=Ge(r,0,e._dayOfYear),e._a[_e]=n.getUTCMonth(),e._a[ye]=n.getUTCDate()),t=0;t<3&&null==e._a[t];++t)e._a[t]=a[t]=s[t];for(;t<7;t++)e._a[t]=a[t]=null==e._a[t]?2===t?1:0:e._a[t];24===e._a[ge]&&0===e._a[ve]&&0===e._a[pe]&&0===e._a[we]&&(e._nextDay=!0,e._a[ge]=0),e._d=(e._useUTC?Ge:function(e,t,n,s,i,r,a){var o;return e<100&&0<=e?(o=new Date(e+400,t,n,s,i,r,a),isFinite(o.getFullYear())&&o.setFullYear(e)):o=new Date(e,t,n,s,i,r,a),o}).apply(null,a),i=e._useUTC?e._d.getUTCDay():e._d.getDay(),null!=e._tzm&&e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),e._nextDay&&(e._a[ge]=24),e._w&&void 0!==e._w.d&&e._w.d!==i&&(g(e).weekdayMismatch=!0)}}var mt=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,_t=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,yt=/Z|[+-]\d\d(?::?\d\d)?/,gt=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/]],vt=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],pt=/^\/?Date\((\-?\d+)/i;function wt(e){var t,n,s,i,r,a,o=e._i,u=mt.exec(o)||_t.exec(o);if(u){for(g(e).iso=!0,t=0,n=gt.length;t<n;t++)if(gt[t][1].exec(u[1])){i=gt[t][0],s=!1!==gt[t][2];break}if(null==i)return void(e._isValid=!1);if(u[3]){for(t=0,n=vt.length;t<n;t++)if(vt[t][1].exec(u[3])){r=(u[2]||" ")+vt[t][0];break}if(null==r)return void(e._isValid=!1)}if(!s&&null!=r)return void(e._isValid=!1);if(u[4]){if(!yt.exec(u[4]))return void(e._isValid=!1);a="Z"}e._f=i+(r||"")+(a||""),Yt(e)}else e._isValid=!1}var Mt=/^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/;function kt(e,t,n,s,i,r){var a=[function(e){var t=parseInt(e,10);{if(t<=49)return 2e3+t;if(t<=999)return 1900+t}return t}(e),He.indexOf(t),parseInt(n,10),parseInt(s,10),parseInt(i,10)];return r&&a.push(parseInt(r,10)),a}var St={UT:0,GMT:0,EDT:-240,EST:-300,CDT:-300,CST:-360,MDT:-360,MST:-420,PDT:-420,PST:-480};function Dt(e){var t,n,s,i=Mt.exec(e._i.replace(/\([^)]*\)|[\n\t]/g," ").replace(/(\s\s+)/g," ").replace(/^\s\s*/,"").replace(/\s\s*$/,""));if(i){var r=kt(i[4],i[3],i[2],i[5],i[6],i[7]);if(t=i[1],n=r,s=e,t&&ze.indexOf(t)!==new Date(n[0],n[1],n[2]).getDay()&&(g(s).weekdayMismatch=!0,!(s._isValid=!1)))return;e._a=r,e._tzm=function(e,t,n){if(e)return St[e];if(t)return 0;var s=parseInt(n,10),i=s%100;return(s-i)/100*60+i}(i[8],i[9],i[10]),e._d=Ge.apply(null,e._a),e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),g(e).rfc2822=!0}else e._isValid=!1}function Yt(e){if(e._f!==c.ISO_8601)if(e._f!==c.RFC_2822){e._a=[],g(e).empty=!0;var t,n,s,i,r,a,o,u,l=""+e._i,h=l.length,d=0;for(s=j(e._f,e._locale).match(N)||[],t=0;t<s.length;t++)i=s[t],(n=(l.match(le(i,e))||[])[0])&&(0<(r=l.substr(0,l.indexOf(n))).length&&g(e).unusedInput.push(r),l=l.slice(l.indexOf(n)+n.length),d+=n.length),E[i]?(n?g(e).empty=!1:g(e).unusedTokens.push(i),a=i,u=e,null!=(o=n)&&m(de,a)&&de[a](o,u._a,u,a)):e._strict&&!n&&g(e).unusedTokens.push(i);g(e).charsLeftOver=h-d,0<l.length&&g(e).unusedInput.push(l),e._a[ge]<=12&&!0===g(e).bigHour&&0<e._a[ge]&&(g(e).bigHour=void 0),g(e).parsedDateParts=e._a.slice(0),g(e).meridiem=e._meridiem,e._a[ge]=function(e,t,n){var s;if(null==n)return t;return null!=e.meridiemHour?e.meridiemHour(t,n):(null!=e.isPM&&((s=e.isPM(n))&&t<12&&(t+=12),s||12!==t||(t=0)),t)}(e._locale,e._a[ge],e._meridiem),ft(e),dt(e)}else Dt(e);else wt(e)}function Ot(e){var t,n,s,i,r=e._i,a=e._f;return e._locale=e._locale||ht(e._l),null===r||void 0===a&&""===r?p({nullInput:!0}):("string"==typeof r&&(e._i=r=e._locale.preparse(r)),k(r)?new M(dt(r)):(d(r)?e._d=r:o(a)?function(e){var t,n,s,i,r;if(0===e._f.length)return g(e).invalidFormat=!0,e._d=new Date(NaN);for(i=0;i<e._f.length;i++)r=0,t=w({},e),null!=e._useUTC&&(t._useUTC=e._useUTC),t._f=e._f[i],Yt(t),v(t)&&(r+=g(t).charsLeftOver,r+=10*g(t).unusedTokens.length,g(t).score=r,(null==s||r<s)&&(s=r,n=t));_(e,n||t)}(e):a?Yt(e):l(n=(t=e)._i)?t._d=new Date(c.now()):d(n)?t._d=new Date(n.valueOf()):"string"==typeof n?(s=t,null===(i=pt.exec(s._i))?(wt(s),!1===s._isValid&&(delete s._isValid,Dt(s),!1===s._isValid&&(delete s._isValid,c.createFromInputFallback(s)))):s._d=new Date(+i[1])):o(n)?(t._a=f(n.slice(0),function(e){return parseInt(e,10)}),ft(t)):u(n)?function(e){if(!e._d){var t=R(e._i);e._a=f([t.year,t.month,t.day||t.date,t.hour,t.minute,t.second,t.millisecond],function(e){return e&&parseInt(e,10)}),ft(e)}}(t):h(n)?t._d=new Date(n):c.createFromInputFallback(t),v(e)||(e._d=null),e))}function Tt(e,t,n,s,i){var r,a={};return!0!==n&&!1!==n||(s=n,n=void 0),(u(e)&&function(e){if(Object.getOwnPropertyNames)return 0===Object.getOwnPropertyNames(e).length;var t;for(t in e)if(e.hasOwnProperty(t))return!1;return!0}(e)||o(e)&&0===e.length)&&(e=void 0),a._isAMomentObject=!0,a._useUTC=a._isUTC=i,a._l=n,a._i=e,a._f=t,a._strict=s,(r=new M(dt(Ot(a))))._nextDay&&(r.add(1,"d"),r._nextDay=void 0),r}function bt(e,t,n,s){return Tt(e,t,n,s,!1)}c.createFromInputFallback=n("value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are discouraged and will be removed in an upcoming major release. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.",function(e){e._d=new Date(e._i+(e._useUTC?" UTC":""))}),c.ISO_8601=function(){},c.RFC_2822=function(){};var xt=n("moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/",function(){var e=bt.apply(null,arguments);return this.isValid()&&e.isValid()?e<this?this:e:p()}),Pt=n("moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/",function(){var e=bt.apply(null,arguments);return this.isValid()&&e.isValid()?this<e?this:e:p()});function Wt(e,t){var n,s;if(1===t.length&&o(t[0])&&(t=t[0]),!t.length)return bt();for(n=t[0],s=1;s<t.length;++s)t[s].isValid()&&!t[s][e](n)||(n=t[s]);return n}var Ct=["year","quarter","month","week","day","hour","minute","second","millisecond"];function Ht(e){var t=R(e),n=t.year||0,s=t.quarter||0,i=t.month||0,r=t.week||t.isoWeek||0,a=t.day||0,o=t.hour||0,u=t.minute||0,l=t.second||0,h=t.millisecond||0;this._isValid=function(e){for(var t in e)if(-1===Ye.call(Ct,t)||null!=e[t]&&isNaN(e[t]))return!1;for(var n=!1,s=0;s<Ct.length;++s)if(e[Ct[s]]){if(n)return!1;parseFloat(e[Ct[s]])!==D(e[Ct[s]])&&(n=!0)}return!0}(t),this._milliseconds=+h+1e3*l+6e4*u+1e3*o*60*60,this._days=+a+7*r,this._months=+i+3*s+12*n,this._data={},this._locale=ht(),this._bubble()}function Rt(e){return e instanceof Ht}function Ut(e){return e<0?-1*Math.round(-1*e):Math.round(e)}function Ft(e,n){I(e,0,0,function(){var e=this.utcOffset(),t="+";return e<0&&(e=-e,t="-"),t+L(~~(e/60),2)+n+L(~~e%60,2)})}Ft("Z",":"),Ft("ZZ",""),ue("Z",re),ue("ZZ",re),ce(["Z","ZZ"],function(e,t,n){n._useUTC=!0,n._tzm=Nt(re,e)});var Lt=/([\+\-]|\d\d)/gi;function Nt(e,t){var n=(t||"").match(e);if(null===n)return null;var s=((n[n.length-1]||[])+"").match(Lt)||["-",0,0],i=60*s[1]+D(s[2]);return 0===i?0:"+"===s[0]?i:-i}function Gt(e,t){var n,s;return t._isUTC?(n=t.clone(),s=(k(e)||d(e)?e.valueOf():bt(e).valueOf())-n.valueOf(),n._d.setTime(n._d.valueOf()+s),c.updateOffset(n,!1),n):bt(e).local()}function Vt(e){return 15*-Math.round(e._d.getTimezoneOffset()/15)}function Et(){return!!this.isValid()&&(this._isUTC&&0===this._offset)}c.updateOffset=function(){};var It=/^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/,At=/^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;function jt(e,t){var n,s,i,r=e,a=null;return Rt(e)?r={ms:e._milliseconds,d:e._days,M:e._months}:h(e)?(r={},t?r[t]=e:r.milliseconds=e):(a=It.exec(e))?(n="-"===a[1]?-1:1,r={y:0,d:D(a[ye])*n,h:D(a[ge])*n,m:D(a[ve])*n,s:D(a[pe])*n,ms:D(Ut(1e3*a[we]))*n}):(a=At.exec(e))?(n="-"===a[1]?-1:1,r={y:Zt(a[2],n),M:Zt(a[3],n),w:Zt(a[4],n),d:Zt(a[5],n),h:Zt(a[6],n),m:Zt(a[7],n),s:Zt(a[8],n)}):null==r?r={}:"object"==typeof r&&("from"in r||"to"in r)&&(i=function(e,t){var n;if(!e.isValid()||!t.isValid())return{milliseconds:0,months:0};t=Gt(t,e),e.isBefore(t)?n=zt(e,t):((n=zt(t,e)).milliseconds=-n.milliseconds,n.months=-n.months);return n}(bt(r.from),bt(r.to)),(r={}).ms=i.milliseconds,r.M=i.months),s=new Ht(r),Rt(e)&&m(e,"_locale")&&(s._locale=e._locale),s}function Zt(e,t){var n=e&&parseFloat(e.replace(",","."));return(isNaN(n)?0:n)*t}function zt(e,t){var n={};return n.months=t.month()-e.month()+12*(t.year()-e.year()),e.clone().add(n.months,"M").isAfter(t)&&--n.months,n.milliseconds=+t-+e.clone().add(n.months,"M"),n}function $t(s,i){return function(e,t){var n;return null===t||isNaN(+t)||(T(i,"moment()."+i+"(period, number) is deprecated. Please use moment()."+i+"(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info."),n=e,e=t,t=n),qt(this,jt(e="string"==typeof e?+e:e,t),s),this}}function qt(e,t,n,s){var i=t._milliseconds,r=Ut(t._days),a=Ut(t._months);e.isValid()&&(s=null==s||s,a&&Re(e,be(e,"Month")+a*n),r&&xe(e,"Date",be(e,"Date")+r*n),i&&e._d.setTime(e._d.valueOf()+i*n),s&&c.updateOffset(e,r||a))}jt.fn=Ht.prototype,jt.invalid=function(){return jt(NaN)};var Jt=$t(1,"add"),Bt=$t(-1,"subtract");function Qt(e,t){var n=12*(t.year()-e.year())+(t.month()-e.month()),s=e.clone().add(n,"months");return-(n+(t-s<0?(t-s)/(s-e.clone().add(n-1,"months")):(t-s)/(e.clone().add(n+1,"months")-s)))||0}function Xt(e){var t;return void 0===e?this._locale._abbr:(null!=(t=ht(e))&&(this._locale=t),this)}c.defaultFormat="YYYY-MM-DDTHH:mm:ssZ",c.defaultFormatUtc="YYYY-MM-DDTHH:mm:ss[Z]";var Kt=n("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(e){return void 0===e?this.localeData():this.locale(e)});function en(){return this._locale}var tn=126227808e5;function nn(e,t){return(e%t+t)%t}function sn(e,t,n){return e<100&&0<=e?new Date(e+400,t,n)-tn:new Date(e,t,n).valueOf()}function rn(e,t,n){return e<100&&0<=e?Date.UTC(e+400,t,n)-tn:Date.UTC(e,t,n)}function an(e,t){I(0,[e,e.length],0,t)}function on(e,t,n,s,i){var r;return null==e?Ie(this,s,i).year:((r=Ae(e,s,i))<t&&(t=r),function(e,t,n,s,i){var r=Ee(e,t,n,s,i),a=Ge(r.year,0,r.dayOfYear);return this.year(a.getUTCFullYear()),this.month(a.getUTCMonth()),this.date(a.getUTCDate()),this}.call(this,e,t,n,s,i))}I(0,["gg",2],0,function(){return this.weekYear()%100}),I(0,["GG",2],0,function(){return this.isoWeekYear()%100}),an("gggg","weekYear"),an("ggggg","weekYear"),an("GGGG","isoWeekYear"),an("GGGGG","isoWeekYear"),C("weekYear","gg"),C("isoWeekYear","GG"),F("weekYear",1),F("isoWeekYear",1),ue("G",se),ue("g",se),ue("GG",B,z),ue("gg",B,z),ue("GGGG",ee,q),ue("gggg",ee,q),ue("GGGGG",te,J),ue("ggggg",te,J),fe(["gggg","ggggg","GGGG","GGGGG"],function(e,t,n,s){t[s.substr(0,2)]=D(e)}),fe(["gg","GG"],function(e,t,n,s){t[s]=c.parseTwoDigitYear(e)}),I("Q",0,"Qo","quarter"),C("quarter","Q"),F("quarter",7),ue("Q",Z),ce("Q",function(e,t){t[_e]=3*(D(e)-1)}),I("D",["DD",2],"Do","date"),C("date","D"),F("date",9),ue("D",B),ue("DD",B,z),ue("Do",function(e,t){return e?t._dayOfMonthOrdinalParse||t._ordinalParse:t._dayOfMonthOrdinalParseLenient}),ce(["D","DD"],ye),ce("Do",function(e,t){t[ye]=D(e.match(B)[0])});var un=Te("Date",!0);I("DDD",["DDDD",3],"DDDo","dayOfYear"),C("dayOfYear","DDD"),F("dayOfYear",4),ue("DDD",K),ue("DDDD",$),ce(["DDD","DDDD"],function(e,t,n){n._dayOfYear=D(e)}),I("m",["mm",2],0,"minute"),C("minute","m"),F("minute",14),ue("m",B),ue("mm",B,z),ce(["m","mm"],ve);var ln=Te("Minutes",!1);I("s",["ss",2],0,"second"),C("second","s"),F("second",15),ue("s",B),ue("ss",B,z),ce(["s","ss"],pe);var hn,dn=Te("Seconds",!1);for(I("S",0,0,function(){return~~(this.millisecond()/100)}),I(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),I(0,["SSS",3],0,"millisecond"),I(0,["SSSS",4],0,function(){return 10*this.millisecond()}),I(0,["SSSSS",5],0,function(){return 100*this.millisecond()}),I(0,["SSSSSS",6],0,function(){return 1e3*this.millisecond()}),I(0,["SSSSSSS",7],0,function(){return 1e4*this.millisecond()}),I(0,["SSSSSSSS",8],0,function(){return 1e5*this.millisecond()}),I(0,["SSSSSSSSS",9],0,function(){return 1e6*this.millisecond()}),C("millisecond","ms"),F("millisecond",16),ue("S",K,Z),ue("SS",K,z),ue("SSS",K,$),hn="SSSS";hn.length<=9;hn+="S")ue(hn,ne);function cn(e,t){t[we]=D(1e3*("0."+e))}for(hn="S";hn.length<=9;hn+="S")ce(hn,cn);var fn=Te("Milliseconds",!1);I("z",0,0,"zoneAbbr"),I("zz",0,0,"zoneName");var mn=M.prototype;function _n(e){return e}mn.add=Jt,mn.calendar=function(e,t){var n=e||bt(),s=Gt(n,this).startOf("day"),i=c.calendarFormat(this,s)||"sameElse",r=t&&(b(t[i])?t[i].call(this,n):t[i]);return this.format(r||this.localeData().calendar(i,this,bt(n)))},mn.clone=function(){return new M(this)},mn.diff=function(e,t,n){var s,i,r;if(!this.isValid())return NaN;if(!(s=Gt(e,this)).isValid())return NaN;switch(i=6e4*(s.utcOffset()-this.utcOffset()),t=H(t)){case"year":r=Qt(this,s)/12;break;case"month":r=Qt(this,s);break;case"quarter":r=Qt(this,s)/3;break;case"second":r=(this-s)/1e3;break;case"minute":r=(this-s)/6e4;break;case"hour":r=(this-s)/36e5;break;case"day":r=(this-s-i)/864e5;break;case"week":r=(this-s-i)/6048e5;break;default:r=this-s}return n?r:S(r)},mn.endOf=function(e){var t;if(void 0===(e=H(e))||"millisecond"===e||!this.isValid())return this;var n=this._isUTC?rn:sn;switch(e){case"year":t=n(this.year()+1,0,1)-1;break;case"quarter":t=n(this.year(),this.month()-this.month()%3+3,1)-1;break;case"month":t=n(this.year(),this.month()+1,1)-1;break;case"week":t=n(this.year(),this.month(),this.date()-this.weekday()+7)-1;break;case"isoWeek":t=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1)+7)-1;break;case"day":case"date":t=n(this.year(),this.month(),this.date()+1)-1;break;case"hour":t=this._d.valueOf(),t+=36e5-nn(t+(this._isUTC?0:6e4*this.utcOffset()),36e5)-1;break;case"minute":t=this._d.valueOf(),t+=6e4-nn(t,6e4)-1;break;case"second":t=this._d.valueOf(),t+=1e3-nn(t,1e3)-1;break}return this._d.setTime(t),c.updateOffset(this,!0),this},mn.format=function(e){e||(e=this.isUtc()?c.defaultFormatUtc:c.defaultFormat);var t=A(this,e);return this.localeData().postformat(t)},mn.from=function(e,t){return this.isValid()&&(k(e)&&e.isValid()||bt(e).isValid())?jt({to:this,from:e}).locale(this.locale()).humanize(!t):this.localeData().invalidDate()},mn.fromNow=function(e){return this.from(bt(),e)},mn.to=function(e,t){return this.isValid()&&(k(e)&&e.isValid()||bt(e).isValid())?jt({from:this,to:e}).locale(this.locale()).humanize(!t):this.localeData().invalidDate()},mn.toNow=function(e){return this.to(bt(),e)},mn.get=function(e){return b(this[e=H(e)])?this[e]():this},mn.invalidAt=function(){return g(this).overflow},mn.isAfter=function(e,t){var n=k(e)?e:bt(e);return!(!this.isValid()||!n.isValid())&&("millisecond"===(t=H(t)||"millisecond")?this.valueOf()>n.valueOf():n.valueOf()<this.clone().startOf(t).valueOf())},mn.isBefore=function(e,t){var n=k(e)?e:bt(e);return!(!this.isValid()||!n.isValid())&&("millisecond"===(t=H(t)||"millisecond")?this.valueOf()<n.valueOf():this.clone().endOf(t).valueOf()<n.valueOf())},mn.isBetween=function(e,t,n,s){var i=k(e)?e:bt(e),r=k(t)?t:bt(t);return!!(this.isValid()&&i.isValid()&&r.isValid())&&("("===(s=s||"()")[0]?this.isAfter(i,n):!this.isBefore(i,n))&&(")"===s[1]?this.isBefore(r,n):!this.isAfter(r,n))},mn.isSame=function(e,t){var n,s=k(e)?e:bt(e);return!(!this.isValid()||!s.isValid())&&("millisecond"===(t=H(t)||"millisecond")?this.valueOf()===s.valueOf():(n=s.valueOf(),this.clone().startOf(t).valueOf()<=n&&n<=this.clone().endOf(t).valueOf()))},mn.isSameOrAfter=function(e,t){return this.isSame(e,t)||this.isAfter(e,t)},mn.isSameOrBefore=function(e,t){return this.isSame(e,t)||this.isBefore(e,t)},mn.isValid=function(){return v(this)},mn.lang=Kt,mn.locale=Xt,mn.localeData=en,mn.max=Pt,mn.min=xt,mn.parsingFlags=function(){return _({},g(this))},mn.set=function(e,t){if("object"==typeof e)for(var n=function(e){var t=[];for(var n in e)t.push({unit:n,priority:U[n]});return t.sort(function(e,t){return e.priority-t.priority}),t}(e=R(e)),s=0;s<n.length;s++)this[n[s].unit](e[n[s].unit]);else if(b(this[e=H(e)]))return this[e](t);return this},mn.startOf=function(e){var t;if(void 0===(e=H(e))||"millisecond"===e||!this.isValid())return this;var n=this._isUTC?rn:sn;switch(e){case"year":t=n(this.year(),0,1);break;case"quarter":t=n(this.year(),this.month()-this.month()%3,1);break;case"month":t=n(this.year(),this.month(),1);break;case"week":t=n(this.year(),this.month(),this.date()-this.weekday());break;case"isoWeek":t=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1));break;case"day":case"date":t=n(this.year(),this.month(),this.date());break;case"hour":t=this._d.valueOf(),t-=nn(t+(this._isUTC?0:6e4*this.utcOffset()),36e5);break;case"minute":t=this._d.valueOf(),t-=nn(t,6e4);break;case"second":t=this._d.valueOf(),t-=nn(t,1e3);break}return this._d.setTime(t),c.updateOffset(this,!0),this},mn.subtract=Bt,mn.toArray=function(){var e=this;return[e.year(),e.month(),e.date(),e.hour(),e.minute(),e.second(),e.millisecond()]},mn.toObject=function(){var e=this;return{years:e.year(),months:e.month(),date:e.date(),hours:e.hours(),minutes:e.minutes(),seconds:e.seconds(),milliseconds:e.milliseconds()}},mn.toDate=function(){return new Date(this.valueOf())},mn.toISOString=function(e){if(!this.isValid())return null;var t=!0!==e,n=t?this.clone().utc():this;return n.year()<0||9999<n.year()?A(n,t?"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYYYY-MM-DD[T]HH:mm:ss.SSSZ"):b(Date.prototype.toISOString)?t?this.toDate().toISOString():new Date(this.valueOf()+60*this.utcOffset()*1e3).toISOString().replace("Z",A(n,"Z")):A(n,t?"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYY-MM-DD[T]HH:mm:ss.SSSZ")},mn.inspect=function(){if(!this.isValid())return"moment.invalid(/* "+this._i+" */)";var e="moment",t="";this.isLocal()||(e=0===this.utcOffset()?"moment.utc":"moment.parseZone",t="Z");var n="["+e+'("]',s=0<=this.year()&&this.year()<=9999?"YYYY":"YYYYYY",i=t+'[")]';return this.format(n+s+"-MM-DD[T]HH:mm:ss.SSS"+i)},mn.toJSON=function(){return this.isValid()?this.toISOString():null},mn.toString=function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},mn.unix=function(){return Math.floor(this.valueOf()/1e3)},mn.valueOf=function(){return this._d.valueOf()-6e4*(this._offset||0)},mn.creationData=function(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}},mn.year=Oe,mn.isLeapYear=function(){return De(this.year())},mn.weekYear=function(e){return on.call(this,e,this.week(),this.weekday(),this.localeData()._week.dow,this.localeData()._week.doy)},mn.isoWeekYear=function(e){return on.call(this,e,this.isoWeek(),this.isoWeekday(),1,4)},mn.quarter=mn.quarters=function(e){return null==e?Math.ceil((this.month()+1)/3):this.month(3*(e-1)+this.month()%3)},mn.month=Ue,mn.daysInMonth=function(){return Pe(this.year(),this.month())},mn.week=mn.weeks=function(e){var t=this.localeData().week(this);return null==e?t:this.add(7*(e-t),"d")},mn.isoWeek=mn.isoWeeks=function(e){var t=Ie(this,1,4).week;return null==e?t:this.add(7*(e-t),"d")},mn.weeksInYear=function(){var e=this.localeData()._week;return Ae(this.year(),e.dow,e.doy)},mn.isoWeeksInYear=function(){return Ae(this.year(),1,4)},mn.date=un,mn.day=mn.days=function(e){if(!this.isValid())return null!=e?this:NaN;var t,n,s=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=e?(t=e,n=this.localeData(),e="string"!=typeof t?t:isNaN(t)?"number"==typeof(t=n.weekdaysParse(t))?t:null:parseInt(t,10),this.add(e-s,"d")):s},mn.weekday=function(e){if(!this.isValid())return null!=e?this:NaN;var t=(this.day()+7-this.localeData()._week.dow)%7;return null==e?t:this.add(e-t,"d")},mn.isoWeekday=function(e){if(!this.isValid())return null!=e?this:NaN;if(null==e)return this.day()||7;var t,n,s=(t=e,n=this.localeData(),"string"==typeof t?n.weekdaysParse(t)%7||7:isNaN(t)?null:t);return this.day(this.day()%7?s:s-7)},mn.dayOfYear=function(e){var t=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==e?t:this.add(e-t,"d")},mn.hour=mn.hours=nt,mn.minute=mn.minutes=ln,mn.second=mn.seconds=dn,mn.millisecond=mn.milliseconds=fn,mn.utcOffset=function(e,t,n){var s,i=this._offset||0;if(!this.isValid())return null!=e?this:NaN;if(null==e)return this._isUTC?i:Vt(this);if("string"==typeof e){if(null===(e=Nt(re,e)))return this}else Math.abs(e)<16&&!n&&(e*=60);return!this._isUTC&&t&&(s=Vt(this)),this._offset=e,this._isUTC=!0,null!=s&&this.add(s,"m"),i!==e&&(!t||this._changeInProgress?qt(this,jt(e-i,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,c.updateOffset(this,!0),this._changeInProgress=null)),this},mn.utc=function(e){return this.utcOffset(0,e)},mn.local=function(e){return this._isUTC&&(this.utcOffset(0,e),this._isUTC=!1,e&&this.subtract(Vt(this),"m")),this},mn.parseZone=function(){if(null!=this._tzm)this.utcOffset(this._tzm,!1,!0);else if("string"==typeof this._i){var e=Nt(ie,this._i);null!=e?this.utcOffset(e):this.utcOffset(0,!0)}return this},mn.hasAlignedHourOffset=function(e){return!!this.isValid()&&(e=e?bt(e).utcOffset():0,(this.utcOffset()-e)%60==0)},mn.isDST=function(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},mn.isLocal=function(){return!!this.isValid()&&!this._isUTC},mn.isUtcOffset=function(){return!!this.isValid()&&this._isUTC},mn.isUtc=Et,mn.isUTC=Et,mn.zoneAbbr=function(){return this._isUTC?"UTC":""},mn.zoneName=function(){return this._isUTC?"Coordinated Universal Time":""},mn.dates=n("dates accessor is deprecated. Use date instead.",un),mn.months=n("months accessor is deprecated. Use month instead",Ue),mn.years=n("years accessor is deprecated. Use year instead",Oe),mn.zone=n("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",function(e,t){return null!=e?("string"!=typeof e&&(e=-e),this.utcOffset(e,t),this):-this.utcOffset()}),mn.isDSTShifted=n("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",function(){if(!l(this._isDSTShifted))return this._isDSTShifted;var e={};if(w(e,this),(e=Ot(e))._a){var t=e._isUTC?y(e._a):bt(e._a);this._isDSTShifted=this.isValid()&&0<a(e._a,t.toArray())}else this._isDSTShifted=!1;return this._isDSTShifted});var yn=P.prototype;function gn(e,t,n,s){var i=ht(),r=y().set(s,t);return i[n](r,e)}function vn(e,t,n){if(h(e)&&(t=e,e=void 0),e=e||"",null!=t)return gn(e,t,n,"month");var s,i=[];for(s=0;s<12;s++)i[s]=gn(e,s,n,"month");return i}function pn(e,t,n,s){t=("boolean"==typeof e?h(t)&&(n=t,t=void 0):(t=e,e=!1,h(n=t)&&(n=t,t=void 0)),t||"");var i,r=ht(),a=e?r._week.dow:0;if(null!=n)return gn(t,(n+a)%7,s,"day");var o=[];for(i=0;i<7;i++)o[i]=gn(t,(i+a)%7,s,"day");return o}yn.calendar=function(e,t,n){var s=this._calendar[e]||this._calendar.sameElse;return b(s)?s.call(t,n):s},yn.longDateFormat=function(e){var t=this._longDateFormat[e],n=this._longDateFormat[e.toUpperCase()];return t||!n?t:(this._longDateFormat[e]=n.replace(/MMMM|MM|DD|dddd/g,function(e){return e.slice(1)}),this._longDateFormat[e])},yn.invalidDate=function(){return this._invalidDate},yn.ordinal=function(e){return this._ordinal.replace("%d",e)},yn.preparse=_n,yn.postformat=_n,yn.relativeTime=function(e,t,n,s){var i=this._relativeTime[n];return b(i)?i(e,t,n,s):i.replace(/%d/i,e)},yn.pastFuture=function(e,t){var n=this._relativeTime[0<e?"future":"past"];return b(n)?n(t):n.replace(/%s/i,t)},yn.set=function(e){var t,n;for(n in e)b(t=e[n])?this[n]=t:this["_"+n]=t;this._config=e,this._dayOfMonthOrdinalParseLenient=new RegExp((this._dayOfMonthOrdinalParse.source||this._ordinalParse.source)+"|"+/\d{1,2}/.source)},yn.months=function(e,t){return e?o(this._months)?this._months[e.month()]:this._months[(this._months.isFormat||We).test(t)?"format":"standalone"][e.month()]:o(this._months)?this._months:this._months.standalone},yn.monthsShort=function(e,t){return e?o(this._monthsShort)?this._monthsShort[e.month()]:this._monthsShort[We.test(t)?"format":"standalone"][e.month()]:o(this._monthsShort)?this._monthsShort:this._monthsShort.standalone},yn.monthsParse=function(e,t,n){var s,i,r;if(this._monthsParseExact)return function(e,t,n){var s,i,r,a=e.toLocaleLowerCase();if(!this._monthsParse)for(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[],s=0;s<12;++s)r=y([2e3,s]),this._shortMonthsParse[s]=this.monthsShort(r,"").toLocaleLowerCase(),this._longMonthsParse[s]=this.months(r,"").toLocaleLowerCase();return n?"MMM"===t?-1!==(i=Ye.call(this._shortMonthsParse,a))?i:null:-1!==(i=Ye.call(this._longMonthsParse,a))?i:null:"MMM"===t?-1!==(i=Ye.call(this._shortMonthsParse,a))?i:-1!==(i=Ye.call(this._longMonthsParse,a))?i:null:-1!==(i=Ye.call(this._longMonthsParse,a))?i:-1!==(i=Ye.call(this._shortMonthsParse,a))?i:null}.call(this,e,t,n);for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),s=0;s<12;s++){if(i=y([2e3,s]),n&&!this._longMonthsParse[s]&&(this._longMonthsParse[s]=new RegExp("^"+this.months(i,"").replace(".","")+"$","i"),this._shortMonthsParse[s]=new RegExp("^"+this.monthsShort(i,"").replace(".","")+"$","i")),n||this._monthsParse[s]||(r="^"+this.months(i,"")+"|^"+this.monthsShort(i,""),this._monthsParse[s]=new RegExp(r.replace(".",""),"i")),n&&"MMMM"===t&&this._longMonthsParse[s].test(e))return s;if(n&&"MMM"===t&&this._shortMonthsParse[s].test(e))return s;if(!n&&this._monthsParse[s].test(e))return s}},yn.monthsRegex=function(e){return this._monthsParseExact?(m(this,"_monthsRegex")||Ne.call(this),e?this._monthsStrictRegex:this._monthsRegex):(m(this,"_monthsRegex")||(this._monthsRegex=Le),this._monthsStrictRegex&&e?this._monthsStrictRegex:this._monthsRegex)},yn.monthsShortRegex=function(e){return this._monthsParseExact?(m(this,"_monthsRegex")||Ne.call(this),e?this._monthsShortStrictRegex:this._monthsShortRegex):(m(this,"_monthsShortRegex")||(this._monthsShortRegex=Fe),this._monthsShortStrictRegex&&e?this._monthsShortStrictRegex:this._monthsShortRegex)},yn.week=function(e){return Ie(e,this._week.dow,this._week.doy).week},yn.firstDayOfYear=function(){return this._week.doy},yn.firstDayOfWeek=function(){return this._week.dow},yn.weekdays=function(e,t){var n=o(this._weekdays)?this._weekdays:this._weekdays[e&&!0!==e&&this._weekdays.isFormat.test(t)?"format":"standalone"];return!0===e?je(n,this._week.dow):e?n[e.day()]:n},yn.weekdaysMin=function(e){return!0===e?je(this._weekdaysMin,this._week.dow):e?this._weekdaysMin[e.day()]:this._weekdaysMin},yn.weekdaysShort=function(e){return!0===e?je(this._weekdaysShort,this._week.dow):e?this._weekdaysShort[e.day()]:this._weekdaysShort},yn.weekdaysParse=function(e,t,n){var s,i,r;if(this._weekdaysParseExact)return function(e,t,n){var s,i,r,a=e.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],s=0;s<7;++s)r=y([2e3,1]).day(s),this._minWeekdaysParse[s]=this.weekdaysMin(r,"").toLocaleLowerCase(),this._shortWeekdaysParse[s]=this.weekdaysShort(r,"").toLocaleLowerCase(),this._weekdaysParse[s]=this.weekdays(r,"").toLocaleLowerCase();return n?"dddd"===t?-1!==(i=Ye.call(this._weekdaysParse,a))?i:null:"ddd"===t?-1!==(i=Ye.call(this._shortWeekdaysParse,a))?i:null:-1!==(i=Ye.call(this._minWeekdaysParse,a))?i:null:"dddd"===t?-1!==(i=Ye.call(this._weekdaysParse,a))?i:-1!==(i=Ye.call(this._shortWeekdaysParse,a))?i:-1!==(i=Ye.call(this._minWeekdaysParse,a))?i:null:"ddd"===t?-1!==(i=Ye.call(this._shortWeekdaysParse,a))?i:-1!==(i=Ye.call(this._weekdaysParse,a))?i:-1!==(i=Ye.call(this._minWeekdaysParse,a))?i:null:-1!==(i=Ye.call(this._minWeekdaysParse,a))?i:-1!==(i=Ye.call(this._weekdaysParse,a))?i:-1!==(i=Ye.call(this._shortWeekdaysParse,a))?i:null}.call(this,e,t,n);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),s=0;s<7;s++){if(i=y([2e3,1]).day(s),n&&!this._fullWeekdaysParse[s]&&(this._fullWeekdaysParse[s]=new RegExp("^"+this.weekdays(i,"").replace(".","\\.?")+"$","i"),this._shortWeekdaysParse[s]=new RegExp("^"+this.weekdaysShort(i,"").replace(".","\\.?")+"$","i"),this._minWeekdaysParse[s]=new RegExp("^"+this.weekdaysMin(i,"").replace(".","\\.?")+"$","i")),this._weekdaysParse[s]||(r="^"+this.weekdays(i,"")+"|^"+this.weekdaysShort(i,"")+"|^"+this.weekdaysMin(i,""),this._weekdaysParse[s]=new RegExp(r.replace(".",""),"i")),n&&"dddd"===t&&this._fullWeekdaysParse[s].test(e))return s;if(n&&"ddd"===t&&this._shortWeekdaysParse[s].test(e))return s;if(n&&"dd"===t&&this._minWeekdaysParse[s].test(e))return s;if(!n&&this._weekdaysParse[s].test(e))return s}},yn.weekdaysRegex=function(e){return this._weekdaysParseExact?(m(this,"_weekdaysRegex")||Qe.call(this),e?this._weekdaysStrictRegex:this._weekdaysRegex):(m(this,"_weekdaysRegex")||(this._weekdaysRegex=qe),this._weekdaysStrictRegex&&e?this._weekdaysStrictRegex:this._weekdaysRegex)},yn.weekdaysShortRegex=function(e){return this._weekdaysParseExact?(m(this,"_weekdaysRegex")||Qe.call(this),e?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(m(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=Je),this._weekdaysShortStrictRegex&&e?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)},yn.weekdaysMinRegex=function(e){return this._weekdaysParseExact?(m(this,"_weekdaysRegex")||Qe.call(this),e?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(m(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=Be),this._weekdaysMinStrictRegex&&e?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)},yn.isPM=function(e){return"p"===(e+"").toLowerCase().charAt(0)},yn.meridiem=function(e,t,n){return 11<e?n?"pm":"PM":n?"am":"AM"},ut("en",{dayOfMonthOrdinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(e){var t=e%10;return e+(1===D(e%100/10)?"th":1===t?"st":2===t?"nd":3===t?"rd":"th")}}),c.lang=n("moment.lang is deprecated. Use moment.locale instead.",ut),c.langData=n("moment.langData is deprecated. Use moment.localeData instead.",ht);var wn=Math.abs;function Mn(e,t,n,s){var i=jt(t,n);return e._milliseconds+=s*i._milliseconds,e._days+=s*i._days,e._months+=s*i._months,e._bubble()}function kn(e){return e<0?Math.floor(e):Math.ceil(e)}function Sn(e){return 4800*e/146097}function Dn(e){return 146097*e/4800}function Yn(e){return function(){return this.as(e)}}var On=Yn("ms"),Tn=Yn("s"),bn=Yn("m"),xn=Yn("h"),Pn=Yn("d"),Wn=Yn("w"),Cn=Yn("M"),Hn=Yn("Q"),Rn=Yn("y");function Un(e){return function(){return this.isValid()?this._data[e]:NaN}}var Fn=Un("milliseconds"),Ln=Un("seconds"),Nn=Un("minutes"),Gn=Un("hours"),Vn=Un("days"),En=Un("months"),In=Un("years");var An=Math.round,jn={ss:44,s:45,m:45,h:22,d:26,M:11};var Zn=Math.abs;function zn(e){return(0<e)-(e<0)||+e}function $n(){if(!this.isValid())return this.localeData().invalidDate();var e,t,n=Zn(this._milliseconds)/1e3,s=Zn(this._days),i=Zn(this._months);t=S((e=S(n/60))/60),n%=60,e%=60;var r=S(i/12),a=i%=12,o=s,u=t,l=e,h=n?n.toFixed(3).replace(/\.?0+$/,""):"",d=this.asSeconds();if(!d)return"P0D";var c=d<0?"-":"",f=zn(this._months)!==zn(d)?"-":"",m=zn(this._days)!==zn(d)?"-":"",_=zn(this._milliseconds)!==zn(d)?"-":"";return c+"P"+(r?f+r+"Y":"")+(a?f+a+"M":"")+(o?m+o+"D":"")+(u||l||h?"T":"")+(u?_+u+"H":"")+(l?_+l+"M":"")+(h?_+h+"S":"")}var qn=Ht.prototype;return qn.isValid=function(){return this._isValid},qn.abs=function(){var e=this._data;return this._milliseconds=wn(this._milliseconds),this._days=wn(this._days),this._months=wn(this._months),e.milliseconds=wn(e.milliseconds),e.seconds=wn(e.seconds),e.minutes=wn(e.minutes),e.hours=wn(e.hours),e.months=wn(e.months),e.years=wn(e.years),this},qn.add=function(e,t){return Mn(this,e,t,1)},qn.subtract=function(e,t){return Mn(this,e,t,-1)},qn.as=function(e){if(!this.isValid())return NaN;var t,n,s=this._milliseconds;if("month"===(e=H(e))||"quarter"===e||"year"===e)switch(t=this._days+s/864e5,n=this._months+Sn(t),e){case"month":return n;case"quarter":return n/3;case"year":return n/12}else switch(t=this._days+Math.round(Dn(this._months)),e){case"week":return t/7+s/6048e5;case"day":return t+s/864e5;case"hour":return 24*t+s/36e5;case"minute":return 1440*t+s/6e4;case"second":return 86400*t+s/1e3;case"millisecond":return Math.floor(864e5*t)+s;default:throw new Error("Unknown unit "+e)}},qn.asMilliseconds=On,qn.asSeconds=Tn,qn.asMinutes=bn,qn.asHours=xn,qn.asDays=Pn,qn.asWeeks=Wn,qn.asMonths=Cn,qn.asQuarters=Hn,qn.asYears=Rn,qn.valueOf=function(){return this.isValid()?this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*D(this._months/12):NaN},qn._bubble=function(){var e,t,n,s,i,r=this._milliseconds,a=this._days,o=this._months,u=this._data;return 0<=r&&0<=a&&0<=o||r<=0&&a<=0&&o<=0||(r+=864e5*kn(Dn(o)+a),o=a=0),u.milliseconds=r%1e3,e=S(r/1e3),u.seconds=e%60,t=S(e/60),u.minutes=t%60,n=S(t/60),u.hours=n%24,o+=i=S(Sn(a+=S(n/24))),a-=kn(Dn(i)),s=S(o/12),o%=12,u.days=a,u.months=o,u.years=s,this},qn.clone=function(){return jt(this)},qn.get=function(e){return e=H(e),this.isValid()?this[e+"s"]():NaN},qn.milliseconds=Fn,qn.seconds=Ln,qn.minutes=Nn,qn.hours=Gn,qn.days=Vn,qn.weeks=function(){return S(this.days()/7)},qn.months=En,qn.years=In,qn.humanize=function(e){if(!this.isValid())return this.localeData().invalidDate();var t,n,s,i,r,a,o,u,l,h,d,c=this.localeData(),f=(n=!e,s=c,i=jt(t=this).abs(),r=An(i.as("s")),a=An(i.as("m")),o=An(i.as("h")),u=An(i.as("d")),l=An(i.as("M")),h=An(i.as("y")),(d=r<=jn.ss&&["s",r]||r<jn.s&&["ss",r]||a<=1&&["m"]||a<jn.m&&["mm",a]||o<=1&&["h"]||o<jn.h&&["hh",o]||u<=1&&["d"]||u<jn.d&&["dd",u]||l<=1&&["M"]||l<jn.M&&["MM",l]||h<=1&&["y"]||["yy",h])[2]=n,d[3]=0<+t,d[4]=s,function(e,t,n,s,i){return i.relativeTime(t||1,!!n,e,s)}.apply(null,d));return e&&(f=c.pastFuture(+this,f)),c.postformat(f)},qn.toISOString=$n,qn.toString=$n,qn.toJSON=$n,qn.locale=Xt,qn.localeData=en,qn.toIsoString=n("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",$n),qn.lang=Kt,I("X",0,0,"unix"),I("x",0,0,"valueOf"),ue("x",se),ue("X",/[+-]?\d+(\.\d{1,3})?/),ce("X",function(e,t,n){n._d=new Date(1e3*parseFloat(e,10))}),ce("x",function(e,t,n){n._d=new Date(D(e))}),c.version="2.24.0",e=bt,c.fn=mn,c.min=function(){return Wt("isBefore",[].slice.call(arguments,0))},c.max=function(){return Wt("isAfter",[].slice.call(arguments,0))},c.now=function(){return Date.now?Date.now():+new Date},c.utc=y,c.unix=function(e){return bt(1e3*e)},c.months=function(e,t){return vn(e,t,"months")},c.isDate=d,c.locale=ut,c.invalid=p,c.duration=jt,c.isMoment=k,c.weekdays=function(e,t,n){return pn(e,t,n,"weekdays")},c.parseZone=function(){return bt.apply(null,arguments).parseZone()},c.localeData=ht,c.isDuration=Rt,c.monthsShort=function(e,t){return vn(e,t,"monthsShort")},c.weekdaysMin=function(e,t,n){return pn(e,t,n,"weekdaysMin")},c.defineLocale=lt,c.updateLocale=function(e,t){if(null!=t){var n,s,i=st;null!=(s=ot(e))&&(i=s._config),(n=new P(t=x(i,t))).parentLocale=it[e],it[e]=n,ut(e)}else null!=it[e]&&(null!=it[e].parentLocale?it[e]=it[e].parentLocale:null!=it[e]&&delete it[e]);return it[e]},c.locales=function(){return s(it)},c.weekdaysShort=function(e,t,n){return pn(e,t,n,"weekdaysShort")},c.normalizeUnits=H,c.relativeTimeRounding=function(e){return void 0===e?An:"function"==typeof e&&(An=e,!0)},c.relativeTimeThreshold=function(e,t){return void 0!==jn[e]&&(void 0===t?jn[e]:(jn[e]=t,"s"===e&&(jn.ss=t-1),!0))},c.calendarFormat=function(e,t){var n=e.diff(t,"days",!0);return n<-6?"sameElse":n<-1?"lastWeek":n<0?"lastDay":n<1?"sameDay":n<2?"nextDay":n<7?"nextWeek":"sameElse"},c.prototype=mn,c.HTML5_FMT={DATETIME_LOCAL:"YYYY-MM-DDTHH:mm",DATETIME_LOCAL_SECONDS:"YYYY-MM-DDTHH:mm:ss",DATETIME_LOCAL_MS:"YYYY-MM-DDTHH:mm:ss.SSS",DATE:"YYYY-MM-DD",TIME:"HH:mm",TIME_SECONDS:"HH:mm:ss",TIME_MS:"HH:mm:ss.SSS",WEEK:"GGGG-[W]WW",MONTH:"YYYY-MM"},c});
\ No newline at end of file
diff --git a/nginx.conf.sample b/nginx.conf.sample
index 979ac0be1f537..9219400f6aacd 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -109,7 +109,7 @@ location /static/ {
         rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last;
     }
 
-    location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|json)$ {
+    location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|html|json)$ {
         add_header Cache-Control "public";
         add_header X-Frame-Options "SAMEORIGIN";
         expires +1y;
diff --git a/pub/static/.htaccess b/pub/static/.htaccess
index a5aa6fb0d5cfd..84741c4ebb35e 100644
--- a/pub/static/.htaccess
+++ b/pub/static/.htaccess
@@ -72,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|json)$>
+    <FilesMatch .*\.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2|html|json)$>
         Header append Cache-Control public
     </FilesMatch>
 
diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 00ae0bdbb8a47..7db2b26e3c621 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -504,6 +504,11 @@
             <stringProp name="Argument.value">${__P(graphqlGetCmsPageByIdPercentage,0)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="graphqlGetCmsPageWithPageBuilderProductListPercentage" elementType="Argument">
+            <stringProp name="Argument.name">graphqlGetCmsPageWithPageBuilderProductListPercentage</stringProp>
+            <stringProp name="Argument.value">${__P(graphqlGetCmsPageWithPageBuilderProductListPercentage,0)}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
           <elementProp name="graphqlGetConfigurableProductDetailsByNamePercentage" elementType="Argument">
             <stringProp name="Argument.name">graphqlGetConfigurableProductDetailsByNamePercentage</stringProp>
             <stringProp name="Argument.value">${__P(graphqlGetConfigurableProductDetailsByNamePercentage,0)}</stringProp>
@@ -36067,6 +36072,187 @@ vars.put("configurable_sku", "Configurable Product - ${__time(YMD)}-${__threadNu
         <hashTree/>
       </hashTree>
     </hashTree>
+  
+    <TestFragmentController guiclass="TestFragmentControllerGui" testclass="TestFragmentController" testname="Test Fragment" enabled="true"/>
+    <hashTree>
+      <GenericController guiclass="LogicControllerGui" testclass="GenericController" testname="Create Cms Page with Page Builder Product List" enabled="true">
+        <stringProp name="TestPlan.comments">mpaf/tool/fragments/ee/admin_create_cms_page_with_page_builder_product_list/admin_create_cms_page_with_page_builder_product_list.jmx</stringProp>
+      </GenericController>
+      <hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Create New" 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}/cms/page/new</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/>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Save" enabled="true">
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="content" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">&amp;lt;div data-content-type=&amp;quot;row&amp;quot; data-appearance=&amp;quot;contained&amp;quot; data-element=&amp;quot;main&amp;quot;&amp;gt;&amp;lt;div data-enable-parallax=&amp;quot;0&amp;quot; data-parallax-speed=&amp;quot;0.5&amp;quot; data-background-images=&amp;quot;{}&amp;quot; data-element=&amp;quot;inner&amp;quot; style=&amp;quot;justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px 0px 10px; padding: 10px;&amp;quot;&amp;gt;&amp;lt;div data-content-type=&amp;quot;products&amp;quot; data-appearance=&amp;quot;grid&amp;quot; data-element=&amp;quot;main&amp;quot; style=&amp;quot;border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px;&amp;quot;&amp;gt;{{widget type=&amp;quot;Magento\CatalogWidget\Block\Product\ProductsList&amp;quot; template=&amp;quot;Magento_CatalogWidget::product/widget/content/grid.phtml&amp;quot; anchor_text=&amp;quot;&amp;quot; id_path=&amp;quot;&amp;quot; show_pager=&amp;quot;0&amp;quot; products_count=&amp;quot;5&amp;quot; sort_order=&amp;quot;date_newest_top&amp;quot; type_name=&amp;quot;Catalog Products List&amp;quot; conditions_encoded=&amp;quot;^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`any`,`value`:`1`,`new_child`:``^]^]&amp;quot;}}&amp;lt;/div&amp;gt;&amp;lt;/div&amp;gt;&amp;lt;/div&amp;gt;</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">content</stringProp>
+              </elementProp>
+              <elementProp name="content_heading" 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">content_heading</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="identifier" 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">identifier</stringProp>
+              </elementProp>
+              <elementProp name="is_active" 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">is_active</stringProp>
+              </elementProp>
+              <elementProp name="layout_update_xml" 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">layout_update_xml</stringProp>
+              </elementProp>
+              <elementProp name="meta_description" 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">meta_description</stringProp>
+              </elementProp>
+              <elementProp name="meta_keywords" 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">meta_keywords</stringProp>
+              </elementProp>
+              <elementProp name="meta_title" 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">meta_title</stringProp>
+              </elementProp>
+              <elementProp name="nodes_data" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">{}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">nodes_data</stringProp>
+              </elementProp>
+              <elementProp name="node_ids" 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">node_ids</stringProp>
+              </elementProp>
+              <elementProp name="page_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">page_id</stringProp>
+              </elementProp>
+              <elementProp name="page_layout" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">1column</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">page_layout</stringProp>
+              </elementProp>
+              <elementProp name="store_id[0]" 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">store_id[0]</stringProp>
+              </elementProp>
+              <elementProp name="title" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">true</boolProp>
+                <stringProp name="Argument.value">Page Builder Products ${__time(YMDHMS)}-${__threadNum}-${__Random(1,1000000)}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">title</stringProp>
+              </elementProp>
+              <elementProp name="website_root" 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">website_root</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}/cms/page/save/back/edit</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="-398886250">You saved the page.</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/>
+          <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Regular Expression Extractor" enabled="true">
+            <stringProp name="RegexExtractor.useHeaders">URL</stringProp>
+            <stringProp name="RegexExtractor.refname">cms_page_id</stringProp>
+            <stringProp name="RegexExtractor.regex">/page_id\/([0-9]*)\/back/</stringProp>
+            <stringProp name="RegexExtractor.template">$1$</stringProp>
+            <stringProp name="RegexExtractor.default"/>
+            <stringProp name="RegexExtractor.match_number">1</stringProp>
+          </RegexExtractor>
+          <hashTree/>
+        </hashTree>
+      </hashTree>
+    </hashTree>
   </hashTree>
   
     <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Logout" enabled="true">
@@ -39438,6 +39624,104 @@ if (name == null) {
       </BeanShellAssertion>
       <hashTree/>
     </hashTree>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query CategoryList" 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  categoryList{\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_list.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_categoryList_query_name</stringProp>
+        <stringProp name="JSONPATH">$.data.categoryList[0].name</stringProp>
+        <stringProp name="DEFAULT"/>
+        <stringProp name="VARIABLE"/>
+        <stringProp name="SUBJECT">BODY</stringProp>
+        <stringProp name="INPUT_FORMAT">JSON</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_categoryList_query_name");
+if (name == null) {
+	Failure = true;
+	FailureMessage = "Not Expected \"children\" to be null";
+} else {
+	if (!name.equals("Default Category")) {
+		Failure = true;
+		FailureMessage = "Expected \"name\" to equal \"Default Category\", Actual: " + name;
+	} 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="Get Cms Page by id" 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":"query getCmsPage($id: Int!, $onServer: Boolean!) {\n  cmsPage(id: $id) {\n    url_key\n    content\n    content_heading\n    title\n    page_layout\n    meta_title @include(if: $onServer)\n    meta_keywords @include(if: $onServer)\n    meta_description @include(if: $onServer)\n  }\n}","variables":{"id":${cms_page_id},"onServer":false},"operationName":"getCmsPage"}
+            </stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <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/get_get_cms_page_by_id.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">$.data.cmsPage.url_key</stringProp>
+        <stringProp name="EXPECTED_VALUE">${cms_page_id}</stringProp>
+        <boolProp name="JSONVALIDATION">false</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>
   </hashTree>
   </hashTree>
 
@@ -40368,6 +40652,301 @@ function assertCategoryChildren(category, response) {
   </hashTree>
 
   
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Category List by category_url_key" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetCategoryListByCategoryIdPercentage}</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", "GraphQL Get Category List by category_url_key");
+            </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/>
+  
+      <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/>
+    
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
+
+var categories = props.get("categories");
+number = random.nextInt(categories.length);
+
+vars.put("category_url_key", categories[number].url_key);
+vars.put("category_name", categories[number].name);
+vars.put("category_id", categories[number].id);
+vars.putObject("category", categories[number]);
+        </stringProp>
+    <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_category_setup.jmx</stringProp></JSR223Sampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get Category List by category_url_key" 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 categoryList(filters:{url_key: {in: [\"${category_url_key}\"]}}) {\n  id\n  children {\n   id\n   name\n   url_key\n   url_path\n   children_count\n   path\n   image\n   productImagePreview: products(pageSize: 1, sort: {name: ASC}) {\n    items {\n     small_image {\n       label\n       url\n     }\n    }\n   }\n  }\n }\n}"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <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/get_category_list_by_category_url_key.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="Assert found categories" enabled="true">
+        <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="cacheKey"/>
+        <stringProp name="script">var category = vars.getObject("category");
+var response = JSON.parse(prev.getResponseDataAsString());
+
+assertCategoryId(category, response);
+assertCategoryChildren(category, response);
+
+function assertCategoryId(category, response) {
+    if (response.data == undefined || response.data.categoryList == undefined || response.data.categoryList[0].id != category.id) {
+      AssertionResult.setFailureMessage("Cannot find category with id \"" + category.id + "\"");
+      AssertionResult.setFailure(true);
+     }
+}
+
+function assertCategoryChildren(category, response) {
+    foundCategory = response.data &amp;&amp; response.data.categoryList ? response.data.categoryList[0] : null;
+    if (foundCategory) {
+        var childrenFound = foundCategory.children.map(function (c) {return parseInt(c.id)});
+        var children = category.children.map(function (c) {return parseInt(c)});
+        if (JSON.stringify(children.sort()) != JSON.stringify(childrenFound.sort())) {
+           AssertionResult.setFailureMessage("Cannot math children categories \"" + JSON.stringify(children) + "\" for to found one: \"" + JSON.stringify(childrenFound) +  "\"");
+           AssertionResult.setFailure(true);
+        }
+    }
+ 
+}
+
+</stringProp>
+      </JSR223Assertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
+    <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Multiple Categories" enabled="true">
+      <intProp name="ThroughputController.style">1</intProp>
+      <boolProp name="ThroughputController.perThread">false</boolProp>
+      <intProp name="ThroughputController.maxThroughput">1</intProp>
+      <stringProp name="ThroughputController.percentThroughput">${graphqlGetCategoryListByCategoryIdPercentage}</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", "GraphQL Get Multiple Categories");
+            </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/>
+  
+      <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/>
+    
+    <JSR223Sampler guiclass="TestBeanGUI" testclass="JSR223Sampler" testname="SetUp - Prepare Category Data" enabled="true">
+      <stringProp name="scriptLanguage">javascript</stringProp>
+      <stringProp name="parameters"/>
+      <stringProp name="filename"/>
+      <stringProp name="cacheKey"/>
+      <stringProp name="script">random = vars.getObject("randomIntGenerator");
+
+var categories = props.get("categories");
+
+var numbers = [];
+
+var sanity = 0;
+for(var i = 0; i &lt; 4; i++){
+	sanity++;
+	if(sanity &gt; 100){
+		break;
+	}
+	var number = random.nextInt(categories.length)
+	if(numbers.indexOf(number) &gt;= 0){
+		i--;
+		continue;
+	}
+	numbers.push(number);
+}
+
+vars.put("category_id_1", categories[numbers[0]].id);
+vars.put("category_id_2", categories[numbers[1]].id);
+vars.put("category_id_3", categories[numbers[2]].id);
+vars.put("category_id_4", categories[numbers[3]].id);
+</stringProp>
+      <stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/common/extract_multiple_categories_setup.jmx</stringProp>
+    </JSR223Sampler>
+    <hashTree/>
+  
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Get multiple categories by ID" 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 categoryList(filters:{ids: {in: [\"${category_id_1}\", \"${category_id_2}\", \"${category_id_3}\", \"${category_id_4}\"]}}) {\n  id\n  children {\n   id\n   name\n   url_key\n   url_path\n   children_count\n   path\n   image\n   productImagePreview: products(pageSize: 1, sort: {name: ASC}) {\n    items {\n     small_image {\n       label\n       url\n     }\n    }\n   }\n  }\n }\n}"}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <stringProp name="HTTPSampler.domain"/>
+      <stringProp name="HTTPSampler.port">${graphql_port_number}</stringProp>
+      <stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
+      <stringProp name="HTTPSampler.response_timeout">200000</stringProp>
+      <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/get_multiple_categories_by_id.jmx</stringProp>
+    </HTTPSamplerProxy>
+    <hashTree>
+      <JSR223Assertion guiclass="TestBeanGUI" testclass="JSR223Assertion" testname="Assert category count" enabled="true">
+        <stringProp name="scriptLanguage">javascript</stringProp>
+        <stringProp name="parameters"/>
+        <stringProp name="filename"/>
+        <stringProp name="cacheKey"/>
+        <stringProp name="script">var response = JSON.parse(prev.getResponseDataAsString());
+
+if(response.data == undefined || response.data.categoryList == undefined){
+	AssertionResult.setFailureMessage("CategoryList results are empty.");
+	AssertionResult.setFailure(true);
+}
+
+if(response.data.categoryList.length !== 4){
+	AssertionResult.setFailureMessage("CategoryList query expected to find 4 categories. " + response.data.categoryList.length + " returned.");
+	AssertionResult.setFailure(true);
+}
+</stringProp>
+      </JSR223Assertion>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+
+  
     <ThroughputController guiclass="ThroughputControllerGui" testclass="ThroughputController" testname="GraphQL Get Url Info by url_key" enabled="true">
       <intProp name="ThroughputController.style">1</intProp>
       <boolProp name="ThroughputController.perThread">false</boolProp>
@@ -41151,7 +41730,7 @@ vars.putObject("randomIntGenerator", random);
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"mutation {\n  setShippingAddressesOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      shipping_addresses: [\n        {\n          address: {\n            firstname: \"test firstname\"\n            lastname: \"test lastname\"\n            company: \"test company\"\n            street: [\"test street 1\", \"test street 2\"]\n            city: \"test city\"\n            region: \"test region\"\n            postcode: \"887766\"\n            country_code: \"US\"\n            telephone: \"88776655\"\n            save_in_address_book: false\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      shipping_addresses {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  setShippingAddressesOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      shipping_addresses: [\n        {\n          address: {\n            firstname: \"test firstname\"\n            lastname: \"test lastname\"\n            company: \"test company\"\n            street: [\"test street 1\", \"test street 2\"]\n            city: \"test city\"\n            region: \"AZ\"\n            postcode: \"887766\"\n            country_code: \"US\"\n            telephone: \"88776655\"\n            save_in_address_book: false\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      shipping_addresses {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -41341,7 +41920,7 @@ vars.putObject("randomIntGenerator", random);
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"mutation {\n  setBillingAddressOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      billing_address: {\n        address: {\n          firstname: \"test firstname\"\n          lastname: \"test lastname\"\n          company: \"test company\"\n          street: [\"test street 1\", \"test street 2\"]\n          city: \"test city\"\n          region: \"test region\"\n          postcode: \"887766\"\n          country_code: \"US\"\n          telephone: \"88776655\"\n          save_in_address_book: false\n        }\n      }\n    }\n  ) {\n    cart {\n      billing_address {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  setBillingAddressOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      billing_address: {\n        address: {\n          firstname: \"test firstname\"\n          lastname: \"test lastname\"\n          company: \"test company\"\n          street: [\"test street 1\", \"test street 2\"]\n          city: \"test city\"\n          region: \"AZ\"\n          postcode: \"887766\"\n          country_code: \"US\"\n          telephone: \"88776655\"\n          save_in_address_book: false\n        }\n      }\n    }\n  ) {\n    cart {\n      billing_address {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -44790,7 +45369,7 @@ vars.put("product_sku", product.get("sku"));
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"mutation {\n  setBillingAddressOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      billing_address: {\n        address: {\n          firstname: \"test firstname\"\n          lastname: \"test lastname\"\n          company: \"test company\"\n          street: [\"test street 1\", \"test street 2\"]\n          city: \"test city\"\n          region: \"test region\"\n          postcode: \"887766\"\n          country_code: \"US\"\n          telephone: \"88776655\"\n          save_in_address_book: false\n        }\n      }\n    }\n  ) {\n    cart {\n      billing_address {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  setBillingAddressOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      billing_address: {\n        address: {\n          firstname: \"test firstname\"\n          lastname: \"test lastname\"\n          company: \"test company\"\n          street: [\"test street 1\", \"test street 2\"]\n          city: \"test city\"\n          region: \"AZ\"\n          postcode: \"887766\"\n          country_code: \"US\"\n          telephone: \"88776655\"\n          save_in_address_book: false\n        }\n      }\n    }\n  ) {\n    cart {\n      billing_address {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -44829,7 +45408,7 @@ vars.put("product_sku", product.get("sku"));
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"mutation {\n  setShippingAddressesOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      shipping_addresses: [\n        {\n          address: {\n            firstname: \"test firstname\"\n            lastname: \"test lastname\"\n            company: \"test company\"\n            street: [\"test street 1\", \"test street 2\"]\n            city: \"test city\"\n            region: \"test region\"\n            postcode: \"887766\"\n            country_code: \"US\"\n            telephone: \"88776655\"\n            save_in_address_book: false\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      shipping_addresses {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"mutation {\n  setShippingAddressesOnCart(\n    input: {\n      cart_id: \"${quote_id}\"\n      shipping_addresses: [\n        {\n          address: {\n            firstname: \"test firstname\"\n            lastname: \"test lastname\"\n            company: \"test company\"\n            street: [\"test street 1\", \"test street 2\"]\n            city: \"test city\"\n            region: \"AZ\"\n            postcode: \"887766\"\n            country_code: \"US\"\n            telephone: \"88776655\"\n            save_in_address_book: false\n          }\n        }\n      ]\n    }\n  ) {\n    cart {\n      shipping_addresses {\n        firstname\n        lastname\n        company\n        street\n        city\n        postcode\n        telephone\n        country {\n          code\n          label\n        }\n        }\n    }\n  }\n}","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
diff --git a/setup/src/Magento/Setup/Controller/DataOption.php b/setup/src/Magento/Setup/Controller/DataOption.php
index 7c94139aad92b..88ebf291016d9 100644
--- a/setup/src/Magento/Setup/Controller/DataOption.php
+++ b/setup/src/Magento/Setup/Controller/DataOption.php
@@ -56,6 +56,6 @@ public function hasUninstallAction()
         if (isset($params['moduleName'])) {
             $uninstallClasses = $this->uninstallCollector->collectUninstall([$params['moduleName']]);
         }
-        return new JsonModel(['hasUninstall' => isset($uninstallClasses) && sizeof($uninstallClasses) > 0]);
+        return new JsonModel(['hasUninstall' => isset($uninstallClasses) && count($uninstallClasses) > 0]);
     }
 }
diff --git a/setup/src/Magento/Setup/Fixtures/_files/dictionary.csv b/setup/src/Magento/Setup/Fixtures/_files/dictionary.csv
index c839b7c46f51c..ba188534a3e24 100644
--- a/setup/src/Magento/Setup/Fixtures/_files/dictionary.csv
+++ b/setup/src/Magento/Setup/Fixtures/_files/dictionary.csv
@@ -7370,4 +7370,4 @@ Gregory
 pine
 borrowed
 bow
-disturbing
\ No newline at end of file
+disturbing
diff --git a/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php b/setup/src/Magento/Setup/Model/Address/AddressDataGenerator.php
index 1bbd152f2ba4e..2d450a4374c5e 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' => random_int(10000, 99999)
+            'postcode' => mt_rand(10000, 99999)
         ];
     }
 }
diff --git a/setup/src/Magento/Setup/Model/ConfigGenerator.php b/setup/src/Magento/Setup/Model/ConfigGenerator.php
index 88421797e59df..09d15489812e2 100644
--- a/setup/src/Magento/Setup/Model/ConfigGenerator.php
+++ b/setup/src/Magento/Setup/Model/ConfigGenerator.php
@@ -19,7 +19,7 @@
 /**
  * Creates deployment config data based on user input array
  *
- * This class introduced to break down {@see Magento\Setup\Model\ConfigOptionsList::createConfig}
+ * This class introduced to break down {@see \Magento\Setup\Model\ConfigOptionsList::createConfig}
  */
 class ConfigGenerator
 {
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList.php b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
index 313e08d6c92ca..7bc0853769217 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Setup\Model;
 
@@ -11,7 +12,6 @@
 use Magento\Framework\Encryption\KeyValidator;
 use Magento\Framework\Setup\ConfigOptionsListInterface;
 use Magento\Framework\Setup\Option\FlagConfigOption;
-use Magento\Framework\Setup\Option\SelectConfigOption;
 use Magento\Framework\Setup\Option\TextConfigOption;
 use Magento\Setup\Model\ConfigOptionsList\DriverOptions;
 use Magento\Setup\Validator\DbValidator;
@@ -178,7 +178,7 @@ public function getOptions()
                 ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT_DRIVER_OPTIONS .
                 '/' . ConfigOptionsListConstants::KEY_MYSQL_SSL_KEY,
                 'Full path of client key file in order to establish db connection through SSL',
-                null
+                ''
             ),
             new TextConfigOption(
                 ConfigOptionsListConstants::INPUT_KEY_DB_SSL_CERT,
@@ -186,7 +186,7 @@ public function getOptions()
                 ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT_DRIVER_OPTIONS .
                 '/' . ConfigOptionsListConstants::KEY_MYSQL_SSL_CERT,
                 'Full path of client certificate file in order to establish db connection through SSL',
-                null
+                ''
             ),
             new TextConfigOption(
                 ConfigOptionsListConstants::INPUT_KEY_DB_SSL_CA,
@@ -194,7 +194,7 @@ public function getOptions()
                 ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT_DRIVER_OPTIONS .
                 '/' . ConfigOptionsListConstants::KEY_MYSQL_SSL_CA,
                 'Full path of server certificate file in order to establish db connection through SSL',
-                null
+                ''
             ),
             new FlagConfigOption(
                 ConfigOptionsListConstants::INPUT_KEY_DB_SSL_VERIFY,
@@ -205,6 +205,7 @@ public function getOptions()
         ];
 
         foreach ($this->configOptionsCollection as $configOptionsList) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $options = array_merge($options, $configOptionsList->getOptions());
         }
 
@@ -261,6 +262,7 @@ public function validate(array $options, DeploymentConfig $deploymentConfig)
         }
 
         foreach ($this->configOptionsCollection as $configOptionsList) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $errors = array_merge($errors, $configOptionsList->validate($options, $deploymentConfig));
         }
 
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/DriverOptions.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/DriverOptions.php
index 5910899354911..1d9fdd6098cbb 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/DriverOptions.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/DriverOptions.php
@@ -10,12 +10,12 @@
 use Magento\Framework\Config\ConfigOptionsListConstants;
 
 /**
- * MySql driver options
+ * Mysql driver options.
  */
 class DriverOptions
 {
     /**
-     * Get driver options.
+     * Get mysql driver options.
      *
      * @param array $options
      * @return array
@@ -26,9 +26,7 @@ public function getDriverOptions(array $options): array
             ConfigOptionsListConstants::KEY_MYSQL_SSL_KEY => ConfigOptionsListConstants::INPUT_KEY_DB_SSL_KEY,
             ConfigOptionsListConstants::KEY_MYSQL_SSL_CERT => ConfigOptionsListConstants::INPUT_KEY_DB_SSL_CERT,
             ConfigOptionsListConstants::KEY_MYSQL_SSL_CA => ConfigOptionsListConstants::INPUT_KEY_DB_SSL_CA,
-        ];
-        $booleanDriverOptionKeys = [
-            ConfigOptionsListConstants::KEY_MYSQL_SSL_VERIFY => ConfigOptionsListConstants::INPUT_KEY_DB_SSL_VERIFY,
+            ConfigOptionsListConstants::KEY_MYSQL_SSL_VERIFY => ConfigOptionsListConstants::INPUT_KEY_DB_SSL_VERIFY
         ];
         $driverOptions = [];
         foreach ($driverOptionKeys as $configKey => $driverOptionKey) {
@@ -36,37 +34,18 @@ public function getDriverOptions(array $options): array
                 $driverOptions[$configKey] = $options[$driverOptionKey];
             }
         }
-        foreach ($booleanDriverOptionKeys as $configKey => $driverOptionKey) {
-            $driverOptions[$configKey] = $this->booleanValue($options, $driverOptionKey);
-        }
-
         return $driverOptions;
     }
 
     /**
-     * Check if provided option exists.
-     *
-     * @param array $options
-     * @param string $driverOptionKey
-     * @return bool
-     */
-    private function optionExists(array $options, string $driverOptionKey): bool
-    {
-        return isset($options[$driverOptionKey])
-            && ($options[$driverOptionKey] === false || !empty($options[$driverOptionKey]));
-    }
-
-    /**
-     * Transforms checkbox flag value into boolean.
-     *
-     * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/checkbox#value
+     * Verify if option exists.
      *
      * @param array $options
      * @param string $driverOptionKey
      * @return bool
      */
-    private function booleanValue(array $options, string $driverOptionKey): bool
+    private function optionExists($options, $driverOptionKey): bool
     {
-        return isset($options[$driverOptionKey]) && (bool)$options[$driverOptionKey];
+        return $options[$driverOptionKey] === false || !empty($options[$driverOptionKey]);
     }
 }
diff --git a/setup/src/Magento/Setup/Model/DataGenerator.php b/setup/src/Magento/Setup/Model/DataGenerator.php
index 540433e5aa3ec..c7c975f2d993d 100644
--- a/setup/src/Magento/Setup/Model/DataGenerator.php
+++ b/setup/src/Magento/Setup/Model/DataGenerator.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * A custom adapter that allows generating arbitrary descriptions
- */
 namespace Magento\Setup\Model;
 
+/**
+ * A custom adapter that allows generating arbitrary descriptions.
+ */
 class DataGenerator
 {
     /**
@@ -67,12 +67,12 @@ protected function readData()
      */
     public function generate($minAmountOfWords, $maxAmountOfWords, $key = null)
     {
-        $numberOfWords = random_int($minAmountOfWords, $maxAmountOfWords);
+        $numberOfWords = mt_rand($minAmountOfWords, $maxAmountOfWords);
         $result = '';
 
         if ($key === null || !array_key_exists($key, $this->generatedValues)) {
             for ($i = 0; $i < $numberOfWords; $i++) {
-                $result .= ' ' . $this->dictionaryData[random_int(0, count($this->dictionaryData) - 1)];
+                $result .= ' ' . $this->dictionaryData[mt_rand(0, count($this->dictionaryData) - 1)];
             }
             $result = trim($result);
 
diff --git a/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php b/setup/src/Magento/Setup/Model/Description/DescriptionGenerator.php
index a790bfdbe608d..807e1fde7d90d 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 = random_int(
+        $paragraphsCount = mt_rand(
             $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 57ece1f9558c3..50544e6ea9726 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 = random_int(
+        $sentencesCount = mt_rand(
             $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 10b07e7e1c7a2..299b4b50bed0f 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 = random_int(
+        $sentenceWordsCount = mt_rand(
             $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 927759c4bfa7c..db208adc67de8 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, random_int(5, 8)),
+            $this->randomWordSelector->getRandomWords($rawText, mt_rand(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 c7efcc7f12e0f..0598db218728f 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[random_int(0, $wordsSize - 1)];
+            $randWords[] = $words[mt_rand(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 7621bccf08773..87e033be330cf 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, random_int(5, 8)),
+            $this->randomWordSelector->getRandomWords($rawText, mt_rand(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 fe53ebef535a8..ed5a836129460 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, random_int(5, 8)),
+            $this->randomWordSelector->getRandomWords($rawText, mt_rand(5, 8)),
             '<span>%s</span>'
         );
     }
diff --git a/setup/src/Magento/Setup/Model/Dictionary.php b/setup/src/Magento/Setup/Model/Dictionary.php
index 52f7cc1bb5148..630d35092d0fc 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 = random_int(0, count($this->dictionary) - 1);
+        $randIndex = mt_rand(0, count($this->dictionary) - 1);
         return trim($this->dictionary[$randIndex]);
     }
 
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index 7a097e49c6289..23f8a13c8bfe8 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -429,7 +429,7 @@ private function createModulesConfig($request, $dryRun = false)
         $disable = $this->readListOfModules($all, $request, InstallCommand::INPUT_KEY_DISABLE_MODULES);
         $result = [];
         foreach ($all as $module) {
-            if ((isset($currentModules[$module]) && !$currentModules[$module])) {
+            if (isset($currentModules[$module]) && !$currentModules[$module]) {
                 $result[$module] = 0;
             } else {
                 $result[$module] = 1;
@@ -925,7 +925,7 @@ private function throwExceptionForNotWritablePaths(array $paths)
      */
     private function handleDBSchemaData($setup, $type, array $request)
     {
-        if (!(($type === 'schema') || ($type === 'data'))) {
+        if (!($type === 'schema' || $type === 'data')) {
             throw  new \Magento\Setup\Exception("Unsupported operation type $type is requested");
         }
         $resource = new \Magento\Framework\Module\ModuleResource($this->context);
diff --git a/setup/src/Magento/Setup/Model/ModuleStatus.php b/setup/src/Magento/Setup/Model/ModuleStatus.php
index c36b413e61419..a70125e8df3eb 100644
--- a/setup/src/Magento/Setup/Model/ModuleStatus.php
+++ b/setup/src/Magento/Setup/Model/ModuleStatus.php
@@ -11,6 +11,9 @@
 use Magento\Framework\Module\DependencyChecker;
 use Magento\Framework\Module\ModuleList\Loader as ModuleLoader;
 
+/**
+ * Setup module status
+ */
 class ModuleStatus
 {
     /**
@@ -104,7 +107,7 @@ private function getListOfDisableModules()
                 [$module['name']],
                 $enabledModules
             );
-            if (sizeof($errorMessages[$module['name']]) === 0) {
+            if (count($errorMessages[$module['name']]) === 0) {
                 $canBeDisabled[] = $module['name'];
             }
         }
@@ -128,6 +131,8 @@ private function getListOfEnabledModules()
     }
 
     /**
+     * Set module status is enabled
+     *
      * @param bool $status
      * @param String $moduleName
      *
diff --git a/setup/src/Magento/Setup/Model/UninstallCollector.php b/setup/src/Magento/Setup/Model/UninstallCollector.php
index 2e22913975fef..94ef0336d404b 100644
--- a/setup/src/Magento/Setup/Model/UninstallCollector.php
+++ b/setup/src/Magento/Setup/Model/UninstallCollector.php
@@ -55,7 +55,7 @@ public function collectUninstall($filterModules = [])
         /** @var \Magento\Setup\Module\DataSetup $setup */
         $setup = $this->dataSetupFactory->create();
         $result = $setup->getConnection()->select()->from($setup->getTable('setup_module'), ['module']);
-        if (isset($filterModules) && sizeof($filterModules) > 0) {
+        if (isset($filterModules) && count($filterModules) > 0) {
             $result->where('module in( ? )', $filterModules);
         }
         // go through modules
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 d78e259ec06e0..b3a2f14aa922a 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php
@@ -10,6 +10,11 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\FileSystemException;
 
+/**
+ * Class ClassesScanner
+ *
+ * @package Magento\Setup\Module\Di\Code\Reader
+ */
 class ClassesScanner implements ClassesScannerInterface
 {
     /**
@@ -29,7 +34,8 @@ class ClassesScanner implements ClassesScannerInterface
 
     /**
      * @param array $excludePatterns
-     * @param string $generationDirectory
+     * @param DirectoryList|null $directoryList
+     * @throws FileSystemException
      */
     public function __construct(array $excludePatterns = [], DirectoryList $directoryList = null)
     {
@@ -61,7 +67,7 @@ public function addExcludePatterns(array $excludePatterns)
      */
     public function getList($path)
     {
-
+        // phpcs:ignore
         $realPath = realpath($path);
         $isGeneration = strpos($realPath, $this->generationDirectory) === 0;
 
@@ -94,7 +100,7 @@ public function getList($path)
      */
     private function extract(\RecursiveIteratorIterator $recursiveIterator)
     {
-        $classes = [];
+        $classes = [[]];
         foreach ($recursiveIterator as $fileItem) {
             /** @var $fileItem \SplFileInfo */
             if ($fileItem->isDir() || $fileItem->getExtension() !== 'php' || $fileItem->getBasename()[0] == '.') {
@@ -109,12 +115,14 @@ private function extract(\RecursiveIteratorIterator $recursiveIterator)
             $fileScanner = new FileClassScanner($fileItemPath);
             $classNames = $fileScanner->getClassNames();
             $this->includeClasses($classNames, $fileItemPath);
-            $classes = array_merge($classes, $classNames);
+            $classes [] = $classNames;
         }
-        return $classes;
+        return array_merge(...$classes);
     }
 
     /**
+     * Include classes from file path
+     *
      * @param array $classNames
      * @param string $fileItemPath
      * @return bool Whether the class is included or not
@@ -123,6 +131,7 @@ private function includeClasses(array $classNames, $fileItemPath)
     {
         foreach ($classNames as $className) {
             if (!class_exists($className)) {
+                // phpcs:ignore
                 require_once $fileItemPath;
                 return true;
             }
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Reader/FileClassScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Reader/FileClassScanner.php
index e34fcbd041c76..9a91006564d7f 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/FileClassScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/FileClassScanner.php
@@ -6,8 +6,24 @@
 
 namespace Magento\Setup\Module\Di\Code\Reader;
 
+/**
+ * Class FileClassScanner
+ *
+ * @package Magento\Setup\Module\Di\Code\Reader
+ */
 class FileClassScanner
 {
+    private const NAMESPACE_TOKENS = [
+        T_WHITESPACE => true,
+        T_STRING => true,
+        T_NS_SEPARATOR => true
+    ];
+
+    private const ALLOWED_OPEN_BRACES_TOKENS = [
+        T_CURLY_OPEN               => true,
+        T_DOLLAR_OPEN_CURLY_BRACES => true,
+        T_STRING_VARNAME           => true];
+
     /**
      * The filename of the file to introspect
      *
@@ -34,7 +50,9 @@ class FileClassScanner
      */
     public function __construct($filename)
     {
+        // phpcs:ignore
         $filename = realpath($filename);
+        // phpcs:ignore
         if (!file_exists($filename) || !\is_file($filename)) {
             throw new InvalidFileException(
                 sprintf(
@@ -53,12 +71,14 @@ public function __construct($filename)
      */
     public function getFileContents()
     {
+        // phpcs:ignore
         return file_get_contents($this->filename);
     }
 
     /**
-     * Extracts the fully qualified class name from a file.  It only searches for the first match and stops looking
-     * as soon as it enters the class definition itself.
+     * Extracts the fully qualified class name from a file.
+     *
+     * It only searches for the first match and stops looking as soon as it enters the class definition itself.
      *
      * Warnings are suppressed for this method due to a micro-optimization that only really shows up when this logic
      * is called several millions of times, which can happen quite easily with even moderately sized codebases.
@@ -69,35 +89,36 @@ public function getFileContents()
      */
     private function extract()
     {
-        $allowedOpenBraces = [T_CURLY_OPEN, T_DOLLAR_OPEN_CURLY_BRACES, T_STRING_VARNAME];
         $classes = [];
-        $namespace = '';
+        $namespaceParts = [];
         $class = '';
         $triggerClass = false;
         $triggerNamespace = false;
         $braceLevel = 0;
         $bracedNamespace = false;
 
+        // phpcs:ignore
         $this->tokens = token_get_all($this->getFileContents());
         foreach ($this->tokens as $index => $token) {
+            $tokenIsArray = is_array($token);
             // Is either a literal brace or an interpolated brace with a variable
-            if ($token == '{' || (is_array($token) && in_array($token[0], $allowedOpenBraces))) {
+            if ($token === '{' || ($tokenIsArray && isset(self::ALLOWED_OPEN_BRACES_TOKENS[$token[0]]))) {
                 $braceLevel++;
-            } else if ($token == '}') {
+            } elseif ($token === '}') {
                 $braceLevel--;
             }
             // The namespace keyword was found in the last loop
             if ($triggerNamespace) {
                 // A string ; or a discovered namespace that looks like "namespace name { }"
-                if (!is_array($token) || ($namespace && $token[0] == T_WHITESPACE)) {
+                if (!$tokenIsArray || ($namespaceParts && $token[0] === T_WHITESPACE)) {
                     $triggerNamespace = false;
-                    $namespace .= '\\';
+                    $namespaceParts[] = '\\';
                     continue;
                 }
-                $namespace .= $token[1];
+                $namespaceParts[] = $token[1];
 
-                // The class keyword was found in the last loop
-            } else if ($triggerClass && $token[0] == T_STRING) {
+            // The class keyword was found in the last loop
+            } elseif ($triggerClass && $token[0] === T_STRING) {
                 $triggerClass = false;
                 $class = $token[1];
             }
@@ -106,7 +127,7 @@ private function extract()
                 case T_NAMESPACE:
                     // Current loop contains the namespace keyword.  Between this and the semicolon is the namespace
                     $triggerNamespace = true;
-                    $namespace = '';
+                    $namespaceParts = [];
                     $bracedNamespace = $this->isBracedNamespace($index);
                     break;
                 case T_CLASS:
@@ -118,9 +139,8 @@ private function extract()
             }
 
             // We have a class name, let's concatenate and store it!
-            if ($class != '') {
-                $namespace = trim($namespace);
-                $fqClassName = $namespace . trim($class);
+            if ($class !== '') {
+                $fqClassName = trim(join('', $namespaceParts)) . trim($class);
                 $classes[] = $fqClassName;
                 $class = '';
             }
@@ -139,15 +159,15 @@ private function isBracedNamespace($index)
         $len = count($this->tokens);
         while ($index++ < $len) {
             if (!is_array($this->tokens[$index])) {
-                if ($this->tokens[$index] == ';') {
+                if ($this->tokens[$index] === ';') {
                     return false;
-                } else if ($this->tokens[$index] == '{') {
+                } elseif ($this->tokens[$index] === '{') {
                     return true;
                 }
                 continue;
             }
 
-            if (!in_array($this->tokens[$index][0], [T_WHITESPACE, T_STRING, T_NS_SEPARATOR])) {
+            if (!isset(self::NAMESPACE_TOKENS[$this->tokens[$index][0]])) {
                 throw new InvalidFileException('Namespace not defined properly');
             }
         }
@@ -155,8 +175,9 @@ private function isBracedNamespace($index)
     }
 
     /**
-     * Retrieves the first class found in a class file.  The return value is in an array format so it retains the
-     * same usage as the FileScanner.
+     * Retrieves the first class found in a class file.
+     *
+     * The return value is in an array format so it retains the same usage as the FileScanner.
      *
      * @return array
      */
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
index ab66a63e24498..1cd242acbe50b 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
@@ -11,6 +11,11 @@
 use Magento\Setup\Module\Di\Compiler\Log\Log;
 use \Magento\Framework\Reflection\TypeProcessor;
 
+/**
+ * Class PhpScanner
+ *
+ * @package Magento\Setup\Module\Di\Code\Scanner
+ */
 class PhpScanner implements ScannerInterface
 {
     /**
@@ -167,48 +172,51 @@ protected function _fetchMissingExtensionAttributesClasses($reflectionClass, $fi
      *
      * @param array $files
      * @return array
+     * @throws \ReflectionException
      */
     public function collectEntities(array $files)
     {
-        $output = [];
+        $output = [[]];
         foreach ($files as $file) {
             $classes = $this->_getDeclaredClasses($file);
             foreach ($classes as $className) {
                 $reflectionClass = new \ReflectionClass($className);
-                $output = array_merge(
-                    $output,
-                    $this->_fetchFactories($reflectionClass, $file),
-                    $this->_fetchMissingExtensionAttributesClasses($reflectionClass, $file)
-                );
+                $output [] = $this->_fetchFactories($reflectionClass, $file);
+                $output [] = $this->_fetchMissingExtensionAttributesClasses($reflectionClass, $file);
             }
         }
-        return array_unique($output);
+        return array_unique(array_merge(...$output));
     }
 
     /**
-     * @param $tokenIterator int
-     * @param $count int
-     * @param $tokens array
+     * Fetch namespaces from tokenized PHP file
+     *
+     * @param int $tokenIterator
+     * @param int $count
+     * @param array $tokens
      * @return string
      */
     protected function _fetchNamespace($tokenIterator, $count, $tokens)
     {
-        $namespace = '';
+        $namespaceParts = [];
         for ($tokenOffset = $tokenIterator + 1; $tokenOffset < $count; ++$tokenOffset) {
             if ($tokens[$tokenOffset][0] === T_STRING) {
-                $namespace .= "\\" . $tokens[$tokenOffset][1];
+                $namespaceParts[] = "\\";
+                $namespaceParts[] = $tokens[$tokenOffset][1];
             } elseif ($tokens[$tokenOffset] === '{' || $tokens[$tokenOffset] === ';') {
                 break;
             }
         }
-        return $namespace;
+        return join('', $namespaceParts);
     }
 
     /**
-     * @param $namespace string
-     * @param $tokenIterator int
-     * @param $count int
-     * @param $tokens array
+     * Fetch class names from tokenized PHP file
+     *
+     * @param string $namespace
+     * @param int $tokenIterator
+     * @param int $count
+     * @param array $tokens
      * @return array
      */
     protected function _fetchClasses($namespace, $tokenIterator, $count, $tokens)
@@ -230,23 +238,24 @@ protected function _fetchClasses($namespace, $tokenIterator, $count, $tokens)
      */
     protected function _getDeclaredClasses($file)
     {
-        $classes = [];
-        $namespace = '';
+        $classes = [[]];
+        $namespaceParts = [];
+        // phpcs:ignore
         $tokens = token_get_all(file_get_contents($file));
         $count = count($tokens);
 
         for ($tokenIterator = 0; $tokenIterator < $count; $tokenIterator++) {
             if ($tokens[$tokenIterator][0] == T_NAMESPACE) {
-                $namespace .= $this->_fetchNamespace($tokenIterator, $count, $tokens);
+                $namespaceParts[] = $this->_fetchNamespace($tokenIterator, $count, $tokens);
             }
 
             if (($tokens[$tokenIterator][0] == T_CLASS || $tokens[$tokenIterator][0] == T_INTERFACE)
                 && $tokens[$tokenIterator - 1][0] != T_DOUBLE_COLON
             ) {
-                $classes = array_merge($classes, $this->_fetchClasses($namespace, $tokenIterator, $count, $tokens));
+                $classes[] = $this->_fetchClasses(join('', $namespaceParts), $tokenIterator, $count, $tokens);
             }
         }
-        return array_unique($classes);
+        return array_unique(array_merge(...$classes));
     }
 
     /**
@@ -263,7 +272,7 @@ private function shouldGenerateClass($missingClassName, $entityType, $file)
             if (class_exists($missingClassName)) {
                 return false;
             }
-        } catch (\RuntimeException $e) {
+        } catch (\RuntimeException $e) { //phpcs:ignore
         }
         $sourceClassName = $this->getSourceClassName($missingClassName, $entityType);
         if (!class_exists($sourceClassName) && !interface_exists($sourceClassName)) {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/BackslashTrim.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/BackslashTrim.php
index 10b6b941df8e1..ce0fa5dbac121 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/BackslashTrim.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/BackslashTrim.php
@@ -8,8 +8,21 @@
 
 use Magento\Setup\Module\Di\Compiler\Config\ModificationInterface;
 
+/**
+ * Class BackslashTrim
+ *
+ * @package Magento\Setup\Module\Di\Compiler\Config\Chain
+ */
 class BackslashTrim implements ModificationInterface
 {
+    /**
+     * Argument keys which require recursive resolving
+     */
+    private const RECURSIVE_ARGUMENT_KEYS = [
+        '_i_' => true, // shared instance of a class or interface
+        '_ins_' => true // non-shared instance of a class or interface
+    ];
+
     /**
      * Modifies input config
      *
@@ -48,7 +61,6 @@ private function resolveInstancesNames(array $arguments)
      * Resolves instances arguments
      *
      * @param array $argument
-     * @return array
      */
     private function resolveArguments(&$argument)
     {
@@ -57,15 +69,12 @@ private function resolveArguments(&$argument)
         }
 
         foreach ($argument as $key => &$value) {
-            if (in_array($key, ['_i_', '_ins_'], true)) {
+            if (isset(self::RECURSIVE_ARGUMENT_KEYS[$key])) {
                 $value = ltrim($value, '\\');
                 continue;
             }
 
-            if (is_array($value)) {
-                $this->resolveArguments($value);
-            }
+            $this->resolveArguments($value);
         }
-        return;
     }
 }
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/PreferencesResolving.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/PreferencesResolving.php
index 8624ce39df09c..d902c0c0eb62a 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/PreferencesResolving.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/PreferencesResolving.php
@@ -8,8 +8,21 @@
 
 use Magento\Setup\Module\Di\Compiler\Config\ModificationInterface;
 
+/**
+ * Class PreferencesResolving
+ *
+ * @package Magento\Setup\Module\Di\Compiler\Config\Chain
+ */
 class PreferencesResolving implements ModificationInterface
 {
+    /**
+     * Argument keys which require recursive resolving
+     */
+    private const RECURSIVE_ARGUMENT_KEYS = [
+        '_i_' => true, // shared instance of a class or interface
+        '_ins_' => true // non-shared instance of a class or interface
+    ];
+
     /**
      * Modifies input config
      *
@@ -32,7 +45,6 @@ public function modify(array $config)
      *
      * @param array $argument
      * @param array $preferences
-     * @return array
      */
     private function resolvePreferences(&$argument, &$preferences)
     {
@@ -41,14 +53,12 @@ private function resolvePreferences(&$argument, &$preferences)
         }
 
         foreach ($argument as $key => &$value) {
-            if (in_array($key, ['_i_', '_ins_'], true)) {
+            if (isset(self::RECURSIVE_ARGUMENT_KEYS[$key])) {
                 $value = $this->resolvePreferenceRecursive($value, $preferences);
                 continue;
             }
 
-            if (is_array($value)) {
-                $this->resolvePreferences($value, $preferences);
-            }
+            $this->resolvePreferences($value, $preferences);
         }
     }
 
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Reader.php b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Reader.php
index 353e15d2da5d2..3b8d301fb3d0e 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Config/Reader.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Config/Reader.php
@@ -15,6 +15,7 @@
 
 /**
  * Class Reader
+ *
  * @package Magento\Setup\Module\Di\Compiler\Config
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -84,7 +85,7 @@ public function generateCachePerScope(
         }
 
         $config = [];
-        
+
         $this->fillThirdPartyInterfaces($areaConfig, $definitionsCollection);
         $config['arguments'] = $this->getConfigForScope($definitionsCollection, $areaConfig);
 
@@ -98,6 +99,12 @@ public function generateCachePerScope(
         foreach (array_keys($areaConfig->getVirtualTypes()) as $virtualType) {
             $config['instanceTypes'][$virtualType] = $areaConfig->getInstanceType($virtualType);
         }
+
+        // sort configuration to have it in the same order on every build
+        ksort($config['arguments']);
+        ksort($config['preferences']);
+        ksort($config['instanceTypes']);
+
         return $config;
     }
 
@@ -113,11 +120,10 @@ private function getConfigForScope(DefinitionsCollection $definitionsCollection,
     {
         $constructors = [];
         $argumentsResolver = $this->argumentsResolverFactory->create($config);
-        foreach ($definitionsCollection->getInstancesNamesList() as $instanceType) {
+        foreach ($definitionsCollection->getCollection() as $instanceType => $constructor) {
             if (!$this->typeReader->isConcrete($instanceType)) {
                 continue;
             }
-            $constructor = $definitionsCollection->getInstanceArguments($instanceType);
             $constructors[$instanceType] = $argumentsResolver->getResolvedConstructorArguments(
                 $instanceType,
                 $constructor
@@ -151,14 +157,9 @@ private function getConfigForScope(DefinitionsCollection $definitionsCollection,
      */
     private function fillThirdPartyInterfaces(ConfigInterface $config, DefinitionsCollection $definitionsCollection)
     {
-        $definedInstances = $definitionsCollection->getInstancesNamesList();
-
-        foreach (array_keys($config->getPreferences()) as $interface) {
-            if (in_array($interface, $definedInstances)) {
-                continue;
-            }
-
-            $definitionsCollection->addDefinition($interface, []);
-        }
+        $definedInstances = $definitionsCollection->getCollection();
+        $newInstances = array_fill_keys(array_keys($config->getPreferences()), []);
+        $newCollection = array_merge($newInstances, $definedInstances);
+        $definitionsCollection->initialize($newCollection);
     }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleConfigStatusCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleConfigStatusCommandTest.php
index 16577ed2db738..23879bf005f85 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleConfigStatusCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleConfigStatusCommandTest.php
@@ -49,6 +49,9 @@ public function testExecute(array $currentConfig, array $correctConfig, string $
         $this->assertEquals($expectedOutput, $tester->getDisplay());
     }
 
+    /**
+     * @return array
+     */
     public function executeDataProvider()
     {
         $successMessage = 'The modules configuration is up to date.' . PHP_EOL;
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/EnvironmentTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/EnvironmentTest.php
index aa16ea1f8cd60..6050122d78521 100644
--- a/setup/src/Magento/Setup/Test/Unit/Controller/EnvironmentTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Controller/EnvironmentTest.php
@@ -294,6 +294,13 @@ public function testIndexAction()
         $this->assertInstanceOf(\Zend\View\Model\JsonModel::class, $model);
     }
 
+    /**
+     * @param \PHPUnit\Framework\MockObject\MockObject $request
+     * @param \PHPUnit\Framework\MockObject\MockObject $response
+     * @param \PHPUnit\Framework\MockObject\MockObject $routeMatch
+     *
+     * @return \PHPUnit\Framework\MockObject\MockObject
+     */
     protected function getMvcEventMock(
         MockObject $request,
         MockObject $response,
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
index 435f03f9de60b..4445fc076d49d 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
@@ -179,6 +179,9 @@ private function prepareValidationMocks()
             ->disableOriginalConstructor()
             ->getMock();
         $this->dbValidator->expects($this->once())->method('checkDatabaseTablePrefix')->willReturn($configDataMock);
+        $this->dbValidator->expects($this->once())
+            ->method('checkDatabaseConnectionWithDriverOptions')
+            ->willReturn($configDataMock);
         $this->dbValidator
             ->expects($this->once())
             ->method('checkDatabaseConnectionWithDriverOptions')
diff --git a/setup/src/Magento/Setup/Validator/AdminCredentialsValidator.php b/setup/src/Magento/Setup/Validator/AdminCredentialsValidator.php
index 23e41df900d4f..660c5ed893d59 100644
--- a/setup/src/Magento/Setup/Validator/AdminCredentialsValidator.php
+++ b/setup/src/Magento/Setup/Validator/AdminCredentialsValidator.php
@@ -8,7 +8,6 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Config\ConfigOptionsListConstants as ConfigOption;
 use Magento\Setup\Model\AdminAccount;
-use Magento\Setup\Model\Installer;
 use Magento\Setup\Model\ConfigOptionsList\DriverOptions;
 
 /**
@@ -66,7 +65,6 @@ public function __construct(
     public function validate(array $data)
     {
         $driverOptions = $this->driverOptions->getDriverOptions($data);
-
         $dbConnection = $this->connectionFactory->create(
             [
                 ConfigOption::KEY_NAME => $data[ConfigOption::INPUT_KEY_DB_NAME],
diff --git a/setup/src/Magento/Setup/Validator/IpValidator.php b/setup/src/Magento/Setup/Validator/IpValidator.php
index 1b5624c0c6ffe..5d1e83021e34b 100644
--- a/setup/src/Magento/Setup/Validator/IpValidator.php
+++ b/setup/src/Magento/Setup/Validator/IpValidator.php
@@ -42,12 +42,12 @@ public function validateIps(array $ips, $noneAllowed)
 
         $this->filterIps($ips);
 
-        if (sizeof($this->none) > 0 && !$noneAllowed) {
+        if (count($this->none) > 0 && !$noneAllowed) {
             $messages[] = "'none' is not allowed";
-        } elseif ($noneAllowed && sizeof($this->none) > 1) {
+        } elseif ($noneAllowed && count($this->none) > 1) {
             $messages[] = "'none' can be only used once";
-        } elseif ($noneAllowed && sizeof($this->none) > 0 &&
-            (sizeof($this->validIps) > 0 || sizeof($this->invalidIps) > 0)
+        } elseif ($noneAllowed && count($this->none) > 0 &&
+            (count($this->validIps) > 0 || count($this->invalidIps) > 0)
         ) {
             $messages[] = "Multiple values are not allowed when 'none' is used";
         } else {
diff --git a/setup/view/magento/setup/add-database.phtml b/setup/view/magento/setup/add-database.phtml
index c858d92cfef55..5ba15cf0c1ec8 100644
--- a/setup/view/magento/setup/add-database.phtml
+++ b/setup/view/magento/setup/add-database.phtml
@@ -90,11 +90,96 @@
             Create a database for me
         </label>
     </div>
+ */
+?>
+<div class="row form-row">
+    <div class="col-m-3">
+        <label class="form-label" for="dbDriverOptionsSslKey">
+            Driver Options - SSL Key
+        </label>
+    </div>
+    <div class="col-m-4">
+        <input
+                id="dbDriverOptionsSslKey"
+                class="form-el-input"
+                tooltip-placement="right"
+                tooltip="File that contains X509 key"
+                tooltip-trigger="focus"
+                tooltip-append-to-body="true"
+                type="text"
+                name="dbDriverOptionsSslKey"
+                ng-model="db.driverOptionsSslKey"
+                placeholder="/path/to/client-key.pem"
+        >
+    </div>
+</div>
 
-</fieldset>
+<div class="row form-row">
+    <div class="col-m-3">
+        <label class="form-label" for="dbDriverOptionsSslCert">
+            Driver Options - SSL Certificate
+        </label>
+    </div>
+    <div class="col-m-4">
+        <input
+                id="dbDriverOptionsSslCert"
+                class="form-el-input"
+                tooltip-placement="right"
+                tooltip="File that contains X509 certificate"
+                tooltip-trigger="focus"
+                tooltip-append-to-body="true"
+                type="text"
+                name="dbDriverOptionsSslCert"
+                ng-model="db.driverOptionsSslCert"
+                placeholder="/path/to/client-cert.pem"
+        >
+    </div>
+</div>
 
-*/
-?>
+<div class="row form-row">
+    <div class="col-m-3">
+        <label class="form-label" for="dbDriverOptionsSslCa">
+            Driver Options - SSL Certificate Authorities
+        </label>
+    </div>
+    <div class="col-m-4">
+        <input
+                id="dbDriverOptionsSslCa"
+                class="form-el-input"
+                tooltip-placement="right"
+                tooltip="File that contains list of trusted SSL Certificate Authorities"
+                tooltip-trigger="focus"
+                tooltip-append-to-body="true"
+                type="text"
+                name="dbDriverOptionsSslCa"
+                ng-model="db.driverOptionsSslCa"
+                placeholder="/path/to/ca.pem"
+        >
+    </div>
+</div>
+
+<div class="row form-row">
+    <div class="col-m-3">
+        <label class="form-label">
+            Driver Options - SSL Verification
+        </label>
+    </div>
+    <div class="col-m-4">
+        <div class="form-row">
+            <input
+                    id="dbDriverOptionsSslVerify"
+                    class="form-el-checkbox"
+                    type="checkbox"
+                    ng-model="db.driverOptionsSslVerify"
+                    ng-checked="db.driverOptionsSslVerify"
+            >
+            <label class="form-label" for="dbDriverOptionsSslVerify">
+                Perform verification against the server CA certificate and against the server host name in its certificate
+            </label>
+        </div>
+    </div>
+</div>
+</fieldset>
 
 <fieldset class="form-fieldset">
 
@@ -475,94 +560,6 @@
 
 */
 ?>
-
-<div class="row form-row">
-    <div class="col-m-3">
-        <label class="form-label" for="dbDriverOptionsSslKey">
-            Driver Options - SSL Key
-        </label>
-    </div>
-    <div class="col-m-4">
-        <input
-                id="dbDriverOptionsSslKey"
-                class="form-el-input"
-                tooltip-placement="right"
-                tooltip="File that contains X509 key"
-                tooltip-trigger="focus"
-                tooltip-append-to-body="true"
-                type="text"
-                name="dbDriverOptionsSslKey"
-                ng-model="db.driverOptionsSslKey"
-                placeholder="/path/to/client-key.pem"
-        >
-    </div>
-</div>
-
-<div class="row form-row">
-    <div class="col-m-3">
-        <label class="form-label" for="dbDriverOptionsSslCert">
-            Driver Options - SSL Certificate
-        </label>
-    </div>
-    <div class="col-m-4">
-        <input
-                id="dbDriverOptionsSslCert"
-                class="form-el-input"
-                tooltip-placement="right"
-                tooltip="File that contains X509 certificate"
-                tooltip-trigger="focus"
-                tooltip-append-to-body="true"
-                type="text"
-                name="dbDriverOptionsSslCert"
-                ng-model="db.driverOptionsSslCert"
-                placeholder="/path/to/client-cert.pem"
-        >
-    </div>
-</div>
-
-<div class="row form-row">
-    <div class="col-m-3">
-        <label class="form-label" for="dbDriverOptionsSslCa">
-            Driver Options - SSL Certificate Authorities
-        </label>
-    </div>
-    <div class="col-m-4">
-        <input
-                id="dbDriverOptionsSslCa"
-                class="form-el-input"
-                tooltip-placement="right"
-                tooltip="File that contains list of trusted SSL Certificate Authorities"
-                tooltip-trigger="focus"
-                tooltip-append-to-body="true"
-                type="text"
-                name="dbDriverOptionsSslCa"
-                ng-model="db.driverOptionsSslCa"
-                placeholder="/path/to/ca.pem"
-        >
-    </div>
-</div>
-
-<div class="row form-row">
-    <div class="col-m-3">
-        <label class="form-label">
-            Driver Options - SSL Verification
-        </label>
-    </div>
-    <div class="col-m-4">
-        <div class="form-row">
-            <input
-                    id="dbDriverOptionsSslVerify"
-                    class="form-el-checkbox"
-                    type="checkbox"
-                    ng-model="db.driverOptionsSslVerify"
-                    ng-checked="db.driverOptionsSslVerify"
-            >
-            <label class="form-label" for="dbDriverOptionsSslVerify">
-                Perform verification against the server CA certificate and against the server host name in its certificate
-            </label>
-        </div>
-    </div>
-</div>
 </fieldset>
 
 </form>